Replace John Marino email address with FreeBSD version

While I'm here, also trim the headers on a couple of ports and remove
a reference to the Dragonlace mirror which is down indefinitely.

Approved by:	bapt (mentor)

16 files changed, 32 insertions, 45 deletions

diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index 6f133eb79378..fd5b0e4d964b 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -2,7 +2,7 @@
 #
 # Establish Ada-capable compiler as a build dependency
 #
-# MAINTAINER: draco@marino.st
+# MAINTAINER: marino@FreeBSD.org
 #
 # Feature:      ada
 # Usage:        USES=ada
diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile
index 30e49258a780..36ea928e76d1 100644
--- a/devel/gnatpython/Makefile
+++ b/devel/gnatpython/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for:  gnatpython
-# Date created:                       12 December 2010
-# Whom:                               John Marino <draco@marino.st>
-#
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gnatpython
 PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	devel
-MASTER_SITES=	http://downloads.dragonlace.net/src/ \
-		http://dragonlace.mirrors.ada.cx/src/
+MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Python package used in Ada testsuites
 
 SNAPSHOT=	20110912
diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index 5bb3051e8984..185a8be9bdfd 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gprbuild
@@ -8,7 +8,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gprbuild-gpl-2012-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Adacore multi-language software build tool
 
 LICENSE=	GPLv3
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 93eee3ff15d1..de94d6b89aa3 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gps
@@ -8,7 +8,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gps-5.2.1-1-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	GNAT Programming Studio - IDE for Ada and many other languages
 
 BUILD_DEPENDS=	gtkada>=2.24:${PORTSDIR}/x11-toolkits/gtkada \
diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile
index abfcab60230c..36ae2ab7e006 100644
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	matreshka
@@ -6,7 +6,7 @@ PORTVERSION=	0.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ada-ru.org/matreshka/downloads/
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada framework for information systems development
 
 LICENSE=	BSD
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 1b45d31d2685..78a9aca085e2 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st> 
+# Created by: John Marino <marino@FreeBSD.org> 
 # $FreeBSD$
 
 PORTNAME=	gcc-aux
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
 DISTFILES=	gcc-${GCC_VERSION}.tar.bz2
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Version of GCC ${GCC_BRANCH} with full Ada support
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/lang/gnat-aux/Makefile b/lang/gnat-aux/Makefile
index 978fddb4d5c9..80136a37356a 100644
--- a/lang/gnat-aux/Makefile
+++ b/lang/gnat-aux/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnat-aux
@@ -9,7 +9,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
 DISTFILES=	gcc-core-${GCC_VERSION}.tar.bz2
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	GNAT Ada compiler based on GCC ${GCC_BRANCH}
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/lang/gnatdroid-armv5/Makefile b/lang/gnatdroid-armv5/Makefile
index 0239fadf16ed..87b22c34127a 100644
--- a/lang/gnatdroid-armv5/Makefile
+++ b/lang/gnatdroid-armv5/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	armv5
@@ -12,7 +12,7 @@ DISTFILES=	gcc-core-${GCC_VERSION}.tar.bz2 \
 		gcc-ada-${GCC_VERSION}.tar.bz2 \
 		gcc-testsuite-${GCC_VERSION}.tar.bz2
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	C/Ada cross-compiler, target: Android ARMv5
 
 BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index add56839fdae..8fc4db2bf6da 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	armv7
@@ -12,7 +12,7 @@ DISTFILES=	gcc-core-${GCC_VERSION}.tar.bz2 \
 		gcc-ada-${GCC_VERSION}.tar.bz2 \
 		gcc-testsuite-${GCC_VERSION}.tar.bz2
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	C/Ada cross-compiler, target: Android ARMv7
 
 BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 7aa9f0c7b7ef..e129d02e7371 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnatdroid-binutils
-# Date created:				2011-07-20
-# Whom:					John Marino <draco@marino>
-#
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=		binutils
 PORTVERSION=		2.21.1
@@ -12,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=		gnatdroid-
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Infrastructure for C/Ada Android cross-compiler
 
 BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
diff --git a/lang/gnatdroid-sysroot/Makefile b/lang/gnatdroid-sysroot/Makefile
index a58db5ff9450..5c6056db9fee 100644
--- a/lang/gnatdroid-sysroot/Makefile
+++ b/lang/gnatdroid-sysroot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnatdroid-sysroot
-# Date created:				2011-07-20
-# Whom:					John Marino <draco@marino>
-#
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sysroot
 PORTVERSION=	9
@@ -13,7 +9,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 PKGNAMEPREFIX=	gnatdroid-
 DISTNAME=	android-9-arm
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Android-9 sysroot for C/Ada Android cross-compiler
 
 USE_BZIP2=	YES
diff --git a/security/libsparkcrypto/Makefile b/security/libsparkcrypto/Makefile
index 50742a6e9680..552122baab10 100644
--- a/security/libsparkcrypto/Makefile
+++ b/security/libsparkcrypto/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libsparkcrypto
@@ -7,7 +7,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://senier.net/libsparkcrypto/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Cryptographic library implemented in SPARK
 
 LICENSE=	BSD
diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 1e057244b0ae..3a4aa1bd7e10 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xmlada
@@ -6,7 +6,7 @@ PORTVERSION=	4.4.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Adacore XML suite for the Ada language
 
 LICENSE=	GPLv2
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 6976b5d286a7..f28f12c2e8e7 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aws
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	-demos
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Adacore Ada Web Server demos
 
 BUILD_DEPENDS+=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 660b41711b0d..dcec3916f31b 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aws
@@ -6,7 +6,7 @@ PORTVERSION=	3.1.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Adacore Ada Web Server and framework
 
 BUILD_DEPENDS=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 02ef05f92708..c1d44ebf9173 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -1,4 +1,4 @@
-# Created by: John Marino <draco@marino.st>
+# Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gtkada
@@ -8,7 +8,7 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		gtkada-rm-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	draco@marino.st
+MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada graphical toolkit based on Gtk2+
 
 LICENSE=	GPLv2