Index: head/security/cyrus-sasl2/Makefile.common
===================================================================
--- head/security/cyrus-sasl2/Makefile.common	(revision 514143)
+++ head/security/cyrus-sasl2/Makefile.common	(revision 514144)
@@ -1,190 +1,190 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.27
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	https://www.cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-sasl/
 
 MAINTAINER=	ume@FreeBSD.org
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		gmake
 USE_LDCONFIG=	yes
 USES+=		ssl
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--with-lib-subdir=lib \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--includedir=${PREFIX}/include \
 		--enable-static \
 		--with-rc4=openssl
 CONFIGURE_ARGS+=--disable-anon \
 		--disable-cram \
 		--disable-digest \
 		--disable-gssapi \
 		--disable-krb4 \
 		--disable-login \
 		--disable-ntlm \
 		--disable-otp \
 		--disable-plain \
 		--disable-scram \
 		--disable-srp \
 		--with-dblib=none
 CONFIGURE_ARGS+=${CYRUS_CONFIGURE_ARGS}
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
 DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
 CPE_VENDOR=	cmu
 
 SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 CYRUS_SASL2_DIR=${MASTERDIR}/../../security/cyrus-sasl2
 DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distinfo
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 
 .if defined(PKGNAMESUFFIX)
 CYRUS_BUILD_TARGET?=	${PKGNAMESUFFIX:S/^-//}
 .else
 CYRUS_BUILD_TARGET?=	${PORTNAME}
 .endif
 
 .if ${CYRUS_BUILD_TARGET} != "cyrus-sasl" && ${CYRUS_BUILD_TARGET} != "saslauthd"
 
 INSTALL_WRKSRC=	${WRKSRC}/plugins
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 USES+=		libtool:build
 
 PLIST_FILES+=	lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3 \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3.0.0
 
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 .if ${ARCH} == "amd64"
 CPPFLAGS+=	-fPIC
 .endif
 
 .if ${CYRUS_BUILD_TARGET} == "cyrus-sasl"
 
 .if ${PORT_OPTIONS:MBDB1}
 SASLDB_NAME=	sasldb2.db
 .elif ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 SASLDB_NAME=	sasldb2
 .elif ${PORT_OPTIONS:MGDBM} || ${PORT_OPTIONS:MLMDB}
 SASLDB_NAME=	sasldb2
 .else
 SASLDB=	"@comment "
 .endif
 
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \
 		SASLDB_NAME=${SASLDB_NAME}
 
 PLIST_SUB+=	PREFIX=${PREFIX} \
 		SASLDB=${SASLDB}
 PORTDOCS=	*
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo \
 		-o -name Makefile -o -name Makefile.in \
 		-o -name Makefile.in.bak -o -name Makefile.am \
 		-o -name NTMakefile -o -name .cvsignore )"
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${STAGEDIR}${DOCSDIR}
 
 .elif ${CYRUS_BUILD_TARGET} == "saslauthd"
 
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 .endif
 
 .if ${PORT_OPTIONS:MOPENLDAP}
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 .endif
 
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 RUNPATH=	"@comment "
 .endif
 
 PLIST_SUB+=	PREFIX=${PREFIX} \
 		RUNPATH=${RUNPATH}
 PORTDOCS=	*
 
 SUB_LIST+=	SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH}
 
 do-build:
 	cd ${WRKSRC}/include && gmake
 	cd ${WRKSRC}/common && gmake
 #.if ${PORT_OPTIONS:MBDB1} || ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MGDBM}
 	cd ${WRKSRC}/sasldb && gmake
 #.endif
 	cd ${WRKSRC}/saslauthd && gmake
 	cd ${WRKSRC}/saslauthd && gmake saslcache
 	cd ${WRKSRC}/saslauthd && gmake testsaslauthd
 
 post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \
 		${STAGEDIR}${PREFIX}/sbin/saslcache
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
 		${STAGEDIR}${PREFIX}/sbin/testsaslauthd
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "SASLAUTHD_RUNPATH was specified."
 	@${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}."
 	@${ECHO_MSG} ""
 .else
 	@${MKDIR} ${STAGEDIR}/var/run/saslauthd
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \
 		${STAGEDIR}${DOCSDIR}/saslauthd
 .endfor
 
 .else		# plugin
 
 LIBTOOL=	${LOCALBASE}/bin/libtool
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|g" \
 		${WRKSRC}/configure
 
 do-build:
 	cd ${WRKSRC}/include && gmake
 	cd ${WRKSRC}/common && gmake
 	cd ${WRKSRC}/lib && gmake libobj.la
 	cd ${WRKSRC}/plugins && gmake
 
 .endif
 
 .include <bsd.port.post.mk>
