diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index 3962e14e6ef6..ac50a82f2af3 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -1,91 +1,91 @@
 # Run autoreconf in AUTORECONF_WRKSRC to update configure, Makefile.in and
 # other build scripts.
 #
 # Autoreconf runs the following commands provided by devel/autoconf and
 # devel/automake.  Each command applies to a single configure.ac or
 # configure.in (old name).  If configure.ac defines subdirectories with their
 # own configure.ac (using AC_CONFIG_SUBDIRS), autoreconf will recursively
 # update those as well.
 #
 # aclocal	Looks up definitions of m4 macros used in configure.ac that are
 #		not provided by autoconf and copies them from their source *.m4
 #		file to aclocal.m4.  Local *.m4 files included with the source
 #		code take precedence over systemwide *.m4 files.
 # autoconf	Generates configure from configure.ac using macro definitions
 #		provided by autoconf itself and aclocal.m4.
 # autoheader	Generates a configuration header (typically config.h.in) from
 #		configure.ac and the macro definitions in aclocal.m4.  Run by
 #		autoreconf if configure.ac (or one of the macros it uses)
 #		contains AC_CONFIG_HEADERS, AC_CONFIG_HEADER (undocumented), or
 #		AM_CONFIG_HEADER (obsolete).
 # automake	Generates Makefile.in from Makefile.am for each Makefile
 #		listed in configure.ac (using AC_CONFIG_FILES).  Also updates
 #		build scripts like compile, depcomp, install-sh, ylwrap,...
 #		Run by autoreconf if configure.ac (or one of the macros it
 #		uses) contains AM_INIT_AUTOMAKE.
 #
 # Autoreconf may also run these additional commands provided by other ports.
 # A port needs to have a build depdendency on these ports when that's the case.
 #
 # autopoint	Provided by devel/gettext-tools.  Updates gettext related *.m4
 #		files included with the source code and build scripts such as
 #		config.rpath.  Run by autoreconf if configure.ac (or one of the
 #		macros it uses) contains AM_GNU_GETTEXT.  A build dependency on
 #		devel/gettext-tools can be added with USES+=gettext-tools.
 #		Note that autoreconf runs autopoint even if a port has an NLS
 #		option and the option is disabled.  The build dependency on
 #		gettext-tools is not optional.  If the run dependency on
 #		gettext is optional this can be specified with
 #		NLS_USES=gettext-runtime.
 # libtoolize	Provided by devel/libtool.  Updates libtool related *.m4 files
 #		included with the source code and build scripts such as
 #		ltmain.sh.  Run by autoreconf if configure.ac  (or one of the
 #		macros it uses) contains AC_PROG_LIBTOOL or LT_INIT.  A build
 #		dependency on devel/libtool is added implicitly when USES
 #		contains both autoreconf and libtool.
 #
 # Feature:	autoreconf
 # Usage:	USES=autoreconf or USES=autoreconf:args
 # Valid args:	build	Don't run autoreconf, only add build dependencies
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_AUTORECONF_MK)
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
 AUTORECONF?=	${LOCALBASE}/bin/autoreconf
 AUTORECONF_WRKSRC?=	${WRKSRC}
 
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
 BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
 		automake>=1.16.1:devel/automake
 
 .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:devel/libtool
 .endif
 
 .if empty(autoreconf_ARGS)
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
 .for f in AUTHORS ChangeLog INSTALL NEWS README
 # Don't modify time stamps if the files already exist
 	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
 .endfor
 .if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
 	@(cd ${AUTORECONF_WRKSRC} && \
 		if test -f configure.ac; then configure=configure.ac; \
 		else configure=configure.in; fi && \
 		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
 .endif
 	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
 .elif ! ${autoreconf_ARGS:Mbuild}
 IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
 .endif
 
 .endif
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
index 2ddead64842c..e74526f7087a 100644
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -1,38 +1,38 @@
 # handle dependency on the bison port
 #
 # Feature:	bison
 # Usage:	USES=bison or USES=bison:ARGS
 # Valid ARGS:	build (default, implicit), run, both, alias, wrappers
 #
 # 'alias'	will automatically create a BINARY_ALIAS to use base
 #		byacc invoked as bison
 # 'wrapper'	will automatically create BINARY_WRAPPER to use base
 #		byacc with a wrapper to mimic a bit more bison
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_BISON_MK)
 _INCLUDE_USES_BISON_MK=	yes
 
 _BISON_DEPENDS=	bison:devel/bison
 
 .if empty(bison_ARGS)
 bison_ARGS=	build
 .endif
 
 .if ${bison_ARGS} == "build"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 .elif ${bison_ARGS} == "run"
 RUN_DEPENDS+=	${_BISON_DEPENDS}
 .elif ${bison_ARGS} == "both"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 RUN_DEPENDS+=	${_BISON_DEPENDS}
 .elif ${bison_ARGS} == "alias"
 BINARY_ALIAS+=	bison=byacc
 .elif ${bison_ARGS} == "wrapper"
 BINARY_WRAPPERS+=	bison
 .else
 IGNORE=	USES=bison - invalid args: [${bison_ARGS}] specified
 .endif
 
 .endif
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk
index 553074e8e216..1e3e6f61eb3b 100644
--- a/Mk/Uses/charsetfix.mk
+++ b/Mk/Uses/charsetfix.mk
@@ -1,25 +1,25 @@
 # Lookup in Makefile.in to prevent a package from installing/modifying charset.alias
 #
 # Feature:	charsetfix
 # Usage:	USES=charsetfix
 # Valid ARGS:	does not require args
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CHARSETFIX_MK)
 _INCLUDE_USES_CHARSETFIX_MK=	yes
 
 .if !empty(charsetfix_ARGS)
 IGNORE=	USES=charsetfix does not require args
 .endif
 
 CHARSETFIX_MAKEFILEIN?=	Makefile.in
 
 _USES_patch+=	600:charsetfix-post-patch
 charsetfix-post-patch:
 	@${FIND} ${WRKSRC} -name "${CHARSETFIX_MAKEFILEIN}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
 		-e 's|need_charset_alias=true|need_charset_alias=false|g ; \
 		s|test -f $$(charset_alias)|false|g ;\
 		s|test -f $$(DESTDIR)$$(libdir)/charset.alias|false|g'
 
 .endif
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index b83f8acbf952..0c2421eed598 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -1,199 +1,199 @@
 # Allows to determine the compiler being used
 #
 # Feature:	compiler
 # Usage:	USES=compiler or USES=compiler:ARGS
 # Valid ARGS:	env (default, implicit) c++0x c++11-lib c++11-lang c11 nestedfct features
 #
 # c++0x:	The port needs a compiler understanding C++0X
 # c++11-lang:	The port needs a compiler understanding C++11
 # c++14-lang:	The port needs a compiler understanding C++14
 # c++17-lang:	The port needs a compiler understanding C++17
 # gcc-c++11-lib:The port needs g++ compiler with a C++11 library
 # c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
 # c11:		The port needs a compiler understanding C11
 # nestedfct:	The port needs a compiler understanding nested functions
 # features:	The port will determine the features supported by the default compiler
 #
 # Variable to test after <bsd.port.pre.mk>
 #
 # COMPILER_TYPE:	can be gcc or clang
 # ALT_COMPILER_TYPE:	can be gcc or clang depending on COMPILER_TYPE, only set if the base system has 2 compilers
 # COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.*
 # ALT_COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.* of the ALT_COMPILER_TYPE
 #
 # COMPILER_FEATURES:	the list of features supported by the compiler includes the standard C++ library.
 # CHOSEN_COMPILER_TYPE:	can be gcc or clang (type of compiler chosen by the framework)
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
 
 .if empty(compiler_ARGS)
 compiler_ARGS=	env
 .endif
 
 VALID_ARGS=	c++11-lib c++11-lang c++14-lang c++17-lang c11 features env nestedfct c++0x gcc-c++11-lib
 
 _CC_hash:=	${CC:hash}
 _CXX_hash:=	${CXX:hash}
 
 .if ${compiler_ARGS} == gcc-c++11-lib
 _COMPILER_ARGS+=	features gcc-c++11-lib
 .elif ${compiler_ARGS} == c++11-lib
 _COMPILER_ARGS+=	features c++11-lib
 .elif ${compiler_ARGS} == c++0x
 _COMPILER_ARGS+=	features c++0x
 .elif ${compiler_ARGS} == c++11-lang
 _COMPILER_ARGS+=	features c++11-lang
 .elif ${compiler_ARGS} == c++14-lang
 _COMPILER_ARGS+=	features c++14-lang
 .elif ${compiler_ARGS} == c++17-lang
 _COMPILER_ARGS+=	features c++17-lang
 .elif ${compiler_ARGS} == c11
 _COMPILER_ARGS+=	features c11
 .elif ${compiler_ARGS} == features
 _COMPILER_ARGS+=	features
 .elif ${compiler_ARGS} == env
 _COMPILER_ARGS+=	env
 .elif ${compiler_ARGS} == nestedfct
 _COMPILER_ARGS+=	env nestedfct
 .else
 IGNORE=	Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS}
 _COMPILER_ARGS=	#
 .endif
 
 .if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11}
 _COMPILER_ARGS+=	features
 .endif
 
 .if defined(_CCVERSION_${_CC_hash})
 _CCVERSION=	${_CCVERSION_${_CC_hash}}
 .else
 _CCVERSION!=	${CC} --version
 _CCVERSION_${_CC_hash}=	${_CCVERSION}
 PORTS_ENV_VARS+=	_CCVERSION_${_CC_hash}
 .endif
 COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 .if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
 .else
 COMPILER_TYPE=	gcc
 .endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=		none
 .if defined(_ALTCCVERSION_${_CC_hash})
 _ALTCCVERSION=	${_ALTCCVERSION_${_CC_hash}}
 .else
 .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
 .if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason
 _ALTCCVERSION!=	/usr/bin/clang --version
 .endif
 .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
 .endif
 _ALTCCVERSION_${_CC_hash}=	${_ALTCCVERSION}
 PORTS_ENV_VARS+=		_ALTCCVERSION_${_CC_hash}
 .endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 .if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
 .elif ${_ALTCCVERSION} != none
 ALT_COMPILER_TYPE=	gcc
 .endif
 
 CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
 
 .if ${_COMPILER_ARGS:Mnestedfct}
 .if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mfeatures}
 .if defined(_CXXINTERNAL_${_CXX_hash})
 _CXXINTERNAL=	${_CXXINTERNAL_${_CXX_hash}}
 .else
 _CXXINTERNAL!=	${CXX} -\#\#\# /dev/null 2>&1
 _CXXINTERNAL_${_CXX_hash}=	${_CXXINTERNAL}
 PORTS_ENV_VARS+=	_CXXINTERNAL_${_CXX_hash}
 .endif
 .if ${_CXXINTERNAL:M\"-lc++\"}
 COMPILER_FEATURES=	libc++
 .else
 COMPILER_FEATURES=	libstdc++
 .endif
 
 CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
 CXXSTD=	c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11 gnu++14 gnu++17
 
 .for std in ${CSTD} ${CXXSTD}
 _LANG=c
 .if ${CXXSTD:M${std}}
 _LANG=c++
 .endif
 .if defined(CC_OUTPUT_${_CC_hash}_${std:hash})
 OUTPUT_${std}=	${CC_OUTPUT_${_CC_hash}_${std:hash}}
 .else
 OUTPUT_${std}!=	if ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; then echo yes; fi; echo
 CC_OUTPUT_${_CC_hash}_${std:hash}=	${OUTPUT_${std}}
 PORTS_ENV_VARS+=			CC_OUTPUT_${_CC_hash}_${std:hash}
 .endif
 .if !${OUTPUT_${std}:M*error*}
 COMPILER_FEATURES+=	${std}
 .endif
 .endfor
 .endif
 
 .if ${_COMPILER_ARGS:Mc++11-lib}
 .if !${COMPILER_FEATURES:Mc++11}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \
 (${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \
 (${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \
 (${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \
 (${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11})
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang10:devel/llvm10
 CPP=	${LOCALBASE}/bin/clang-cpp10
 CC=	${LOCALBASE}/bin/clang10
 CXX=	${LOCALBASE}/bin/clang++10
 CHOSEN_COMPILER_TYPE=	clang
 .endif
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mgcc-c++11-lib}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .if ${COMPILER_FEATURES:Mlibc++}
 CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
 LDFLAGS+=	-L${WRKDIR}
 
 _USES_configure+=	200:gcc-libc++-configure
 gcc-libc++-configure:
 	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
 .endif
 .endif
 
 .endif
diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
index d9b86247cba6..f29c4c972e71 100644
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -1,18 +1,18 @@
 # Handle gnu configure that does not properly support DESTDIR
 #
 # Feature:	desthack
 # Usage:	USES=desthack
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DESTHACK_MK)
 _INCLUDE_USES_DESTHACK_MK=	yes
 
 .if !empty(desthack_ARGS)
 IGNORE=	USES=desthack does not require args
 .endif
 
 GNU_CONFIGURE_PREFIX=	\$${${DESTDIRNAME}}${PREFIX}
 GNU_CONFIGURE_MANPREFIX=	\$${${DESTDIRNAME}}${MANPREFIX}
 .endif
diff --git a/Mk/Uses/dos2unix.mk b/Mk/Uses/dos2unix.mk
index 6d1ea28a6a61..965175cc6c08 100644
--- a/Mk/Uses/dos2unix.mk
+++ b/Mk/Uses/dos2unix.mk
@@ -1,44 +1,44 @@
 # Provide support to convert files from dos2unix
 #
 # DOS2UNIX_REGEX	a regular expression to match files that needs to be converted
 # DOS2UNIX_FILES	list of files of glob pattern relative to ${WRKSRC}
 # DOS2UNIX_GLOB		list of glob pattern find(1) will match with
 # DOS2UNIX_WRKSRC	top-level path for directory traversal instead of ${WRKSRC}
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DOS2UNIX_MK)
 _INCLUDE_USES_DOS2UNIX_MK=	yes
 
 .if !empty(dos2unix_ARGS)
 IGNORE=	USES=dos2unix takes no arguments
 .endif
 
 .if !defined(DOS2UNIX_FILES) && !defined(DOS2UNIX_REGEX) && !defined(DOS2UNIX_GLOB)
 _DOS2UNIX_ALL=	yes
 .endif
 
 DOS2UNIX_WRKSRC?=	${WRKSRC}
 
 _USES_patch+=	200:dos2unix
 dos2unix:
 	@${ECHO_MSG} "===>   Converting DOS text files to UNIX text files"
 .if defined(_DOS2UNIX_ALL)
 	@${FIND} ${DOS2UNIX_WRKSRC} -type f -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
 .else
 .if defined(DOS2UNIX_FILES)
 	@(cd ${DOS2UNIX_WRKSRC}; \
 		${ECHO_CMD} ${DOS2UNIX_FILES} | ${XARGS} ${SED} -i '' -e 's/
$$//' )
 .elif defined(DOS2UNIX_REGEX)
 	@${FIND} -E ${DOS2UNIX_WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
 .else
 .for f in ${DOS2UNIX_GLOB}
 	@${FIND} ${DOS2UNIX_WRKSRC} -type f -name '${f}' -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
 .endfor
 .endif
 .endif
 
 .endif
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
index 35e70f5079a9..6cdd1ff333e5 100644
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -1,60 +1,60 @@
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 #
 # Feature:	fam
 # Usage:	USES=fam or USES=fam:ARG
 # Valid ARG:	gamin, fam
 #
 # User-specified File Alteration Monitor wish:
 # Usage:	WITH_FAM_SYSTEM=ARG
 # Valid ARG:	gamin (default), fam
 #
 # Handle dependency on File Alteration Monitor
 
 .if !defined(_INCLUDE_USES_FAM_MK)
 _INCLUDE_USES_FAM_MK=	yes
 
 _fam_DEPENDS=	libfam.so.0:devel/fam
 _gamin_DEPENDS=	libfam.so.0:devel/gamin
 
 _FAM_SYSTEMS=	fam gamin
 _DEFAULT_FAM=	gamin
 
 .if exists(${LOCALBASE}/libexec/gam_server)
 _HAVE_FAM=	gamin
 .elif exists(${LOCALBASE}/bin/fam)
 _HAVE_FAM=	fam
 .endif
 
 # Sanity checks
 .if defined(WITH_FAM_SYSTEM) && defined(_HAVE_FAM) && ${_HAVE_FAM} != ${WITH_FAM_SYSTEM}
 IGNORE=	FAM mismatch: ${_HAVE_FAM} is installed, but ${WITH_FAM_SYSTEM} desired
 .endif
 
 .if !empty(fam_ARGS)
 .for _fam_ARGS in ${fam_ARGS}
 .  if ! ${_FAM_SYSTEMS:M${_fam_ARGS}}
 IGNORE=	Incorrect 'USES+= fam:${fam_ARGS}' usage: argument [${_fam_ARGS}] is not recognized
 .  endif
 .endfor
 .  if defined(_HAVE_FAM) && ${_HAVE_FAM} != ${fam_ARGS}
 IGNORE=	FAM mismatch: port wants to use ${fam_ARGS} while you have ${_HAVE_FAM}
 .  endif
 .  if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM} != ${fam_ARGS}
 IGNORE=	FAM mismatch: port wants to use ${fam_ARGS} while you wish to use ${WITH_FAM_SYSTEM}
 .  endif
 .endif
 
 # Proceed
 .if !empty(fam_ARGS)
 _USE_FAM=	${fam_ARGS}
 .elif defined(_HAVE_FAM)
 _USE_FAM=	${_HAVE_FAM}
 .elif defined(WITH_FAM_SYSTEM)
 _USE_FAM=	${WITH_FAM_SYSTEM}
 .else
 _USE_FAM=	${_DEFAULT_FAM}
 .endif
 
 LIB_DEPENDS+=	${_${_USE_FAM}_DEPENDS}
 
 .endif
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
index 1e63e2b5ed6e..e56f955d1103 100644
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -1,24 +1,24 @@
 # Handle dependency on the fuse port
 #
 # Feature:	fuse
 # Usage:	USES=fuse[:version]
 # Valid ARGS:	2 [default], 3
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_FUSE_MK)
 _INCLUDE_USES_FUSE_MK=	yes
 
 .if !empty(fuse_ARGS)
 LIBFUSE_VER=	${fuse_ARGS}
 .endif
 LIBFUSE_VER?=	2
 
 .if ${LIBFUSE_VER} == 2
 LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
 .elif ${LIBFUSE_VER} == 3
 LIB_DEPENDS+=	libfuse3.so:sysutils/fusefs-libs3
 .else
 IGNORE=		cannot install: unknown FUSE library version: ${LIBFUSE_VERSION}
 .endif
 
 .endif
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index 9a06492da5af..274640eb89cb 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -1,141 +1,141 @@
 # Support rubygem packages
 #
 # Feature:	gem
 # Usage:	USES=gem[:noautoplist]
 # Valid args:	noautoplist	Don't generate the plist automatically
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ruby@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GEM_MK)
 
 _INCLUDE_USES_GEM_MK=        yes
 
 _valid_ARGS=			noautoplist
 
 # Sanity check
 .for arg in ${gem_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .endfor
 
 BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 
 PKGNAMEPREFIX?=	rubygem-
 EXTRACT_SUFX=	.gem
 EXTRACT_ONLY=
 DIST_SUBDIR=	rubygem
 
 EXTRACT_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
 DOC_DIR=	${GEMS_BASE_DIR}/doc
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 EXT_DIR=	${GEMS_BASE_DIR}/extensions
 PLUGINS_DIR=	${GEMS_BASE_DIR}/plugins
 GEM_NAME?=	${DISTNAME}
 GEM_LIB_DIR?=	${GEMS_DIR}/${GEM_NAME}
 GEM_DOC_DIR?=	${DOC_DIR}/${GEM_NAME}
 GEM_SPEC?=	${SPEC_DIR}/${GEM_NAME}.gemspec
 GEM_CACHE?=	${CACHE_DIR}/${GEM_NAME}.gem
 GEMSPEC=	${PORTNAME}.gemspec
 GEM_ENV+=	RB_USER_INSTALL=yes
 
 USE_LOCALE?=	en_US.UTF-8
 GEM_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 		REV="${RUBY_GEM}" \
 		GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \
 		GEMS_DIR="${GEMS_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
 		CACHE_DIR="${CACHE_DIR}" \
 		SPEC_DIR="${SPEC_DIR}" \
 		EXT_DIR="${EXT_DIR}" \
 		PLUGINS_DIR="${PLUGINS_DIR}" \
 		PORT="${PORTNAME}-${PORTVERSION}" \
 		GEM_NAME="${GEM_NAME}" \
 		GEM_LIB_DIR="${GEM_LIB_DIR}" \
 		GEM_DOC_DIR="${GEM_DOC_DIR}" \
 		GEM_SPEC="${GEM_SPEC}" \
 		GEM_CACHE="${GEM_CACHE}" \
 		EXTRACT_SUFX="${EXTRACT_SUFX}"
 
 RUBYGEMBIN=	${LOCALBASE}/bin/gem
 
 . if defined(DISTFILES)
 GEMFILES=	${DISTFILES:C/:[^:]+$//}
 . else
 GEMFILES=	${DISTNAME}${EXTRACT_SUFX}
 . endif
 
 RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
 
 .if ${PORT_OPTIONS:MDOCS}
 RUBYGEM_ARGS+=	--document rdoc,ri
 .else
 RUBYGEM_ARGS+=	--no-document
 .endif
 
 .if !target(do-extract)
 do-extract:
 	@${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
 	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Extraction failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
 			fi; \
 		${FALSE}; \
 		fi)
 .endif
 
 .if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Compilation failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
 			fi; \
 		${FALSE}; \
 		fi)
 .endif
 
 .if !target(do-install)
 do-install:
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS})
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
 	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type f -not -name '*.so' -delete 2> /dev/null || ${TRUE}
 	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type d -empty -delete 2> /dev/null || ${TRUE}
 	${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} 2> /dev/null || ${TRUE}
 .if !${PORT_OPTIONS:MDOCS}
 	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
 .endif
 .endif
 
 .if empty(gem_ARGS:Mnoautoplist)
 _USES_install+=	820:gem-autoplist
 gem-autoplist:
 	@${ECHO_CMD} ${GEM_SPEC} >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .endif
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 	@if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
 		${FIND} -ds ${STAGEDIR}${PREFIX}/${EXT_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
 	fi
 	@if [ -d ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} ]; then \
 		${FIND} -ds ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
 	fi
 .endif
 
 .endif
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
index 50e16fe9961a..568db58b87f0 100644
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -1,26 +1,26 @@
 # Handle dependency on the gettext-runtime (libintl) port
 #
 # Feature:	gettext-runtime
 # Usage:	USES=gettext-runtime or USES=gettext-runtime:ARGS
 # Valid ARGS:	lib (default), build, run
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_RUNTIME_MK)
 _INCLUDE_USES_GETTEXT_RUNTIME_MK=	yes
 
 .if empty(gettext-runtime_ARGS)
 gettext-runtime_ARGS=	lib
 .endif
 
 .if ${gettext-runtime_ARGS:Mlib}
 LIB_DEPENDS+=	libintl.so:devel/gettext-runtime
 .endif
 .if ${gettext-runtime_ARGS:Mbuild}
 BUILD_DEPENDS+=	gettext:devel/gettext-runtime
 .endif
 .if ${gettext-runtime_ARGS:Mrun}
 RUN_DEPENDS+=	gettext:devel/gettext-runtime
 .endif
 
 .endif
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
index e05602cf7dec..63e251bde988 100644
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -1,23 +1,23 @@
 # Handle dependency on the gettext-tools port
 #
 # Feature:	gettext-tools
 # Usage:	USES=gettext-tools or USES=gettext-tools:ARGS
 # Valid ARGS:	build (default), run
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_TOOLS_MK)
 _INCLUDE_USES_GETTEXT_TOOLS_MK=	yes
 
 .if empty(gettext-tools_ARGS)
 gettext-tools_ARGS=	build
 .endif
 
 .if ${gettext-tools_ARGS:Mbuild}
 BUILD_DEPENDS+=	msgfmt:devel/gettext-tools
 .endif
 .if ${gettext-tools_ARGS:Mrun}
 RUN_DEPENDS+=	msgfmt:devel/gettext-tools
 .endif
 
 .endif
