Move MAINTAINER lines to the end of the initial comment block and

make things a bit more consistent.

Approved by:	portmgr (bapt)

47 files changed, 76 insertions, 104 deletions

diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index ff26d9605260..5c4eee103d5e 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -2,11 +2,11 @@
 #
 # Establish Ada-capable compiler as a build dependency
 #
-# MAINTAINER: marino@FreeBSD.org
-#
 # Feature:      ada
 # Usage:        USES=ada
 # Valid ARGS:   47
+#
+# MAINTAINER: marino@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ADA_MK)
 _INCLUDE_USES_ADA_MK=    yes
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
index 80f2648acc12..c92d759b8054 100644
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency on the bison port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	bison
 # Usage:	USES=bison or USES=bison:ARGS
 # Valid ARGS:	build (default, implicit), run, both
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_BISON_MK)
 _INCLUDE_USES_BISON_MK=	yes
 
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk
index edd1dc7fdd66..abcce27036e6 100644
--- a/Mk/Uses/charsetfix.mk
+++ b/Mk/Uses/charsetfix.mk
@@ -2,13 +2,12 @@
 #
 # Lookup in Makefile.in to prevent a package from installing/modifying charset.alias
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	charsetfix
 # Usage:	USES=charsetfix
 # Valid ARGS:	does not require args
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_CHARSETFIX_MK)
 _INCLUDE_USES_CHARSETFIX_MK=	yes
 
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index c4e438b6cd6e..3440a3178493 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -2,8 +2,6 @@
 #
 # Provide support for CMake based projects
 #
-# MAINTAINER: kde@FreeBSD.org
-#
 # Feature:		cmake
 # Usage:		USES=cmake or USES=cmake:ARGS
 # Valid ARGS:		outsource
@@ -36,6 +34,8 @@
 #			Debug otherwise
 # CMAKE_SOURCE_PATH	- Path to the source directory
 #			Default: ${WRKSRC}
+#
+# MAINTAINER: kde@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CMAKE_MK)
 _INCLUDE_USES_CMAKE_MK=	yes
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index 4a2bbc4b1c1e..8cb476a7b29c 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -2,8 +2,6 @@
 #
 # Allows to determine the compiler being used
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	compiler
 # Usage:	USES=compiler or USES=compiler:ARGS
 # Valid ARGS:	env (default, implicit) c++0x c++11-lib c++11-lang c11 openmp nestedfct features
@@ -25,6 +23,8 @@
 #
 # 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
 
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index 860a774c0cc0..b97946f77d14 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -2,13 +2,13 @@
 #
 # Use the Comprehensive R Archive Network 
 #
-# MAINTAINER=	wen@FreeBSD.org
-#
 # Feature:	cran
 # Usage:	USES=cran or USES=cran:ARGS
 # Valid ARGS:	auto-plist
 #
 # auto-plist	The pkg-plist can be automatically compiled
+#
+# MAINTAINER=	wen@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CRAN_MK)
 _INCLUDE_USES_CRAN_MK=	yes
diff --git a/Mk/Uses/desktop-file-utils.mk b/Mk/Uses/desktop-file-utils.mk
index 386769ec0e23..91128ad9a601 100644
--- a/Mk/Uses/desktop-file-utils.mk
+++ b/Mk/Uses/desktop-file-utils.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency depends on desktop-file-utils and package regen
 #
-# MAINTAINER: gnome@FreeBSD.org
-#
 # Feature:	desktop-file-utils
 # Usage:	USES=desktop-file-utils
 # Valid ARGS:	does not require args
 #
-#
+# MAINTAINER: gnome@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_DESKTOP_FILE_UTILS_MK)
 _INCLUDE_USES_DESKTOP_FILE_UTILS_MK=	yes
 
diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
index ff2e39e73eef..5049350ad5b8 100644
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -1,14 +1,12 @@
-#
 # $FreeBSD$
 #
 # Handle gnu configure that does not properly support DESTDIR
 #
-# MAINTAINER:	portmgr@FreeBSD.org
-#
 # Feature:	desthack
 # Usage:	USES=desthack
 # Valid ARGS:	none
 #