Index: head/security/dropbear/Makefile
===================================================================
--- head/security/dropbear/Makefile	(revision 514143)
+++ head/security/dropbear/Makefile	(revision 514144)
@@ -1,166 +1,166 @@
 # Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
 # $FreeBSD$
 
 PORTNAME=	dropbear
 PORTVERSION=	2019.78
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	SSH 2 server, designed to be usable in small memory environments
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe gmake tar:bzip2
 CPE_VENDOR=	matt_johnston
 CPE_PRODUCT=	dropbear_ssh_server
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-harden
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		SMALL_CODE STATIC
 OPTIONS_DEFAULT=	AES128 AES256 CTR CURVE25519 GROUP14_SHA256 GROUP16 RSA SHA2_256 TWOFISH128 TWOFISH256
 OPTIONS_MULTI=		ENC KEY KEX MAC MODE
 OPTIONS_MULTI_ENC=	3DES AES128 AES256 BLOWFISH TWOFISH128 TWOFISH256
 OPTIONS_MULTI_KEY=	ECDSA DSA RSA
 OPTIONS_MULTI_KEX=	CURVE25519 ECDH GROUP1 GROUP14_SHA1 GROUP14_SHA256 GROUP16
 OPTIONS_MULTI_MAC=	MD5 SHA1 SHA1_96 SHA2_256
 OPTIONS_MULTI_MODE=	CBC CTR
 
 3DES_DESC=		Enable 3DES-based encryption
 AES128_DESC=		Enable AES128-based encryption
 AES256_DESC=		Enable AES256-based encryption
 BLOWFISH_DESC=		Enable Blowfish-based encryption
 CBC_DESC=		Use CBC mode for ciphers (less secure)
 CTR_DESC=		Use CTR mode for ciphers (more secure)
 CURVE25519_DESC=	Enable Curve25519
 DSA_DESC=		Enable DSA public key support
 ECDH_DESC=		Enable ECDH (insecure)
 ECDSA_DESC=		Enable ECDSA public key support
 GROUP14_SHA1_DESC=	Enable Group14 Diffie-Helman with SHA1 (insecure)
 GROUP14_SHA256_DESC=	Enable Group14 Diffie-Helman with SHA256
 GROUP16_DESC=		Enable Group16 Diffie-Hellman
 GROUP1_DESC=		Enable Group1 Diffie-Hellman (insecure)
 MD5_DESC=		Enable MD5 MAC (broken)
 RSA_DESC=		Enable RSA public key support
 SHA1_96_DESC=		Enable SHA1_96 MAC (less secure)
 SHA1_DESC=		Enable SHA1 MAC (less secure)
 SHA2_256_DESC=		Enable SHA2_256 MAC
 SMALL_CODE_DESC=	Make binary smaller in exchange for 50% performance hit
 TWOFISH128_DESC=	Enable Twofish128-based encryption
 TWOFISH256_DESC=	Enable Twofish256-based encryption
 
 3DES_IMPLIES=	CTR
 CBC_IMPLIES=	CTR
 
 STATIC_CONFIGURE_ENABLE=	static
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
 		s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/default_options.h
 	@${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch]
 	@${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \
 				${WRKSRC}/libtomcrypt/Makefile.in
 
 post-patch-SMALL_CODE-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_SMALL_CODE/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-3DES-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_3DES/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-AES128-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES128/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-AES256-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES256/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-TWOFISH256-on:
 	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH256 0,#define DROPBEAR_TWOFISH256 1,g" \
 		${WRKSRC}/default_options.h
 
 post-patch-TWOFISH128-on:
 	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH128 0,#define DROPBEAR_TWOFISH128 1,g" \
 		${WRKSRC}/default_options.h
 
 post-patch-BLOWFISH-on:
 	@${REINPLACE_CMD} -e "s,#define DROPBEAR_BLOWFISH 0,#define DROPBEAR_BLOWFISH 1,g" \
 		${WRKSRC}/default_options.h
 
 post-patch-CBC-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CBC_MODE/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-CTR-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CTR_MODE/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-CURVE25519-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_CURVE25519 1/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-ECDH-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDH 1/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-GROUP1-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP1 1/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-GROUP14_SHA1-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA1 1/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-GROUP14_SHA256-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA256 1/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-GROUP16-on:
 	@${REINPLACE_CMD} -e "s,#define DROPBEAR_DH_GROUP16 0,#define DROPBEAR_DH_GROUP16 1,g" \
 		${WRKSRC}/default_options.h
 
 post-patch-DSA-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_DSS/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-RSA-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_RSA/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-ECDSA-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDSA/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-MD5-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_MD5_HMAC/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-SHA1-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_HMAC/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-SHA1_96-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_96_HMAC/d" \
 		${WRKSRC}/default_options.h
 
 post-patch-SHA2_256-off:
 	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA2_256_HMAC/d" \
 		${WRKSRC}/default_options.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dropbear
 	${INSTALL_PROGRAM} ${WRKSRC}/dbclient ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dropbearconvert ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dropbearkey ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dropbear ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/dropbearconvert.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/dropbearkey.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/dbclient.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/dropbear.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/security/heimdal/Makefile
===================================================================
--- head/security/heimdal/Makefile	(revision 514143)
+++ head/security/heimdal/Makefile	(revision 514144)
@@ -1,121 +1,121 @@
 # Created by: nectar@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	heimdal
 PORTVERSION=	7.5.0
 PORTREVISION=	4
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Popular BSD-licensed implementation of Kerberos 5
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \
 		wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]*
 
 USES=		gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \
 		pkgconfig readline makeinfo ssl
 USE_LDCONFIG=	${GSSAPILIBDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
 		ac_cv_header_db_h=no \
 		ac_cv_header_db3_db_h=no \
 		ac_cv_header_db4_db_h=no \
 		ac_cv_header_db5_db_h=no \
 		ac_cv_header_db5_h=no \
 		ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et
 CONFIGURE_ARGS=	--with-berkeley-db \
 		--with-libintl \
 		--with-libintl-include="${LOCALBASE}/include" \
 		--with-libintl-lib="${LOCALBASE}/lib" \
 		--libdir="${GSSAPILIBDIR}" \
 		--includedir="${GSSAPIINCDIR}" \
 		--with-kcm \
 		--with-openssl \
 		--with-openssl-include="${OPENSSLINC}" \
 		--with-openssl-lib="${OPENSSLLIB}" \
 		--enable-otp \
 		--enable-pthread-support \
 		--with-readline="${LOCALBASE}" \
 		--with-hdbdir="/var/${PORTNAME}" \
 		--sysconfdir="${PREFIX}/etc"
 # XXX --with-readline picks up libreadline even if found in /usr/lib.
 MAKE_ENV=	INSTALL_CATPAGES=no
 INSTALL_TARGET=	install-strip
 .if !exists(/etc/rc.d/ipropd_master)
 USE_RC_SUBR=	ipropd_master ipropd_slave
 .endif
 INFO=		heimdal hx509
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	IPV6 BDB LMDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
 OPTIONS_DEFAULT=     BDB             PKINIT DIGEST KX509
 OPTIONS_SUB=	yes
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 BDB_DESC=		Enable BerkeleyDB KDC backend support
 BDB_USES=		bdb:5 localbase
 BDB_CONFIGURE_ENV=	ac_cv_header_db${BDB_VER}_db_h=yes \
 			ac_cv_func_db_create=yes \
 			ac_cv_funclib_db_create="-l${BDB_LIB_NAME}"
 BDB_CONFIGURE_ON=	--disable-ndbm-db
 BDB_CONFIGURE_ENV_OFF=	ac_cv_header_db_h=yes \
 			ac_cv_func_db_create=no \
 			ac_cv_funclib_db_create=no
 BDB_CONFIGURE_OFF=	--enable-ndbm-db
 
 LMDB_DESC=		Enable LMDB KDC backend support
 LMDB_CONFIGURE_ENABLE=	mdb_db
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 SQLITE_DESC=		Enable SQLite KDC backend support
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite3-include="${LOCALBASE}/include" \
 			--with-sqlite3-lib="${LOCALBASE}/lib"
 SQLITE_CONFIGURE_WITH=	sqlite3
 
 LDAP_DESC=		Enable OpenLDAP KDC backend support
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-openldap-include="${LOCALBASE}/include" \
 			--with-openldap-lib="${LOCALBASE}/lib"
 LDAP_CONFIGURE_WITH=	openldap
 
 PKINIT_DESC=		Enable PK-INIT support
 PKINIT_CONFIGURE_ENABLE=pk-init
 
 DIGEST_DESC=		Enable DIGEST support
 DIGEST_CONFIGURE_ENABLE=digest
 
 KX509_DESC=		Enable kx509 support
 KX509_CONFIGURE_ENABLE=	kx509
 
 CRACKLIB_DESC=		Use CrackLib for password quality checking
 CRACKLIB_LIB_DEPENDS=	libcrack.so:security/cracklib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
 WANT_OPENLDAP_SASL?=	yes
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \
 	    ${WRKSRC}/kpasswdd-cracklib
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
 	    ${WRKSRC}/kpasswdd-cracklib/Makefile
 
 post-build-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET}
 
 post-install-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