diff --git a/Mk/Uses/gettext.mk b/Mk/Uses/gettext.mk
index ca23f60d5cb2..936f2056f3f2 100644
--- a/Mk/Uses/gettext.mk
+++ b/Mk/Uses/gettext.mk
@@ -1,19 +1,19 @@
 # Sets a library dependency on gettext-runtime and a build dependency
 # on gettext-tools.  Same as "USES=gettext-runtime gettext-tools".
 #
 # Feature:	gettext
 # Usage:	USES=gettext
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GETTEXT_MK)
 _INCLUDE_USES_GETTEXT_MK=	yes
 
 .if !empty(gettext_ARGS)
 IGNORE=		USES=gettext does not take arguments
 .endif
 
 .include "${USESDIR}/gettext-runtime.mk"
 .include "${USESDIR}/gettext-tools.mk"
 
 .endif
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
index 601d8fbd4801..50b9df2ecb3c 100644
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -1,19 +1,19 @@
 # Provide support to use the GNU make
 #
 # Feature:		gmake
 # Usage:		USES=gmake
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
 
 .if !empty(gmake_ARGS)
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .endif
 
 BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
 CONFIGURE_ENV+=		MAKE=gmake
 MAKE_CMD=		gmake
 
 .endif
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index e55fcffe8cc5..4b9fafc10d35 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -1,67 +1,67 @@
 # handle dependency on the iconv port
 #
 # Feature:	iconv
 # Usage:	USES=iconv or USES=iconv:ARGS
 # Valid ARGS:	lib (default, implicit), build, patch,
 #		wchar_t (port uses "WCHAR_T" extension),
 #		translit (port uses "//TRANSLIT" extension)
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: desktop@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
 
 .if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit}
 
 ICONV_CMD=	${LOCALBASE}/bin/iconv
 ICONV_LIB=	-liconv
 ICONV_PREFIX=	${LOCALBASE}
 ICONV_CONFIGURE_ARG=	--with-libiconv-prefix=${LOCALBASE}
 ICONV_CONFIGURE_BASE=	--with-libiconv=${LOCALBASE}
 ICONV_INCLUDE_PATH=	${LOCALBASE}/include
 ICONV_LIB_PATH=		${LOCALBASE}/lib/libiconv.so
 
 .if ${iconv_ARGS:Mbuild}
 BUILD_DEPENDS+=	${ICONV_CMD}:converters/libiconv
 .elif ${iconv_ARGS:Mpatch}
 PATCH_DEPENDS+=	${ICONV_CMD}:converters/libiconv
 .else
 LIB_DEPENDS+=	libiconv.so:converters/libiconv
 .endif
 
 .else
 
 ICONV_CMD=	/usr/bin/iconv
 ICONV_LIB=
 ICONV_PREFIX=	/usr
 ICONV_CONFIGURE_ARG=
 ICONV_CONFIGURE_BASE=
 ICONV_INCLUDE_PATH=	/usr/include
 ICONV_LIB_PATH=		/usr/lib/libc.so
 
 .if exists(${LOCALBASE}/include/iconv.h)
 # Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to work.
 BUILD_DEPENDS+=	libiconv>=1.14_11:converters/libiconv
 .endif
 
 # LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h.
 CPPFLAGS+=	-DLIBICONV_PLUG
 CFLAGS+=	-DLIBICONV_PLUG
 CXXFLAGS+=	-DLIBICONV_PLUG
 OBJCFLAGS+=	-DLIBICONV_PLUG
 
 .endif
 
 # These are the most common names for the iconv-related variables found in
 # CMake-based ports. We set them here via CMAKE_ARGS to make sure that the best
 # combination is always used (ie. we prefer the version in libc whenever it is
 # available, and sometimes have to fall back to the iconv.h header from ports
 # while still using the library from base).
 CMAKE_ARGS+=	-DICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
 		-DICONV_LIBRARIES=${ICONV_LIB_PATH} \
 		-DICONV_LIBRARY=${ICONV_LIB_PATH} \
 		-DLIBICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
 		-DLIBICONV_LIBRARIES=${ICONV_LIB_PATH} \
 		-DLIBICONV_LIBRARY=${ICONV_LIB_PATH}
 
 .endif