+# MAINTAINER:	portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DESTHACK_MK)
 _INCLUDE_USES_DESTHACK_MK=	yes
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index 14eacd46f1cf..532d0c83497e 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -1,13 +1,12 @@
 # $FreeBSD$
 #
-# MAINTAINER: x11@FreeBSD.org
-#
 # Feature:	display
 # Usage:	USES=display or USES=display:ARGS
 # Valid ARGS:	install (default, implicit), any target
 # 
 # Except the target where the DISPLAY is needed
 #
+# MAINTAINER: x11@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DISPLAY_MK)
 _INCLUDE_USES_DISPLAY_MK=	yes
diff --git a/Mk/Uses/dos2unix.mk b/Mk/Uses/dos2unix.mk
index 6abc251a921f..a6c9994cdb15 100644
--- a/Mk/Uses/dos2unix.mk
+++ b/Mk/Uses/dos2unix.mk
@@ -2,11 +2,11 @@
 #
 # Provide support to convert files from dos2unix
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # 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
+#
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_DOS2UNIX_MK)
 _INCLUDE_USES_DOS2UNIX_MK=	yes
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
index 852196e88c0e..d7424067d1fa 100644
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -1,7 +1,5 @@
 # $FreeBSD$
 #
-# Handle dependency on File Alteration Monitor
-#
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # Feature:	fam
@@ -12,7 +10,8 @@
 # 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
 
diff --git a/Mk/Uses/fmake.mk b/Mk/Uses/fmake.mk
index 99dc725dd828..3911befeeff8 100644
--- a/Mk/Uses/fmake.mk
+++ b/Mk/Uses/fmake.mk
@@ -2,11 +2,10 @@
 #
 # Provide support to use the legacy FreeBSD make
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:		fmake
 # Usage:		USES=fmake
 #
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_FMAKE_MK)
 _INCLUDE_USES_FMAKE_MK=	yes
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index fe7da4b2d23e..3d2e54c459fe 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -2,11 +2,11 @@
 #
 # Fortran support
 #
-# MAINTAINER:	fortran@FreeBSD.org
-#
 # Feature:	fortran
 # Usage:	USES=fortran
 # Valid ARGS:	gcc (default), ifort
+#
+# MAINTAINER:	fortran@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_FORTRAN_MK)
 _INCLUDE_USES_FORTRAN_MK=	yes
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
index eaa621c13280..b8aebbd3da5b 100644
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency on the fuse port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	fuse
 # Usage:	USES=fuse
 # Valid ARGS:	does not require args
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_FUSE_MK)
 _INCLUDE_USES_FUSE_MK=	yes
 
diff --git a/Mk/Uses/gettext.mk b/Mk/Uses/gettext.mk
index 1898e26f324b..5d0ed389577a 100644
--- a/Mk/Uses/gettext.mk
+++ b/Mk/Uses/gettext.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency on the gettext (libintl) port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	gettext
 # Usage:	USES=gettext or USES=gettext:ARGS
 # Valid ARGS:	build, run, lib (default, implicit)
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_GETTEXT_MK)
 _INCLUDE_USES_GETTEXT_MK=	yes
 
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
index 8def61f9f8e4..7fd44b3ae76f 100644
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -2,11 +2,10 @@
 #
 # Provide support to use the GNU make
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:		gmake
 # Usage:		USES=gmake
 #
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index 2709a6b9efca..c9a7a6cdfcfb 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -2,13 +2,13 @@
 #
 # handle dependency on the iconv port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # 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
 
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk
index b71fc41bcecb..22f5dd573831 100644
--- a/Mk/Uses/imake.mk
+++ b/Mk/Uses/imake.mk
@@ -2,13 +2,12 @@
 #
 # Provide support for imake based projects
 #
-# MAINTAINER: x11@FreeBSD.org
-#
 # Feature:		imake
 # Usage:		USES=imake
 # Valid ARGS:		env: do not define any target
 #			notall: do not pass -a to xmkmf
 #
+# MAINTAINER: x11@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_IMAKE_MK)
 _INCLUDE_USES_IMAKE_MK=	yes