Index: head/security/ipv6toolkit/Makefile
===================================================================
--- head/security/ipv6toolkit/Makefile	(revision 514143)
+++ head/security/ipv6toolkit/Makefile	(revision 514144)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6toolkit
 PORTVERSION=	2.0
 DISTVERSIONPREFIX=	v
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Set of IPv6 security assessment tools
 
 LICENSE=	GPLv3
 
 USES=		shebangfix uidfix
 SHEBANG_FILES=	tools/blackhole6 tools/script6
 MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WRKSRC}
 SUB_FILES=	BSDMakefile Makefile Makefile.lib
 MAKEFILE=	BSDMakefile
 PORTDOCS=	README.TXT CHANGES.TXT CREDITS.TXT
 
 PROGDIRS=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 path6 ra6 rd6 rs6 \
 		scan6 tcp6 udp6
 LIBDIRS=	libipv6
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS}
 
 post-patch: apply-slist
 	${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC}
 	for D in ${PROGDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \
 	done
 	for D in ${LIBDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile.lib ${WRKSRC}/$$D/Makefile; \
 	done
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/blackhole6 ${WRKSRC}/tools/script6 \
 	    ${STAGEDIR}${PREFIX}/sbin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/nmap/Makefile
===================================================================
--- head/security/nmap/Makefile	(revision 514143)
+++ head/security/nmap/Makefile	(revision 514144)
@@ -1,74 +1,74 @@
 # Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
 
 PORTNAME=	nmap
 DISTVERSION=	7.70
 PORTREVISION=	0
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	https://nmap.org/dist/ \
 		LOCAL/ohauer
 
 MAINTAINER?=	ohauer@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
 
 # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
 # https://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !defined(MASTERDIR)
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DOCS PCAP SSH2 SSL
 OPTIONS_DEFAULT=PCAP SSH2 SSL
 
 PCAP_DESC=		Build with libpcap from nmap
 SSH2_DESC=		SSH2 protocol support
 
 PCAP_CONFIGURE_ON=	--with-libpcap=included
 SSH2_CONFIGURE_ON=	--with-libssh2=included
 SSH2_CONFIGURE_OFF=	--without-libssh2
 SSH2_IMPLIES=		SSL
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_VARS=		STRIP_FILES+=ncat
 
 DOCS=	CHANGELOG HACKING
 STRIP_FILES+=	nmap nping
 
 CONFIGURE_ARGS+=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=included \
 		--without-nmap-update
 
 # XXX limit results if we do a grep in the sources!
 post-extract:
 	@${RM} -r ${WRKSRC}/mswin32
 
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S|^|${STAGEDIR}${PREFIX}/bin/|}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .endif
 
 .include <bsd.port.mk>
Index: head/security/obfs4proxy-tor/Makefile
===================================================================
--- head/security/obfs4proxy-tor/Makefile	(revision 514143)
+++ head/security/obfs4proxy-tor/Makefile	(revision 514144)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	obfs4proxy
 DISTVERSION=	0.0.11
-CATEGORIES=	security net ipv6
+CATEGORIES=	security net
 MASTER_SITES=	https://people.torproject.org/~yawning/releases/${PORTNAME}/
 PKGNAMESUFFIX=	-tor
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Pluggable transport proxy for Tor (obfs4, The Obfuscator)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/LICENSE
 
 USES=		cpe go:modules tar:xz
 
 CPE_VENDOR=	torproject
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	ahf:goptlib:7d56ec4:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \
 		agl:ed25519:5312a61:ed25519/vendor/github.com/agl/ed25519 \
 		dchest:siphash:v1.2.1:siphash/vendor/github.com/dchest/siphash \
 		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
 		golang:crypto:cc06ce4:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:3b0461e:golang_net/vendor/golang.org/x/net \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		golang:sys:d432491:golang_sys/vendor/golang.org/x/sys \
 		Yawning:bsaes:26d1add:Yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git
 
 USE_GITLAB=	nodefault
 GL_TUPLE=	yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/vendor/gitlab.com/yawning/utls.git
 
 GO_TARGET=	../obfs4proxy
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/obfs4proxy \
 		man/man1/obfs4proxy.1.gz
 
 post-patch:
 	${LN} -s ${WRKSRC}/vendor ${WRKDIR}
 
 post-install:
 	${INSTALL_MAN} ${WRKDIR}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/security/oidentd/Makefile
===================================================================
--- head/security/oidentd/Makefile	(revision 514143)
+++ head/security/oidentd/Makefile	(revision 514144)
@@ -1,51 +1,49 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	oidentd
 PORTVERSION=	2.3.2
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/janikrabe/oidentd/releases/download/v2.3.2/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ident server that supports user-defined ident strings
 
 LICENSE=	GPLv2
 
 USES=		bison
 USE_RC_SUBR=	oidentd
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	sbin/oidentd etc/oidentd.conf.sample \
 		etc/oidentd_masq.conf.sample
 MANPAGES=	oidentd.conf.5 oidentd_masq.conf.5 oidentd.8
 .for man in ${MANPAGES}
 PLIST_FILES+=	man/man${man:E}/${man}.gz
 .endfor
 USE_CSTD=	gnu89
 
 OPTIONS_DEFINE=	IPV6
 
 CONFIGURE_ARGS=--disable-masq
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--disable-ipv6
-.else
-CATEGORIES+=	ipv6
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,g' ${WRKSRC}/src/oidentd.h
 	@${REINPLACE_CMD} -e 's|\[5-9\]||g;s|\[4-9\]||g' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/oidentd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/oidentd.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${FILESDIR}/oidentd_masq.conf.sample ${STAGEDIR}${PREFIX}/etc
 .for MANFILE in ${MANPAGES}
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/doc/${MANFILE}
 	${INSTALL_MAN} ${WRKSRC}/doc/${MANFILE} ${STAGEDIR}${PREFIX}/man/man${MANFILE:E}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/openiked/Makefile
===================================================================
--- head/security/openiked/Makefile	(revision 514143)
+++ head/security/openiked/Makefile	(revision 514144)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	openiked
 PORTVERSION=	2.1
 PORTREVISION=	1
-CATEGORIES=	security net ipv6
+CATEGORIES=	security net
 
 MAINTAINER=	marcel@FreeBSD.org
 COMMENT=	IKEv2 daemon
 
 LICENSE=	ISCL
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 USES=		autoreconf libtool ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xcllnt
 
 USE_RC_SUBR=	iked
 USERS=		_iked
 GROUPS=		_iked
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-libevent-dir=${PREFIX} --with-mantype=man
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/ikeca.cnf \
 	    ${STAGEDIR}${PREFIX}/etc/ikeca.cnf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/iked.conf \
 	    ${STAGEDIR}${PREFIX}/etc/iked.conf.sample
 
 .include <bsd.port.mk>
Index: head/security/openssh-portable/Makefile
===================================================================
--- head/security/openssh-portable/Makefile	(revision 514143)
+++ head/security/openssh-portable/Makefile	(revision 514144)
@@ -1,243 +1,243 @@
 # Created by: dwcjr@inethouston.net
 # $FreeBSD$
 
 PORTNAME=	openssh
 DISTVERSION=	8.0p1
 PORTREVISION=	1
 PORTEPOCH=	1
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	OPENBSD/OpenSSH/portable
 PKGNAMESUFFIX?=	-portable
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	The portable version of OpenBSD's OpenSSH
 
 #LICENSE=      BSD2,BSD3,MIT,public domain,BSD-Style,BEER-WARE,"any purpose with notice intact",ISC-Style
 #LICENSE_FILE= ${WRKSRC}/LICENCE
 
 CONFLICTS?=		openssh-3.* ssh-1.* ssh2-3.* openssh-portable-devel-*
 
 USES=			alias autoreconf ncurses ssl
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		ac_cv_func_strnvis=no
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-md5-passwords \
 			--without-zlib-version-check --with-ssl-engine \
 			--with-mantype=man
 
 ETCOLD=			${PREFIX}/etc
 
 FLAVORS=			default hpn gssapi x509
 default_CONFLICTS_INSTALL=	openssh-portable-hpn openssh-portable-gssapi \
 				openssh-portable-x509
 hpn_CONFLICTS_INSTALL=		openssh-portable openssh-portable-gssapi \
 				openssh-portable-x509
 hpn_PKGNAMESUFFIX=		-portable-hpn
 gssapi_CONFLICTS_INSTALL=	openssh-portable openssh-portable-hpn \
 				openssh-portable-x509
 gssapi_PKGNAMESUFFIX=		-portable-gssapi
 x509_CONFLICTS_INSTALL=		openssh-portable openssh-portable-hpn \
 				openssh-portable-gssapi
 x509_PKGNAMESUFFIX=		-portable-x509
 
 x509_BROKEN=		X509 not yet updated for ${DISTVERSION} - Does anyone use this? Contact maintainer bdrewery@FreeBSD.org
 OPTIONS_DEFINE=		DOCS PAM TCP_WRAPPERS LIBEDIT BSM \
 			HPN X509 KERB_GSSAPI \
 			LDNS NONECIPHER XMSS
 OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS LDNS
 .if ${FLAVOR:U} == hpn
 OPTIONS_DEFAULT+=	HPN NONECIPHER
 .endif
 .if ${FLAVOR:U} == gssapi
 OPTIONS_DEFAULT+=	KERB_GSSAPI MIT
 .endif
 .if ${FLAVOR:U} == x509
 OPTIONS_DEFAULT+=	X509
 .endif
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
 TCP_WRAPPERS_DESC=	tcp_wrappers support
 BSM_DESC=		OpenBSM Auditing
 KERB_GSSAPI_DESC=	Kerberos/GSSAPI patch (req: GSSAPI)
 HPN_DESC=		HPN-SSH patch
 LDNS_DESC=		SSHFP/LDNS support
 X509_DESC=		x509 certificate patch
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 MIT_DESC=		MIT Kerberos (security/krb5)
 NONECIPHER_DESC=	NONE Cipher support
 XMSS_DESC=		XMSS key support (experimental)
 
 OPTIONS_SUB=		yes
 
 TCP_WRAPPERS_EXTRA_PATCHES=${FILESDIR}/extra-patch-tcpwrappers
 
 LDNS_CONFIGURE_WITH=	ldns=${LOCALBASE}
 LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 LDNS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ldns
 LDNS_CFLAGS=		-I${LOCALBASE}/include
 LDNS_CONFIGURE_ON=	--with-ldflags='-L${LOCALBASE}/lib'
 
 HPN_CONFIGURE_WITH=		hpn
 NONECIPHER_CONFIGURE_WITH=	nonecipher
 
 # See http://www.roumenpetrov.info/openssh/
 X509_VERSION=		11.5
 X509_PATCH_SITES=	http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509
 X509_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-x509-glue
 X509_PATCHFILES=	${PORTNAME}-7.9p1+x509-${X509_VERSION}.diff.gz:-p1:x509
 
 MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
 HEIMDAL_LIB_DEPENDS=		libkrb5.so.26:security/heimdal
 
 PAM_CONFIGURE_WITH=	pam
 TCP_WRAPPERS_CONFIGURE_WITH=	tcp-wrappers
 
 LIBEDIT_CONFIGURE_WITH=	libedit
 LIBEDIT_USES=		libedit
 BSM_CONFIGURE_ON=	--with-audit=bsm
 
 ETCDIR?=		${PREFIX}/etc/ssh
 
 .include <bsd.port.pre.mk>
 
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
 
 # X509 patch includes TCP Wrapper support already
 .if ${PORT_OPTIONS:MX509}
 EXTRA_PATCHES:=		${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA_PATCHES}}
 .endif
 
 # Must add this patch before HPN due to conflicts
 .if ${PORT_OPTIONS:MKERB_GSSAPI}
 #BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
 .  if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}
 # Needed glue for applying HPN patch without conflict
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
 .  endif
 # - See https://sources.debian.org/data/main/o/openssh/ for which subdir to
 # pull from.
 GSSAPI_DEBIAN_SUBDIR=	${DISTVERSION}-3
 # - Debian does not use a versioned filename so we trick fetch to make one for
 # us with the ?<anything>=/ trick.
 PATCH_SITES+=	https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex
 # Bump this when updating the patch location
 GSSAPI_UPDATE_DATE=	20190719
 PATCHFILES+=	openssh-${DISTVERSION}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex
 .endif
 
 # https://www.psc.edu/hpn-ssh https://github.com/rapier1/openssh-portable/tree/hpn-openssl1.1-7_7_P1
 .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}
 #BROKEN=			HPN: Not yet updated for ${DISTVERSION} yet.
 PORTDOCS+=		HPN-README
 HPN_VERSION=		14v15
 HPN_DISTVERSION=	7.7p1
 #PATCH_SITES+=		SOURCEFORGE/hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn
 #PATCHFILES+=		${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-hpn:-p2
 .elif !${PORT_OPTIONS:MHPN} && !${PORT_OPTIONS:MNONECIPHER}
 # Apply compatibility patch
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-hpn-compat
 .endif
 
 CONFIGURE_LIBS+=	-lutil
 
 CONFIGURE_ARGS+=	--disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog
 
 # Keep this last
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-version-addendum
 
 .if ${PORT_OPTIONS:MX509}
 .  if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}
 BROKEN=		X509 patch and HPN patch do not apply cleanly together
 .  endif
 
 .  if ${PORT_OPTIONS:MKERB_GSSAPI}
 BROKEN=		X509 patch incompatible with KERB_GSSAPI patch
 .  endif
 
 .endif
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && ${PORT_OPTIONS:MKERB_GSSAPI}
 BROKEN=		KERB_GSSAPI Requires either MIT or HEMIDAL, does not build with base Heimdal currently
 .endif
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have heimdal installed in base
 .endif
 
 .if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_BASE}
 .	if ${PORT_OPTIONS:MHEIMDAL_BASE}
 CONFIGURE_LIBS+=	-lgssapi_krb5
 CONFIGURE_ARGS+=	--with-kerberos5=/usr
 .	else
 CONFIGURE_ARGS+=	--with-kerberos5=${LOCALBASE}
 .	endif
 .	if ${OPENSSLBASE} == "/usr"
 CONFIGURE_ARGS+=	--without-rpath
 LDFLAGS=		# empty
 .	endif
 .else
 .	if ${PORT_OPTIONS:MKERB_GSSAPI}
 IGNORE=	KERB_GSSAPI requires one of MIT HEIMDAL or HEIMDAL_BASE
 .	endif
 .endif
 
 .if ${OPENSSLBASE} != "/usr"
 CONFIGURE_ARGS+=	--with-ssl-dir=${OPENSSLBASE}
 .endif
 
 EMPTYDIR=		/var/empty
 
 USE_RC_SUBR=		openssh
 
 # After all
 CONFIGURE_ARGS+=	--sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR}
 .if !empty(CONFIGURE_LIBS)
 CONFIGURE_ARGS+=	--with-libs='${CONFIGURE_LIBS}'
 .endif
 
 CONFIGURE_ARGS+=	--with-xauth=${LOCALBASE}/bin/xauth
 
 RC_SCRIPT_NAME=		openssh
 VERSION_ADDENDUM_DEFAULT?=	${OPSYS}-${PKGNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldes|-lcrypto|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 	    -e 's|install: \(.*\) host-key check-config|install: \1|g' \
 	    ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \
 		-e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8
 	@${REINPLACE_CMD} \
 	    -e 's|\(VersionAddendum\) none|\1 ${VERSION_ADDENDUM_DEFAULT}|' \
 	    ${WRKSRC}/sshd_config
 	@${REINPLACE_CMD} \
 	    -e 's|%%SSH_VERSION_FREEBSD_PORT%%|${VERSION_ADDENDUM_DEFAULT}|' \
 	    ${WRKSRC}/sshd_config.5
 	@${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT	"${VERSION_ADDENDUM_DEFAULT}"' >> \
 		${WRKSRC}/version.h
 
 post-configure-XMSS-on:
 	@${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/ssh_config \
 	    ${STAGEDIR}${ETCDIR}//ssh_config.sample
 	${MV} ${STAGEDIR}${ETCDIR}/sshd_config \
 	    ${STAGEDIR}${ETCDIR}/sshd_config.sample
 .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/HPN-README ${STAGEDIR}${DOCSDIR}
 .endif
 
 test: build
 	cd ${WRKSRC} && ${SETENV} -i \
 		OBJ=${WRKDIR} ${MAKE_ENV} \
 		TEST_SHELL=${SH} \
 		SUDO="${SUDO}" \
 		LOGNAME="${LOGNAME}" \
 		TEST_SSH_TRACE=yes \
 		PATH=${WRKSRC}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} tests
 
 .include <bsd.port.post.mk>
Index: head/security/p5-Net-SinFP/Makefile
===================================================================
--- head/security/p5-Net-SinFP/Makefile	(revision 514143)
+++ head/security/p5-Net-SinFP/Makefile	(revision 514144)
@@ -1,47 +1,47 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	Net-SinFP
 PORTVERSION=	2.09
 .ifdef DBDATE
 PORTREVISION=	${DBDATE}1
 .else
 PORTREVISION=	1
 .endif
-CATEGORIES=	security ipv6 perl5
+CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 .ifdef DBDATE
 MASTER_SITES+=	http://www.gomor.org/files/:DB
 .endif
 MASTER_SITE_SUBDIR=	CPAN:GOMOR
 DISTNAME=	Net-SinFP-${PORTVERSION}
 .ifdef DBDATE
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-${DBDATE}.db:DB
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Full operating system stack fingerprinting suite
 
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/LICENSE.Artistic
 
 .if ${PORTNAME} == "Net-SinFP"
 PKGNAMEPREFIX=	p5-
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
 		p5-DBIx-SQLite-Simple>=0.33:databases/p5-DBIx-SQLite-Simple \
 		p5-Net-Packet>=3.00:net/p5-Net-Packet \
 		p5-Net-Packet-Target>=1.00:net/p5-Net-Packet-Target
 
 USES=		perl5
 USE_PERL5=	configure
 INSTALL_TARGET=	pure_install
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/.*EXE_FILES.*//' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
 .include <bsd.port.mk>
Index: head/security/pidentd/Makefile
===================================================================
--- head/security/pidentd/Makefile	(revision 514143)
+++ head/security/pidentd/Makefile	(revision 514144)
@@ -1,50 +1,50 @@
 # Created by: torstenb
 # $FreeBSD$
 
 PORTNAME=	pidentd
 PORTVERSION=	3.0.19
 PORTREVISION=	4
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/unix/ident/servers/ \
 		ftp://ftp.stack.nl/pub/users/johans/pidentd/
 
 PATCH_SITES=	ftp://ftp.stack.nl/pub/users/johans/pidentd/ \
 		ftp://mud.stack.nl/pub/pidentd/
 PATCHFILES=	pidentd-${PORTVERSION}-ipv6-20080101.diff.gz
 PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	RFC1413 identification server
 
 BROKEN_FreeBSD_12=	fails to compile: k_freebsd2.c: storage size of 'pcbp' isn't known
 BROKEN_FreeBSD_13=	fails to compile: k_freebsd2.c: storage size of 'pcbp' isn't known
 
 CONFLICTS_INSTALL=	fakeident-[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		ssl
 
 PLIST_FILES=	sbin/ibench sbin/identd sbin/idecrypt sbin/ikeygen \
 		man/man8/identd.8.gz man/man8/idecrypt.8.gz
 
 CFLAGS+=	-DINCLUDE_CRYPT -DOPENSSL_DES_LIBDES_COMPATIBILITY
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto
 
 post-extract:
 	${CP} ${FILESDIR}/idecrypt.8 ${WRKSRC}/doc/idecrypt.8
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's| /etc/identd.conf| ${PREFIX}/etc/identd.conf|' \
 		-e 's| /etc/identd.key| ${PREFIX}/etc/identd.key|' \
 		${WRKSRC}/doc/identd.8 ${WRKSRC}/doc/idecrypt.8
 	@${REINPLACE_CMD} -e 's|freebsd.4.7.|freebsd|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(sbindir)|$${DESTDIR}&|' \
 		-e 's|-m 755|-s &|' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(mandir)|$${DESTDIR}&|' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_MAN} -m 644 ${WRKSRC}/doc/idecrypt.8 \
 		${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/security/putty/Makefile
===================================================================
--- head/security/putty/Makefile	(revision 514143)
+++ head/security/putty/Makefile	(revision 514144)
@@ -1,109 +1,109 @@
 # $FreeBSD$
 
 PORTNAME=	putty
 PORTVERSION=	0.72
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client
 # test plan: test ALL 4 GSSAPI_* options, ALL 3 GTK options, WITH_DEBUG=yes build.
 
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/LICENSE
 
 USES=		cpe gmake pkgconfig
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 MAKEFILE=	Makefile.gtk
 
 CPE_VENDOR=	simon_tatham
 
 PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
 PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz
 
 OPTIONS_RADIO=		TOOLKIT
 OPTIONS_RADIO_TOOLKIT=	GTK2 GTK3
 OPTIONS_DEFAULT=GSSAPI_BASE GTK3
 OPTIONS_SINGLE=	GSSAPI_SELECT
 OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 CONFLICTS_INSTALL?=	pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*
 
 .include <bsd.port.options.mk>
 
 CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP -DIPV6 -DHAVE_FUTIMES
 LDFLAGS+=	-Wl,--as-needed
 
 .if (${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}) && !defined(WITHOUT_X11)
 USE_XORG=	x11
 .if ${PORT_OPTIONS:MGTK2}
 USES+=		gnome
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags"
 .endif
 .if ${PORT_OPTIONS:MGTK3}
 USES+=		gnome
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags"
 .endif
 
 PLIST_FILES+=	bin/pageant bin/pterm bin/putty bin/puttytel
 PLIST_FILES+=	man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz
 PLIST_FILES+=	share/pixmaps/putty.ico
 DESKTOP_ENTRIES="PuTTY" \
 		"${COMMENT}" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 		"${PORTNAME}" \
 		"" \
 		false
 .else
 MAKE_ARGS+=	GTK_CONFIG=:
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_BASE}
 USES+=		gssapi:base,flags
 MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
 USES+=		gssapi:heimdal,flags
 MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .elif ${PORT_OPTIONS:MGSSAPI_MIT}
 USES+=		gssapi:mit,flags
 MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .else
 _COMPAT=		-DNO_GSSAPI
 .endif
 
 _COMPAT+=	-DOMIT_UTMP
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DDEBUG
 XFLAGS=		-DDEBUG
 _COMPAT+=	-DDEBUG
 .endif
 
 # upstream sets -Werror - there are no issues on 9.1-FreeBSD amd64
 # currently, but override it nonetheless.
 XFLAGS+=	-Wno-error
 
 MAKE_ARGS+=	COMPAT="${_COMPAT}" \
 		CC="${CC}" \
 		XFLAGS="${XFLAGS}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\
 			      s,make,${MAKE_CMD},'\
 		${WRKSRC}/${MAKEFILE}
 
 post-install:
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/../windows/putty.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.mk>
Index: head/security/racoon2/Makefile
===================================================================
--- head/security/racoon2/Makefile	(revision 514143)
+++ head/security/racoon2/Makefile	(revision 514144)
@@ -1,104 +1,104 @@
 # Created by: sumikawa
 # $FreeBSD$
 
 PORTNAME=	racoon2
 PORTVERSION=	${RACOON2_COMMIT_DATE}
 PORTREVISION=	1
-CATEGORIES=	security net ipv6
+CATEGORIES=	security net
 HASH=		5c4af73
 RACOON2_COMMIT_DATE=20181215
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 
 BROKEN_FreeBSD_11=	Requires openssl111 to build
 
 CONFLICTS=	racoon2-legacy-*
 
 USE_GITHUB=     yes
 GH_ACCOUNT=     zoulasc
 GH_TAGNAME=     ${HASH}
 
 USES=		autoreconf:build perl5 tar:tgz ssl
 CONFIGURE_ARGS+=	--enable-natt \
 			--prefix=${PREFIX}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl5
 
 # MAKE_ENV=	DESTDIR=${DESTDIR}
 
 CFLAGS=		-DHAVE_CONFIG_H
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=	DOCS NO_KRB
 OPTIONS_SINGLE=	KERBEROS
 OPTIONS_SINGLE_KERBEROS=	NO_KRB KRB5 HEIMDAL_PORT HEIMDAL_BASE
 NO_KRB_DESC=	No Kerberos support
 KRB5_DESC=	Build with Kerberos (security/krb5)
 HEIMDAL_PORT_DESC=	Build with Heimdal in ports (security/heimdal)
 HEIMDAL_BASE_DESC=	Build with Heimdal in base
 
 NO_KRB_CONFIGURE_ON=	--disable-kinkd
 NO_KRB_MAKE_ENV=	WITH_KINK=no
 NO_KRB_PLIST_SUB=	KINK="@comment "
 NO_KRB_VARS=		KINK=no
 
 KRB5_USES=		gssapi:mit
 KRB5_CONFIGURE_ON=	--enable-kinkd
 KRB5_MAKE_ENV=		WITH_KINK=yes
 KRB5_PLIST_SUB=		KINK=""
 KRB5_LIB_DEPENDS=	libkrb5support.so:security/krb5
 KRB5_RUN_DEPENDS=	kinit:security/krb5
 KRB5_VARS=		KINK=yes
 
 HEIMDAL_PORT_USES=	gssapi:heimdal
 HEIMDAL_PORT_CONFIGURE_ON=	--enable-kinkd
 HEIMDAL_PORT_MAKE_ENV=	WITH_KINK=yes
 HEIMDAL_PORT_PLIST_SUB=	KINK=""
 HEIMDAL_PORT_VARS=	KINK=yes
 
 HEIMDAL_BASE_USES=	gssapi:base
 HEIMDAL_BASE_CONFIGURE_ON=	--enable-kinkd
 HEIMDAL_BASE_MAKE_ENV=	WITH_KINK=yes
 HEIMDAL_BASE_PLIST_SUB=	KINK=""
 HEIMDAL_BASE_VARS=	KINK=yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS+=	INSTALL USAGE config-usage.ja.txt config-usage.txt
 PORTDOCS+=	iked-memo.ja.txt libracoon.ja.txt specification.ja.txt
 PORTDOCS+=	spmif.txt style.txt system-message.ja.txt
 .if defined(KINK)
 PORTDOCS+=	kinkd-data-struct.obj kinkd-impl.ja.txt
 PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj
 .endif
 .endif
 
 post-patch:
 	# @${REINPLACE_CMD} 's|/var/run/racoon2|$$(STAGEDIR)&|' \
 		${WRKSRC}/samples/Makefile.in
 	@${LN} -sf ${LOCALBASE}/share/automake-1.16/ylwrap ${WRKSRC}/lib
 
 post-patch-DOCS-on:
 .for FILE in ${PORTDOCS}
 	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
 .endfor
 
 post-install:
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \
 	    ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \
 	    ${ECHO_MSG} "         You must build the kernel if you want to run racoon on the host"; \
 	fi ;
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/ssllabs-scan/Makefile
===================================================================
--- head/security/ssllabs-scan/Makefile	(revision 514143)
+++ head/security/ssllabs-scan/Makefile	(revision 514144)
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=		ssllabs-scan
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.5.0
-CATEGORIES=		security net ipv6
+CATEGORIES=		security net
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Command-line tool to use the SSL Labs API
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		go
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	ssllabs
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/security/tor/Makefile
===================================================================
--- head/security/tor/Makefile	(revision 514143)
+++ head/security/tor/Makefile	(revision 514144)
@@ -1,117 +1,117 @@
 # Created by: peter.thoenen@yahoo.com
 # $FreeBSD$
 
 PORTNAME=	tor
 DISTVERSION=	0.4.1.6
-CATEGORIES=	security net ipv6
+CATEGORIES=	security net
 MASTER_SITES=	TOR
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Anonymizing overlay network for TCP
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 cpe gmake pkgconfig # should be compiler:c99 or compiler:gnu99
 USE_CSTD=	gnu99 # until this bug report is closed: https://trac.torproject.org/projects/tor/ticket/27900
 
 CPE_VENDOR=	torproject
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}"
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
 OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC
 OPTIONS_GROUP=	COMPRESSION
 OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
 OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
 OPTIONS_SUB=	yes
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 COMPRESSION_DESC=	Supported compression libraries
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
 PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 
 GROUPS=		_tor
 USERS=		_tor
 
 CONFLICTS_INSTALL=	tor-devel-[0-9]*
 
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
 ZSTD_CONFIGURE_ENABLE=		zstd
 ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
 LZMA_CONFIGURE_ENABLE=		lzma
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	asciidoc:textproc/asciidoc
 .else
 CONFIGURE_ARGS+=	--disable-asciidoc
 .endif
 
 .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .  if ${PORT_OPTIONS:MZSTD}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libzstd.a:archivers/zstd
 TOR_ZSTD_LIBS=		${LOCALBASE}/lib/libzstd.a
 .  endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:devel/libevent
 TOR_LIBEVENT_LIBS=	-levent
 .  if ${PORT_OPTIONS:MZSTD}
 LIB_DEPENDS+=		libzstd.so:archivers/zstd
 TOR_ZSTD_LIBS=		-lzstd
 .  endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-malloc=tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
 		${WRKSRC}/src/config/torrc.*.in \
 		${WRKSRC}/doc/tor.1.* \
 		${WRKSRC}/doc/tor.html.in
 
 post-patch-STATIC_TOR-off:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		${WRKSRC}/configure
 
 post-patch-STATIC_TOR-on:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
 
 .include <bsd.port.mk>
Index: head/security/tor-devel/Makefile
===================================================================
--- head/security/tor-devel/Makefile	(revision 514143)
+++ head/security/tor-devel/Makefile	(revision 514144)
@@ -1,119 +1,119 @@
 # Created by: peter.thoenen@yahoo.com
 # $FreeBSD$
 
 PORTNAME=	tor
 DISTVERSION=	0.4.2.2
 DISTVERSIONSUFFIX=	-alpha
-CATEGORIES=	security net ipv6
+CATEGORIES=	security net
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Anonymizing overlay network for TCP
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 cpe gmake pkgconfig # should be compiler:c99 or compiler:gnu99
 USE_CSTD=	gnu99 # until this bug report is closed: https://trac.torproject.org/projects/tor/ticket/27900
 
 CPE_VENDOR=	torproject
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}"
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
 OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC
 OPTIONS_GROUP=	COMPRESSION
 OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
 OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
 OPTIONS_SUB=	yes
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 COMPRESSION_DESC=	Supported compression libraries
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
 PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 
 GROUPS=		_tor
 USERS=		_tor
 
 CONFLICTS_INSTALL=	tor-[0-9]*
 
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
 ZSTD_CONFIGURE_ENABLE=		zstd
 ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
 LZMA_CONFIGURE_ENABLE=		lzma
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	asciidoc:textproc/asciidoc
 .else
 CONFIGURE_ARGS+=	--disable-asciidoc
 .endif
 
 .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .  if ${PORT_OPTIONS:MZSTD}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libzstd.a:archivers/zstd
 TOR_ZSTD_LIBS=		${LOCALBASE}/lib/libzstd.a
 .  endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:devel/libevent
 TOR_LIBEVENT_LIBS=	-levent
 .  if ${PORT_OPTIONS:MZSTD}
 LIB_DEPENDS+=		libzstd.so:archivers/zstd
 TOR_ZSTD_LIBS=		-lzstd
 .  endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-malloc=tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
 		${WRKSRC}/src/config/torrc.*.in \
 		${WRKSRC}/doc/tor.1.* \
 		${WRKSRC}/doc/tor.html.in
 
 post-patch-STATIC_TOR-off:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		${WRKSRC}/configure
 
 post-patch-STATIC_TOR-on:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
 
 .include <bsd.port.mk>