diff --git a/Mk/Uses/jpeg.mk b/Mk/Uses/jpeg.mk
index 06f8132f52d6..71b6b22b1e19 100644
--- a/Mk/Uses/jpeg.mk
+++ b/Mk/Uses/jpeg.mk
@@ -1,36 +1,36 @@
 # Handle dependency on jpeg
 #
 # Feature:	jpeg
 # Usage:	USES=jpeg or USES=jpeg:ARGS
 # Valid ARGS:	lib (default, implicit), build, run, both
 #
 # User defined variables:
 # JPEG_PORT		- jpeg implementation
 #			Valid values: graphics/jpeg-turbo, graphics/mozjpeg
 #			Default value: graphics/jpeg-turbo
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_JPEG_MK)
 
 _INCLUDE_USES_JPEG_MK=	yes
 JPEG_PORT?=	graphics/jpeg-turbo
 
 .if empty(jpeg_ARGS)
 jpeg_ARGS=	lib
 .endif
 
 .if ${jpeg_ARGS} == lib
 LIB_DEPENDS+=	libjpeg.so:${JPEG_PORT}
 .elif ${jpeg_ARGS} == build
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
 .elif ${jpeg_ARGS} == run
 RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .elif ${jpeg_ARGS} == both
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
 RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .else
 IGNORE=		USES=jpeg - invalid args: [${jpeg_ARGS}] specified
 .endif
 
 .endif