diff --git a/Mk/Uses/kmod.mk b/Mk/Uses/kmod.mk
index 14ec4f7ae005..3aa9ba879c20 100644
--- a/Mk/Uses/kmod.mk
+++ b/Mk/Uses/kmod.mk
@@ -2,12 +2,12 @@
 #
 # Handles common items for kernel module ports.
 #
-# MAINTAINER: rene@FreeBSD.org
-#
 # Feature:	kmod
 # Usage:	USES=kmod
 # Valid ARGS:	none
 #
+# MAINTAINER: rene@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_KMOD_MK)
 _INCLUDE_USES_KMOD_MK=	yes
 
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index 1a5049de496d..0f4c401c0a9a 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -2,10 +2,10 @@
 #
 # Bring libtool scripts up to date.
 #
-# MAINTAINER:	autotools@FreeBSD.org
-#
 # Feature:	libtool
 # Usage:	USES=libtool
+#
+# MAINTAINER:	autotools@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LIBTOOL_MK)
 _INCLUDE_USES_LIBTOOL_MK=	yes
diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
index d8f5a169df5b..51541a4e7b70 100644
--- a/Mk/Uses/lua.mk
+++ b/Mk/Uses/lua.mk
@@ -3,7 +3,6 @@
 # Provide support for lua
 # 
 # MAINTAINER: lua@FreeBSD.org
-#
 
 .if !defined(_INCLUDE_USES_LUA_MK)
 _INCLUDE_USES_LUA_MK=	yes
diff --git a/Mk/Uses/makeself.mk b/Mk/Uses/makeself.mk
index 2fe9fba2c11b..342728ede03f 100644
--- a/Mk/Uses/makeself.mk
+++ b/Mk/Uses/makeself.mk
@@ -2,11 +2,11 @@
 #
 # handle makeself archives
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	makeself
 # Usage:	USES=makeself
 #
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_MAKESELF_Mk)
 _INCLUDE_USES_MAKESELF_MK=	yes
 
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index 4e2ea0ad4cd8..5a2617d3a975 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -2,13 +2,13 @@
 #
 # handle dependency on motif
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # 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
 
 .if !defined(_INCLUDE_USES_MOTIF_MK)
 _INCLUDE_USES_MOTIF_MK=	yes
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
index 451978731910..000f4d623a05 100644
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -2,8 +2,6 @@
 #
 # handle dependency on the ncurses port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	ncurses
 # Usage:	USES=ncurses
 # Valid ARGS:	base port
@@ -22,6 +20,8 @@
 #
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
+#
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NCURSES_MK)
 _INCLUDE_USES_NCURSES_MK=	yes
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
index 6b9f01eced6d..189eab48f86f 100644
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -2,14 +2,13 @@
 #
 # Provide support to use Ninja
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:		ninja
 # Usage:		USES=ninja
 #
 # User defined variables:
 # NINJA_VERBOSE		- Enable verbose output.
 #
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NINJA_MK)
 _INCLUDE_USES_NINJA_MK=	yes
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
index 6cf49a2a3919..dfceba2ca0a6 100644
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -2,8 +2,6 @@
 #
 # Handle dependency on OpenAL
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	openal
 # Usage:	USES=openal or USES=openal:ARGS
 # Valid ARGS:	al, soft (default), si, alut
@@ -12,7 +10,8 @@
 # Usage:	WANT_OPENAL=ARG
 # Valid ARG:	soft (default), si
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_OPENAL_MK)
 _INCLUDE_USES_OPENAL_MK=	yes
 
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index 069c056dc156..80e5981644f3 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -3,13 +3,12 @@
 # Lookup in Makefile.in and configure for common incorrect paths and set them
 # to respect FreeBSD hier
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	pathfix
 # Usage:	USES=pathfix
 # Valid ARGS:	does not require args
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
 
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index cbdc9324df22..19355ed1e4b3 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -2,8 +2,6 @@
 #
 # Provide support to use perl5
 #
-# MAINTAINER: perl@FreeBSD.org
-#
 # PERL5			- Set to full path of perl5, either in the system or
 #				  installed from a port.
 # PERL			- Set to full path of perl5, either in the system or