Index: head/security/xinetd/Makefile
===================================================================
--- head/security/xinetd/Makefile	(revision 514143)
+++ head/security/xinetd/Makefile	(revision 514144)
@@ -1,48 +1,48 @@
 # Created by: markm
 # $FreeBSD$
 
 PORTNAME=	xinetd
 PORTVERSION=	2.3.15
 PORTREVISION=	2
-CATEGORIES=	security ipv6
+CATEGORIES=	security
 MASTER_SITES=	GENTOO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Replacement for inetd with better control and logging
 
 LICENSE=	XINETD
 LICENSE_NAME=	xinetd license
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xinetd
 ALL_TARGET=	build
 CONFIGURE_ARGS=	--with-loadavg
 
 USES=		cpe shebangfix
 SHEBANG_FILES=	${WRKSRC}/xinetd/xconv.pl
 
 OPTIONS_DEFINE=	IPV6 LIBWRAP XCONV
 OPTIONS_DEFAULT=	LIBWRAP XCONV
 OPTIONS_SUB=	yes
 
 XCONV_DESC=	Install xconv utility (requires perl)
 
 IPV6_CONFIGURE_WITH=	ipv6
 LIBWRAP_CONFIGURE_WITH=	libwrap
 XCONV_USES=	perl5
 XCONV_USE=	PERL5=run
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xinetd/xinetd ${STAGEDIR}${PREFIX}/sbin/xinetd
 	${INSTALL_SCRIPT} ${WRKSRC}/xinetd/xconv.pl ${STAGEDIR}${PREFIX}/bin/xconv
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.conf.man ${STAGEDIR}${PREFIX}/man/man5/xinetd.conf.5
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xconv.pl.8 ${STAGEDIR}${PREFIX}/man/man8/xconv.8
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.8
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.log.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.log.8
 
 .include <bsd.port.mk>
