Index: head/Mk/Uses/ada.mk
===================================================================
--- head/Mk/Uses/ada.mk	(revision 434194)
+++ head/Mk/Uses/ada.mk	(revision 434195)
@@ -1,38 +1,38 @@
 # $FreeBSD$
 #
 # Establish Ada-capable compiler as a build dependency
 # To change default compiler, define ADA_DEFAULT in make.conf to 5
 #
 # Feature:      ada
 # Usage:        USES=ada
 # Valid ARGS:   5, 6, run
 #
-# MAINTAINER: ports@FreeBSD.org
+# MAINTAINER: freebsd.contact@marino.st
 
 .if !defined(_INCLUDE_USES_ADA_MK)
 _INCLUDE_USES_ADA_MK=    yes
 
 CC=	ada
 ADAXX=	gcc6	# framework default
 
 . if ${ada_ARGS:M5}
 ADAXX=	gcc5
 . elif ${ada_ARGS:M6}
 ADAXX=	gcc6
 . elif defined(ADA_DEFAULT)
 .  if ${ADA_DEFAULT} == 5
 ADAXX=	gcc5
 .  endif
 . endif
 
 . if ${ada_ARGS:Mrun}
 RUN_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
 . endif
 
 BUILD_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 
 .endif
Index: head/Mk/Uses/alias.mk
===================================================================
--- head/Mk/Uses/alias.mk	(revision 434194)
+++ head/Mk/Uses/alias.mk	(revision 434195)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 #
 # Add __FreeBSD__ definition to CFLAGS
 # Used by DPorts when masquerading as FreeBSD allows port to build without
 # additional patches
 #
 # Feature:      alias
 # Usage:        USES=alias or USES=alias:ARGS
 # Valid ARGS:   9 (default), 10, 11
 #
-# MAINTAINER:	ports@FreeBSD.org
+# MAINTAINER:	freebsd.contact@marino.st
 
 .if !defined(_INCLUDE_USES_ALIAS_MK)
 _INCLUDE_USES_ALIAS_MK=    yes
 
 .if ${OPSYS} != FreeBSD
 
 .if empty(alias_ARGS)
 CFLAGS+=	-D__FreeBSD__=9
 .else
 .  if ${alias_ARGS} == 9 || ${alias_ARGS} == 10 || ${alias_ARGS} == 11
 CFLAGS+=	-D__FreeBSD__=${alias_ARGS}
 .  else
 IGNORE=	invalid MAJOR RELEASE argument (${alias_ARGS}) for USES=alias
 .  endif
 .endif
 
 .endif # OPSYS != FreeBSD
 
 .endif