@@ -30,6 +28,8 @@
 #				  It can also have configure, modbuild and modbuildtiny when
 #				  the port needs to run Makefile.PL, Build.PL and a
 #				  Module::Build::Tiny flavor of Build.PL.
+#
+# MAINTAINER: perl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PERL5_MK)
 _INCLUDE_USES_PERL5_MK=	yes
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 3aab6b5422cc..847512082035 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -2,8 +2,6 @@
 #
 # Provide support for PostgreSQL (pgsql)
 #
-# MAINTAINER: pgsql@FreeBSD.org
-#
 # Feature:	pgsql
 # Usage:	USES=		pgsql[:version]
 #
@@ -19,6 +17,8 @@
 #		by the user via defined variable), try to find the
 #		currently installed version.  Fall back to default if
 #		necessary.
+#
+# MAINTAINER: pgsql@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PGSQL_MK)
 
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
index 4451ce6a784f..6da41c905678 100644
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency on the pkgconf port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	pkgconfig
 # Usage:	USES=pkgconfig or USES=pkgconfig:ARGS
 # Valid ARGS:	build (default, implicit), run, both
 #
-#
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_PKGCONFIG_MK)
 _INCLUDE_USES_PKGCONFIG_MK=	yes
 
diff --git a/Mk/Uses/pure.mk b/Mk/Uses/pure.mk
index 7866b1df8179..76655eb5506a 100644
--- a/Mk/Uses/pure.mk
+++ b/Mk/Uses/pure.mk
@@ -3,14 +3,13 @@
 #
 # Provide support for Pure Programming Language based projects
 #
-# MAINTAINER= nemysis@FreeBSD.org
-#
 # Feature:		pure
 # Usage:		USES=pure or USES=pure:ARGS
 # Valid ARGS:		ffi
 # ARGS description:
 # ffi			makes the port depends on pure-ffi at runtime
 #
+# MAINTAINER= nemysis@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PURE_MK)
 _INCLUDE_USES_PURE_MK=	yes
diff --git a/Mk/Uses/qmail.mk b/Mk/Uses/qmail.mk
index 60d02f11a8d5..a25886a537f8 100644
--- a/Mk/Uses/qmail.mk
+++ b/Mk/Uses/qmail.mk
@@ -1,7 +1,5 @@
 # $FreeBSD$
 #
-# MAINTAINER=	bdrewery@FreeBSD.org
-#
 # Feature:	qmail
 # Usage:	USES=qmail or USES=qmail:ARGS
 # Valid ARGS:	both (default, implicit), run, build, vars
@@ -15,6 +13,7 @@
 #			  prevent stale dependencies. Valid slaveports are:
 #			  ldap, mysql, spamcontrol and tls.
 #
+# MAINTAINER=	bdrewery@FreeBSD.org
 
 .if !defined(_INCLUDE_QMAIL_MK)
 _INCLUDE_QMAIL_MK=	yes
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk
index 7ac00a702fe2..f0dbbf772329 100644
--- a/Mk/Uses/qmake.mk
+++ b/Mk/Uses/qmake.mk
@@ -2,8 +2,6 @@
 #
 # Provide support for qmake-based projects
 #
-# MAINTAINER: kde@FreeBSD.org
-#
 # Feature:		qmake
 # Usage:		USES=qmake or USES=qmake:ARGS
 #			Must be used along with	'USE_QT*=#'
@@ -25,6 +23,7 @@
 # User defined variables:
 # QMAKE_VERBOSE		- Enable verbose configure output.
 #
+# MAINTAINER: kde@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_QMAKE_MK)
 _INCLUDE_USES_QMAKE_MK=	yes
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
index be37246ed8ac..19674b2d25c2 100644
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -2,12 +2,11 @@
 #
 # handle dependency on the readline port
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	readline
 # Usage:	USES=readline
 # Valid ARGS:	port
 #
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_READLINE_MK)
 _INCLUDE_USES_READLINE_MK=	yes
diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk
index d218cee321e4..1f84ccbc1417 100644
--- a/Mk/Uses/scons.mk
+++ b/Mk/Uses/scons.mk
@@ -2,11 +2,10 @@
 #
 # Provide support to use the scons
 #