Index: head/sysutils/gkrellm2/Makefile
===================================================================
--- head/sysutils/gkrellm2/Makefile	(revision 514143)
+++ head/sysutils/gkrellm2/Makefile	(revision 514144)
@@ -1,83 +1,83 @@
 # $FreeBSD$
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.3.11
 #PORTREVISION=	0
-CATEGORIES=	sysutils ipv6
+CATEGORIES=	sysutils
 MASTER_SITES=	http://gkrellm.srcbox.net/releases/ \
 		LOCAL/ume
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GTK based system monitor
 
 LICENSE=	GPLv3
 
 USES=		gmake pkgconfig tar:bzip2
 USE_RC_SUBR=	gkrellmd
 
 OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
 OPTIONS_DEFAULT=	CLIENT NTLM OPENSSL
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		GKrellM Client
 CLIENT_CONFLICTS=	gkrellm-[^2].* gkrellm[^2]-[^2].*
 CLIENT_USE=		GNOME=gtk20 XORG=sm,x11
 CLIENT_USE_OFF=		GNOME=glib20
 CLIENT_VARS_OFF=	BUILD_WRKSRC=${WRKSRC}/server \
 			INSTALL_WRKSRC=${WRKSRC}/server
 NTLM_LIB_DEPENDS=	libntlm.so:security/libntlm
 NTLM_VARS_OFF=		MAKE_ENV+=without-ntlm=1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 .else
 MAKE_ENV+=	enable_nls=0
 .endif
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 MAKE_ENV+=	without-gnutls=1
 .else
 MAKE_ENV+=	without-gnutls=1 without-ssl=1
 .endif
 .endif
 
 PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 
 ALL_TARGET=	freebsd
 
 MAKE_ENV+=	INSTALLROOT=${PREFIX} INSTALL_PREFIX=${STAGEDIR} \
 		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
 		SINSTALLDIR=${PREFIX}/sbin \
 		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \
 		VERSION=${PORTVERSION}
 
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
 		-DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \
 		-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \
 		-DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \
 			  ${WRKSRC}/src/Makefile
 
 post-install-CLIENT-on:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
 		${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/sysutils/healthd/Makefile
===================================================================
--- head/sysutils/healthd/Makefile	(revision 514143)
+++ head/sysutils/healthd/Makefile	(revision 514144)
@@ -1,41 +1,41 @@
 # Created by: jim@thehousleys.net
 # $FreeBSD$
 
 PORTNAME=	healthd
 PORTVERSION=	0.7.9
 PORTREVISION=	2
-CATEGORIES=	sysutils ipv6
+CATEGORIES=	sysutils
 MASTER_SITES=	http://healthd.thehousleys.net/ \
 		LOCAL/ohauer
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to monitor vital motherboard parameters
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 INSTALL_TARGET=	install-all
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	IPV6 FULL_CONFIG DOCS
 
 FULL_CONFIG_DESC=		Remotely reading the full config
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 FULL_CONFIG_CONFIGURE_ENABLE=	full-config
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| @exec_prefix@| $$(DESTDIR)@exec_prefix@|' \
 		${WRKSRC}/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/PROTOCOL ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/socket/Makefile
===================================================================
--- head/sysutils/socket/Makefile	(revision 514143)
+++ head/sysutils/socket/Makefile	(revision 514144)
@@ -1,25 +1,25 @@
 # Created by: wosch
 # $FreeBSD$
 
 PORTNAME=	socket
 PORTVERSION=	1.2
 #PORTREVISION=	1
-CATEGORIES=	sysutils net ipv6
+CATEGORIES=	sysutils net
 MASTER_SITES=	https://wolfram.schneider.org/src/ LOCAL/wosch
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create TCP socket and connect to stdin/out
 
 LICENSE=	GPLv1
 
 PLIST_FILES=	bin/socket man/man1/socket.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>