Index: head/archivers/zip-ada/Makefile
===================================================================
--- head/archivers/zip-ada/Makefile	(revision 434194)
+++ head/archivers/zip-ada/Makefile	(revision 434195)
@@ -1,75 +1,75 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	zip-ada
 PORTVERSION=	52
 CATEGORIES=	archivers
 MASTER_SITES=	SF/unzip-ada/
 DISTNAME=	zipada${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Zip compressed archive file format library written in Ada
 
 LICENSE=	MIT
 
 USES=		ada perl5 dos2unix zip
 USE_PERL5=	build
 WRKSRC=		${WRKDIR}/zip-ada
 MAKE_ENV+=	Build_Mode=Fast
 ZTOOLS=		zipada \
 		comp_zip \
 		find_zip \
 		rezip \
 		za_gnat \
 		rz_gnat \
 		bunzip \
 		lz \
 		lzma_dec \
 		lzma_enc \
 		lz77_stats \
 		random_data \
 		several_sizes
 DEMOS=		demo_csv_into_zip \
 		demo_zip \
 		demo_unzip \
 		test_unz_streams \
 		test_chunk \
 		ziptest \
 		zip_with_many_files \
 		test_zip_info_timing \
 		test_stream_performance \
 		test_extract \
 		test_extract_tb \
 		test_lz_scramble \
 		test_llhc \
 		test_lz77
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -P zipada.gpr)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		  ${STAGEDIR}${EXAMPLESDIR} \
 		  ${STAGEDIR}${PREFIX}/include/zip-ada \
 		  ${STAGEDIR}${PREFIX}/lib/zip-ada \
 		  ${STAGEDIR}${PREFIX}/lib/gnat
 	@${MKDIR} ${WRKSRC}/obj_tools ${WRKSRC}/obj_demos
 .for F in ${ZTOOLS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/bin/
 	${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_tools/
 .endfor
 .for F in ${DEMOS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${EXAMPLESDIR}/
 	${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_demos/
 .endfor
 	(cd ${WRKSRC}/obj_opt && ${AR} rcs libzip-ada.a *.o)
 	${MV} ${STAGEDIR}${PREFIX}/bin/bunzip \
 		${STAGEDIR}${PREFIX}/bin/debzip2
 	${INSTALL_DATA} ${WRKSRC}/zip_lib/*.ad[sb] \
 		${STAGEDIR}${PREFIX}/include/zip-ada/
 	${INSTALL_DATA} ${WRKSRC}/obj_opt/*.ali \
 		${STAGEDIR}${PREFIX}/lib/zip-ada/
 	${INSTALL_DATA} ${WRKSRC}/obj_opt/*.a ${STAGEDIR}${PREFIX}/lib/zip-ada/
 	${INSTALL_DATA} ${FILESDIR}/zip-ada.gpr ${STAGEDIR}${PREFIX}/lib/gnat/
 
 .include <bsd.port.mk>
Index: head/databases/adabase/Makefile
===================================================================
--- head/databases/adabase/Makefile	(revision 434194)
+++ head/databases/adabase/Makefile	(revision 434195)
@@ -1,71 +1,71 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	adabase
 PORTVERSION=	3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Thick database bindings for Ada
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 GH_PROJECT=	AdaBase
 
 OPTIONS_DEFINE=		DEBUG
 OPTIONS_MULTI=		DBASE
 OPTIONS_MULTI_DBASE=	MYSQL SQLITE PGSQL
 OPTIONS_DEFAULT=	MYSQL SQLITE PGSQL
 OPTIONS_SUB=		yes
 
 DBASE_DESC=		Databases Supported
 
 SQLITE_MAKE_ENV=	SQLITE=yes
 SQLITE_USES=		sqlite:3
 SQLITE_VARS=		DRVSQLITE=yes
 SQLITE_VARS_OFF=	DRVSQLITE=no
 
 MYSQL_MAKE_ENV=		MYSQL=yes
 MYSQL_USES=		mysql
 MYSQL_VARS=		DRVMYSQL=yes
 MYSQL_VARS_OFF=		DRVMYSQL=no
 
 PGSQL_MAKE_ENV=		POSTGRESQL=yes
 PGSQL_USES=		pgsql
 PGSQL_VARS=		DRVPGSQL=yes
 PGSQL_VARS_OFF=		DRVPGSQL=no
 
 DEBUG_MAKE_ENV=		DEBUGSYM=yes
 
 MAKE_ENV+=	OS_VERSION=unix
 
 post-patch:
 	${RM} ${WRKSRC}/src/drivers/adabase-driver-base-firebird.ad?
 	${REINPLACE_CMD} -e '/Driver_MySQL/ s/yes/no/' \
 		${WRKSRC}/adabase.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		gprbuild -p -P adabase ${BUILD_ARGS})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/adabase \
 		${STAGEDIR}${PREFIX}/lib/adabase \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/adabase
 	${INSTALL_DATA} ${WRKSRC}/src/*/*.ad[bs] ${WRKSRC}/src/adabase.ads \
 		${STAGEDIR}${PREFIX}/include/adabase
 	${SED} -e "s|@PREFIX@|${PREFIX}|" \
 	       -e "s|@MYSQL@|${DRVMYSQL}|" \
 	       -e "s|@PGSQL@|${DRVPGSQL}|" \
 	       -e "s|@SQLITE@|${DRVSQLITE}|" ${WRKSRC}/adabase.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adabase.gpr
 
 .include <bsd.port.mk>
Index: head/databases/apq/Makefile
===================================================================
--- head/databases/apq/Makefile	(revision 434194)
+++ head/databases/apq/Makefile	(revision 434195)
@@ -1,55 +1,55 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	apq
 PORTVERSION=	${APQ_VERSION}
 PORTREVISION=	${BASE_PORTREV}
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/marino
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	APQ Ada95 database base library
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gprbuild:devel/gprbuild
 
 USES=		ada tar:bzip2
 PORTDOCS=	README HISTORY
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
 		--disable-relocatable \
 		--work-path=${WRKPATH} \
 		--processors=${MAKE_JOBS_NUMBER}
 
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/Makefile.version"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' ${WRKSRC}/gnat/apq.gpr.in
 	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
 		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/apq/static \
 		${STAGEDIR}${PREFIX}/include/apq \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKPATH}/include/apq/* \
 		${STAGEDIR}${PREFIX}/include/apq
 	${INSTALL_DATA} ${WRKPATH}/lib/apq/static/*.a* \
 		${STAGEDIR}${PREFIX}/lib/apq/static
 	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HISTORY \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/databases/apq-mysql/Makefile
===================================================================
--- head/databases/apq-mysql/Makefile	(revision 434194)
+++ head/databases/apq-mysql/Makefile	(revision 434195)
@@ -1,57 +1,57 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	apq-mysql
 PORTVERSION=	${APQ_VERSION}
 PORTREVISION=	${DRV_MYSQL_PR}
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/marino
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	APQ Ada95 MySQL database driver
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gprbuild:devel/gprbuild \
 		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 
 USES=		ada tar:bzip2
 USE_MYSQL=	yes
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
 		--disable-relocatable \
 		--work-path=${WRKPATH} \
 		--processors=${MAKE_JOBS_NUMBER}
 
 .include "${.CURDIR}/../apq/Makefile.version"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
 		${WRKSRC}/src-in/apq-mysql.gpr.in
 	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
 		${WRKSRC}/scripts/buildutil.sh
 
 post-configure:
 	# The header generated with MySQL 5.6 comes with two instances of
 	# double underscore variables, which is illegal in Ada
 	${REINPLACE_CMD} -e 's|__|_|' \
 		${WRKDIR}/build/include/apq-mysql/apq-mysql.ads
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/apq-mysql/static \
 		${STAGEDIR}${PREFIX}/include/apq-mysql
 	${INSTALL_DATA} ${WRKPATH}/include/apq-mysql/* \
 		${STAGEDIR}${PREFIX}/include/apq-mysql
 	${INSTALL_DATA} ${WRKPATH}/lib/apq-mysql/static/*.a* \
 		${STAGEDIR}${PREFIX}/lib/apq-mysql/static
 	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-mysql.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/databases/apq-odbc/Makefile
===================================================================
--- head/databases/apq-odbc/Makefile	(revision 434194)
+++ head/databases/apq-odbc/Makefile	(revision 434195)
@@ -1,56 +1,56 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	apq-odbc
 PORTVERSION=	${APQ_VERSION}
 PORTREVISION=	${DRV_ODBC_PR}
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/marino
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	APQ Ada95 ODBC database driver
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gprbuild:devel/gprbuild \
 		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		ada tar:bzip2
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
 		--disable-relocatable \
 		--work-path=${WRKPATH} \
 		--processors=${MAKE_JOBS_NUMBER}
 
 .include "${.CURDIR}/../apq/Makefile.version"
 
 post-extract:
 	${RM} ${WRKSRC}/src/test.adb
 	${ECHO} ${APQ_VERSION} > ${WRKSRC}/version
 
 post-patch:
 	${RM} ${WRKSRC}/src/*.orig
 	${REINPLACE_CMD} -e 's|"-march=x86-64",||g' -e '/for Object_Dir/d' \
 		${WRKSRC}/gnat/apq-odbc.gpr.in
 	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
 		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/apq-odbc/static \
 		${STAGEDIR}${PREFIX}/include/apq-odbc
 	${INSTALL_DATA} ${WRKPATH}/src/apq-odbc/* \
 		${STAGEDIR}${PREFIX}/include/apq-odbc
 	${INSTALL_DATA} ${WRKPATH}/lib/apq-odbc/static/*.a* \
 		${STAGEDIR}${PREFIX}/lib/apq-odbc/static
 	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-odbc.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/databases/apq-pgsql/Makefile
===================================================================
--- head/databases/apq-pgsql/Makefile	(revision 434194)
+++ head/databases/apq-pgsql/Makefile	(revision 434195)
@@ -1,52 +1,52 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	apq-pgsql
 PORTVERSION=	${APQ_VERSION}
 PORTREVISION=	${DRV_PGSQL_PR}
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/marino
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	APQ Ada95 PostgreSQL database driver
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gprbuild:devel/gprbuild \
 		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 
 USES=		ada tar:bzip2 pgsql
 WANT_PGSQL=	lib
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
 		--disable-relocatable \
 		--work-path=${WRKPATH} \
 		--processors=${MAKE_JOBS_NUMBER}
 
 .include "${.CURDIR}/../apq/Makefile.version"
 
 post-patch:
 	${RM} ${WRKSRC}/src/*.orig
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
 		${WRKSRC}/src-in/apq-postgresql.gpr.in
 	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
 		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/apq-postgresql/static \
 		${STAGEDIR}${PREFIX}/include/apq-postgresql
 	${INSTALL_DATA} ${WRKPATH}/include/apq-postgresql/* \
 		${STAGEDIR}${PREFIX}/include/apq-postgresql
 	${INSTALL_DATA} ${WRKPATH}/lib/apq-postgresql/static/*.a* \
 		${STAGEDIR}${PREFIX}/lib/apq-postgresql/static
 	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-postgresql.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/devel/ada-util/Makefile
===================================================================
--- head/devel/ada-util/Makefile	(revision 434194)
+++ head/devel/ada-util/Makefile	(revision 434195)
@@ -1,61 +1,61 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ada-util
 PORTVERSION=	1.8.0
 PORTREVISION=	3
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Utility library for Ada 2005 applications
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		ada gmake
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ahven
 CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
 LDFLAGS=	-L${LOCALBASE}/lib
 
 GH_ACCOUNT=	stcarrez
 GH_TAGNAME=	b6612400
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,freebsd\*,dragonfly*|freebsd*,' \
 		-e "s/^NR_CPUS=.*/NR_CPUS=${MAKE_JOBS_NUMBER}/" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@prefix@|$${DESTDIR}@prefix@|' \
 		-e '/GPRINSTALL/ \
 		s|--prefix|--project-subdir=lib/gnat --prefix|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/Content_Type/d' \
 		${WRKSRC}/src/http/util-http-rest.adb
 
 	# Loggers are hardcoded for several packages at the INFO level
 	# which is quite useless for things like spawning commands.
 	# Set the loggers to filter out everything up less than ERROR
 
 	@${REINPLACE_CMD} -e '/Loggers.Create/s|);|, Util.Log.ERROR_LEVEL);|'\
 		${WRKSRC}/src/http/aws/util-http-clients-web.adb \
 		${WRKSRC}/src/http/curl/util-http-clients-curl.adb \
 		${WRKSRC}/src/http/util-http-clients.adb \
 		${WRKSRC}/src/http/util-http-parts.adb \
 		${WRKSRC}/src/util-beans-factory.adb \
 		${WRKSRC}/src/util-processes.adb \
 		${WRKSRC}/src/util-properties-bundles.adb \
 		${WRKSRC}/src/xml/util-serialize-io-xml.adb
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/gnat/manifests
 	# Scoop up all the source files gprinstall missed. (!)
 	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/http/*.ad[bs] \
 		${WRKSRC}/src/os-linux/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/util.static
 
 .include <bsd.port.mk>
Index: head/devel/adabooch/Makefile
===================================================================
--- head/devel/adabooch/Makefile	(revision 434194)
+++ head/devel/adabooch/Makefile	(revision 434195)
@@ -1,32 +1,32 @@
 # Created by: David Holm <david@realityrift.com>
 # $FreeBSD$
 
 PORTNAME=	adabooch
 PORTVERSION=	20160321
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/booch95/booch95/${PORTVERSION}
 DISTNAME=	bc-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada 95 Booch Components
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake tar:bzip2
 HAS_CONFIGURE=	yes
 ALL_TARGET=	libs
 
 # Demos are available but require that the libraries are already installed
 # In other words, adabooch demos requires a separate port to do correctly
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}/
 	${RM} ${STAGEDIR}${DOCSDIR}/Makefile
 
 .include <bsd.port.mk>
Index: head/devel/adacurses/Makefile
===================================================================
--- head/devel/adacurses/Makefile	(revision 434194)
+++ head/devel/adacurses/Makefile	(revision 434195)
@@ -1,52 +1,52 @@
 # Created by: olgeni@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	adacurses
 PORTVERSION=	20150808
 PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/AdaCurses/
 DISTNAME=	AdaCurses-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada95 bindings for ncurses
 
 LICENSE=	MIT
 
 USES=		ada gmake pkgconfig ncurses:port tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ada-include=${PREFIX}/include/adacurses \
 		--with-ada-objects=${PREFIX}/lib/adacurses \
 		--with-curses-dir=${NCURSESBASE} \
 		--libdir=${PREFIX}/lib/adacurses \
 		--enable-widec
 PORTDOCS=	ada Ada95.html
 PLIST_SUB=	atic=adacurses/terminal_interface-curses
 
 OPTIONS_DEFINE=	DOCS
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e '/(INSTALL_PROG)/d' -e 's|@ADAGEN_LDFLAGS@||' \
 		${WRKSRC}/gen/Makefile.in
 	@${REINPLACE_CMD} -e '/pragma Linker_Options/d' \
 		${WRKSRC}/gen/terminal_interface-curses.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-menus.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-forms.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-panels.ads.m4
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -lmenu -lform -lpanel|' \
 		${WRKSRC}/samples/Makefile.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gen/adacurses-config \
 		${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat
 	${SED} "s|@PREFIX@|${NCURSESBASE}|g" ${FILESDIR}/adacurses.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adacurses.gpr
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} THIS=${PORTNAME} install.html)
 
 .include <bsd.port.mk>
Index: head/devel/adaid/Makefile
===================================================================
--- head/devel/adaid/Makefile	(revision 434194)
+++ head/devel/adaid/Makefile	(revision 434195)
@@ -1,48 +1,48 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	AdaID
 PORTVERSION=	0.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Simple Ada library for generating UUIDs
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 TEST_DEPENDS=	${LOCALBASE}/lib/gnat/aunit.gpr:devel/aunit
 
 USES=		ada:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	anthony-arnold
 
 LIB_VERSION=	1.0.2	# get from ${WRKSRC}/Makefile
 
 post-patch:
 	${SED} -e 's|"src"|"src", "include"|; s|%VERSION%|${LIB_VERSION}|' \
 		${WRKSRC}/adaid.gpr.in > ${WRKSRC}/adaid.gpr
 	${REINPLACE_CMD} -e 's|adaid_debug|adaid|' ${WRKSRC}/test.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ARGS} \
 		gprbuild -p -P adaid)
 
 do-test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TEST_ARGS} \
 		gprbuild -p -P test)
 	${TEST_WRKSRC}/bin/test
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/adaid \
 		${STAGEDIR}${PREFIX}/lib/adaid \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/adaid
 	${INSTALL_DATA} ${WRKSRC}/ali/*.ali* ${STAGEDIR}${PREFIX}/lib/adaid
 	${INSTALL_DATA} ${WRKSRC}/src/*.adb ${WRKSRC}/include/*.ads \
 		${STAGEDIR}${PREFIX}/include/adaid
 	${INSTALL_DATA} ${FILESDIR}/adaid.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/devel/ahven/Makefile
===================================================================
--- head/devel/ahven/Makefile	(revision 434194)
+++ head/devel/ahven/Makefile	(revision 434195)
@@ -1,53 +1,53 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ahven
 PORTVERSION=	2.6
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ahven-framework.com/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada unit test framework
 
 LICENSE=	ISCL
 
 BUILD_DEPENDS=	adactl:lang/adacontrol
 
 USES=		ada gmake
 MAKE_ENV=	OS_VERSION=unix
 
 OPTIONS_DEFINE=		TRACE DOCS
 OPTIONS_DEFAULT=	TRACE
 NO_OPTIONS_SORT=	yes
 TRACE_DESC=		Build with GNAT-specific symbolic tracing functionality
 
 DOCS_USES=		python:build
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain
 TRACE_EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
 
 do-build:
 	(cd ${WRKSRC} && ${MKDIR} lib objects)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pgnat/ahven_lib)
 
 do-build-DOCS-on:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} -C doc/manual/en html)
 
 do-install:
 	(cd ${STAGEDIR}${PREFIX} && ${MKDIR} lib/gnat lib/ahven include/ahven)
 	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/ahven
 	${INSTALL_DATA} ${WRKSRC}/lib/*.ali ${STAGEDIR}${PREFIX}/lib/ahven
 	${INSTALL_DATA} ${WRKSRC}/lib/libahven.a ${STAGEDIR}${PREFIX}/lib/ahven
 	${INSTALL_DATA} ${FILESDIR}/ahven.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/manual/en/build && \
 		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR});
 	${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources
 	${RM} ${STAGEDIR}${DOCSDIR}/html/.buildinfo
 
 .include <bsd.port.mk>
Index: head/devel/alog/Makefile
===================================================================
--- head/devel/alog/Makefile	(revision 434194)
+++ head/devel/alog/Makefile	(revision 434195)
@@ -1,55 +1,55 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	alog
 PORTVERSION=	0.5.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.codelabs.ch/download/
 DISTNAME=	libalog-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Stackable logging framework for Ada
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada tar:bzip2
 ALL_TARGET=	all
 PORTDOCS=	html
 MAKE_ARGS+=	NUM_CPUS=${MAKE_JOBS_NUMBER} \
 		LIBRARY_KIND=static
 
 OPTIONS_DEFINE=	TEST DOCS
 OPTIONS_SUB=	yes
 TEST_DESC=	Run unit test suite before installation
 NO_OPTIONS_SORT=yes
 
 DOCS_USES=		gmake
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			source-highlight:textproc/source-highlight
 DOCS_ALL_TARGET=	doc
 TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 TEST_ALL_TARGET=	tests
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e '/^NUM_CPUS/d' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/\(not-allowed\)/NONEXISTENT\/\1/' \
 		${WRKSRC}/tests/facility_tests-fd.adb
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/alog \
 		${STAGEDIR}${PREFIX}/include/alog \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/include/alog
 	${INSTALL_DATA} ${WRKSRC}/lib/*/*.ali ${STAGEDIR}${PREFIX}/lib/alog
 	${INSTALL_DATA} ${WRKSRC}/gnat/alog.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/lib/*/libalog.a ${STAGEDIR}${PREFIX}/lib/alog
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/aunit/Makefile
===================================================================
--- head/devel/aunit/Makefile	(revision 434194)
+++ head/devel/aunit/Makefile	(revision 434195)
@@ -1,28 +1,28 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aunit
 PORTVERSION=	2016
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	aunit-gpl-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada unit testing framework
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake
 
 post-patch:
 	${REINPLACE_CMD} -e 's|LIBDIR|MYLIBDIR|' \
 		${WRKSRC}/lib/gnat/aunit_shared.gpr
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/gnat/manifests
 
 .include <bsd.port.mk>
Index: head/devel/florist-gpl/Makefile
===================================================================
--- head/devel/florist-gpl/Makefile	(revision 434194)
+++ head/devel/florist-gpl/Makefile	(revision 434195)
@@ -1,24 +1,24 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	florist-gpl
 PORTVERSION=	2016
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	POSIX Ada binding, IEEE Standards 1003.5(b,c)
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake
 GNU_CONFIGURE=	yes
 SUB_FILES=	florist.gpr
 
 post-extract:
 	(cd ${WRKSRC}/configs && ${CP} pconfig.FreeBSD pconfig.DragonFly)
 
 .include <bsd.port.mk>
Index: head/devel/gnatcoll/Makefile
===================================================================
--- head/devel/gnatcoll/Makefile	(revision 434194)
+++ head/devel/gnatcoll/Makefile	(revision 434195)
@@ -1,88 +1,88 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnatcoll
 PORTVERSION=	2016	# branch: gpl-for-gps-2016
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	GNAT Component Collection from Adacore
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		gnat_util>=20140422:lang/gnat_util
 LIB_DEPENDS=	libgtkada.so:x11-toolkits/gtkada3 \
 		libgmp.so:math/gmp
 RUN_DEPENDS=	gnat_util>=20140422:lang/gnat_util
 
 USES=		ada gmake pkgconfig python
 USE_GNOME=	pygobject3
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	gprbuild:libgpr
 GH_TAGNAME=	858f72c a2e9066:libgpr
 
 PYCOMPILE=	${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		Gnatcoll_Build=Production
 
 OPTIONS_DEFINE=		READLINE SYSLOG PGSQL DOCS EXAMPLES
 OPTIONS_DEFAULT=	READLINE SYSLOG
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_ALL_TARGET=	docs
 SYSLOG_CONFIGURE_ENABLE=	syslog
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ARGS=		--with-gmp=${PREFIX} \
 			--with-sqlite=embedded \
 			--with-python_exec=${PYTHON_CMD} \
 			--with-gtk=3.0 \
 			--without-iconv \
 			--enable-pygobject \
 			--enable-projects \
 			--disable-shared \
 			--disable-pygtk
 
 READLINE_USES=		readline:port
 READLINE_CONFIGURE_ON=	--enable-gpl
 READLINE_CONFIGURE_OFF=	--disable-readline
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql=${PREFIX}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|@PREFIX@|${PREFIX}|g" \
 	    ${WRKSRC}/src/gnatcoll_readline.gpr.in
 	@${REINPLACE_CMD} -e 's|with "gpr"|with "${WRKSRC_libgpr}/gpr/gpr"|' \
 		${WRKSRC}/src/gnatcoll__libgpr.gpr
 
 pre-build:
 	(cd ${WRKSRC_libgpr}/gpr && ${SETENV} ${MAKE_ENV} \
 		gprbuild -p -P gpr);
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gnatcoll_db2ada
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gnatinspect
 	${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources
 	${RM} -r ${STAGEDIR}${PREFIX}/share/gps
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/library
 .if ! ${PORT_OPTIONS:MEXAMPLES}
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/gnatpython/Makefile
===================================================================
--- head/devel/gnatpython/Makefile	(revision 434194)
+++ head/devel/gnatpython/Makefile	(revision 434195)
@@ -1,20 +1,20 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnatpython
 PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Python package used in Ada testsuites
 
 LICENSE=	GPLv3
 
 SNAPSHOT=	20140224
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
 
 NO_LICENSES_INSTALL=	yes
 
 .include <bsd.port.mk>
Index: head/devel/gprbuild/Makefile
===================================================================
--- head/devel/gprbuild/Makefile	(revision 434194)
+++ head/devel/gprbuild/Makefile	(revision 434195)
@@ -1,40 +1,40 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gprbuild
 PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Adacore multi-language software build tool
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 SNAPSHOT=	20160609
 USES=		ada
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	gprbuild
 GH_TAGNAME=	376670f
 
 PORTDOCS=	*
 MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}
 BUILD_WRKSRC=	${WRKSRC}/construction
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_TARGET=	install
 
 #OPTIONS_DEFINE=	DOCS
 #DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 #DOCS_ALL_TARGET=	gen-docs
 #DOCS_INSTALL_TARGET=	install-docs
 
 post-patch:
 	${MKDIR} ${WRKDIR}/trash ${BUILD_WRKSRC}
 	${CP} ${FILESDIR}/Makefile.BSD ${WRKSRC}/construction/Makefile
 	@${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/${ADAXX}-aux," \
 		${WRKSRC}/share/gprconfig/compilers.xml
 	${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKDIR}/trash
 
 .include <bsd.port.mk>
Index: head/devel/gps/Makefile
===================================================================
--- head/devel/gps/Makefile	(revision 434194)
+++ head/devel/gps/Makefile	(revision 434195)
@@ -1,118 +1,118 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gps
 PORTVERSION=	2016
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gps-gpl-${PORTVERSION}-src
 PKGNAMESUFFIX=	-ide
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	GNAT Programming Studio - IDE for Ada and many other languages
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		xmlada>=4.4:textproc/xmlada \
 		gnatcoll>=2016:devel/gnatcoll \
 		templates_parser>11:textproc/templates_parser
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgtkada.so:x11-toolkits/gtkada3 \
 		libfreetype.so:print/freetype2 \
 		libclang.so.3.8:devel/llvm38
 RUN_DEPENDS=	rsvg-convert:graphics/librsvg2 \
 		gdb${PORTGDB}:devel/gdb \
 		gprbuild:devel/gprbuild \
 		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi
 
 GNU_CONFIGURE=	yes
 USES=		ada:run gettext gmake perl5 pkgconfig python
 USE_XORG=	x11
 USE_PERL5=	build
 USE_GNOME=	glib20 pygobject3 gtk30 pango atk cairo gdkpixbuf2
 PYCOMPILE=	${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
 AWKREVDATE=	'/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
 GPSVER=		GPS_VERSION=${PORTVERSION}
 ALL_TARGET=	default
 NO_MTREE=	yes
 SUB_FILES=	gps
 PORTGDB=	${GDBVER:S/.//g}
 
 # note: librsvg2 is needed to display the svg icons in the menu.  Actually
 # needed is lib/gdk-pixbuf-2.0/%%GTK2_VER%%/loaders/libpixbufloader-svg.so ,
 # but it's a variable library needed only at runtime, which is obnoxious so
 # we just request the sole binary to pull in the package which effectively
 # accomplishes what is desired.
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DEBUG_CONFIGURE_ON=	Build=Debug
 DEBUG_CONFIGURE_OFF=	Build=Production
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
 CONFIGURE_ARGS=		--with-gtk=3.0 \
 			--with-clang=${PREFIX}/llvm38/lib
 MAKE_ARGS+=		PROCESSORS=${MAKE_JOBS_NUMBER}
 MAKE_ARGS+=		PYTHON_CMD=${PYTHON_CMD}
 PORTDOCS=		html pdf
 PORTEXAMPLES=		demo python remote tutorial xml
 
 .include <bsd.port.options.mk>
 
 SUB_LIST=		ADA_PATH=${PREFIX}/${ADAXX}-aux/bin
 GDBVER!=		${GREP} ^PORTVERSION ${.CURDIR}/../gdb/Makefile | \
 			${AWK} '{print $$2}'
 
 post-extract:
 	@${MV} ${WRKSRC}/templates_parser ${WRKSRC}/TP.ignore
 	@${MV} ${WRKSRC}/Makefile.gnat ${WRKSRC}/Makefile.gnat.ignore
 	@${FIND} ${WRKSRC}/share -name "*.pyc" -delete
 	${RM} ${WRKSRC}/share/support/core/cross_references.py
 
 post-patch:
 	@${RM} ${WRKSRC}/share/plug-ins/*.orig
 	@${ECHO} "GNAT_SOURCES=" > ${WRKSRC}/Makefile.gnat
 	@${REINPLACE_CMD} -e 's/^with .*templates_parser\//with "/g' \
 		${WRKSRC}/gnatdoc/gnatdoc.gpr \
 		${WRKSRC}/vcs/vcs.gpr
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
 		${WRKSRC}/widgets/widgets.gpr
 	@${SED} -i '' -e \
 		's|= "gnat"|= "${LOCALBASE}/${ADAXX}-aux/bin/gnat"|' \
 		${WRKSRC}/share/support/core/gps_utils/gnat_rules.py
 	@${REINPLACE_CMD} -e '/Gdb_Command/ s|"gdb"|"gdb${PORTGDB}"|' \
 		${WRKSRC}/gvd/src/debugger-gdb_mi.adb \
 		${WRKSRC}/gvd/src/debugger-gdb.adb
 	@${REINPLACE_CMD} -i '' -e 's|ISO-8859|ISO8859|' \
 		${WRKSRC}/kernel/src/gps-kernel-charsets.adb \
 		${WRKSRC}/share/support/core/os_utils.py \
 		${WRKSRC}/configure* \
 		${WRKSRC}/po/build_skeleton.pl
 	@${REINPLACE_CMD} -e 's|iso-8859|ISO8859|' \
 		${WRKSRC}/cli/src/gps-cli_scripts.adb \
 		${WRKSRC}/cli/src/gnatdoc_main.adb
 
 do-build:
 	@${CP} ${PREFIX}/include/gnat_util/impunit.* ${WRKSRC}/distrib
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} all
 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins
 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library
 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/support
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources
 	${INSTALL_SCRIPT} ${WRKDIR}/gps ${STAGEDIR}${PREFIX}/bin
 	echo "This is the GPS GPL Edition for the ${OPSYS} Ports Collection." \
 		> ${STAGEDIR}${PREFIX}/share/gps/about.txt
 	${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: head/devel/libspark2012/Makefile
===================================================================
--- head/devel/libspark2012/Makefile	(revision 434194)
+++ head/devel/libspark2012/Makefile	(revision 434195)
@@ -1,17 +1,17 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libspark2012
 PORTVERSION=	2012
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	SPARK 2012 Spark.Ada library
 
 LICENSE=	GPLv3
 
 USES=		ada tar:bzip2
 
 .include <bsd.port.mk>
Index: head/devel/matreshka/Makefile
===================================================================
--- head/devel/matreshka/Makefile	(revision 434194)
+++ head/devel/matreshka/Makefile	(revision 434195)
@@ -1,57 +1,57 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	matreshka
 PORTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ada-ru.org/matreshka/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada framework for information systems development
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake pkgconfig
 HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 
 OPTIONS_DEFINE=	SQLITE3 FIREBIRD PGSQL MYSQL ORACLE AMF
 OPTIONS_DEFAULT=SQLITE3 PGSQL
 
 AMF_DESC=	Build Ada Modeling Framework
 
 SQLITE3_CONFIGURE_ENABLE=	sqlite3
 FIREBIRD_CONFIGURE_ENABLE=	firebird
 PGSQL_CONFIGURE_ENABLE=		postgresql
 MYSQL_CONFIGURE_ENABLE=		mysql
 ORACLE_CONFIGURE_ENABLE=	oracle
 AMF_CONFIGURE_ENABLE=		amf
 
 MYSQL_USE=			MYSQL=yes
 PGSQL_USES=			pgsql
 SQLITE3_USES=			sqlite
 FIREBIRD_USES=			firebird
 
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_ENV+=	SMP_MFLAGS=-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFIREBIRD}
 CONFIGURE_ARGS+= --with-firebird-libdir=${LOCALBASE}/lib
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} config
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so \
 		${STAGEDIR}${PREFIX}/bin/wsdl2ada
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
 	   ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/devel/pcsc-ada/Makefile
===================================================================
--- head/devel/pcsc-ada/Makefile	(revision 434194)
+++ head/devel/pcsc-ada/Makefile	(revision 434195)
@@ -1,75 +1,75 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pcsc-ada
 PORTVERSION=	0.7.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.codelabs.ch/download/
 DISTNAME=	libpcscada-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada binding to PC/SC middleware (Smart card interface)
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		ada tar:bzip2
 ALL_TARGET=	all
 GPRLINK=	"-L${LOCALBASE}/lib", "-lpcsclite"
 MAKE_ARGS+=	NUM_CPUS=${MAKE_JOBS_NUMBER} \
 		LIBRARY_KIND=static
 PORTEXAMPLES=	src bin
 
 OPTIONS_DEFINE=	UNIT_TEST INTF_TEST DOCS EXAMPLES
 OPTIONS_SUB=	yes
 UNIT_TEST_DESC= Run unit test suite before installation
 INTF_TEST_DESC= Run interface tests against installed smart card after build
 NO_OPTIONS_SORT=yes
 
 DOCS_USES=		gmake
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			source-highlight:textproc/source-highlight
 UNIT_TEST_BUILD_DEPENDS=${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 INTF_TEST_BUILD_DEPENDS=${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 
 DOCS_ALL_TARGET=	doc
 EXAMPLES_ALL_TARGET=	examples
 UNIT_TEST_ALL_TARGET=	utests
 INTF_TEST_ALL_TARGET=	itests
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"-lpcsclite"|${GPRLINK}|' \
 		${WRKSRC}/pcscada_common.gpr \
 		${WRKSRC}/pcscada_lib.gpr
 
 do-build:
 #	We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set
 #	for PROCESSORS, but that also sets -j for gmake can break build
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS:NDESTDIR=*} ${ALL_TARGET})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/pcscada \
 		${STAGEDIR}${PREFIX}/include/pcscada \
 		${STAGEDIR}${EXAMPLESDIR}/src \
 		${STAGEDIR}${EXAMPLESDIR}/bin \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/include/pcscada
 	${INSTALL_DATA} ${WRKSRC}/lib/static/* \
 		${STAGEDIR}${PREFIX}/lib/pcscada
 	${INSTALL_DATA} ${FILESDIR}/pcscada.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR}/src)
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/src/*/*.bak
 	(cd ${WRKSRC}/obj/examples && ${INSTALL_PROGRAM} cardd pinpad \
 		thin_example ${STAGEDIR}${EXAMPLESDIR}/bin)
 
 .include <bsd.port.mk>
Index: head/devel/pragmarcs/Makefile
===================================================================
--- head/devel/pragmarcs/Makefile	(revision 434194)
+++ head/devel/pragmarcs/Makefile	(revision 434195)
@@ -1,36 +1,36 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pragmarcs
 PORTVERSION=	20161207
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	PragmAda Reusable Components
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 USES=		ada
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrcarter
 GH_PROJECT=	PragmARC
 GH_TAGNAME=	1378e7a
 
 post-extract:
 	@${CP} ${FILESDIR}/buildlib.gpr ${WRKSRC}/
 	${RM} ${WRKSRC}/compile_all.adb
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pbuildlib)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/pragmarcs \
 		${STAGEDIR}${PREFIX}/lib/pragmarcs \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib/pragmarcs
 	${INSTALL_DATA} ${WRKSRC}/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/pragmarcs
 	${INSTALL_DATA} ${FILESDIR}/pragmarcs.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/devel/sdl_gnat/Makefile
===================================================================
--- head/devel/sdl_gnat/Makefile	(revision 434194)
+++ head/devel/sdl_gnat/Makefile	(revision 434195)
@@ -1,23 +1,23 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sdl_gnat
 PORTVERSION=	2013
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada thin bindings for SDL (GPLv3)
 
 LICENSE=	GPLv3
 
 USES=		ada tar:bzip2
 USE_SDL=	sdl ttf
 USE_GL=		glu gl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|' \
 		${WRKSRC}/gnat_sdl.gpr
 
 .include <bsd.port.mk>
Index: head/dns/ironsides/Makefile
===================================================================
--- head/dns/ironsides/Makefile	(revision 434194)
+++ head/dns/ironsides/Makefile	(revision 434195)
@@ -1,31 +1,31 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ironsides
 PORTVERSION=	${SNAPSHOT:S/_//g}
 PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://ironsides.martincarlisle.com/
 DISTNAME=	ironsides_authoritative-${SNAPSHOT}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Authoritative DNS server formally verified by SPARK/Ada
 
 LICENSE=	Ironsides
 LICENSE_NAME=	IRONSIDES - Free software, unlimited redistribution
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/include/spark2012/spark.ads:devel/libspark2012
 
 USES=		ada dos2unix zip
 DOS2UNIX_FILES=	dfcs.usafa.edu.zonefile ironsides.1
 SNAPSHOT=	2015_04_15
 WRKSRC=		${WRKDIR}/${DISTFILES:S/.zip//}
 PLIST_FILES=	sbin/ironsides man/man1/ironsides.1.gz
 PORTEXAMPLES=	dfcs.usafa.edu.zonefile
 
 post-extract:
 	@${CP} ${FILESDIR}/ironsides.gpr ${FILESDIR}/Makefile ${WRKSRC}/
 
 .include <bsd.port.mk>
Index: head/graphics/generic_image_decoder/Makefile
===================================================================
--- head/graphics/generic_image_decoder/Makefile	(revision 434194)
+++ head/graphics/generic_image_decoder/Makefile	(revision 434195)
@@ -1,54 +1,54 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	generic_image_decoder
 PORTVERSION=	06
 CATEGORIES=	graphics
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	gid-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada library for decoding various image formats inc. animations
 
 LICENSE=	MIT
 
 USES=		ada zip dos2unix
 SFPATH=		gen-img-dec/files
 WRKSRC=		${WRKDIR}/gid
 MAKE_ENV+=	Build_Mode=Fast_but_checked
 PORTDOCS=	gid.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src ${WRKDIR}/data
 	${MV} ${WRKSRC}/gid_work.xls ${WRKDIR}/data
 	(cd ${WRKSRC}; ${MV} *.ad[bs] src)
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-j2|-j${MAKE_JOBS_NUMBER}|" \
 		${WRKSRC}/gid.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pgid)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/generic_image_decoder \
 		${STAGEDIR}${PREFIX}/include/generic_image_decoder
 	${INSTALL_DATA} ${FILESDIR}/generic_image_decoder.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/generic_image_decoder
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/generic_image_decoder
 	(cd ${WRKSRC}/test && ${INSTALL_PROGRAM} to_bmp mini \
 		${STAGEDIR}${PREFIX}/bin)
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/gid.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/adacontrol/Makefile
===================================================================
--- head/lang/adacontrol/Makefile	(revision 434194)
+++ head/lang/adacontrol/Makefile	(revision 434195)
@@ -1,61 +1,61 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	adacontrol
 PORTVERSION=	1.18r9
 CATEGORIES=	lang
 MASTER_SITES=	SF/adacontrol
 DISTNAME=	adactl-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Tool for detecting use or non-use of specific Ada constructs
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	asis>=2013:lang/asis
 
 USES=		ada tar:tgz
 WRKSRC=		${WRKDIR}/adactl-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 ALL_TARGET=	build
 PORTDOCS=	adacontrol*
 
 OPTIONS_DEFINE= DOCS PROJECTS
 
 PROJECTS_DESC=		Support the direct processing of .gpr files
 PROJECTS_BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 			${LOCALBASE}/lib/gnat/gnatcoll.gpr:devel/gnatcoll
 
 do-patch-PROJECTS-off:
 	(cd ${WRKSRC}/src && ${MV} \
 		implementation_options-i_options_from_gpr_project.adb \
 		implementation_options-i_options_from_gpr_project_gpr.adb)
 	(cd ${WRKSRC}/src && ${MV} \
 		implementation_options-i_options_from_gpr_project_nogpr.adb \
 		implementation_options-i_options_from_gpr_project.adb)
 	${REINPLACE_CMD} -e '/gnatcoll/d' ${WRKSRC}/build.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins \
 		${STAGEDIR}${PREFIX}/share/doc/gps/html \
 		${STAGEDIR}${PREFIX}/share/gprconfig
 	${INSTALL_PROGRAM} ${WRKSRC}/adactl ${WRKSRC}/pfni \
 		${WRKSRC}/ptree ${STAGEDIR}/${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/GPS/adacontrol.xml \
 		${STAGEDIR}${PREFIX}/share/gprconfig
 	${INSTALL_DATA} ${WRKSRC}/GPS/*adactl* ${WRKSRC}/GPS/pfni.* \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${PREFIX}/share/doc/gps/html
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/asis/Makefile
===================================================================
--- head/lang/asis/Makefile	(revision 434194)
+++ head/lang/asis/Makefile	(revision 434195)
@@ -1,63 +1,63 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	asis
 PORTVERSION=	2016
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-gpl-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	GNAT implementation of Ada Semantic Interface Specification
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gprbuild>=20130416:devel/gprbuild \
 		xmlada>=3.2:textproc/xmlada \
 		${GUSTATIC}:lang/gnat_util
 RUN_DEPENDS=	${GUSTATIC}:lang/gnat_util
 
 USES=		ada gmake
 NO_MTREE=	yes
 MAKE_ENV=	PROCESSORS=${MAKE_JOBS_NUMBER}
 GUSTATIC=	${LOCALBASE}/lib/gnat_util/libgnat_util.a
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|OPSYS|ASISOPSYS|g' \
 		-e 's|(prefix)|(DESTDIR)$$(prefix)|g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/Makefile.stub \
 		${WRKSRC}/common.gpr
 	@${RM} -r ${WRKSRC}/gnat
 
 do-build:
 	# This target is recreated because -j cannot be set, but
 	# MAKE_JOBS_UNSAFE=yes would break PROCESSORS value
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all)
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-all)
 
 do-install:
 	# gprinstall seems to be malfunctioning, just install manually
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/include/asis \
 		${STAGEDIR}${PREFIX}/lib/asis \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/asistant/asistant \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/asis/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/asis
 	${INSTALL_DATA} ${WRKSRC}/lib/*.ali ${STAGEDIR}${PREFIX}/lib/asis
 	${INSTALL_DATA} ${WRKSRC}/lib/*.a ${STAGEDIR}${PREFIX}/lib/asis
 	${INSTALL_DATA} ${FILESDIR}/asis.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/lang/gcc5-aux/Makefile
===================================================================
--- head/lang/gcc5-aux/Makefile	(revision 434194)
+++ head/lang/gcc5-aux/Makefile	(revision 434195)
@@ -1,294 +1,294 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gcc5-aux
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${MAIN_PR}
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 		LOCAL/marino:boot GCC/${MS_SUBDIR}
 DISTFILES=	${IDENTIFICATION}.tar.bz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Version of GCC ${GCC_BRANCH} with full Ada support
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 .include "${.CURDIR}/Makefile.common"
 
 LANGS=			c c++ ada
 APPLY_DIFFS=		core cxx ada
 INTENDED_COMPILER=	NATIVE
 GARCH=			${ARCH:S/amd64/x86_64/}
 BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
 FULL_GNATGCC=		NOT_SET
 OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
 NO_MTREE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 OPTIONS_GROUP=		Standard Bootstrap
 OPTIONS_GROUP_Standard=	FORTRAN OBJC NLS TESTSUITE ALLSTAGES STATIC
 OPTIONS_GROUP_Bootstrap=BOOTSTRAP
 OPTIONS_DEFAULT=	FORTRAN OBJC
 NO_OPTIONS_SORT=	yes
 
 OBJC_DESC=		Objective-C language support
 TESTSUITE_DESC=		Activate test support
 ALLSTAGES_DESC=		Build compiler with itself (twice, brings in libcc1)
 STATIC_DESC=		Link compilers and drivers statically
 BOOTSTRAP_DESC=		Create bootstrap compiler (overrides other options)
 
 # The BOOTSTRAP option overrides all the others.  "make stage" will build a
 # static compiler that supports C, C++, and Ada languages and then create
 # a new distfile in $WRKDIR/newbsd with the name following the pattern:
 # ada-bootstrap.$ARCH.$OPSYS.XY.tar.bz2.  There is no need to "make install"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 ONLY_FOR_ARCHS=		amd64 i386
 MODERN_BINUTILS=	yes
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
 .endif
 .if ${OPSYS} == DragonFly
 ONLY_FOR_ARCHS=		x86_64
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
 .endif
 
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
 EXTRA_CONFIG+=	--with-ld=/usr/bin/ld
 EXTRA_CONFIG+=	--with-as=/usr/bin/as
 .endif
 
 WRKSRC=			${WRKDIR}/${IDENTIFICATION}
 BUILDDIR=		${WRKDIR}/build
 NEWBSDIR=		${WRKDIR}/newbs/bootstrap
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
 PHASEFILE=		${WRKSRC}/gcc/DEV-PHASE
 BOOTSTRAP_PREFIX=	${WRKDIR}/bootstrap
 PKG_PREFIX=		${PREFIX}/${PORTNAME}
 MANPREFIX=		${PREFIX}/${PORTNAME}/share
 BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:tl}.${OSREL:S/.//}.tar.bz2
 
 # If we find gnatmake and friends in a standard location, then we'll use this
 # compiler instead of downloading the bootstrap.
 .if exists (${LOCALBASE}/${PORTNAME}/bin/ada)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatbind)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatlink)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatmake)
 FULL_GNATGCC=${LOCALBASE}/${PORTNAME}/bin/ada
 FULL_GNATGXX=${LOCALBASE}/${PORTNAME}/bin/g++
 FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin
 .endif
 .endif
 .endif
 .endif
 
 # If FULL_GNATGCC is not set, we'll request the bootstrap compiler
 .if ${FULL_GNATGCC} == NOT_SET
 INTENDED_COMPILER=BOOTSTRAP
 FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc
 FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++
 FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin
 DISTFILES+=	${BOOTSTRAP_COMPILER}:boot
 .endif
 
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
 DISTFILES=	\
    ${IDENTIFICATION}.tar.bz2 \
    ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \
    ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot
 .endif
 
 .if ${PORT_OPTIONS:MFORTRAN} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		fortran
 #APPLY_DIFFS+=	fortran
 EXTRA_CONFIG+=	--enable-libquadmath
 .else
 EXTRA_CONFIG+=	--disable-libquadmath
 .endif
 
 .if ${PORT_OPTIONS:MOBJC} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	cxx-testsuite
 APPLY_DIFFS+=	gcc-testsuite
 .endif
 
 .if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
 USES+=		gettext
 EXTRA_CONFIG+=	--enable-nls
 .else
 EXTRA_CONFIG+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC} && !${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--with-stage1-ldflags=-static
 .endif
 
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--disable-shared --disable-lto
 EXTRA_CONFIG+=		--with-boot-ldflags=-static
 .else
 .  if !${PORT_OPTIONS:MALLSTAGES}
 #  For reasons unknown, build fails at libcc1 when the compiler is not
 #  not bootstrapping.  It appears to be an upstream error.  LibCC1 is used
 #  for gdb 7.9 exclusively, so it's not really needed.  Let's disable it
 #  by default, but let people that want it suffer a 3-stage build.
 EXTRA_CONFIG+=		--disable-bootstrap --disable-libcc1
 .  endif
 USES+=			iconv
 .endif
 
 # Establish Ada-aware compiler for use
 ADA_CONFIGURE_ENV+=	CC=${FULL_GNATGCC}
 ADA_CONFIGURE_ENV+=	CXX=${FULL_GNATGXX}
 ADA_CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 ADA_CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 ADA_CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 ADA_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 ADA_CONFIGURE_ENV+=	build_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	host_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	PATH=${FULL_PATH}
 ADA_MAKE_ENV+=		PATH=${FULL_PATH}
 
 # The standard configuration options
 ADA_CONFIG_ARGS=	--enable-languages=${LANGS:Q}
 ADA_CONFIG_ARGS+=	--build=${BLD_TARGET}
 ADA_CONFIG_ARGS+=	--prefix=${PKG_PREFIX:Q}
 ADA_CONFIG_ARGS+=	--with-system-zlib
 ADA_CONFIG_ARGS+=	--with-gmp=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpfr=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpc=${PREFIX}
 ADA_CONFIG_ARGS+=	${ICONV_CONFIGURE_ARG}
 ADA_CONFIG_ARGS+=	--enable-shared
 ADA_CONFIG_ARGS+=	--enable-threads=posix
 ADA_CONFIG_ARGS+=	--enable-checking=release
 ADA_CONFIG_ARGS+=	--disable-libmudflap
 ADA_CONFIG_ARGS+=	--disable-libgomp
 ADA_CONFIG_ARGS+=	--disable-libssp
 ADA_CONFIG_ARGS+=	${EXTRA_CONFIG}
 
 post-extract:
 	# Personalize GNAT for each different machine
 	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}
 	@${ECHO} ${PHASE} > ${PHASEFILE}
 
 	# Apply required composite diff files
 .for suffix in ${APPLY_DIFFS}
 	@${ECHO} "Applying composite patch diff-${suffix}"
 	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
 .endfor
 	# Try to test more locale stuff than stock GCC
 	@(cd ${WRKSRC}/libstdc++-v3/testsuite/22_locale && ${REINPLACE_CMD} \
 		-e 's|ISO-8859|ISO8859|g' \
 		-e 's|ja_JP.eucjp|ja_JP.eucJP|g' \
 		-e 's|en_HK|zh_HK|g' \
 		-e 's|en_PH|en_NZ|g' \
 		-e 's|se_NO|no_NO|g' \
 		-e 's|es_MX|es_ES|g' \
 		-e 's|ru_RU.UTF8|ru_RU.UTF-8|g' ${LOCALE22FIX})
 .if ${PORT_OPTIONS:MSTATIC} || ${PORT_OPTIONS:MBOOTSTRAP}
 	# Ensure GNAT tools are built statically
 	${REINPLACE_CMD} -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
 		${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
 .endif
 	# Update LINK_SPEC to add gcc-aux lib runpath in every binary
 	@${ECHO} "Configuring LINK_SPEC runpath"
 	@${REINPLACE_CMD} -e 's;\@PREFIX\@;${PREFIX};' \
 		-e 's;\@GCCAUX\@;${PORTNAME};' \
 		${WRKSRC}/gcc/config/dragonfly.h \
 		${WRKSRC}/gcc/config/i386/freebsd64.h \
 		${WRKSRC}/gcc/config/i386/freebsd.h
 .if defined(MODERN_BINUTILS)
 	# Use dwarf4-compatible addr2line (affects FreeBSD only)
 	${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \
 	  ${WRKSRC}/gcc/ada/traceback_symbolic.c
 .endif
 
 do-configure:
 	${MKDIR} ${BUILDDIR}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \
 		${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
 
 do-build:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} all
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 test: build test-ada test-fortran test-objc test-cxx test-c
 
 test-ada:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -sk check-ada
 
 test-cxx:
 	# libstdc++ testsuite will break every time, for TRUE to continue
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c++ || true
 
 test-c:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c
 
 test-fortran:
 .  if ${PORT_OPTIONS:MFORTRAN}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-fortran
 .  endif
 
 test-objc:
 .  if ${PORT_OPTIONS:MOBJC}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-objc
 .  endif
 .endif
 
 do-install:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} install-strip ${MAKE_ARGS}
 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
 #	Don't activate until this port builds gnatdroid
 #	Otherwise it will conflict with lang/gcc-aux
 #	Add "share" after {PORTNAME} on 3rd line of post-stage target
 #	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
 #		${STAGEDIR}${PREFIX}/share/dejagnu/config
 #	${INSTALL_DATA} ${FILESDIR}/android.exp \
 #		${STAGEDIR}${PREFIX}/share/dejagnu/config
 #	${INSTALL_DATA} ${FILESDIR}/gnatdroid.exp \
 #		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
 
 post-stage:
 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
 		${SORT} -dr | ${XARGS} ${RMDIR})
 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \
 		\( -type f -or -type l \) | ${SORT} | ${SED} \
 		-e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST})
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 	${MKDIR} ${NEWBSDIR}
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/bin ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/lib ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
 	${RM} -r ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/gcc6-aux/Makefile
===================================================================
--- head/lang/gcc6-aux/Makefile	(revision 434194)
+++ head/lang/gcc6-aux/Makefile	(revision 434195)
@@ -1,286 +1,286 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gcc6-aux
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${MAIN_PR}
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 		LOCAL/marino:boot GCC/${MS_SUBDIR}
 DISTFILES=	${IDENTIFICATION}.tar.bz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Version of GCC ${GCC_BRANCH} with full Ada support
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 .include "${.CURDIR}/Makefile.common"
 
 LANGS=			c c++ ada
 APPLY_DIFFS=		core cxx ada
 INTENDED_COMPILER=	NATIVE
 GARCH=			${ARCH:S/amd64/x86_64/}
 BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
 FULL_GNATGCC=		NOT_SET
 OS_LABEL4VERS=		[${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
 NO_MTREE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 OPTIONS_GROUP=		Standard Bootstrap
 OPTIONS_GROUP_Standard=	FORTRAN OBJC NLS TESTSUITE ALLSTAGES STATIC
 OPTIONS_GROUP_Bootstrap=BOOTSTRAP
 OPTIONS_DEFAULT=	FORTRAN OBJC
 NO_OPTIONS_SORT=	yes
 
 OBJC_DESC=		Objective-C language support
 TESTSUITE_DESC=		Activate test support
 ALLSTAGES_DESC=		Build compiler with itself (twice, brings in libcc1)
 STATIC_DESC=		Link compilers and drivers statically
 BOOTSTRAP_DESC=		Create bootstrap compiler (overrides other options)
 
 # The BOOTSTRAP option overrides all the others.  "make stage" will build a
 # static compiler that supports C, C++, and Ada languages and then create
 # a new distfile in $WRKDIR/newbsd with the name following the pattern:
 # ada-bootstrap.$ARCH.$OPSYS.XY.tar.bz2.  There is no need to "make install"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 ONLY_FOR_ARCHS=		amd64 i386 aarch64
 MODERN_BINUTILS=	yes
 .  if ${ARCH} == aarch64
 BOOTSTRAP_COMPILER=	ada-bootstrap.aarch64.freebsd.120.tar.bz2
 .  else
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
 .  endif
 .endif
 .if ${OPSYS} == DragonFly
 ONLY_FOR_ARCHS=		x86_64
 BOOTSTRAP_COMPILER=	ada-bootstrap.x86_64.dragonfly.41.tar.bz2
 .endif
 
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
 EXTRA_CONFIG+=	--with-ld=/usr/bin/ld
 EXTRA_CONFIG+=	--with-as=/usr/bin/as
 .endif
 
 WRKSRC=			${WRKDIR}/${IDENTIFICATION}
 BUILDDIR=		${WRKDIR}/build
 NEWBSDIR=		${WRKDIR}/newbs/bootstrap
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
 PHASEFILE=		${WRKSRC}/gcc/DEV-PHASE
 BOOTSTRAP_PREFIX=	${WRKDIR}/bootstrap
 PKG_PREFIX=		${PREFIX}/${PORTNAME}
 MANPREFIX=		${PREFIX}/${PORTNAME}/share
 BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:tl}.${OSREL:S/.//}.tar.bz2
 
 # If we find gnatmake and friends in a standard location, then we'll use this
 # compiler instead of downloading the bootstrap.
 .if exists (${LOCALBASE}/${PORTNAME}/bin/ada)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatbind)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatlink)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatmake)
 FULL_GNATGCC=${LOCALBASE}/${PORTNAME}/bin/ada
 FULL_GNATGXX=${LOCALBASE}/${PORTNAME}/bin/g++
 FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin
 .endif
 .endif
 .endif
 .endif
 
 # If FULL_GNATGCC is not set, we'll request the bootstrap compiler
 .if ${FULL_GNATGCC} == NOT_SET
 INTENDED_COMPILER=BOOTSTRAP
 FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc
 FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++
 FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin
 DISTFILES+=	${BOOTSTRAP_COMPILER}:boot
 .endif
 
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
 DISTFILES=	\
    ${IDENTIFICATION}.tar.bz2 \
    ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \
    ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.aarch64.freebsd.120.tar.bz2:boot
 .endif
 
 .if ${PORT_OPTIONS:MFORTRAN} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		fortran
 EXTRA_CONFIG+=	--enable-libquadmath
 .else
 EXTRA_CONFIG+=	--disable-libquadmath
 .endif
 
 .if ${PORT_OPTIONS:MOBJC} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	gcc-testsuite
 .endif
 
 .if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
 USES+=		gettext
 EXTRA_CONFIG+=	--enable-nls
 .else
 EXTRA_CONFIG+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC} && !${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--with-stage1-ldflags=-static
 .endif
 
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--disable-shared --disable-lto
 EXTRA_CONFIG+=		--with-boot-ldflags=-static
 .else
 .  if !${PORT_OPTIONS:MALLSTAGES}
 #  For reasons unknown, build fails at libcc1 when the compiler is not
 #  not bootstrapping.  It appears to be an upstream error.  LibCC1 is used
 #  for gdb 7.9 exclusively, so it's not really needed.  Let's disable it
 #  by default, but let people that want it suffer a 3-stage build.
 EXTRA_CONFIG+=		--disable-bootstrap --disable-libcc1
 .  endif
 USES+=			iconv
 .endif
 
 # Establish Ada-aware compiler for use
 ADA_CONFIGURE_ENV+=	CC=${FULL_GNATGCC}
 ADA_CONFIGURE_ENV+=	CXX=${FULL_GNATGXX}
 ADA_CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 ADA_CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 ADA_CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 ADA_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 ADA_CONFIGURE_ENV+=	build_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	host_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	PATH=${FULL_PATH}
 ADA_MAKE_ENV+=		PATH=${FULL_PATH}
 
 # The standard configuration options
 ADA_CONFIG_ARGS=	--enable-languages=${LANGS:Q}
 ADA_CONFIG_ARGS+=	--build=${BLD_TARGET}
 ADA_CONFIG_ARGS+=	--prefix=${PKG_PREFIX:Q}
 ADA_CONFIG_ARGS+=	--with-system-zlib
 ADA_CONFIG_ARGS+=	--with-gmp=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpfr=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpc=${PREFIX}
 ADA_CONFIG_ARGS+=	${ICONV_CONFIGURE_ARG}
 ADA_CONFIG_ARGS+=	--enable-shared
 ADA_CONFIG_ARGS+=	--enable-threads=posix
 ADA_CONFIG_ARGS+=	--enable-checking=release
 ADA_CONFIG_ARGS+=	--disable-libmudflap
 ADA_CONFIG_ARGS+=	--disable-libgomp
 ADA_CONFIG_ARGS+=	--disable-libssp
 ADA_CONFIG_ARGS+=	${EXTRA_CONFIG}
 
 post-extract:
 	# Personalize GNAT for each different machine
 	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}
 	@${ECHO} ${PHASE} > ${PHASEFILE}
 
 	# Apply required composite diff files
 .for suffix in ${APPLY_DIFFS}
 	@${ECHO} "Applying composite patch diff-${suffix}"
 	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
 .endfor
 .if ${PORT_OPTIONS:MSTATIC} || ${PORT_OPTIONS:MBOOTSTRAP}
 	# Ensure GNAT tools are built statically
 	${REINPLACE_CMD} -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
 		${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
 .endif
 	# Update LINK_SPEC to add gcc-aux lib runpath in every binary
 	@${ECHO} "Configuring LINK_SPEC runpath"
 	@${REINPLACE_CMD} -e 's;\@PREFIX\@;${PREFIX};' \
 		-e 's;\@GCCAUX\@;${PORTNAME};' \
 		${WRKSRC}/gcc/config/dragonfly.h \
 		${WRKSRC}/gcc/config/i386/freebsd64.h \
 		${WRKSRC}/gcc/config/i386/freebsd.h \
 		${WRKSRC}/gcc/config/aarch64/aarch64-freebsd.h
 .if defined(MODERN_BINUTILS)
 	# Use dwarf4-compatible addr2line (affects FreeBSD only)
 	${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \
 	  ${WRKSRC}/gcc/ada/traceback_symbolic.c
 .endif
 
 do-configure:
 	${MKDIR} ${BUILDDIR}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \
 		${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
 
 do-build:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} all
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 test: build test-ada test-fortran test-objc test-cxx test-c
 
 test-ada:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -sk check-ada
 
 test-cxx:
 	# libstdc++ testsuite will break every time, for TRUE to continue
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c++ || true
 
 test-c:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c
 
 test-fortran:
 .  if ${PORT_OPTIONS:MFORTRAN}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-fortran
 .  endif
 
 test-objc:
 .  if ${PORT_OPTIONS:MOBJC}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-objc
 .  endif
 .endif
 
 do-install:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} install-strip ${MAKE_ARGS}
 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config
 	${INSTALL_DATA} ${FILESDIR}/android6.exp \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config
 	${INSTALL_DATA} ${FILESDIR}/gnatdroid6.exp \
 		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
 
 post-stage:
 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
 		${SORT} -dr | ${XARGS} ${RMDIR})
 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
 		\( -type f -or -type l \) | ${SORT} | ${SED} \
 		-e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST})
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 	${MKDIR} ${NEWBSDIR}
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/bin ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/lib ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
 	${RM} -r ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/gnat_util/Makefile
===================================================================
--- head/lang/gnat_util/Makefile	(revision 434194)
+++ head/lang/gnat_util/Makefile	(revision 434195)
@@ -1,51 +1,51 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnat_util
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${UTIL_PR}
 CATEGORIES=	lang
 MASTER_SITES=	GCC/${MS_SUBDIR}
 DISTNAME=	${IDENTIFICATION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Library used to build GNAT tools such as ASIS
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 USES=		ada tar:bzip2
 NO_MTREE=	yes
 DISTINFO_FILE=	${.CURDIR}/../${ADAXX}-aux/distinfo
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV=	MAKEOBJDIR=${WRKSRC}/obj
 
 .include "${.CURDIR}/Makefile.sources"
 
 .if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 49
 .include "${.CURDIR}/../gcc-aux/Makefile.version"
 .elif defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 5
 .include "${.CURDIR}/../gcc5-aux/Makefile.version"
 .else
 .include "${.CURDIR}/../gcc6-aux/Makefile.version"
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/obj
 .for F in Makefile gnat_util.gpr sdefault_adb.gnat_util osint_scars.c
 	@${CP} ${FILESDIR}/${F} ${WRKSRC}/
 .endfor
 .for F in ${GNAT_SRCS}
 	@${CP} ${WRKDIR}/${DISTNAME}/gcc/ada/${F} ${WRKSRC}/
 .endfor
 
 post-install:
 	# impunit is needed for GPS menus, just provide the source files
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/gcc/ada/impunit.* \
 		${STAGEDIR}${PREFIX}/include/gnat_util
 	# gnat_ugn.texi is used to generate gnat_switches.py for GPS
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/gcc/ada/gnat_ugn.texi \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/lang/gnatcross-aarch64/Makefile
===================================================================
--- head/lang/gnatcross-aarch64/Makefile	(revision 434194)
+++ head/lang/gnatcross-aarch64/Makefile	(revision 434195)
@@ -1,26 +1,26 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aarch64
 PORTREVISION=	${ARM64_PR}
 PKGNAMEPREFIX=	gnatcross-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	C/Ada cross-compiler, target: ${LABEL_TARGET}
 
 LABEL_TARGET=	FreeBSD/ARM64
 DROID_TARGET=	aarch64-aux-freebsd11.0
 ARG_ARCH=	# don't specify
 ARG_FPU=	# don't specify
 ARG_FLOATSOFT=	# don't specify
 SRPREFIX=	${LOCALBASE}/FreeBSD_ARM64/sysroot
 GNATPREFIX=	${LOCALBASE}/FreeBSD_ARM64
 SYSROOT=	gnatcross-sysroot-aarch64
 GDBINUTILS=	gnatcross-binutils-aarch64
 MASTERDIR=	${.CURDIR}/../../lang/gnatdroid-armv7
 PATCHDIR=	${.CURDIR}/files
 DESCR=		${.CURDIR}/pkg-descr
 
 ARG_TARGET_SPECIFIC=	# override ARM settings
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/gnatcross-binutils-aarch64/Makefile
===================================================================
--- head/lang/gnatcross-binutils-aarch64/Makefile	(revision 434194)
+++ head/lang/gnatcross-binutils-aarch64/Makefile	(revision 434195)
@@ -1,22 +1,22 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMEPREFIX=	gnatcross-
 PKGNAMESUFFIX=	-aarch64
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Infrastructure for C/Ada FreeBSD cross-compiler (aarch64)
 
 BRANCH2=	# Assume aarch64 will always be only CPU for FreeBSD/ARM64
 XCCTARGET=	aarch64-aux-freebsd11.0
 PREFIX=		${LOCALBASE}/FreeBSD_ARM64
 SRPREFIX=	${PREFIX}/sysroot
 SYSROOT=	gnatcross-sysroot-aarch64
 MASTERDIR=	${.CURDIR}/../../lang/gnatdroid-binutils
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr
 
 PLIST_SUB=	AMD64=${ARCH:S/i386/"@comment "/:S/${ARCH}/""/}
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/gnatcross-sysroot-aarch64/Makefile
===================================================================
--- head/lang/gnatcross-sysroot-aarch64/Makefile	(revision 434194)
+++ head/lang/gnatcross-sysroot-aarch64/Makefile	(revision 434195)
@@ -1,44 +1,44 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sysroot
 PORTVERSION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${PUB_FREEBSD}/releases/arm64/aarch64/11.0-RELEASE/:R11
 PKGNAMEPREFIX=	gnatcross-
 PKGNAMESUFFIX=	-aarch64
 DIST_SUBDIR=	gnatcross/arm64-aarch64/${RELEASE}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	FreeBSD sysroots for C/Ada cross-compiler (${ARCH})
 
 NO_BUILD=	yes
 NO_MTREE=	yes
 
 PUB_FREEBSD=	ftp://ftp.freebsd.org/pub/FreeBSD
 PREFIX=		${LOCALBASE}/FreeBSD_ARM64
 
 ONLY_FOR_ARCHS=		i386 amd64	# avoid aarch64 x aarch64
 EXTRACT_AFTER_ARGS=	lib/ usr/include/ usr/lib/
 
 OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	RELEASE_11_0
 OPTIONS_DEFAULT=	RELEASE_11_0
 
 RELEASE_11_0_DESC=	FreeBSD 11.0 Release
 RELEASE_11_0_DISTFILES=	base.txz:R11
 RELEASE_11_0_VARS=	RELEASE=R11_0 CTARGET=aarch64-aux-freebsd11.0
 
 post-extract:
 	/bin/chflags -R noschg ${WRKDIR}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/sysroot
 	@${MV} ${WRKDIR}/lib ${STAGEDIR}${PREFIX}/sysroot
 	@${MV} ${WRKDIR}/usr ${STAGEDIR}${PREFIX}/sysroot
 	@echo ${CTARGET} > ${STAGEDIR}${PREFIX}/sysroot/target_triplet
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot -type d -empty -delete)
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot \( -type f -or -type l \) \
 		| ${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>
Index: head/lang/gnatdroid-binutils/Makefile
===================================================================
--- head/lang/gnatdroid-binutils/Makefile	(revision 434194)
+++ head/lang/gnatdroid-binutils/Makefile	(revision 434195)
@@ -1,49 +1,49 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	binutils
 PORTVERSION=	2.27
 CATEGORIES=	lang
 MASTER_SITES=	SOURCEWARE/binutils/releases
 PKGNAMEPREFIX?=	gnatdroid-
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	freebsd.contact@marino.st
 COMMENT?=	Infrastructure for C/Ada Android cross-compiler (ARMv7)
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${SYSROOT}>0:lang/${SYSROOT} \
 		${LOCALBASE}/lib/libgmp.so:math/gmp \
 		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 
 NO_LICENSES_INSTALL= yes
 
 WRKSRC=			${WRKDIR}/binutils-${PORTVERSION}
 PREFIX?=		${LOCALBASE}/android
 SRPREFIX?=		${PREFIX}
 BRANCH2?=		ARMv7
 BR2_PREFIX=		${PREFIX}/${BRANCH2}
 XCCTARGET?=		arm-aux-linux-androideabi
 SYSROOT?=		gnatdroid-sysroot
 PLIST_SUB+=		TARGET="${XCCTARGET}"
 PLIST_SUB+=		BRANCH2="${BRANCH2}"
 
 CONFIGURE_ARGS+=	--target=${XCCTARGET}
 CONFIGURE_ARGS+=	--prefix=${BR2_PREFIX}
 CONFIGURE_ARGS+=	--with-sysroot=${SRPREFIX}
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpfr=${LOCALBASE}
 CONFIGURE_ARGS+=	--disable-werror
 CONFIGURE_ARGS+=	--disable-nls
 
 post-install:
 #	Move the unwanted documentation out of the stage directory
 	${MV} ${STAGEDIR}${BR2_PREFIX}/share ${WRKDIR}
 
 .include <bsd.port.mk>
Index: head/lang/gnatdroid-binutils-x86/Makefile
===================================================================
--- head/lang/gnatdroid-binutils-x86/Makefile	(revision 434194)
+++ head/lang/gnatdroid-binutils-x86/Makefile	(revision 434195)
@@ -1,20 +1,20 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-x86
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Infrastructure for C/Ada Android cross-compiler (x86)
 
 BRANCH2=	x86_32
 XCCTARGET=	i686-aux-linux-android
 PREFIX=		${LOCALBASE}/android-x86
 SYSROOT=	gnatdroid-sysroot-x86
 MASTERDIR=	${.CURDIR}/../../lang/gnatdroid-binutils
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr
 
 PLIST_SUB=	AMD64=${ARCH:S/i386/"@comment "/:S/${ARCH}/""/}
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/gnatdroid-sysroot/Makefile
===================================================================
--- head/lang/gnatdroid-sysroot/Makefile	(revision 434194)
+++ head/lang/gnatdroid-sysroot/Makefile	(revision 434195)
@@ -1,68 +1,68 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sysroot
 PORTVERSION=	23
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/gnatdroid/
 PKGNAMEPREFIX=	gnatdroid-
 DISTNAME=	android-${API}-arm
 DIST_SUBDIR=	gnatdroid-ndk11
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Android sysroots for C/Ada Android cross-compiler
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		tar:bzip2
 NO_BUILD=	yes
 NO_MTREE=	yes
 
 WRKSRC=		${WRKDIR}/android-${API}-arm
 PREFIX=		${LOCALBASE}/android
 STAT_PATCH=	${FILESDIR}/extra-stat.h
 EXTRA_PATCHES=	${STAT_PATCH}
 
 OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	ICS JBEAN16 JBEAN17 JBEAN18 KITKAT LOLLIPOP MARSH
 OPTIONS_DEFAULT=	KITKAT
 
 ICS_DESC=	Android 4.0 - API level 15 - Ice Cream Sandwich 2
 JBEAN16_DESC=	Android 4.1 - API level 16 - Jelly Bean 1
 JBEAN17_DESC=	Android 4.2 - API level 17 - Jelly Bean 2
 JBEAN18_DESC=	Android 4.3 - API level 18 - Jelly Bean 3
 KITKAT_DESC=	Android 4.4 - API level 19 - Kitkat
 LOLLIPOP_DESC=	Android 5.0 - API level 21 - Lollipop
 MARSH_DESC=	Android 6.0 - API Level 23 - Marshmellow
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICS}
 API=	15
 .elif ${PORT_OPTIONS:MJBEAN16}
 API=	16
 .elif ${PORT_OPTIONS:MJBEAN17}
 API=	17
 .elif ${PORT_OPTIONS:MJBEAN18}
 API=	18
 .elif ${PORT_OPTIONS:MKITKAT}
 API=	19
 .elif ${PORT_OPTIONS:MLOLLIPOP}
 API=	21
 STAT_PATCH=	${FILESDIR}/extra-21-stat.h
 .elif ${PORT_OPTIONS:MMARSH}
 API=	23
 STAT_PATCH=	${FILESDIR}/extra-21-stat.h
 .else
 IGNORE=	the API option is improperly selected
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} usr ${STAGEDIR}${PREFIX})
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} usr \( -type f -or -type l \) | \
 		${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>
Index: head/lang/gnatdroid-sysroot-x86/Makefile
===================================================================
--- head/lang/gnatdroid-sysroot-x86/Makefile	(revision 434194)
+++ head/lang/gnatdroid-sysroot-x86/Makefile	(revision 434195)
@@ -1,56 +1,56 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sysroot
 PORTVERSION=	23
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/gnatdroid/
 PKGNAMEPREFIX=	gnatdroid-
 PKGNAMESUFFIX=	-x86
 DISTNAME=	android-${API}-x86
 DIST_SUBDIR=	gnatdroid-ndk11
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Android sysroots for C/Ada Android cross-compiler (x86)
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		tar:bzip2
 NO_BUILD=	yes
 NO_MTREE=	yes
 
 PREFIX=		${LOCALBASE}/android-x86
 STAT_PATCH=	${FILESDIR}/extra-stat.h
 EXTRA_PATCHES=	${STAT_PATCH}
 
 OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	KITKAT LOLLIPOP MARSH
 OPTIONS_DEFAULT=	KITKAT
 
 KITKAT_DESC=	Android 4.4 - API level 19 - Kitkat
 LOLLIPOP_DESC=	Android 5.0 - API level 21 - Lollipop
 MARSH_DESC=	Android 6.0 - API Level 23 - Marshmellow
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKITKAT}
 API=	19
 .elif ${PORT_OPTIONS:MLOLLIPOP}
 API=	21
 STAT_PATCH=	${FILESDIR}/extra-21-stat.h
 .elif ${PORT_OPTIONS:MMARSH}
 API=	23
 STAT_PATCH=	${FILESDIR}/extra-21-stat.h
 .else
 IGNORE=	the API option is improperly selected
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} usr ${STAGEDIR}${PREFIX})
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} usr \( -type f -or -type l \) | \
 		${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>
Index: head/lang/gnatdroid-x86/Makefile
===================================================================
--- head/lang/gnatdroid-x86/Makefile	(revision 434194)
+++ head/lang/gnatdroid-x86/Makefile	(revision 434195)
@@ -1,21 +1,21 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	x86
 PORTREVISION=	${X86_PR}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	C/Ada cross-compiler, target: Android x86
 
 DROID_TARGET=	i686-aux-linux-android
 CPUVERSION=	x86_32
 ARG_ARCH=	# don't specify
 ARG_FPU=	# don't specify
 ARG_FLOATSOFT=	# don't specify
 SRPREFIX=	${LOCALBASE}/android-x86
 SYSROOT=	gnatdroid-sysroot-x86
 GDBINUTILS=	gnatdroid-binutils-x86
 MASTERDIR=	${.CURDIR}/../../lang/gnatdroid-armv7
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/lua-ada/Makefile
===================================================================
--- head/lang/lua-ada/Makefile	(revision 434194)
+++ head/lang/lua-ada/Makefile	(revision 434195)
@@ -1,74 +1,74 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lua-ada
 PORTVERSION=	1.0			# made-up; no version info on GH
 PORTREVISION=	1
 CATEGORIES=	lang
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada binding for Lua
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada lua
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	ada-lua
 GH_TAGNAME=	e008192
 
 SUB_FILES=	lua.gpr
 SUB_LIST=	LUA_VER=${LUA_VER}
 
 PORTEXAMPLES=	example1 example2
 EXDIRPREFIX=	${WRKSRC}/examples/example
 REPLACEMENT=	"-L${LOCALBASE}/lib", "-Wl,-R,${LOCALBASE}/lib",\
 		"-llua-${LUA_VER}"
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|with "Lua"|with "../../lua.gpr"|' \
 		-e 's|"-L../..", "-llua"|${REPLACEMENT}|' \
 		${EXDIRPREFIX}1/example1.gpr \
 		${EXDIRPREFIX}2/example2.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		gprbuild -Plua --create-missing-dirs)
 .if ${PORT_OPTIONS:MEXAMPLES}
 	(cd ${WRKSRC}/examples/example1 && ${SETENV} ${MAKE_ENV} \
 		gprbuild -Pexample1 --create-missing-dirs)
 	(cd ${WRKSRC}/examples/example2 && ${SETENV} ${MAKE_ENV} \
 		gprbuild -Pexample2 --create-missing-dirs)
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/lua-ada \
 		${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/include/lua-ada
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/lua-ada
 	${INSTALL_DATA} ${WRKSRC}/lua.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/lua-ada
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example1/bin \
 		${STAGEDIR}${EXAMPLESDIR}/example2/bin
 	${INSTALL_DATA} ${EXDIRPREFIX}1/example1.lua \
 		${EXDIRPREFIX}1/src/main.adb \
 		${STAGEDIR}${EXAMPLESDIR}/example1
 	${INSTALL_PROGRAM} ${EXDIRPREFIX}1/obj/main \
 		${STAGEDIR}${EXAMPLESDIR}/example1/bin/hello-lua
 	${INSTALL_DATA} ${EXDIRPREFIX}2/example2.lua \
 		${EXDIRPREFIX}2/src/main.adb \
 		${STAGEDIR}${EXAMPLESDIR}/example2
 	${INSTALL_PROGRAM} ${EXDIRPREFIX}2/obj/main \
 		${STAGEDIR}${EXAMPLESDIR}/example2/bin/hello-function
 .endif
 
 .include <bsd.port.mk>
Index: head/math/opensolaris-libm/Makefile
===================================================================
--- head/math/opensolaris-libm/Makefile	(revision 434194)
+++ head/math/opensolaris-libm/Makefile	(revision 434195)
@@ -1,58 +1,58 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opensolaris-libm
 PORTVERSION=	2006.01.31
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	C99 Math and vector libraries from OpenSolaris snv_33
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/usr/src/OPENSOLARIS.LICENSE
 
 ONLY_FOR_ARCHS=	amd64	# i386 and sparc possible with much work
 PORTSCOUT=	ignore:1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 GH_TAGNAME=	2017.01.31
 
 BUILD_WRKSRC=	${WRKSRC}/usr/src/libm/wos64
 INSTALL_WRKSRC=	${WRKSRC}/usr/src/libm/wos64
 MAKEFILE=	Makefile.bsd
 MAKE_ENV=	ARCH=${ARCH} USE_ASSEMBLY_VERSIONS=yes
 
 # On FreeBSD 11+, libm will build on base clang.
 # On FreeBSD 10, the base clang (v3.4) cannot even build libm without emitting
 # Internal Compiler Errors, so GCC is required and does not appear as an
 # option.  Similarly, the GCC option does not appear on DragonFly as the
 # base compiler is already GCC.  Programs compiled with GCC that link to
 # these libraries require that the libraries are compiled with GCC for
 # proper functioning.
 
 OPTIONS_DEFINE=			GCC
 OPTIONS_EXCLUDE_FreeBSD_10=	GCC
 OPTIONS_EXCLUDE_DragonFly=	GCC
 
 GCC_USE=	GCC=yes
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 . if ${OSREL:R} < 11
 USE_GCC=	yes
 . endif
 
 RUN_DEPENDS=	${LOCALBASE}/bin/addr2line:devel/binutils
 
 post-patch:
 	# The addr2line program in FreeBSD is inadequate, so pull in
 	# binutils on FreeBSD
 	@${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|' \
 		${WRKSRC}/usr/src/libm/src/m9x/__traceback.c
 .endif
 
 .include <bsd.port.mk>
Index: head/math/plplot-ada/Makefile
===================================================================
--- head/math/plplot-ada/Makefile	(revision 434194)
+++ head/math/plplot-ada/Makefile	(revision 434195)
@@ -1,30 +1,30 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	plplot
 PORTVERSION=	${RELEASE}
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 PKGNAMESUFFIX=	-ada
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada bindings for PLplot
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libplplot.so:math/plplot
 
 USES=		ada
 
 DISTINFO_FILE=	${.CURDIR}/../plplot/distinfo
 RELEASE!=	awk '/SHA/ {split($$2,a,"."); print substr(a[1], 9) "." a[2] "." a[3];}' ${DISTINFO_FILE}
 BUILD_WRKSRC=	${WRKSRC}/bindings
 INSTALL_WRKSRC=	${WRKSRC}/bindings
 
 post-extract:
 	${CP} ${FILESDIR}/build_plplot.gpr ${FILESDIR}/Makefile \
 		${BUILD_WRKSRC}
 	${CAT} ${FILESDIR}/plplot.gpr.in | \
 		${SED} -e "s|@PREFIX@|${PREFIX}|g" > ${BUILD_WRKSRC}/plplot.gpr
 
 .include <bsd.port.mk>
Index: head/misc/excel-writer/Makefile
===================================================================
--- head/misc/excel-writer/Makefile	(revision 434194)
+++ head/misc/excel-writer/Makefile	(revision 434195)
@@ -1,68 +1,68 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	excel-writer
 PORTVERSION=	15
 PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	excel_writer_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada package for easily creating Excel files with basic formats
 
 LICENSE=	MIT
 
 USES=		ada zip dos2unix
 SFPATH=		excel-writer/files/excel-writer
 WRKSRC=		${WRKDIR}/Excel_Writer
 PORTDOCS=	excel_writer.txt
 PORTEXAMPLES=	example.gpr excel_out_demo.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${FILESDIR}/biff_dump.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src ${WRKDIR}/data
 	${MV} "${WRKSRC}/Big [BIFF4].xls" ${WRKDIR}/data/Big.xls
 	(cd ${WRKSRC}; ${MV} excel_out.ad[bs] ieee* extras/csv.* src)
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|Big.xls|${DATADIR}/Big.xls|" \
 		-e 's|\$$Dump\$$|_dump_|g' ${WRKSRC}/extras/biff_dump.adb
 	${REINPLACE_CMD} -e 's/"\(.*\.xls\)"/"\/tmp\/\1"/g' \
 		${WRKSRC}/excel_out_demo.adb
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pbiff_dump)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/excel_writer \
 		${STAGEDIR}${PREFIX}/include/excel_writer \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/excel_writer.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/excel_writer
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/excel_writer
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/biff_dump ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/data/Big.xls ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/excel_writer.txt ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/excel_out_demo.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/misc/ini_file_manager/Makefile
===================================================================
--- head/misc/ini_file_manager/Makefile	(revision 434194)
+++ head/misc/ini_file_manager/Makefile	(revision 434195)
@@ -1,55 +1,55 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ini_file_manager
 PORTVERSION=	03
 PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	ini-files-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ini configuration file reader and manipulator package for Ada
 
 LICENSE=	MIT
 
 USES=		ada zip dos2unix
 SFPATH=		ini-files/files/ini-files/ini-files-${PORTVERSION}
 WRKSRC=		${WRKDIR}
 PORTDOCS=	ini_file_manager.txt
 PORTEXAMPLES=	example.gpr test_config.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src
 	${MV} ${WRKSRC}/config.ad[bs] ${WRKSRC}/src
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${FILESDIR}/ini_file_manager.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ini_file_manager.txt ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test_config.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/net/adasockets/Makefile
===================================================================
--- head/net/adasockets/Makefile	(revision 434194)
+++ head/net/adasockets/Makefile	(revision 434195)
@@ -1,29 +1,29 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	adasockets
 PORTVERSION=	1.10.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rfc1149.net/download/adasockets/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	IPv4 socket library for Ada (TCP, UDP, and multicast)
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 USES=		ada gmake libtool
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-doc --disable-shared
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/adasockets \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${MV} ${STAGEDIR}${PREFIX}/lib/libadasockets.* \
 		${STAGEDIR}${PREFIX}/lib/adasockets/
 	${MV} ${STAGEDIR}${PREFIX}/lib/adasockets/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/adasockets/
 	${INSTALL_DATA} ${FILESDIR}/adasockets.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat/
 
 .include <bsd.port.mk>
Index: head/net/anet/Makefile
===================================================================
--- head/net/anet/Makefile	(revision 434194)
+++ head/net/anet/Makefile	(revision 434195)
@@ -1,57 +1,57 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	anet
 PORTVERSION=	0.3.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.codelabs.ch/download/
 DISTNAME=	libanet-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Networking library for Ada
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 USES=		ada tar:bzip2
 ALL_TARGET=	build_lib
 MAKE_ARGS+=	NUM_CPUS=${MAKE_JOBS_NUMBER} \
 		LIBRARY_KIND=static \
 		OS=bsd
 
 OPTIONS_DEFINE=	TEST DOCS
 TEST_DESC=		Run unit test suite before installation
 TEST_ALL_TARGET=	tests
 TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 DOCS_USES=		gmake
 DOCS_ALL_TARGET=	doc
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			source-highlight:textproc/source-highlight
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|dynamic|static|g' \
 		${WRKSRC}/gnat/anet.gpr
 	@${REINPLACE_CMD} -e 's|DESTDIR|DEST2|g' \
 		${WRKSRC}/doc/Makefile
 
 do-build:
 	${MKDIR} ${WRKSRC}/doc/html
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/anet \
 		${STAGEDIR}${PREFIX}/include/anet
 	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/bsd/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/anet
 	${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.ali \
 		${STAGEDIR}${PREFIX}/lib/anet
 	${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/gnat/anet.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/net/polyorb/Makefile
===================================================================
--- head/net/polyorb/Makefile	(revision 434194)
+++ head/net/polyorb/Makefile	(revision 434195)
@@ -1,74 +1,74 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	polyorb
 PORTVERSION=	2.11.1
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	polyorb-gpl-${YEAR}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	CORBA, SOAP, Ada 95 Distributed System Annex middleware
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	xmlada>=3.2:textproc/xmlada
 
 USES=		ada gmake python:build shebangfix
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 YEAR=		2014
 WRKSRC=		${WRKDIR}/polyorb-${YEAR}-src
 
 ALL_TARGET=	default
 MAKE_ENV=	PROCESSORS=${MAKE_JOBS_NUMBER}
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD} \
 		ac_cv_prog_CXXCPP="cpp -E" \
 		ac_cv_prog_SVN=false
 PORTDOCS=	html \
 		info/polyorb_ug.info \
 		pdf/polyorb_ug.pdf \
 		txt/polyorb_ug.txt
 SHEBANG_FILES=	compilers/idlac/*.py testsuite/*.py testsuite/tests/*.py
 
 CONFIGURE_ARGS=	--with-appli-perso="corba dsa moma" \
 		--with-proto-perso="giop soap srp" \
 		--with-corba-services="event ir naming notification time"
 
 # Polyorb 2011 = PCS version 4   GNAT GCC 4.6 = PCS version 4
 # Polyorb 2012 = PCS version 5   GNAT GCC 4.7 = PCS version 5
 # Polyorb 2013 = PCS version 6   GNAT GCC 4.9 = PCS version 6
 # Polyorb 2014 = PCS version 6   GNAT GCC 4.9 = PCS version 6
 
 OPTIONS_DEFINE=	DOCS TESTSUITE
 OPTIONS_SUB=	TESTSUITE
 
 TESTSUITE_ALL_TARGET=	testsuite
 TESTSUITE_BUILD_DEPENDS=gnatpython>=20101207:devel/gnatpython
 TESTSUITE_DESC=		Enable 'make run-testsuite' target
 
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
 	${MV} ${WRKSRC}/docs/polyorb_ug.html ${WRKSRC}/docs/ug.html
 .endif
 	@${REINPLACE_CMD} -e 's|bash|/bin/sh|' ${WRKSRC}/testsuite/testsuite.py
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}; \
 		${FIND} * -type d -empty -print | ${XARGS} ${RMDIR})
 
 .if ${PORT_OPTIONS:MTESTSUITE}
 # must be run after "make install"
 run-testsuite:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} run_tests)
 .endif
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/genpatch/Makefile
===================================================================
--- head/ports-mgmt/genpatch/Makefile	(revision 434194)
+++ head/ports-mgmt/genpatch/Makefile	(revision 434195)
@@ -1,49 +1,49 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	genpatch
 PORTVERSION=	1.40
 PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Single patch generator tool compatible with makepatch format
 
 LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 SUB_FILES=	genpatch portfix
 SUB_LIST=	WORKPATH=${PORTWORK}
 PLIST_FILES=	bin/dupe \
 		bin/genpatch \
 		bin/portfix \
 		man/man1/dupe.1.gz \
 		man/man1/genpatch.1.gz \
 		man/man1/portfix.1.gz
 
 .include <bsd.port.options.mk>
 
 .if defined(PACKAGE_BUILDING) # use known default values, poudriere overrides
 .  if defined(.MAKE.BUILT.BY) # DragonFly!
 PORTWORK=	/usr/obj/dports
 .  else
 PORTWORK=	/usr/ports
 .  endif
 .else
 .  if defined(WRKDIRPREFIX) && !empty(WRKDIRPREFIX)
 PORTWORK=	${WRKDIRPREFIX}
 .  else
 PORTWORK=	${PORTSDIR}
 .  endif
 .endif
 
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/dupe   ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/genpatch ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/portfix  ${STAGEDIR}${PREFIX}/bin
 	(cd ${FILESDIR} && ${INSTALL_MAN} dupe.1 genpatch.1 portfix.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 
 .include <bsd.port.mk>
Index: head/security/libadacrypt/Makefile
===================================================================
--- head/security/libadacrypt/Makefile	(revision 434194)
+++ head/security/libadacrypt/Makefile	(revision 434195)
@@ -1,37 +1,37 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libadacrypt
 PORTVERSION=	20151019
 PORTREVISION=	1
 CATEGORIES=	security
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Crypto library for Ada with a nice API
 
 LICENSE=	GMGPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		ada gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	cforler
 GH_PROJECT=	Ada-Crypto-Library
 GH_TAGNAME=	abc534f
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libadacrypt-|adacrypt-|' \
 		-e 's|-j4|-j${MAKE_JOBS_NUMBER}|' \
 		${WRKSRC}/libadacrypt.gpr
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/adacrypt \
 		${STAGEDIR}${PREFIX}/include/adacrypt
 	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/adacrypt
 	${INSTALL_DATA} ${WRKSRC}/lib/* \
 		${STAGEDIR}${PREFIX}/lib/adacrypt
 	${INSTALL_DATA} ${FILESDIR}/adacrypt.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/security/libsparkcrypto/Makefile
===================================================================
--- head/security/libsparkcrypto/Makefile	(revision 434194)
+++ head/security/libsparkcrypto/Makefile	(revision 434195)
@@ -1,39 +1,39 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libsparkcrypto
 PORTVERSION=	0.1.1
 PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://senier.net/libsparkcrypto/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Cryptographic library implemented in SPARK
 
 LICENSE=	BSD3CLAUSE
 
 USES=		ada dos2unix gmake tar:tgz
 DOS2UNIX_FILES=	Makefile build/libsparkcrypto.gpr \
 		src/shared/generic/lsc-byteswap64.ads \
 		src/shared/generic/lsc-types.ads
 SPARKARCH:=	${ARCH:S/amd64/x86_64/:S/i386/i686/}
 ALL_TARGET=	all build
 
 MAKE_ENV+=	SPARKARCH=${SPARKARCH} \
 		SPARK_DIR=${WRKSRC}/src/spark \
 		MODE=release \
 		RUNTIME=native \
 		NO_TESTS=true \
 		NO_PROOF=true
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_BUILD_DEPENDS=	adabrowse:textproc/adabrowse
 DOCS_MAKE_ENV_OFF=	NO_APIDOC=true
 
 post-patch:
 #	ports passed unwanted ARCH definition to Makefile
 	@${REINPLACE_CMD} -e 's|ARCH|SPARKARCH|g' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/shells/sparforte/Makefile
===================================================================
--- head/shells/sparforte/Makefile	(revision 434194)
+++ head/shells/sparforte/Makefile	(revision 434195)
@@ -1,160 +1,160 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sparforte
 PORTVERSION=	2.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	shells lang
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Shell and scripting language for mission-critical, scalable projects
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kburtch
 GH_PROJECT=	SparForte
 
 USES=		ada bdb:48 gettext-runtime gmake pkgconfig readline:port
 USE_SDL=	sdl image
 HAS_CONFIGURE=	yes
 MAKE_ARGS+=	RPM_BUILD_ROOT=1
 PORTDOCS=	*
 
 # Repurpose CXXFLAGS for gnatprep options
 CXXFLAGS:=	-DREADLINE=true \
 		-DBDB=true
 
 PREPFILES=	world.ads \
 		user_io-getline.adb \
 		scanner_res.ads \
 		scanner_res.adb \
 		parser.adb \
 		builtins.adb \
 		parser_db.adb \
 		parser_dbm.adb \
 		parser_mysql.adb \
 		parser_mysqlm.adb \
 		parser_sound.adb \
 		parser_pen.adb \
 		parser_gnat_cgi.adb \
 		parser_bdb.adb \
 		parser_btree_io.adb \
 		parser_hash_io.adb
 
 CONFIGURE_SCRIPT=	new_configure
 MAKE_JOBS_UNSAFE=	yes # adacgi seems to be unsafe
 
 OPTIONS_DEFINE=		CGI OPENGL SOUND DOCS EXAMPLES
 OPTIONS_GROUP=		Database
 OPTIONS_GROUP_Database=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL PGSQL OPENGL SOUND
 
 MYSQL_USES=		mysql
 MYSQL_CXXFLAGS=		-DMYSQL=true
 MYSQL_CXXFLAGS_OFF=	-DMYSQL=false
 
 PGSQL_USES=		pgsql ssl
 PGSQL_CXXFLAGS=		-DPOSTGRES=true
 PGSQL_CXXFLAGS_OFF=	-DPOSTGRES=false
 
 OPENGL_USE=		GL=gl,glu
 OPENGL_CXXFLAGS=	-DOPENGL=true
 OPENGL_CXXFLAGS_OFF=	-DOPENGL=false
 
 SOUND_LIB_DEPENDS=	libgstreamer-0.10.so:multimedia/gstreamer
 SOUND_USE=		GNOME=glib20,libxml2
 SOUND_CXXFLAGS=		-DSOUND=true
 SOUND_CXXFLAGS_OFF=	-DSOUND=false
 
 CGI_DESC=		Common Gateway Interface (breaks other features)
 CGI_CXXFLAGS=		-DGCGI=true
 CGI_CXXFLAGS_OFF=	-DGCGI=false
 
 # Currently Ada is only available for x86, so we can assume the following
 SF_ARCH=		${ARCH:S/amd64/athlon64/:S/x86_64/athlon64/}
 SF_CPU_FLAG=		-march
 SF_CFLAGSTYPE=		-DFREEBSD
 
 # shortcuts
 SF_SRC=			${WRKSRC}/src
 SCAL=			scanner-calendar
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}
 CXXFLAGS+=		-DAPQ=true
 SETAPQ=			1
 .else
 CXXFLAGS+=		-DAPQ=false
 SETAPQ=			0
 .endif
 SETMYSQL=	${"${PORT_OPTIONS:MMYSQL}" != "":?1:0}
 SETPGSQL=	${"${PORT_OPTIONS:MPGSQL}" != "":?1:0}
 SETSOUND=	${"${PORT_OPTIONS:MSOUND}" != "":?1:0}
 SETGL=		${"${PORT_OPTIONS:MOPENGL}" != "":?1:0}
 
 post-extract:
 	${CP} ${SF_SRC}/bush_freebsd.ads ${SF_SRC}/bush_os.ads
 	${CP} ${SF_SRC}/${SCAL}-latest.ads ${SF_SRC}/${SCAL}.ads
 	${CP} ${SF_SRC}/${SCAL}-latest.adb ${SF_SRC}/${SCAL}.adb
 .if ${SF_ARCH} == "athlon64"
 	${CP} ${SF_SRC}/bush_os-sdl-64bit.ads ${SF_SRC}/bush_os-sdl.ads
 .else
 	${CP} ${SF_SRC}/bush_os-sdl-32bit.ads ${SF_SRC}/bush_os-sdl.ads
 .endif
 	# Create a compact configure script for ports collection
 	${SED} -e "s|@CPU_FLAG@|${SF_CPU_FLAG}|" \
 		-e "s|@ARCH@|${SF_ARCH}|" \
 		-e "s|@MAKECMD@|${MAKE_CMD}|" \
 		-e "s|@CFLAGSTYPE@|${SF_CFLAGSTYPE}|" \
 		-e "s|@PREFIX@|${PREFIX}|" \
 		-e "s|@SETAPQ@|${SETAPQ}|" \
 		-e "s|@SETMYSQL@|${SETMYSQL}|" \
 		-e "s|@SETPGSQL@|${SETPGSQL}|" \
 		-e "s|@SETSOUND@|${SETSOUND}|" \
 		-e "s|@SETGL@|${SETGL}|" \
 		-e "s|@SED@|${SED}|" \
 		${FILESDIR}/new_configure.in > ${WRKSRC}/new_configure
 	${CHMOD} 755 ${WRKSRC}/new_configure
 
 post-patch:
 	# Use the gcc compiler associated with the ada frontend.
 	# Without this substitution, the base compiler is used instead.
 	${REINPLACE_CMD} -e "s|cc |gcc |" ${WRKSRC}/src/pegasock/Makefile
 	# Avoid use of malloc.h
 	${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|" \
 		${WRKSRC}/src/bdb/c_bdb.c
 	# Use db.h from db48 and link to it
 	# Fix multi-job support
 	${REINPLACE_CMD} -e "s|BDB4|BDB4 -I${PREFIX}/include/db48|" \
 		-e "s|-ldb|-L${PREFIX}/lib/db48 -ldb|" \
 		-e "s|db: db.adb|db: bdb_constants.ads db.adb|" \
 		-e "s| -fstack-protector||" \
 		${WRKSRC}/src/bdb/GNUmakefile
 	# fix areadline linkage
 	${REINPLACE_CMD} -e "s|gnatlink.*|gnatlink rl.ali -L${PREFIX}/lib -lreadline -lhistory|" \
 		${WRKSRC}/src/areadline/Makefile
 
 post-configure:
 .for f in ${PREPFILES}
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
 		gnatprep ${CXXFLAGS} ${f}.orig ${f})
 .endfor
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spar
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}	
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${MV} ${WRKSRC}/examples/incomplete ${WRKDIR}/
 	(cd ${WRKSRC}/examples && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/textproc/adabrowse/Makefile
===================================================================
--- head/textproc/adabrowse/Makefile	(revision 434194)
+++ head/textproc/adabrowse/Makefile	(revision 434195)
@@ -1,44 +1,44 @@
 # Created by: John Marino <draco@marino.st>
 # $FreeBSD$
 
 PORTNAME=	adabrowse
 PORTVERSION=	4.0.3
 PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://home.datacomm.ch/t_wolf/tw/ada95/adabrowse/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	HTML generator for Ada 95 library unit specifications
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	asis>=2011:lang/asis
 
 USES=		ada
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 PLIST_FILES=	bin/adabrowse
 PORTDOCS=	*.html *.css
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${CP} ${FILESDIR}/ad-* ${FILESDIR}/build.gpr ${WRKSRC}
 	${RM} ${WRKSRC}/sdefault.adb
 
 do-build:
 #	Since we only need one C object, just compile it manually rather
 #	than bring in GPRBuild as a dependency
 	${MKDIR} ${WRKSRC}/obj
 	(cd ${WRKSRC}/obj && ${SETENV} ${MAKE_ENV} ada -c -O2 ../util-nl.c)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/adabrowse ${STAGEDIR}${PREFIX}/bin/adabrowse
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.css \
 		${STAGEDIR}/${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/textproc/opentoken/Makefile
===================================================================
--- head/textproc/opentoken/Makefile	(revision 434194)
+++ head/textproc/opentoken/Makefile	(revision 434195)
@@ -1,44 +1,44 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opentoken
 PORTVERSION=	6.0b
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://stephe-leake.org/ada/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Lexical analyser and parser for the Ada language
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild>=20130416:devel/gprbuild
 
 USES=		ada tar:bzip2
 
 WRKSRC=		${WRKDIR}/org.${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/build/release
 OTLIBVER=	5.0.0
 PLIST_SUB+=	OTLIBVER=${OTLIBVER}
 
 do-build:
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		gprbuild -p -P opentoken_lib )
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/opentoken \
 		${STAGEDIR}${PREFIX}/include/opentoken
 	${INSTALL_DATA} ${BUILD_WRKSRC}/lib/*.ali \
 		${STAGEDIR}${PREFIX}/lib/opentoken
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/libopentoken.so.${OTLIBVER} \
 		${STAGEDIR}${PREFIX}/lib/opentoken
 	(cd ${STAGEDIR}${PREFIX}/lib/opentoken && \
 		${LN} -s libopentoken.so.${OTLIBVER} libopentoken.so)
 	${INSTALL_DATA} ${WRKSRC}/*.ad[bs] ${WRKSRC}/Language_Lexers/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/opentoken
 	${INSTALL_DATA} ${FILESDIR}/opentoken.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
Index: head/textproc/py-sphinxcontrib-adadomain/Makefile
===================================================================
--- head/textproc/py-sphinxcontrib-adadomain/Makefile	(revision 434194)
+++ head/textproc/py-sphinxcontrib-adadomain/Makefile	(revision 434195)
@@ -1,22 +1,22 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sphinxcontrib-adadomain
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	https://pypi.python.org/packages/source/s/${PORTNAME}/ \
 		LOCAL/marino
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Sphinx Adadomain Extension
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
Index: head/textproc/templates_parser/Makefile
===================================================================
--- head/textproc/templates_parser/Makefile	(revision 434194)
+++ head/textproc/templates_parser/Makefile	(revision 434195)
@@ -1,58 +1,58 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	templates_parser
 PORTVERSION=	17.0.0
 CATEGORIES=	textproc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Web page template engine module for the Ada Web Server
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		xmlada>=4.4:textproc/xmlada
 RUN_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 USES=		ada:run gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	templates-parser
 GH_TAGNAME=	1d62939
 
 DESTINC=	${STAGEDIR}${PREFIX}/include/templates_parser
 PLIST_SUB=	LIBVER=${PORTVERSION:R}
 MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		ENABLE_SHARED=true \
 		HOST=${CONFIGURE_TARGET} \
 		TARGET=${CONFIGURE_TARGET} \
 		VERSION=${PORTVERSION:R} \
 		prefix=${PREFIX}
 
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 do-build:
 	# Override build target to avoid -jX getting passed to makefile
 	# Parallel builds are handled with PROCESSORS setting
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} build
 
 do-build-DOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} html
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests
 	${MV} ${DESTINC}.relocatable/templates_parser-conf*.ads \
 		${DESTINC}.relocatable/templates_parser-configuration.ads
 	${MV} ${DESTINC}/templates_parser-conf*.ads \
 		${DESTINC}/templates_parser-configuration.ads
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${FILESDIR}/templates_parser.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/templates*
 
 .include <bsd.port.mk>
Index: head/textproc/xml_ez_out/Makefile
===================================================================
--- head/textproc/xml_ez_out/Makefile	(revision 434194)
+++ head/textproc/xml_ez_out/Makefile	(revision 434195)
@@ -1,56 +1,56 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xml_ez_out
 PORTVERSION=	1.06
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.mckae.com/xml_ezout/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Library for emitting XML from Ada programs
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 USES=		ada dos2unix tar:tgz
 WRKSRC=		${WRKDIR}/xml_ez_out
 BUILD_WRKSRC=	${WRKSRC}/mckae
 PORTDOCS=	README
 PORTEXAMPLES=	example.gpr tmeztf.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	${CP} ${FILESDIR}/xezo_bld.gpr ${WRKSRC}
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pxezo_bld)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/xml_ez_out \
 		${STAGEDIR}${PREFIX}/include/xml_ez_out
 	${INSTALL_DATA} ${FILESDIR}/xml_ez_out.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${BUILD_WRKSRC}/mckae* \
 		${STAGEDIR}${PREFIX}/include/xml_ez_out
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/xml_ez_out
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/tmeztf.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/xmlada/Makefile
===================================================================
--- head/textproc/xmlada/Makefile	(revision 434194)
+++ head/textproc/xmlada/Makefile	(revision 434195)
@@ -1,164 +1,164 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xmlada
 PORTVERSION=	17.0.0
 CATEGORIES=	textproc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Adacore XML suite for the Ada language
 
 LICENSE=	GPLv3
 
 USES=		ada:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	xmlada
 GH_TAGNAME=	1184d97
 
 MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		LIBVER=${PORTVERSION}
 ALL_TARGET=	schema/lib/static/libxmlada_schema.a \
 		schema/lib/relocatable/libxmlada_schema.so
 PLIST_SUB+=	LIBVER=${PORTVERSION}
 MAKEFILE=	Makefile.bsd
 PORTDOCS=	*
 DUNICODE=	${WRKSRC}/unicode/dummy_unicode.adb
 DINPSRC=	${WRKSRC}/input_sources/dummy_input_sources.adb
 DSAX=		${WRKSRC}/sax/dummy_sax.adb
 DDOM=		${WRKSRC}/dom/dummy_dom.adb
 DSCHEMA=	${WRKSRC}/schema/dummy_schema.adb
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_ALL_TARGET=	gen-docs
 
 FIND1=	cd ${WRKSRC}/unicode && ${FIND} -s * \( -name "unicode*.ad[bs]" \
 	-a ! -name "unicode.ads" \) -exec ${PRINTF} ', "%s"' {} \;
 FIND2=	cd ${WRKSRC}/input_sources && ${FIND} -s * \( -name "input*.ad[bs]" \
 	-a ! -name "input_sources.ads" \) -exec ${PRINTF} ', "%s"' {} \;
 FIND3=	cd ${WRKSRC}/sax && \
 	${FIND} -s * -name "sax-*.ad[bs]" -exec ${PRINTF} ', "%s"' {} \;
 FIND4=	cd ${WRKSRC}/dom && \
 	${FIND} -s * -name "dom-*.ad[bs]" -exec ${PRINTF} ', "%s"' {} \;
 FIND5=	cd ${WRKSRC}/schema && ${FIND} -s * \( -name "schema*.ad[bs]" \
 	-a ! -name "schema.ads" \) -depth 0 -maxdepth 0 \
 	-exec ${PRINTF} ', "%s"' {} \;
 
 post-patch: dummy-unicode dummy-input_sources dummy-sax dummy-dom dummy-schema
 	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}
 	@${MKDIR} ${WRKSRC}/sax/obj/relocatable
 	@${MKDIR} ${WRKSRC}/sax/obj/static
 	@${MKDIR} ${WRKSRC}/sax/lib/relocatable
 	@${MKDIR} ${WRKSRC}/sax/lib/static
 	@${MKDIR} ${WRKSRC}/schema/obj/relocatable
 	@${MKDIR} ${WRKSRC}/schema/obj/static
 	@${SED} -e '/^with/d' -e 's|@ZONE@|unicode|' \
 		-e "s|@FILES@|`${FIND1}`|" \
 		-e 's|@VERSION@|${PORTVERSION}|' ${FILESDIR}/generic_gpr.in \
 		> ${WRKSRC}/distrib/xmlada_unicode.gpr
 	@${SED} -e 's|@DEPENDS@|unicode|' -e 's|@ZONE@|input_sources|' \
 		-e "s|@FILES@|`${FIND2}`|" \
 		-e 's|@VERSION@|${PORTVERSION}|' ${FILESDIR}/generic_gpr.in \
 		> ${WRKSRC}/distrib/xmlada_input_sources.gpr
 	@${SED} -e 's|@DEPENDS@|input_sources|' -e 's|@ZONE@|sax|' \
 		-e "s|@FILES@|`${FIND3}`|" \
 		-e 's|@VERSION@|${PORTVERSION}|' ${FILESDIR}/generic_gpr.in \
 		> ${WRKSRC}/distrib/xmlada_sax.gpr
 	@${SED} -e 's|@DEPENDS@|sax|' -e 's|@ZONE@|dom|' \
 		-e "s|@FILES@|`${FIND4}`|" \
 		-e 's|@VERSION@|${PORTVERSION}|' ${FILESDIR}/generic_gpr.in \
 		> ${WRKSRC}/distrib/xmlada_dom.gpr
 	@${SED} -e 's|@DEPENDS@|dom|' -e 's|@ZONE@|schema|' \
 		-e "s|@FILES@|`${FIND5}`|" \
 		-e 's|@VERSION@|${PORTVERSION}|' ${FILESDIR}/generic_gpr.in \
 		> ${WRKSRC}/distrib/xmlada_schema.gpr
 	# Since we want to pull in all 5 libs, we only need to specify schema
 	${REINPLACE_CMD} -e '/unicode/d' ${WRKSRC}/distrib/xmlada.gpr
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/xmlada \
 		${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/xmlada/relocatable \
 		${STAGEDIR}${PREFIX}/lib/xmlada/static \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/dom/*.ad[bs] \
 		${WRKSRC}/input_sources/*.ad[bs] \
 		${WRKSRC}/sax/*.ad[bs] \
 		${WRKSRC}/schema/*.ad[bs] \
 		${WRKSRC}/unicode/*.ad[bs] \
 		${STAGEDIR}${PREFIX}/include/xmlada
 	${RM} ${STAGEDIR}${PREFIX}/include/xmlada/dummy_*.adb
 	${INSTALL_DATA} ${WRKSRC}/dom/obj/relocatable/*.ali \
 		${WRKSRC}/input_sources/obj/relocatable/*.ali \
 		${WRKSRC}/sax/obj/relocatable/*.ali \
 		${WRKSRC}/schema/obj/relocatable/*.ali \
 		${WRKSRC}/unicode/obj/relocatable/*.ali \
 		${WRKSRC}/dom/lib/relocatable/* \
 		${WRKSRC}/input_sources/lib/relocatable/* \
 		${WRKSRC}/sax/lib/relocatable/* \
 		${WRKSRC}/schema/lib/relocatable/* \
 		${WRKSRC}/unicode/lib/relocatable/* \
 		${STAGEDIR}${PREFIX}/lib/xmlada/relocatable
 	${INSTALL_DATA} ${WRKSRC}/dom/obj/static/*.ali \
 		${WRKSRC}/input_sources/obj/static/*.ali \
 		${WRKSRC}/sax/obj/static/*.ali \
 		${WRKSRC}/schema/obj/static/*.ali \
 		${WRKSRC}/unicode/obj/static/*.ali \
 		${WRKSRC}/dom/lib/static/* \
 		${WRKSRC}/input_sources/lib/static/* \
 		${WRKSRC}/sax/lib/static/* \
 		${WRKSRC}/schema/lib/static/* \
 		${WRKSRC}/unicode/lib/static/* \
 		${STAGEDIR}${PREFIX}/lib/xmlada/static
 	${INSTALL_DATA} ${WRKSRC}/distrib/xml*.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/docs/_build/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${RM} -r ${STAGEDIR}${DOCSDIR}/_sources \
 		${STAGEDIR}${DOCSDIR}/.buildinfo
 
 dummy-unicode:
 	@${GREP} ^package ${WRKSRC}/unicode/unicode-*.ads | \
 		${AWK} '{print "with " $$2 ";"}' | ${SORT} > ${DUNICODE}
 	@${ECHO} 'procedure dummy_unicode is' >> ${DUNICODE}
 	@${ECHO} 'begin' >> ${DUNICODE}
 	@${ECHO} '   null;' >> ${DUNICODE}
 	@${ECHO} 'end dummy_unicode;' >> ${DUNICODE}
 
 dummy-input_sources:
 	@${GREP} ^package ${WRKSRC}/input_sources/input_sources-*.ads | \
 		${AWK} '{print "with " $$2 ";"}' | ${SORT} > ${DINPSRC}
 	@${ECHO} 'procedure dummy_input_sources is' >> ${DINPSRC}
 	@${ECHO} 'begin' >> ${DINPSRC}
 	@${ECHO} '   null;' >> ${DINPSRC}
 	@${ECHO} 'end dummy_input_sources;' >> ${DINPSRC}
 
 dummy-sax:
 	@${GREP} ^package ${WRKSRC}/sax/sax-*.ads | \
 		${AWK} '{print "with " $$2 ";"}' | ${SORT} > ${DSAX}
 	@${ECHO} 'procedure dummy_sax is' >> ${DSAX}
 	@${ECHO} 'begin' >> ${DSAX}
 	@${ECHO} '   null;' >> ${DSAX}
 	@${ECHO} 'end dummy_sax;' >> ${DSAX}
 
 dummy-dom:
 	@${GREP} ^package ${WRKSRC}/dom/dom-*.ads | \
 		${AWK} '{print "with " $$2 ";"}' | ${SORT} > ${DDOM}
 	@${ECHO} 'procedure dummy_dom is' >> ${DDOM}
 	@${ECHO} 'begin' >> ${DDOM}
 	@${ECHO} '   null;' >> ${DDOM}
 	@${ECHO} 'end dummy_dom;' >> ${DDOM}
 
 dummy-schema:
 	@${GREP} ^package ${WRKSRC}/schema/schema-*.ads | \
 		${AWK} '{print "with " $$2 ";"}' | ${SORT} > ${DSCHEMA}
 	@${ECHO} 'procedure dummy_schema is' >> ${DSCHEMA}
 	@${ECHO} 'begin' >> ${DSCHEMA}
 	@${ECHO} '   null;' >> ${DSCHEMA}
 	@${ECHO} 'end dummy_schema;' >> ${DSCHEMA}
 
 .include <bsd.port.mk>
Index: head/www/aws/Makefile
===================================================================
--- head/www/aws/Makefile	(revision 434194)
+++ head/www/aws/Makefile	(revision 434195)
@@ -1,164 +1,164 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aws
 PORTVERSION=	17.1.0
 CATEGORIES=	www
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Adacore Ada Web Server and framework
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		xmlada>=4.4:textproc/xmlada \
 		asis>=2013:lang/asis \
 		gnatpython>=20101207:devel/gnatpython
 RUN_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 USES=		ada:run gmake python shebangfix tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_TAGNAME=	${PORTVERSION:R}
 GH_TUPLE=	AdaCore:templates-parser:${PORTVERSION:R}:tp/templates_parser
 
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 DOTBUILD=	release
 LINK_SSL=	--
 LINK_TLS=	--
 LINK_LDP=	--
 NAME_IP6=	--
 NAME_STD=	--
 BUILD_TYPE=	release
 ADDL_RPATH=	${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable
 SHEBANG_FILES=	tools/awsascb
 
 OPTIONS_SINGLE=		Secure-Socket-Layer
 OPTIONS_DEFINE=		IP6 DEBUG LDAP SHARED DOCS
 OPTIONS_DEFAULT=	SSL SHARED
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS
 
 SHARED_DESC=		Build shared libraries in addition to static ones
 IP6_DESC=		Support IPv6 instead of IPv4
 
 SSL_USES=		ssl
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 LDAP_USE=		OPENLDAP=yes
 
 CONF_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}
 CONF_ARGS+=	GCC=ada
 CONF_ARGS+=	PYTHON=python${PYTHON_VER}
 CONF_ARGS+=	XMLADA=true
 CONF_ARGS+=	PRJ_BUILD=${DOTBUILD}
 CONF_ARGS+=	prefix=${PREFIX}
 CONF_ARGS+=	ZPATH=/usr/lib
 CONF_ARGS+=	ZLIB=true
 CONF_ARGS+=	ASIS=true
 CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=static
 
 .include <bsd.port.options.mk>
 
 ###################
 ##  SSL Support  ##
 ###################
 
 .if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
 CONF_ARGS+=	LPATH=${OPENSSLLIB}
 LINK_SSL=
 .else	
 # it's not SSL so it must be GNUTLS
 CONF_ARGS+=	LPATH=${PREFIX}/lib
 CONF_ARGS+=	SOCKET=gnutls
 LINK_TLS=
 .endif
 
 ####################
 ##  LDAP Support  ##
 ####################
 
 .if ${PORT_OPTIONS:MLDAP}
 CONF_ARGS+=	LDAP=true
 LINK_LDP=
 .endif
 
 ####################
 ##  IPv6 Support  ##
 ####################
 
 .if ${PORT_OPTIONS:MIP6}
 CONF_ARGS+=	IPv6=true
 NAME_IP4=	--
 NAME_IP6=
 .endif
 
 #####################
 ##  Debug Support  ##
 #####################
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONF_ARGS+=	DEBUG=true
 BUILD_TYPE=	debug
 .endif
 
 ##############################
 ##  Shared Runtime Library  ##
 ##############################
 
 .if ${PORT_OPTIONS:MSHARED}
 CONF_ARGS+=	ENABLE_SHARED=true
 .else
 CONF_ARGS+=	ENABLE_SHARED=false
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \
 	    -e 's|@PREFIX@|${LOCALBASE}|g' \
 		${WRKSRC}/aws.gpr \
 		${WRKSRC}/src/src.gpr \
 		${WRKSRC}/include/include.gpr
 	@${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${MAKE_CMD} setup ${CONF_ARGS})
 
 do-build:
 #	We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set
 #	for PROCESSORS, but that also sets -j for gmake which breaks build
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} build
 
 do-build-DOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} html
 
 test:
 .if exists(${LOCALBASE}/bin/awsres)
 	@cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} TIMEOUT=75 \
 		python${PYTHON_VER} testsuite.py
 .else
 	@${ECHO} "AWS has to be installed before testing"
 .endif
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests
 	${RM} ${STAGEDIR}${PREFIX}/include/aws.relocatable/Makefile
 	${RM} ${STAGEDIR}${PREFIX}/include/aws/Makefile
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 	${CAT} ${FILESDIR}/aws.gpr.in | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
 		-e 's|@SSL@|${LINK_SSL}|g' -e 's|@TLS@|${LINK_TLS}|g' \
 		-e 's|@LDP@|${LINK_LDP}|g' -e 's|@IP4@|${NAME_IP4}|g' \
 		-e 's|@IP6@|${NAME_IP6}|g' -e 's|@STD@|${NAME_STD}|g' \
 		> ${STAGEDIR}${PREFIX}/lib/gnat/aws.gpr
 	cd ${WRKSRC}/gps && ${INSTALL_DATA} *.xml aws.py \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 
 .include <bsd.port.mk>
Index: head/www/aws-demos/Makefile
===================================================================
--- head/www/aws-demos/Makefile	(revision 434194)
+++ head/www/aws-demos/Makefile	(revision 434195)
@@ -1,160 +1,160 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aws
 PORTVERSION=	17.1.0
 CATEGORIES=	www
 PKGNAMESUFFIX=	-demos
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Adacore Ada Web Server demos
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		xmlada>=4.4:textproc/xmlada \
 		aws>=3.1:www/aws
 
 USES=		ada gmake python
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_TAGNAME=	${PORTVERSION:R}
 GH_TUPLE=	AdaCore:templates-parser:${PORTVERSION:R}:tp/templates_parser
 
 DISTINFO_FILE=	${PORTSDIR}/www/aws/distinfo
 
 CONF_ARGS=	PROCESSORS=1
 CONF_ARGS+=	GCC=ada
 CONF_ARGS+=	prefix=${PREFIX}
 
 OPTIONS_DEFINE=		SSL LDAP
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=		yes
 
 SSL_USES=		ssl
 
 DEMO_DIRS+=	auth
 DEMO_DIRS+=	autobahn
 DEMO_DIRS+=	cert
 DEMO_DIRS+=	com
 DEMO_DIRS+=	dispatch
 DEMO_DIRS+=	gSOAP
 DEMO_DIRS+=	dowload_manager
 DEMO_DIRS+=	hello_world
 DEMO_DIRS+=	hello_wsdl
 DEMO_DIRS+=	hotplug
 DEMO_DIRS+=	interoplab
 DEMO_DIRS+=	jabber_demo
 DEMO_DIRS+=	multiple_sessions
 DEMO_DIRS+=	res_demo
 DEMO_DIRS+=	soap_demo
 DEMO_DIRS+=	soap_disp
 DEMO_DIRS+=	soap_vs
 DEMO_DIRS+=	split
 DEMO_DIRS+=	test_mail
 DEMO_DIRS+=	text_input
 DEMO_DIRS+=	upload
 DEMO_DIRS+=	vh_demo
 DEMO_DIRS+=	web_block
 DEMO_DIRS+=	web_block_ajax
 DEMO_DIRS+=	web_block_ajax_templates
 DEMO_DIRS+=	web_elements
 DEMO_DIRS+=	web_mail
 DEMO_DIRS+=	websockets
 DEMO_DIRS+=	wps
 DEMO_DIRS+=	ws
 DEMO_DIRS+=	ws_candy
 DEMO_DIRS+=	zdemo
 
 PROGS=		multiple_sessions/multiple_sessions \
 		jabber_demo/jabber_demo \
 		auth/auth \
 		text_input/text_input \
 		web_block/web_block \
 		web_mail/web_mail \
 		websockets/websock \
 		wps/wps \
 		interoplab/interoplab_main \
 		soap_demo/soap_server \
 		soap_demo/soap_client \
 		web_block_ajax/web_block_ajax \
 		web_elements/web_elements_program \
 		cert/cert \
 		com/com_2 \
 		com/com_1 \
 		dowload_manager/download_manager \
 		hello_world/hello_world \
 		hello_wsdl/wsdl_demo_client \
 		hello_wsdl/wsdl_demo_server \
 		hotplug/main \
 		hotplug/hotplug \
 		res_demo/res_demo \
 		soap_vs/soap_svs \
 		soap_vs/soap_cvs \
 		test_mail/test_mail \
 		upload/upload \
 		vh_demo/vh_demo \
 		ws/ws \
 		ws_candy/candy \
 		split/split \
 		dispatch/dispatch \
 		zdemo/zdemo \
 		soap_disp/soap_server_disp \
 		soap_disp/soap_client
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
 DEMO_DIRS+=	agent
 DEMO_DIRS+=	https
 DEMO_DIRS+=	runme
 PROGS+=		agent/agent \
 		https/https \
 		runme/runme
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 CONF_ARGS+=	LDAP=true
 DEMO_DIRS+=	test_ldap
 PROGS+=		test_ldap/test_ldap
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \
 		${WRKSRC}/demos/test_ldap/test_ldap.gpr
 	@${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile
 .for dd in ${DEMO_DIRS}
 	@${REINPLACE_CMD} -i '' -e 's|gprclean|gprclean -c|' \
 		${WRKSRC}/demos/${dd}/Makefile
 .endfor
 
 do-configure:
 	${MKDIR} ${WRKSRC}/.build/native/debug/static/obj
 	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${MAKE_CMD} setup ${CONF_ARGS})
 
 do-build:
 .for dd in ${DEMO_DIRS}
 	@${ECHO_MSG} "=== BUILD ${dd} ==="
 	(cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 	(cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} clean && ${RM} -r Makefile *.ad[bs] *.gpr src)
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/demos
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} web_elements \
 		${STAGEDIR}${EXAMPLESDIR})
 .for dd in ${DEMO_DIRS:Nautobahn}
 	(cd ${WRKSRC}/demos && ${COPYTREE_SHARE} ${dd} \
 		${STAGEDIR}${EXAMPLESDIR}/demos)
 .endfor
 .for prog in ${PROGS}
 	@${CHMOD} 755 ${STAGEDIR}${EXAMPLESDIR}/demos/${prog}
 	@${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/demos/${prog}
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/demos/${prog}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/gtkada/Makefile
===================================================================
--- head/x11-toolkits/gtkada/Makefile	(revision 434194)
+++ head/x11-toolkits/gtkada/Makefile	(revision 434195)
@@ -1,71 +1,71 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gtkada
 PORTVERSION=	2.24.4.0
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		gtkada-rm-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada graphical toolkit based on Gtk2+
 
 LICENSE=	GPLv2
 
 USES=		ada gmake perl5 pkgconfig tar:bzip2
 USE_PERL5=	build
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 ALL_TARGET=	src
 NO_MTREE=	yes
 PORTDOCS=	gtkada_rm gtkada_ug
 PORTEXAMPLES=	*
 
 MAKE_ENV+=	PROCESSORS=${MAKE_JOBS_NUMBER}
 
 CONFLICTS_INSTALL=	gtkada3-*
 
 PORTSCOUT=		ignore:1
 
 OPTIONS_DEFINE=		DOCS NLS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--enable-nls
 USES+=			gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+= docs
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 ALL_TARGET+= tests
 .endif
 
 post-patch:
 	# fix for gcc-5
 	@${REINPLACE_CMD} -e 's|inline gint roundint|gint roundint|' \
 		${WRKSRC}/src/gtkextra/gtkplot*
 
 do-build:
 #	This target is recreated because -j cannot be set, but
 #	MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
 	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/gtkada3/Makefile
===================================================================
--- head/x11-toolkits/gtkada3/Makefile	(revision 434194)
+++ head/x11-toolkits/gtkada3/Makefile	(revision 434195)
@@ -1,74 +1,74 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gtkada
 PORTVERSION=	3.14.2
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	3
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.contact@marino.st
 COMMENT=	Ada graphical toolkit based on Gtk3 components
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libdrm.so:graphics/libdrm \
 		libglapi.so:graphics/libglapi \
 		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libepoxy.so:graphics/libepoxy \
 		libpng16.so:graphics/png \
 		libffi.so:devel/libffi \
 		libpcre.so:devel/pcre \
 		libexpat.so:textproc/expat2 \
 		libatspi.so:accessibility/at-spi2-core \
 		libgraphite2.so:graphics/graphite2 \
 		libdbus-1.so:devel/dbus
 
 USES=		ada:run gmake iconv:wchar_t perl5 pkgconfig
 USE_PERL5=	build
 USE_GNOME=	gtk30 cairo gdkpixbuf2
 USE_XORG=	ice sm xxf86vm xcb xdmcp xau x11 pixman xfixes xdamage \
 		xcomposite xi xext xcursor xrandr xinerama xrender
 USE_GL=		gl egl gbm glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	gtkada
 GH_TAGNAME=	1688bb8
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	tools static relocatable
 PORTDOCS=	gtkada_ug
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}
 
 CONFLICTS_INSTALL=	gtkada-*
 
 CONFIGURE_ARGS+=	--with-GL=auto \
 			--with-GL-prefix=${PREFIX} \
 			--enable-shared \
 			--enable-static
 
 OPTIONS_DEFINE=		DOCS NLS DEBUG
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_ALL_TARGET=	docs
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 DEBUG_CONFIGURE_ON=	--enable-build=Debug
 DEBUG_CONFIGURE_OFF=	--enable-build=Production
 
 do-build:
 #	This target is recreated because -j cannot be set, but
 #	MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gtkada-dialog
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
 
 .include <bsd.port.mk>