diff --git a/Mk/Uses/libarchive.mk b/Mk/Uses/libarchive.mk
index 71e513e96057..460a248455d8 100644
--- a/Mk/Uses/libarchive.mk
+++ b/Mk/Uses/libarchive.mk
@@ -1,14 +1,14 @@
 # handle dependency on the libarchive port
 #
 # Feature:	libarchive
 # Usage:	USES=libarchive
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LIBARCHIVE_MK)
 _INCLUDE_USES_LIBARCHIVE_MK=	yes
 _USES_POST+=	localbase
 
 LIB_DEPENDS+=	libarchive.so.13:archivers/libarchive
 .endif
diff --git a/Mk/Uses/libedit.mk b/Mk/Uses/libedit.mk
index 293b3e672aa8..b5d3b4883e8a 100644
--- a/Mk/Uses/libedit.mk
+++ b/Mk/Uses/libedit.mk
@@ -1,14 +1,14 @@
 # handle dependency on the libedit port
 #
 # Feature:	libedit
 # Usage:	USES=libedit
 # Valid ARGS:	none
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LIBEDIT_MK)
 _INCLUDE_USES_LIBEDIT_MK=	yes
 _USES_POST+=	localbase
 
 LIB_DEPENDS+=	libedit.so.0:devel/libedit
 .endif
diff --git a/Mk/Uses/localbase.mk b/Mk/Uses/localbase.mk
index b14173afd709..32ffa6de5231 100644
--- a/Mk/Uses/localbase.mk
+++ b/Mk/Uses/localbase.mk
@@ -1,29 +1,29 @@
 # handle enforcing localbase in path
 #
 # Feature:	localbase
 # Usage:	USES=localbase or USES=localbase:args
 # Valid ARGS:	ldflags		Set LDFLAGS instead of LIBS
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LOCALBASE_MK)
 _INCLUDE_USES_LOCALBASE_MK=	yes
 _USES_POST+=	localbase
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LOCALBASE_POST_MK)
 _INCLUDE_USES_LOCALBASE_POST_MK=yes
 
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
 CFLAGS+=	-isystem ${LOCALBASE}/include
 CXXFLAGS+=	-isystem ${LOCALBASE}/include
 .if ${localbase_ARGS:Mldflags}
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
 LIBS+=		-L${LOCALBASE}/lib
 .endif
 
 # Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
 # this, and CMAKE_ARGS is not used when bootstrapping CMake.
 CONFIGURE_ENV+=	CMAKE_PREFIX_PATH="${LOCALBASE}"
 .endif
diff --git a/Mk/Uses/makeinfo.mk b/Mk/Uses/makeinfo.mk
index 3c9e25fec110..07a1764b8057 100644
--- a/Mk/Uses/makeinfo.mk
+++ b/Mk/Uses/makeinfo.mk
@@ -1,20 +1,20 @@
 # handle dependency on the makeinfo port
 #
 # Feature:	makeinfo
 # Usage:	USES=makeinfo
 # Valid ARGS:	none
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MAKEINFO_MK)
 _INCLUDE_USES_MAKEINFO_MK=	yes
 
 .if !empty(makeinfo_ARGS)
 IGNORE=	USES=makeinfo - expects no arguments
 .endif
 
 # Depend specifically on makeinfo from ports
 BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:print/texinfo
 MAKEINFO?=	${LOCALBASE}/bin/makeinfo
 
 .endif