-# MAINTAINER: python@FreeBSD.org
-#
 # Feature:		scons
 # Usage:		USES=scons
 #
+# MAINTAINER: python@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_SCONS_MK)
 _INCLUDE_USES_SCONS_MK=	yes
diff --git a/Mk/Uses/shared-mime-info.mk b/Mk/Uses/shared-mime-info.mk
index daed45c414f9..f9566e8a79f8 100644
--- a/Mk/Uses/shared-mime-info.mk
+++ b/Mk/Uses/shared-mime-info.mk
@@ -2,13 +2,12 @@
 #
 # handle dependency depends on shared-mime-info and package regen
 #
-# MAINTAINER: gnome@FreeBSD.org
-#
 # Feature:	shared-mime-info
 # Usage:	USES=shared-mime-info
 # Valid ARGS:	does not require args
 #
-#
+# MAINTAINER: gnome@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)
 _INCLUDE_USES_SHARED_MIME_INFO_MK=	yes
 
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
index 9f442cba8fb0..9b58388207ed 100644
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -5,8 +5,6 @@
 # Standard templates for bash, perl, python,... are included out of
 # the box, others can easily be added per port.
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	shebangfix
 # Usage:	USES=shebangfix
 #
@@ -26,6 +24,7 @@
 #
 #   perl_CMD=	${SETENV} perl
 #
+# MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_SHEBANGFIX_Mk)
 _INCLUDE_USES_SHEBANGFIX_MK=	yes
diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk
index 390c5012829e..0c7332307f95 100644
--- a/Mk/Uses/tar.mk
+++ b/Mk/Uses/tar.mk
@@ -2,11 +2,11 @@
 #
 # handle tar archives
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	tar
 # Usage:	USES=tar[:[xz|lzma|Z|bzip2|tgz]]
 #
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_TAR_Mk)
 _INCLUDE_USES_TAR_MK=	yes
 
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 2c528f09df0f..fa3528a37eca 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -4,9 +4,6 @@
 #
 # Provide support to use Tcl/Tk
 #
-# MAINTAINER: tcltk@FreeBSD.org
-#
-#
 # Variables set by this file:
 #
 # TCL_VER		- Major.Minor version of Tcl
@@ -56,6 +53,7 @@
 #
 # Build-time / Run-time only dependencies can be specified with build or run.
 #
+# MAINTAINER: tcltk@FreeBSD.org
 
 .if ${USES:Mtk} || ${USES:Mtk\:*}
 .if !defined(_TCLTK_PORT)
diff --git a/Mk/Uses/tk.mk b/Mk/Uses/tk.mk
index 7525499c12be..6e204246e76f 100644
--- a/Mk/Uses/tk.mk
+++ b/Mk/Uses/tk.mk
@@ -2,7 +2,6 @@
 #
 # vim: ts=8 noexpandtab
 #
-#
 
 .if defined(tk_ARGS)
 tcl_ARGS:=	${tk_ARGS}
diff --git a/Mk/Uses/twisted.mk b/Mk/Uses/twisted.mk
index 701d1951e5f8..cd1c431f4c21 100644
--- a/Mk/Uses/twisted.mk
+++ b/Mk/Uses/twisted.mk
@@ -2,8 +2,6 @@
 #
 # Provide support for Twisted-related ports
 #
-# MAINTAINER: python@FreeBSD.org
-#
 # Feature:		twisted
 # Usage:		USES=	twisted:build,run,compA,compB,...
 # Valid ARGS:
@@ -21,6 +19,8 @@
 #
 #	conch flow lore mail names news runner web web2 words
 #
+# MAINTAINER: python@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_TWISTED_MK)
 _INCLUDE_USES_TWISTED_MK=	yes
 
diff --git a/Mk/Uses/uidfix.mk b/Mk/Uses/uidfix.mk
index 87656ccc38b0..cbd284c8ba7b 100644
--- a/Mk/Uses/uidfix.mk
+++ b/Mk/Uses/uidfix.mk
@@ -2,12 +2,12 @@
 #
 # Changes some default behaviour of build systems to allow installing as user.
 #
