diff --git a/java/eclipse/Makefile.plugins b/java/eclipse/Makefile.plugins
index 2b4e9ce21dfe..52b6c47b35a9 100644
--- a/java/eclipse/Makefile.plugins
+++ b/java/eclipse/Makefile.plugins
@@ -1,13 +1,12 @@
-# $FreeBSD$
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
 REPO_DIRS?=	features plugins
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse
 	@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) | ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST}
 
diff --git a/net/tinyfugue-devel/Makefile b/net/tinyfugue-devel/Makefile
index 04d03e97b377..aeaf4fb19505 100644
--- a/net/tinyfugue-devel/Makefile
+++ b/net/tinyfugue-devel/Makefile
@@ -1,36 +1,34 @@
-# $FreeBSD: head/net/tinyfugue/Makefile 525173 2020-02-04 16:17:25Z dinoex $
-
 PORTNAME=	tinyfugue
 PORTVERSION=	5.1.3
 PORTREVISION=	0
 CATEGORIES=	net games
 PKGNAMESUFFIX=	-devel${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Popular programmable MUD client, with macro support and more
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ingwarsw
 
 USES=		ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-manpage --enable-version --enable-symlink=no \
 		--exec-prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
 		--mandir=${PREFIX}/man \
 		--datadir=${PREFIX}/lib --with-inclibpfx=${LOCALBASE}
 LDFLAGS+=	-L${LOCALBASE}
 PLIST_SUB=	DISTNAME=tf-development
 
 post-build:
 	${STRIP_CMD} ${WRKSRC}/src/tf
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/src/tf.1.nroffman ${STAGEDIR}${PREFIX}/man/man1/tf-development.1
 
 .include <bsd.port.mk>
diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index 60f9d95678ef..f117647cf281 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -1,97 +1,95 @@
-# $FreeBSD: head/security/bastillion/Makefile 513677 2019-10-03 17:22:17Z glewis $
-
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
 DISTVERSION=		3.14_00
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-upgrade-4.00.01.jar
 PORTREVISION=		0
 CATEGORIES=		security www java
 #MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
 MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v3.14.0/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Web-based SSH console
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		shebangfix
 USE_JAVA=	yes
 USE_GITHUB=	nodefault
 
 SHEBANG_FILES=	jetty_bastillion/bin/jetty.sh
 GH_ACCOUNT=	bastillion-io
 GH_PROJECT=	Bastillion
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	11+
 JAVA_VENDOR=	openjdk
 USE_RC_SUBR=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}/Bastillion-jetty
 
 APP_NAME=	${PORTNAME}
 WWWDIR=		www/${PORTNAME}
 
 USERS=		www
 GROUPS=		www
 
 SUB_LIST=	\
 		APP_NAME=${APP_NAME} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		WWWDIR=${WWWDIR}
 
 SUB_FILES=	\
 		${APP_NAME} \
 		bastillion.sample \
 		pkg-message
 
 PLIST_SUB=	APP_NAME=${APP_NAME} \
 		WWWDIR=${WWWDIR}
 
 post-extract:
 	${RM} ${WRKSRC}/*.bat ${WRKSRC}/startBastillion.sh
 	${MV} ${WRKSRC}/jetty ${WRKSRC}/jetty_bastillion
 	${MV} ${WRKSRC}/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties ${WRKSRC}/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample
 	${MV} ${WRKSRC}/jetty_bastillion/start.ini ${WRKSRC}/
 	${MV} ${WRKSRC}/jetty_bastillion/webapps ${WRKSRC}/
 	${MV} ${WRKSRC}/jetty_bastillion/etc ${WRKSRC}/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${WWWDIR}/work
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	cd ${WRKSRC}; ${COPYTREE_BIN} jetty_bastillion ${STAGEDIR}${PREFIX} "! -name *\.orig"
 	${MKDIR} ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade
 	cd ${WRKSRC}; ${COPYTREE_SHARE} webapps ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	cd ${WRKSRC}; ${COPYTREE_SHARE} etc ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	${RLN} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc ${STAGEDIR}${PREFIX}/jetty_bastillion/etc
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-4.00.01.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/
 
 gen-plist:
 	${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new
 	${ECHO} '@sample(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/log/%%APP_NAME%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/run/%%APP_NAME%%' >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/jetty_bastillion -type f -a ! -name \*.orig -a ! -name \*.sample | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g" | ${SORT} >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%/work' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/start.ini' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/3rdPartyLicenses.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/LICENSE.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/README.md' >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
 	${ECHO} 'jetty_bastillion/etc' >> ${PLIST}.new
 
 .include <bsd.port.mk>