diff --git a/Mk/Uses/makeself.mk b/Mk/Uses/makeself.mk
index af6d18fcf006..6bab118411c0 100644
--- a/Mk/Uses/makeself.mk
+++ b/Mk/Uses/makeself.mk
@@ -1,21 +1,21 @@
 # handle makeself archives
 #
 # Feature:	makeself
 # Usage:	USES=makeself
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MAKESELF_Mk)
 _INCLUDE_USES_MAKESELF_MK=	yes
 
 .if !empty(makeself_ARGS)
 IGNORE=	Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments
 .endif
 
 EXTRACT_DEPENDS+=	${UNMAKESELF_CMD}:archivers/unmakeself
 
 EXTRACT_CMD=	${UNMAKESELF_CMD}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=
 
 .endif
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index 3e0f4e9036f2..bffddf9729d4 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -1,33 +1,33 @@
 # handle dependency on motif
 #
 # Feature:	motif
 # Usage:	USES=motif
 #
 # If WANT_LESSTIF is defined in user make.conf then lesstif will be used
 # instead of open-motif
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MOTIF_MK)
 _INCLUDE_USES_MOTIF_MK=	yes
 
 .if !empty(motif_ARGS)
 IGNORE=	USES=motif takes no arguments
 .endif
 
 .if defined(WANT_LESSTIF)
 LIB_DEPENDS+=		libXm.so:x11-toolkits/lesstif
 .else
 USE_XORG+=	xpm
 LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
 .endif
 
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm
 MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 
 # We only need to include xorg.mk if we want USE_XORG modules
 .if defined(USE_XORG) && !empty(USE_XORG)
 .include "${USESDIR}/xorg.mk"
 .endif
 
 .endif
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
index 6fad636a5ab4..c89ad90ff3cb 100644
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -1,93 +1,93 @@
 # handle dependency on the ncurses port
 #
 # Feature:	ncurses
 # Usage:	USES=ncurses
 # Valid ARGS:	base port
 #
 # use/port can now set this options to the makefiles
 # NCURSES_RPATH= yes	- pass RFLAGS options to CFLAGS
 #
 # Overridable defaults:
 # NCURSES_PORT=	devel/ncurses
 #
 # The makefile sets the following variables:
 # NCURSESBASE		- "/usr" or ${LOCALBASE}
 # NCURSESLIB		- path to the libs
 # NCURSESINC		- path to the matching includes
 # NCURSESRPATH		- rpath for dynamic linker
 #
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NCURSES_MK)
 _INCLUDE_USES_NCURSES_MK=	yes
 
 .if empty(ncurses_ARGS)
 .  if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncursesw.so)
 ncurses_ARGS=	base
 .  else
 ncurses_ARGS=	port
 .  endif
 .endif
 
 .if ${ncurses_ARGS} == base
 NCURSESBASE=	/usr
 NCURSESINC=	${NCURSESBASE}/include
 
 .  if exists(${LOCALBASE}/lib/libncurses.so)
 _USES_sanity+=	400:check-depends-ncurses
 check-depends-ncurses:
 	@${ECHO_CMD} "Dependency error: this port wants the ncurses library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port or undefine WITH_NCURSES_BASE."
 	@${FALSE}
 .  endif
 
 .elif ${ncurses_ARGS} == port
 NCURSESBASE=	${LOCALBASE}
 NCURSESINC=	${LOCALBASE}/include/ncurses
 
 .  if !defined(NCURSES_PORT) && exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so)
 PKG_DBDIR?=	${DESTDIR}/var/db/pkg
 .    if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .    endif
 PKGARGS?=
 NCURSES_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libncurses.so || :
 .  endif
 NCURSES_INSTALLED?=
 
 .if ${NCURSES_INSTALLED} != ""
 NCURSES_PORT=	${NCURSES_INSTALLED}
 NCURSES_SHLIBFILE!=	${PKG_INFO} -ql ${NCURSES_INSTALLED} | grep -m 1 "^`${PKG_QUERY} "%p" ${NCURSES_INSTALLED}`/lib/libncurses.so."
 NCURSES_SHLIBVER?=	${NCURSES_SHLIBFILE:E}
 .endif
 
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	6
 
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 NCURSESRPATH=		${NCURSESBASE}/lib
 TINFO_LIB=		-ltinfo
 NCURSES_LIB=		-lncurses
 
 .if defined(NCURSES_RPATH)
 CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
 .endif
 LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
 
 .else
 .error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
 .endif
 
 NCURSESLIB=	${NCURSESBASE}/lib
 NCURSES_IMPL?=	ncursesw
 TINFO_LIB?=	-ltinfow
 NCURSES_LIB?=	-lncursesw
 NCURSESLIBS=		${NCURSES_LIB} ${TINFO_LIB}
 
 .endif
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
index 6f71484f1ec4..ce9a92af666e 100644
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -1,78 +1,78 @@
 # Provide support to use Ninja
 #
 # Feature:		ninja
 # Usage:		USES=ninja
 # Valid ARGS:		build, make (default), run
 #
 # build			add a build dependency on ninja
 # make			use ninja for the build instead of make, implies "build"
 # run			add a run dependency on ninja
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NINJA_MK)
 _INCLUDE_USES_NINJA_MK=	yes
 
 _valid_ARGS=	build make run
 
 .for _arg in ${ninja_ARGS}
 .    if empty(_valid_ARGS:M${_arg})
 IGNORE=	'USES+= ninja:${ninja_ARGS}' usage: argument [${_arg}] is not recognized
 .    endif
 .endfor
 
 .if empty(ninja_ARGS)
 ninja_ARGS+=	make
 .endif
 
 .if ${ninja_ARGS:Mmake}
 ninja_ARGS+=	build
 .endif
 
 .if ${NINJA_DEFAULT} == ninja
 NINJA_CMD=	ninja
 _NINJA_PORT=	devel/ninja
 .elif ${NINJA_DEFAULT} == samurai
 NINJA_CMD=	samu
 _NINJA_PORT=	devel/samurai
 MAKE_ENV+=	SAMUFLAGS="-v -j${MAKE_JOBS_NUMBER}"
 .  if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*}
 # Cmake and Meson have native support for Samurai and detect and
 # use it when Ninja is not available in the build environment.  The
 # alias is needed for other ports which call Ninja directly and do
 # not fall back to Samurai. There should be no harm in providing it
 # generally.
 BINARY_ALIAS+=	ninja=samu
 .  endif
 .else
 IGNORE=	invalid DEFAULT_VERSIONS+=ninja=${NINJA_DEFAULT}
 .endif
 
 .if ${ninja_ARGS:Mbuild}
 BUILD_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
 # Humanize build log and include percentage of completed jobs %p in it.
 # See samu(1) or the Ninja manual.
 MAKE_ENV+=	NINJA_STATUS="[%p %s/%t] "
 .endif
 
 .if ${ninja_ARGS:Mmake}
 .  if ${NINJA_DEFAULT} == ninja
 # samu does not support GNU-style args, so we cannot just append
 # -v last.  samu gets this via SAMUFLAGS above but ninja does not
 # support an equivalent environment variable.
 MAKE_ARGS+=	-v
 .  endif
 CMAKE_ARGS+=	-GNinja
 MAKEFILE=
 MAKE_CMD=	${NINJA_CMD}
 MAKE_FLAGS=
 # Set a minimal job of 1
 _MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
 _DESTDIR_VIA_ENV=	yes
 .endif
 
 .if ${ninja_ARGS:Mrun}
 RUN_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
 .endif
 
 .endif
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
index 59e408691d84..38b2dd8043fd 100644
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -1,28 +1,28 @@
 # Handle dependency on OpenAL
 #
 # Feature:	openal
 # Usage:	USES=openal or USES=openal:ARGS
 # Valid ARGS:	al, soft (default), alut
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_OPENAL_MK)
 _INCLUDE_USES_OPENAL_MK=	yes
 
 .if empty(openal_ARGS)
 openal_ARGS=	soft
 .endif
 
 .if !empty(openal_ARGS:Nal:Nsoft:Nalut)
 IGNORE=	has unknown USES=openal arguments: ${openal_ARGS:Nal:Nsoft:Nalut}
 .endif
 
 _OPENAL_al_DEPENDS=	libopenal.so.1:audio/openal-soft
 _OPENAL_soft_DEPENDS=	libopenal.so.1:audio/openal-soft
 _OPENAL_alut_DEPENDS=	libalut.so.0:audio/freealut
 
 .for _arg in ${openal_ARGS}
 LIB_DEPENDS+=	${_OPENAL_${_arg}_DEPENDS}
 .endfor
 
 .endif
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index 7593fc923302..e18017933e18 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -1,61 +1,61 @@
 # Lookup common paths in Makefile.in, configure and similar files, and replace
 # their values to respect FreeBSD hier(7) for file installation.
 #
 # Feature:	pathfix
 # Usage:	USES=pathfix
 # Valid ARGS:	does not require args
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
 
 .if !empty(pathfix_ARGS)
 IGNORE=	USES=pathfix does not require args
 .endif
 
 PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
 .if ${USES:Mautoreconf*}
 PATHFIX_MAKEFILEIN?=	Makefile.am Makefile.in
 .else
 PATHFIX_MAKEFILEIN?=	Makefile.in
 .endif
 PATHFIX_WRKSRC?=	${WRKSRC}
 
 _USES_patch+=	190:pathfix
 pathfix:
 .if ${USES:Mcmake*}
 .for file in ${PATHFIX_CMAKELISTSTXT}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]CMAKE_INSTALL_DATAROOTDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_DESTINATION[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]KDE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|lib/pkgconfig|libdata/pkgconfig|g'
 .endfor
 .else
 .for file in ${PATHFIX_MAKEFILEIN}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|@libdir@/locale|@prefix@/share/locale|g ; \
 		s|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
 		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
 .endfor
 .endif
 
 .endif
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
index 9a9083aaf32f..a04a163fbdb8 100644
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -1,175 +1,175 @@
 # Use the PHP Extension and Application Repository
 #
 # Feature:	pear
 # Usage:	USES=pear
 # Valid ARGS:	env
 #
 #	- env : Only provide the environment variables, no fetch/build/install
 #		targets.
 #