-# MAINTAINER:	bapt@FreeBSD.org
-#
 # Feature:	uidfix
 # Usage:	USES=uidfix
 # Valid ARGS:	none
 #
+# MAINTAINER:	bapt@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_UIDFIX_MK)
 _INCLUDE_USES_UIDFIX_MK=	yes
 .if ${UID} != 0
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk
index fba2f298437d..64a40dcd02cd 100644
--- a/Mk/Uses/uniquefiles.mk
+++ b/Mk/Uses/uniquefiles.mk
@@ -5,8 +5,6 @@
 #
 # Make files or directories 'unique', by adding a prefix or suffix.
 #
-# MAINTAINER:	portmgr@FreeBSD.org
-#
 # Feature:		uniquefiles
 # Usage:		USES=uniquefiles or USES=uniquefiles:ARGS
 # Valid ARGS:	dirs
@@ -64,6 +62,7 @@
 # NOTE:	multiple logical instances are not supported by pkg and the original
 # pkg_tools at the moment.
 #
+# MAINTAINER:	portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_UNIQUEFILES_MK)
 _INCLUDE_USES_UNIQUEFILES_MK=	yes
diff --git a/Mk/Uses/webplugin.mk b/Mk/Uses/webplugin.mk
index f681c3b1c5d9..250909b78f4b 100644
--- a/Mk/Uses/webplugin.mk
+++ b/Mk/Uses/webplugin.mk
@@ -1,7 +1,5 @@
 # $FreeBSD$
 #
-# MAINTAINER= gecko@FreeBSD.org
-#
 # Documentation and examples:
 #
 # Feature:	webplugin
@@ -104,6 +102,8 @@
 #	/usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so
 #	/usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
 #	------------------------------------------------------
+#
+# MAINTAINER= gecko@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_WEBPLUGIN_MK)
 _INCLUDE_USES_WEBPLUGIN_MK=	yes
diff --git a/Mk/Uses/zenoss.mk b/Mk/Uses/zenoss.mk
index 829432dfe3be..8e9fc3a4d3f8 100644
--- a/Mk/Uses/zenoss.mk
+++ b/Mk/Uses/zenoss.mk
@@ -6,11 +6,11 @@
 # Please send all suggested changes to the maintainer instead of committing
 # them yourself.
 #
-# MAINTAINER: zenoss@experts-exchange.com
-#
 # Feature:      zenoss
 # Usage:        USES=zenoss
 # Valid ARGS:   does not require args
+#
+# MAINTAINER: zenoss@experts-exchange.com
 
 .if !defined(_INCLUDE_ZENOSS_MK)
 _INCLUDE_ZENOSS_MK=    yes
diff --git a/Mk/Uses/zip.mk b/Mk/Uses/zip.mk
index 7acdbbafd294..87719c954ee7 100644
--- a/Mk/Uses/zip.mk
+++ b/Mk/Uses/zip.mk
@@ -2,11 +2,11 @@
 #
 # handle zip archives
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # Feature:	zip
 # Usage:	USES=zip[:infozip]
 #
+# MAINTAINER: portmgr@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_ZIP_Mk)
 _INCLUDE_USES_ZIP_MK=	yes
 
diff --git a/Mk/Uses/zope.mk b/Mk/Uses/zope.mk
index 0ab4802053e7..b58c8b85eeb4 100644
--- a/Mk/Uses/zope.mk
+++ b/Mk/Uses/zope.mk
@@ -2,8 +2,6 @@
 #
 # Provide support for Zope-related ports
 #
-# MAINTAINER: zope@FreeBSD.org
-#
 # SZOPEBASEDIR		- relative base directory of zope server
 # ZOPEBASEDIR		- absolute base directory of zope that is
 #					  ${LOCALBASE}/${SZOPEBASEDIR} by default,
@@ -13,6 +11,8 @@
 #					  in your /etc/make.conf in case you want to use a
 #					  specific version of zope.
 #
+# MAINTAINER: zope@FreeBSD.org
+
 .if !defined(_INCLUDE_USES_ZOPE_MK)
 _INCLUDE_USES_ZOPE_MK=	yes