-# MAINTAINER=	portmgr@FreeBSD.org
+# MAINTAINER=	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PEAR_MK)
 _INCLUDE_USES_PEAR_MK=	yes
 _USES_POST+=	pear
 
 _valid_pear_ARGS=		env
 
 # Sanity check
 .  for arg in ${pear_ARGS}
 .    if empty(_valid_pear_ARGS:M${arg})
 IGNORE=	Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .  endfor
 
 php_ARGS+=	flavors
 .include "${USESDIR}/php.mk"
 
 .  if empty(pear_ARGS:Menv)
 MASTER_SITES?=	http://pear.php.net/get/
 
 EXTRACT_SUFX?=	.tgz
 DIST_SUBDIR?=	PEAR
 
 .    if empty(php_ARGS:Mphpize)
 NO_BUILD=	yes
 .    endif
 .  endif
 
 BUILD_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
 RUN_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
 
 PEAR_PKGNAMEPREFIX=	php${PHP_VER}-pear-
 
 .  if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != ""
 PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX=	php${PHP_VER}-pear-${PEAR_CHANNEL}-
 PKGNAMEPREFIX?=	${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX}
 PEARPKGREF=	${PEAR_CHANNEL}/${PORTNAME}
 PEAR_CHANNEL_VER?=	>=0
 BUILD_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
 RUN_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
 .  else
 PKGNAMEPREFIX?=	${PEAR_PKGNAMEPREFIX}
 PEARPKGREF=	${PORTNAME}
 .  endif
 
 .  if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
 .  else
 PHP_BASE=	${LOCALBASE}
 .  endif
 PEAR=		${LOCALBASE}/bin/pear
 LPEARDIR=	share/pear
 LPKGREGDIR=	${LPEARDIR}/packages/${PKGNAME}
 LDATADIR=	${LPEARDIR}/data/${PORTNAME}
 LDOCSDIR=	share/doc/pear/${PORTNAME}
 LEXAMPLESDIR=	share/examples/pear/${PORTNAME}
 LSQLSDIR=	${LPEARDIR}/sql/${PORTNAME}
 LSCRIPTSDIR=	bin
 LTESTSDIR=	${LPEARDIR}/tests/${PORTNAME}
 PEARDIR=	${PHP_BASE}/${LPEARDIR}
 PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
 DATADIR=	${PHP_BASE}/${LDATADIR}
 DOCSDIR=	${PHP_BASE}/${LDOCSDIR}
 EXAMPLESDIR=	${PHP_BASE}/${LEXAMPLESDIR}
 SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
 SCRIPTFILESDIR=	${LOCALBASE}/bin
 TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
 .  if defined(CATEGORY) && !empty(CATEGORY)
 LINSTDIR=	${LPEARDIR}/${CATEGORY}
 .  else
 LINSTDIR=	${LPEARDIR}
 .  endif
 INSTDIR=	${PHP_BASE}/${LINSTDIR}
 
 SUB_LIST+=	PKG_NAME=${PEARPKGREF}
 
 .  if empty(pear_ARGS:Menv)
 .    if empty(php_ARGS:Mphpize) && !exists(${.CURDIR}/pkg-plist)
 PLIST=		${WRKDIR}/PLIST
 .    endif
 PKGINSTALL?=	${PORTSDIR}/devel/pear/pear-install
 PKGDEINSTALL?=	${WRKDIR}/pear-deinstall
 .  endif
 
 PLIST_SUB+=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
 		TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
 		SCRIPTFILESDIR=${LCRIPTSDIR}
 
 .endif
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK)
 _INCLUDE_USES_PEAR_POST_MK=	yes
 
 .  if empty(pear_ARGS:Menv)
 
 _USES_install+=	250:pear-pre-install
 pear-pre-install:
 .    if exists(${LOCALBASE}/lib/php.DIST_PHP)	\
 	|| exists(${PHP_BASE}/lib/php.DIST_PHP)	\
 	|| exists(${LOCALBASE}/.PEAR.pkg)	\
 	|| exists(${PHP_BASE}/.PEAR.pkg)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	Sorry, the PEAR structure has been modified;"
 	@${ECHO_MSG} "	Please deinstall your installed pear- ports."
 	@${ECHO_MSG} ""
 	@${FALSE}
 .    endif
 
 DIRFILTER=	${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \
 		    | ( while read r; do \
 			C=1; \
 			while [ $$C = 1 ]; do \
 			    echo $$r; \
 			    if echo $$r | ${GREP} '/' > /dev/null; then \
 	                        r=`${DIRNAME} $$r`; \
 			    else  \
 	                        C=0; \
 	                    fi; \
 	                done; \
 	            done \
 	      ) | ${SORT} -ur
 
 .    if empty(php_ARGS:Mphpize)
 _USES_install+=	260:do-autogenerate-plist
 do-autogenerate-plist:
 	@${ECHO_MSG} "===>   Generating packing list with pear"
 	@${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
 .      for R in .channels .depdb .depdblock .filemap .lock .registry
 	@${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
 	@${RM} -r ${WRKDIR}/inst/${R}
 .      endfor
 	@FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
 	${GREP} -v -E "^${PREFIX}/"` || exit 0; \
 	${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \
 	${ECHO_CMD} "Cannot generate packing list: package files outside PREFIX"; \
 	exit 1; fi;
 	@${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST}
 # pkg_install needs to escape $ in directory name while pkg does not
 	@cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
 	| ${CUT} -c 3- >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml
 # Clean up orphans re-generated by pear-install
 .      for R in .channels .depdb .depdblock .filemap .lock .registry
 	@${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
 	@${RM} -r ${STAGEDIR}/${R}
 .      endfor
 .    endif
 
 _USES_install+=	270:do-generate-deinstall-script
 do-generate-deinstall-script:
 	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${PORTSDIR}/devel/pear/pear-deinstall.in > ${WRKDIR}/pear-deinstall
 
 _USES_install+=	550:pear-post-install
 pear-post-install:
 	@${MKDIR} ${STAGEDIR}${PKGREGDIR}
 	@${INSTALL_DATA} ${WRKDIR}/package.xml ${STAGEDIR}${PKGREGDIR}
 
 show-depends: patch
 	@${PEAR} package-dependencies ${WRKDIR}/package.xml
 
 .  endif
 
 .endif
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
index 25392f4ccd90..d025856d2314 100644
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -1,31 +1,31 @@
 # handle dependency on the pkgconf port
 #
 # Feature:	pkgconfig
 # Usage:	USES=pkgconfig or USES=pkgconfig:ARGS
 # Valid ARGS:	build (default, implicit), run, both
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PKGCONFIG_MK)
 _INCLUDE_USES_PKGCONFIG_MK=	yes
 
 _PKGCONFIG_DEPENDS=	pkgconf>=1.3.0_1:devel/pkgconf
 
 .if empty(pkgconfig_ARGS)
 pkgconfig_ARGS=	build
 .endif
 
 .if ${pkgconfig_ARGS} == "build"
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
 .elif ${pkgconfig_ARGS} == "run"
 RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 .elif ${pkgconfig_ARGS} == "both"
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 .else
 IGNORE=	USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
 .endif
 
 .endif
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
index 4893ebfdee6b..129c5c910c6b 100644
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -1,19 +1,19 @@
 # handle dependency on the readline port
 #
 # Feature:	readline
 # Usage:	USES=readline
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_READLINE_MK)
 _INCLUDE_USES_READLINE_MK=	yes
 
 .if !empty(readline_ARGS)
 IGNORE= Incorrect 'USES+= readline:${readline_ARGS}' readline takes no arguments
 .endif
 
 LIB_DEPENDS+=		libreadline.so.8:devel/readline
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 .endif
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
index dcacff9ae68d..95d0b0a87346 100644
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -1,106 +1,106 @@
 # Replace #! interpreters in scripts by what we actually have.
 #
 # Standard templates for bash, perl, python,... are included out of
 # the box, others can easily be added per port.
 #
 # Feature:	shebangfix
 # Usage:	USES=shebangfix
 #
 #   SHEBANG_REGEX	a regular expression to match files that needs to be converted
 #   SHEBANG_FILES	list of files or glob pattern relative to ${WRKSRC}
 #   SHEBANG_GLOB	list of glob pattern find(1) will match with
 #
 # To specify that ${WRKSRC}/path1/file and all .pl files in ${WRKSRC}/path2
 # should be processed:
 #
 #   SHEBANG_FILES=	path1/file path2/*.pl
 #
 # To define custom shebangs to replace, use the following (note that
 # shebangs with spaces should be quoted):
 #
 #   perl_OLD_CMD=	/usr/bin/perl5.005 "/usr/bin/setenv perl5.005"
 #
 # To define a new shebang scheme add the following to the port Makefile:
 #
 #   SHEBANG_LANG=	lua
 #   lua_OLD_CMD=	/usr/bin/lua
 #   lua_CMD=	${LOCALBASE}/bin/lua
 #
 # To override a definition, for example replacing /usr/bin/perl by
 # /usr/bin/env perl, add the following:
 #
 #   perl_CMD=	${SETENV} perl
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_SHEBANGFIX_MK)
 _INCLUDE_USES_SHEBANGFIX_MK=	yes
 
 SHEBANG_LANG+=	bash java ksh perl php python ruby tcl tk
 
 .if ${USES:Mlua*}
 SHEBANG_LANG+=	lua
 lua_CMD?=	${LOCALBASE}/bin/${LUA_CMD}
 .endif
 
 tcl_OLD_CMD+=	/usr/bin/tclsh
 tcl_CMD?=	${TCLSH}
 
 tk_OLD_CMD+=	/usr/bin/wish
 tk_CMD?=	${WISH}
 
 .if ${USES:Mpython*}
 python_CMD?=	${PYTHON_CMD}
 .endif
 
 # Replace the same patterns for all langs and setup a default, that may have
 # been set already above with ?=.
 .for lang in ${SHEBANG_LANG}
 ${lang}_CMD?= ${LOCALBASE}/bin/${lang}
 ${lang}_OLD_CMD+= "/usr/bin/env ${lang}"
 ${lang}_OLD_CMD+= /bin/${lang}
 ${lang}_OLD_CMD+= /usr/bin/${lang}
 ${lang}_OLD_CMD+= /usr/local/bin/${lang}
 .endfor
 
 .for pyver in 2 3
 python_OLD_CMD+= "/usr/bin/env python${pyver}"
 python_OLD_CMD+= /bin/python${pyver}
 python_OLD_CMD+= /usr/bin/python${pyver}
 python_OLD_CMD+= /usr/local/bin/python${pyver}
 .endfor
 
 .for lang in ${SHEBANG_LANG}
 .  if !defined(${lang}_CMD)
 IGNORE+=	missing definition for ${lang}_CMD
 .  endif
 .  if !defined(${lang}_OLD_CMD)
 IGNORE+=	missing definition for ${lang}_OLD_CMD
 .  endif
 .  for old_cmd in ${${lang}_OLD_CMD}
 _SHEBANG_REINPLACE_ARGS+=	-e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}\([[:space:]]\)|\#!${${lang}_CMD}\1|"
 _SHEBANG_REINPLACE_ARGS+=	-e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}$$|\#!${${lang}_CMD}|"
 .  endfor
 .endfor
 
 _USES_patch+=	210:fix-shebang
 fix-shebang:
 .if defined(SHEBANG_REGEX)
 	@cd ${WRKSRC}; \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
 .endif
 .if defined(SHEBANG_GLOB)
 .  for f in ${SHEBANG_GLOB}
 	@cd ${WRKSRC}; \
 		${FIND} . -type f -name '${f}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
 .  endfor
 .endif
 .if defined(SHEBANG_FILES)
 	@cd ${WRKSRC}; \
 		${FIND} ${SHEBANG_FILES} -type f \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
 .endif
 
 .endif
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index fe8f78db3003..1b658ce18101 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -1,127 +1,127 @@
 # Handle dependency on *ssl ports.
 #
 # Feature:	SSL_DEFAULT
 # Usage:	USES=ssl
 # Valid ARGS:	none (build and run), build, run
 #
 # The user can choose which ssl library he wants with:
 #
 # DEFAULT_VERSIONS+=	ssl=<openssl variant>
 #
 # Variants being base, openssl, libressl, and libressl-devel.
 #
 # The Makefile sets these variables:
 # OPENSSLBASE		- "/usr" or ${LOCALBASE}
 # OPENSSLDIR		- path to openssl
 # OPENSSLLIB		- path to the libs
 # OPENSSLINC		- path to the matching includes
 # OPENSSLRPATH		- rpath for dynamic linker
 #
 # MAKE_ENV		- extended with the variables above
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 #
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
 
 .if !empty(ssl_ARGS:Nbuild:Nrun)
 IGNORE=	"USES=ssl invalid arguments ${ssl_ARGS}."
 .endif
 
 .if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun))
 _SSL_BUILD_DEP=	1
 _SSL_RUN_DEP=	1
 .elif !empty(ssl_ARGS:Mbuild)
 _SSL_BUILD_DEP=	1
 .elif !empty(ssl_ARGS:Mrun)
 _SSL_RUN_DEP=	1
 .endif
 
 .if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}}
 .  if defined(BROKEN_SSL_REASON_${SSL_DEFAULT})
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}}
 .  elif defined(BROKEN_SSL_REASON)
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON}
 .  else
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
 .  endif
 .endif
 
 .if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}}
 .  if defined(IGNORE_SSL_REASON_${SSL_DEFAULT})
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}}
 .  elif defined(IGNORE_SSL_REASON)
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON}
 .  else
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
 .  endif
 .endif
 
 .if ${SSL_DEFAULT} == base
 OPENSSLBASE=		/usr
 OPENSSLDIR?=		/etc/ssl
 
 .  if !exists(${DESTDIR}/usr/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of"
 	@${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your"
 	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
 	@${ECHO_CMD} "(at \"https://docs.FreeBSD.org/en/books/handbook/security/#openssl\", for instance)"
 	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
 	@${ECHO_CMD} "OpenSSL distribution."
 	@${FALSE}
 .  endif
 .  if exists(${LOCALBASE}/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
 	@${FALSE}
 .  endif
 
 .else # ${SSL_DEFAULT} != base
 
 OPENSSLBASE=		${LOCALBASE}
 
 OPENSSL_PORT=		security/${SSL_DEFAULT}
 
 # Get OPENSSL_SHLIBVER from the port
 .sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
 
 .  if !defined(OPENSSL_SHLIBVER)
 .error You are using an unsupported SSL provider ${SSL_DEFAULT}
 .  endif
 
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
 .  if defined(_SSL_BUILD_DEP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
 .  endif
 .  if defined(_SSL_RUN_DEP)
 RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
 .  endif
 OPENSSLRPATH=		${LOCALBASE}/lib
 
 .endif
 
 OPENSSLLIB=		${OPENSSLBASE}/lib
 OPENSSLINC=		${OPENSSLBASE}/include
 
 MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
 MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
 MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
 MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
 
 .if defined(OPENSSLRPATH)
 .  if defined(USE_OPENSSL_RPATH)
 CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
 .  endif
 MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
 OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
 .endif
 
 LDFLAGS+=		${OPENSSL_LDFLAGS}
 
 .endif
diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk
index 0ce79a3840d8..5146c66b8e09 100644
--- a/Mk/Uses/tar.mk
+++ b/Mk/Uses/tar.mk
@@ -1,34 +1,34 @@
 # handle tar archives
 #
 # Feature:	tar
 # Usage:	USES=tar[:[xz|lz|lzma|txz|bz[ip]2|tgz|tbz|tbz2|Z]]
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_TAR_MK)
 _INCLUDE_USES_TAR_MK=	yes
 
 .if ${tar_ARGS} == xz
 EXTRACT_SUFX?=	.tar.xz
 .elif ${tar_ARGS} == lz
 EXTRACT_SUFX?=	.tar.lz
 .elif ${tar_ARGS} == lzma
 EXTRACT_SUFX?=	.tar.lzma
 .elif ${tar_ARGS} == txz
 EXTRACT_SUFX?=	.txz
 .elif ${tar_ARGS} == bzip2 || ${tar_ARGS} == bz2
 EXTRACT_SUFX?=	.tar.bz2
 .elif ${tar_ARGS} == tgz
 EXTRACT_SUFX?=	.tgz
 .elif ${tar_ARGS} == tbz
 EXTRACT_SUFX?=	.tbz
 .elif ${tar_ARGS} == tbz2
 EXTRACT_SUFX?=	.tbz2
 .elif ${tar_ARGS} == Z
 EXTRACT_SUFX?=	.tar.Z
 .elif empty(tar_ARGS)
 EXTRACT_SUFX?=	.tar
 .else
 IGNORE=	Incorrect 'USES+=tar:${tar_ARGS}'
 .endif
 .endif
diff --git a/Mk/Uses/trigger.mk b/Mk/Uses/trigger.mk
index bf15e9512a84..bd83691418b6 100644
--- a/Mk/Uses/trigger.mk
+++ b/Mk/Uses/trigger.mk
@@ -1,29 +1,29 @@
 # Feature:	trigger
 # Usage:	USES=trigger
 # Valid ARGS:	none
 #
 # Variables:
 # TRIGGERS: list of triggers to package
 #
-# MAINTAINER= portmgr@FreeBSD.org
+# MAINTAINER= ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_TRIGGER_MK)
 _INCLUDE_USES_TRIGGER_MK=	yes
 
 .if !empty(trigger_ARGS)
 IGNORE=	Incorrect 'USES+= trigger:${trigger_ARGS}' trigger takes no arguments
 .endif
 
 TRIGGERS?=	${PORTNAME}
 .for t in ${TRIGGERS}
 SUB_FILES+=	${t}.ucl
 PLIST_FILES+=	${LOCALBASE}/share/pkg/triggers/$t.ucl
 .endfor
 
 _USES_install+=	601:trigger-post-install
 trigger-post-install:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pkg/triggers
 .for t in ${TRIGGERS}
 	${INSTALL_DATA} ${WRKDIR}/$t.ucl ${STAGEDIR}${LOCALBASE}/share/pkg/triggers/
 .endfor
 .endif
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk
index f9e3aea6f18a..d99c4ebbca41 100644
--- a/Mk/Uses/uniquefiles.mk
+++ b/Mk/Uses/uniquefiles.mk
@@ -1,219 +1,219 @@
 # Make files or directories 'unique', by adding a prefix or suffix.
 #
 # Feature:		uniquefiles
 # Usage:		USES=uniquefiles or USES=uniquefiles:ARGS
 # Valid ARGS:	dirs
 #
 # dirs:			The port needs a prefix (and only a prefix) based on
 #			UNIQUE_PREFIX for the standard directories
 #			DOCSDIR, EXAMPLESDIR, DATADIR, WWWDIR, ETCDIR
 #
 # Variables for ports:
 #
 # UNIQUE_PREFIX		- The prefix to be used for directories and files.
 #			  Default: ${PKGNAMEPREFIX}.
 # UNIQUE_PREFIX_FILES	- A list of files that need to be prefixed.
 #			  Default: empty
 # UNIQUE_SUFFIX		- The suffix to be used for files.
 #			  Default: ${PKGNAMESUFFIX}.
 # UNIQUE_SUFFIX_FILES	- A list of files that need to be suffixed.
 #			  Default: empty
 #
 # Variables for the ports framework, but NOT individual ports:
 #
 # UNIQUE_DEFAULT_LINKS	- When set to "yes", symlinks of the original
 #			  filenames are also created pointing to their
 #			  UNIQUE_* counterparts.
 #			  This is useful for supporting multiple logical
 #			  instances from a single physical port, but where
 #			  you want to mark only *one* of those instances to
 #			  provide original filenames.
 #
 #			  category/py-foo, installed as:
 #
 #			py27-foo for Python 2.7 (DEFAULT_VERSION)
 #			py33-foo for Python 3.3
 #
 #			  Results in:
 #
 #			py27-foo
 #			bin/foo-2.7             (UNIQUE_SUFFIX)
 #			bin/foo -> bin/foo-2.7  (symlinked original filename)
 #			py33-foo creates:
 #			bin/foo-3.3             (UNIQUE_SUFFIX)
 #
 #			  Default: no
 #
 # UNIQUE_FIND_PREFIX_FILES	- A shell command to be executed to find files for
 #				  the specific port. This has to return a
 #				  list of files to be iterated over.
 #				  Default: empty
 #
 # UNIQUE_FIND_SUFFIX_FILES	- A shell command to be executed to find files for
 #				  the specific port. This has to return a
 #				  list of files to be iterated over.
 #				  Default: empty
 #
 # UNIQUE_SUFFIX_TYPES		- A list of TAGS to defined more complex unique
 #				  suffix handling.  It can, for example, handle
 #				  man pages by doing:
 #
 #		UNIQUE_SUFFIX_TYPES+=	SUFFIX_MAN
 #		UNIQUE_SUFFIX_MAN_WITH_EXT=	.[1-9ln]
 #		UNIQUE_SUFFIX_MAN_EXTRA_EXT=	.gz
 #		UNIQUE_FIND_SUFFIX_MAN_FILES=	${EGREP} -he '^man/man[1-9ln]/.*$$' ${TMPPLIST} 2>/dev/null
 #
 #				  The make(1) target that renames the files
 #				  runs before the man pages are compressed,
 #				  this is what the EXTRA_EXT bit is for.
 #
 # NOTE:	multiple logical instances are not supported by pkg and the original
 # pkg_tools at the moment.
 #
-# MAINTAINER:	portmgr@FreeBSD.org
+# MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_UNIQUEFILES_MK)
 _INCLUDE_USES_UNIQUEFILES_MK=	yes
 
 UNIQUE_PREFIX?=		${PKGNAMEPREFIX}
 UNIQUE_SUFFIX?=		${PKGNAMESUFFIX}
 UNIQUE_PREFIX_FILES?=	# empty
 UNIQUE_SUFFIX_FILES?=	# empty
 
 UNIQUE_SUFFIX_TYPES+=	SUFFIX
 
 .if ${uniquefiles_ARGS:Mdirs}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${UNIQUE_PREFIX}${PORTNAME}
 WWWDIR=		${PREFIX}/www/${UNIQUE_PREFIX}${PORTNAME}
 ETCDIR=		${PREFIX}/etc/${UNIQUE_PREFIX}${PORTNAME}
 .endif
 
 UNIQUE_DEFAULT_LINKS?=		no
 UNIQUE_FIND_PREFIX_FILES?=	# empty
 UNIQUE_FIND_SUFFIX_FILES?=	# empty
 
 _USES_POST+=	uniquefiles
 .endif # _INCLUDE_USES_UNIQUEFILES_MK
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_UNIQUEFILES_POST_MK)
 _INCLUDE_USES_UNIQUEFILES_POST_MK=     yes
 
 _UNIQUEPKGLIST=		${WRKDIR}/.PLIST.uniquefiles
 
 .if ${UNIQUE_DEFAULT_LINKS} == yes
 _DO_CONDITIONAL_SYMLINK=	\
 	if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		${ECHO_MSG} "Link: @$${fname} --> $${newf}"; \
 		${RLN} ${STAGEDIR}${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \
 		${ECHO_CMD} LINKED:$${newf}%%EXTRA_EXT%%:$${fname}%%EXTRA_EXT%% >> ${_UNIQUEPKGLIST}; \
 	fi
 .else
 # We are not symlinking the renamed binary.
 _DO_CONDITIONAL_SYMLINK=	${DO_NADA}
 .endif
 
 _USES_stage+=	775:move-uniquefiles
 move-uniquefiles:
 .if ${UNIQUE_PREFIX_FILES} || ${UNIQUE_FIND_PREFIX_FILES}
 	@${ECHO_MSG} "===> Creating unique files: Move files needing PREFIX";
 .endif
 .for entry in ${UNIQUE_PREFIX_FILES}
 	@fname=${entry}; \
 	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \
 		${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \
 		${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 		${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
 		${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%//g}; \
 	else \
 		${ECHO_MSG} "Makefile error: UNIQUE (prefix): $${fname} not found"; \
 		${FALSE}; \
 	fi;
 .endfor
 .if ${UNIQUE_FIND_PREFIX_FILES}
 	@for fname in `${UNIQUE_FIND_PREFIX_FILES}`; do \
 		if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 			newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \
 			${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \
 			${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 			${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
 			${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%//g}; \
 		else \
 			${ECHO_MSG} "Makefile error: UNIQUE (prefix): $${fname} not found"; \
 			${FALSE}; \
 		fi; \
 	done;
 .endif
 
 .for sufxtype in ${UNIQUE_SUFFIX_TYPES}
 .  if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) || \
      (defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES})
 .    if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT}
 	@${ECHO_MSG} "===> Creating unique files: Move ${sufxtype:S|SUFFIX_||} files needing SUFFIX";
 .    else
 	@${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX";
 .    endif
 .  endif
 .  for entry in ${UNIQUE_${sufxtype}_FILES}
 	@fname=${entry}; \
 	if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
 		fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
 	fi; \
 	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		ofname=$${fname##*/}; \
 		newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
 		${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
 		${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 		${ECHO_CMD} MOVED:$${fname}${UNIQUE_${sufxtype}_EXTRA_EXT}:$${newf}${UNIQUE_${sufxtype}_EXTRA_EXT} >> ${_UNIQUEPKGLIST}; \
 		${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%/${UNIQUE_${sufxtype}_EXTRA_EXT}/g}; \
 	else \
 		${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
 		${FALSE}; \
 	fi;
 .  endfor
 .  if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}
 	@for fname in `${UNIQUE_FIND_${sufxtype}_FILES}`; do \
 		if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
 			fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
 		fi; \
 		if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 			ofname=$${fname##*/}; \
 			newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
 			${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
 			${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 			${ECHO_CMD} MOVED:$${fname}${UNIQUE_${sufxtype}_EXTRA_EXT}:$${newf}${UNIQUE_${sufxtype}_EXTRA_EXT} >> ${_UNIQUEPKGLIST}; \
 			${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%/${UNIQUE_${sufxtype}_EXTRA_EXT}/g}; \
 		else \
 			${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
 			${FALSE}; \
 		fi; \
 	done;
 .  endif
 .endfor
 
 # Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test
 # does not work in poudriere. It works fine on the CLI, though...
 _USES_stage+=	950:move-uniquefiles-plist
 move-uniquefiles-plist:
 	@if [ -e ${_UNIQUEPKGLIST} ]; then \
 		orgIFS=$$IFS; IFS=":"; while read command entry newentry; do \
 			IFS=$$orgIFS; \
 			case $${command} in \
 			MOVED) \
 				${REINPLACE_CMD} -e "s|^$${entry}$$|$${newentry}|" ${TMPPLIST}; \
 				;; \
 			LINKED) \
 				${AWK} '$$0 ~ pe { print; print ne ;next }1' \
 					pe="$${entry}" ne="$${newentry}" \
 					${TMPPLIST} > ${TMPPLIST}.uniquefilestmp; \
 				${MV} ${TMPPLIST}.uniquefilestmp ${TMPPLIST}; \
 				;; \
 			*) ;; \
 			esac; \
 			IFS=":"; \
 		done < ${_UNIQUEPKGLIST}; \
 	fi
 
 .endif # defined(_POSTMKINCLUDED)
diff --git a/Mk/Uses/zip.mk b/Mk/Uses/zip.mk
index 37f2cbe25fe5..4f5bbdb78eef 100644
--- a/Mk/Uses/zip.mk
+++ b/Mk/Uses/zip.mk
@@ -1,25 +1,25 @@
 # handle zip archives
 #
 # Feature:	zip
 # Usage:	USES=zip[:infozip]
 #
-# MAINTAINER: portmgr@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ZIP_MK)
 _INCLUDE_USES_ZIP_MK=	yes
 
 EXTRACT_SUFX?=	.zip
 
 EXTRACT_BEFORE_ARGS?=	-qo
 EXTRACT_AFTER_ARGS?=	-d ${EXTRACT_WRKDIR}
 
 .if empty(zip_ARGS)
 EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
 .elif ${zip_ARGS} == "infozip"
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
 .else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
 .endif
 
 .endif