84 files changed, 79 insertions, 95 deletions

diff --git a/devel/configkit/Makefile b/devel/configkit/Makefile
index a6617f881777..db290cc3985e 100644
--- a/devel/configkit/Makefile
+++ b/devel/configkit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=mat
 DISTNAME=	ConfigKit.${PORTVERSION:C/0.4.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A somewhat prototypical facility for generating CLI interfaces
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libphk.a:${PORTSDIR}/devel/libphk
diff --git a/devel/libphk/Makefile b/devel/libphk/Makefile
index e0a5808159aa..eee0315d0ce4 100644
--- a/devel/libphk/Makefile
+++ b/devel/libphk/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=mat
 DISTNAME=	Libphk.${PORTVERSION:C/0.3.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PHK's utilities functions
 
 WRKSRC=		${WRKDIR}/Libphk
diff --git a/devel/p5-Alzabo-GUI-Mason/Makefile b/devel/p5-Alzabo-GUI-Mason/Makefile
index a321f193412c..066c1c9dd91d 100644
--- a/devel/p5-Alzabo-GUI-Mason/Makefile
+++ b/devel/p5-Alzabo-GUI-Mason/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A GUI for Alzabo using Mason
 
 BUILD_DEPENDS=	${SITE_PERL}/Alzabo.pm:${PORTSDIR}/devel/p5-Alzabo \
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index b66504594154..2cf673db7587 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A data modelling tool and RDBMS-OO mapper
 
 BUILD_DEPENDS=	${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
diff --git a/devel/p5-Attribute-Handlers-Prospective/Makefile b/devel/p5-Attribute-Handlers-Prospective/Makefile
index 1a3bb1e8525a..dddbbe464abc 100644
--- a/devel/p5-Attribute-Handlers-Prospective/Makefile
+++ b/devel/p5-Attribute-Handlers-Prospective/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		devel perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
-MAINTAINER=		mat@FreeBSD.org
+MAINTAINER=		perl@FreeBSD.org
 COMMENT=		Richer semantics for attribute handlers
 
 BUILD_DEPENDS=		${SITE_PERL}/Filter/Simple.pm:${PORTSDIR}/textproc/p5-Filter-Simple \
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index ab2567bd7fc8..4051f3d0f154 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		devel perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
-MAINTAINER=		mat@FreeBSD.org
+MAINTAINER=		perl@FreeBSD.org
 COMMENT=		Attribute::Persistent - Really lazy persistence
 
 BUILD_DEPENDS=		${SITE_PERL}/Attribute/Handlers/Prospective.pm:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective \
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index ee82e5329e48..9c167e3b1d94 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to B::Deparse for use in de-obfuscating source code
 
 RUN_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
diff --git a/devel/p5-B-Keywords/Makefile b/devel/p5-B-Keywords/Makefile
index 3ba30499b1ed..3b3b66f05df8 100644
--- a/devel/p5-B-Keywords/Makefile
+++ b/devel/p5-B-Keywords/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lists of reserved barewords and symbol names
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Class-Accessor-Chained/Makefile b/devel/p5-Class-Accessor-Chained/Makefile
index c09b6cc4fc6f..0abbe866d107 100644
--- a/devel/p5-Class-Accessor-Chained/Makefile
+++ b/devel/p5-Class-Accessor-Chained/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make chained accessors
 
 RUN_DEPENDS=	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index 36e58a88a86e..4a540dbc2335 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Higher level wrapper around Alzabo Row and Table objects
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
diff --git a/devel/p5-Class-ObjectTemplate-DB/Makefile b/devel/p5-Class-ObjectTemplate-DB/Makefile
index b6cc397b4412..ffba5af0251f 100644
--- a/devel/p5-Class-ObjectTemplate-DB/Makefile
+++ b/devel/p5-Class-ObjectTemplate-DB/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An optimized template builder base class with lookup capability
 
 RUN_DEPENDS=	${SITE_PERL}/Class/ObjectTemplate.pm:${PORTSDIR}/devel/p5-Class-ObjectTemplate
diff --git a/devel/p5-Class-ObjectTemplate-DB/pkg-descr b/devel/p5-Class-ObjectTemplate-DB/pkg-descr
index f9a1b27d6352..89c5308481f0 100644
--- a/devel/p5-Class-ObjectTemplate-DB/pkg-descr
+++ b/devel/p5-Class-ObjectTemplate-DB/pkg-descr
@@ -8,6 +8,3 @@ Later if data is accessed and it is not currently present in the object,
 it can be retrieved on an as-need basis.
 
 WWW: http://search.cpan.org/dist/Class-ObjectTemplate-DB/
-
---
-Tony Maher <tonym@biolateral.com.au>
diff --git a/devel/p5-Class-ObjectTemplate/Makefile b/devel/p5-Class-ObjectTemplate/Makefile
index f6f7b230a4ed..e8a29eb887f4 100644
--- a/devel/p5-Class-ObjectTemplate/Makefile
+++ b/devel/p5-Class-ObjectTemplate/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An optimized template builder base class
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Class-ObjectTemplate/pkg-descr b/devel/p5-Class-ObjectTemplate/pkg-descr
index f73367ccce95..1ca5e981c9d3 100644
--- a/devel/p5-Class-ObjectTemplate/pkg-descr
+++ b/devel/p5-Class-ObjectTemplate/pkg-descr
@@ -3,6 +3,3 @@ of other Object Oriented Perl classes.  It was described in detail in
 the O'Reilly book, "Advanced Perl Programming" by Sriram Srinivasam.
 
 WWW: http://search.cpan.org/dist/Class-ObjectTemplate/
-
---
-Tony Maher <tonym@biolateral.com.au>
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 0bc64b120cfd..b0dbe1650253 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Stream a highly accurate breadth first data dump in Perl code
 
 BUILD_DEPENDS=	${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
diff --git a/devel/p5-Data-Dump/Makefile b/devel/p5-Data-Dump/Makefile
index 677e93130b35..f05192c3f01d 100644
--- a/devel/p5-Data-Dump/Makefile
+++ b/devel/p5-Data-Dump/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pretty printing of data structures
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 6443b3130f11..7baf9df7c696 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Stringified perl data structures, suitable for both printing and eval
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Date-ICal/Makefile b/devel/p5-Date-ICal/Makefile
index e30ce30aa59c..07205f22021c 100644
--- a/devel/p5-Date-ICal/Makefile
+++ b/devel/p5-Date-ICal/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ICalendar date objects
 
 BUILD_DEPENDS=	${SITE_PERL}/Date/Leapyear.pm:${PORTSDIR}/devel/p5-Date-Leapyear
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index 98b1bfde87c1..2f75fb029bd3 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Christian calendar
 
 BUILD_DEPENDS=	${SITE_PERL}/DateTime/Calendar/Julian.pm:${PORTSDIR}/devel/p5-DateTime-Calendar-Julian
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index 6787b12f7239..2eabb660ffe0 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the French Revolutionary Calendar
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index 416c933c948c..4173508ffcf3 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Hebrew calendar
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index 8b53cff9eb8a..c4ffe7843cd6 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Julian calendar
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Calendar-Mayan/Makefile b/devel/p5-DateTime-Calendar-Mayan/Makefile
index fdf1e4fa0662..40924c655548 100644
--- a/devel/p5-DateTime-Calendar-Mayan/Makefile
+++ b/devel/p5-DateTime-Calendar-Mayan/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The Mayan Long Count, Haab, and Tzolkin calendars
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 6d04592f30e3..86f053a780b0 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the pataphysical calendar
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index 92f491f77214..fc084cb9c677 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for generating recurrence sets from crontab
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 243f0584600a..06b996137fa0 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Returns Easter events for DateTime objects
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index 92a652dee148..e2d0211731a1 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl DateTime extension for computing rfc2445 recurrences
 
 BUILD_DEPENDS=	${SITE_PERL}/DateTime/Event/Recurrence.pm:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence \
diff --git a/devel/p5-DateTime-Event-NameDay/Makefile b/devel/p5-DateTime-Event-NameDay/Makefile
index dfbdca2f507f..c74d0493f9e6 100644
--- a/devel/p5-DateTime-Event-NameDay/Makefile
+++ b/devel/p5-DateTime-Event-NameDay/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl DateTime extension to work with namedays from various countries
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index f32aaf94aeda..c90431688fed 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for creating random datetimes
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index 169b09749c47..ba91e3d1a02d 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl DateTime extension for computing basic recurrences
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index 2f7c53d24ffa..d30300552dd7 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime Objects for sunrise and sunset for a given day
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index 0278f9d824ce..e3afc31fb977 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate the day or week of the Fiscal Year with an arbitrary start date
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index 05016e1a8ab0..9638c71af39d 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format baby-style time
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
diff --git a/devel/p5-DateTime-Format-Bork/Makefile b/devel/p5-DateTime-Format-Bork/Makefile
index 5f47d5719f19..458071342fbf 100644
--- a/devel/p5-DateTime-Format-Bork/Makefile
+++ b/devel/p5-DateTime-Format-Bork/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Formats datetimes for that guy from The Muppet Show
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 416b4d030c89..3465f6dbf27c 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create DateTime parser classes and objects
 
 RUN_DEPENDS=	p5-Class-Factory-Util>=1.6:${PORTSDIR}/devel/p5-Class-Factory-Util \
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index 9748ac303b84..2c3a79590f79 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Find a parser class for a database connection
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Format-DateManip/Makefile b/devel/p5-DateTime-Format-DateManip/Makefile
index 3eb681c7335c..8240e3125184 100644
--- a/devel/p5-DateTime-Format-DateManip/Makefile
+++ b/devel/p5-DateTime-Format-DateManip/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert Date::Manip dates and durations to DateTimes and vice versa
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index f91c69599f6b..97b87bfcb761 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format and parse DateTime::Durations
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index 68f272d0792c..68889497ce00 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert DateTimes to/from epoch seconds
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 7ce5d5874320..dade99b55890 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and Excel dates
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index 65a886130ca6..a82aaa33c05f 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTTP date conversion routines
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index 7febf6c2d025..21539f3dae67 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format times in .beat notation
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Format-ICal/Makefile b/devel/p5-DateTime-Format-ICal/Makefile
index 8ec94873d0da..a0351e0b55a6 100644
--- a/devel/p5-DateTime-Format-ICal/Makefile
+++ b/devel/p5-DateTime-Format-ICal/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format ICal datetime and duration strings
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 64b002d37f1d..e49ef869cf13 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse ISO8601 formats
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-Mail/Makefile b/devel/p5-DateTime-Format-Mail/Makefile
index 0f34a96367b5..171469ff8d13 100644
--- a/devel/p5-DateTime-Format-Mail/Makefile
+++ b/devel/p5-DateTime-Format-Mail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and RFC2822/822 formats
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index e11cb341b84a..f37cc18f0778 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format MySQL dates and times
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index 9af1a77ad2f0..81838d6f053e 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(...)$/\1/}
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format PostgreSQL dates and times
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Format-Roman/Makefile b/devel/p5-DateTime-Format-Roman/Makefile
index 336f4f70b6dc..ce23962e796d 100644
--- a/devel/p5-DateTime-Format-Roman/Makefile
+++ b/devel/p5-DateTime-Format-Roman/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Roman day numbering for DateTime objects
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Format-Strptime/Makefile b/devel/p5-DateTime-Format-Strptime/Makefile
index ab9824354fae..a2d4d230e8a0 100644
--- a/devel/p5-DateTime-Format-Strptime/Makefile
+++ b/devel/p5-DateTime-Format-Strptime/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format strp and strf time patterns
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
diff --git a/devel/p5-DateTime-Format-W3CDTF/Makefile b/devel/p5-DateTime-Format-W3CDTF/Makefile
index ab95ed8bcdab..be746e8a8542 100644
--- a/devel/p5-DateTime-Format-W3CDTF/Makefile
+++ b/devel/p5-DateTime-Format-W3CDTF/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format W3CDTF datetime strings
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index ef9227bbd061..3bd1b562da39 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Procedural interface to DateTime functions
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-HiRes/Makefile b/devel/p5-DateTime-HiRes/Makefile
index 49e725fc87e8..de1c2b43c785 100644
--- a/devel/p5-DateTime-HiRes/Makefile
+++ b/devel/p5-DateTime-HiRes/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create DateTime objects with sub-second current time resolution
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index afad2c26ec7e..824bff719b0a 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An incomplete DateTime, like January 5
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index 824116237b1a..3d7029e201b5 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 #DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Localization support for DateTime
 
 BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index 3da3870855eb..18e3eeaa9282 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perform common time and date operations with additional GPS operations
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index a61c752d04b9..fbf3883b16f4 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Datetime sets and set math
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
diff --git a/devel/p5-DateTime-TimeZone-Alias/Makefile b/devel/p5-DateTime-TimeZone-Alias/Makefile
index a830e4ea5c96..cfbb7e58e724 100644
--- a/devel/p5-DateTime-TimeZone-Alias/Makefile
+++ b/devel/p5-DateTime-TimeZone-Alias/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create aliases for DateTime timezones
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index 51c1d6805b57..1feb4f6f5d4d 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Local Mean Time time zone for DateTime
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index f0196067a9b0..54bf598d1faf 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Time zone object base class and factory
 
 RUN_DEPENDS=	p5-Class-Singleton>=1.03:${PORTSDIR}/devel/p5-Class-Singleton \
diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile
index 0e1744ad9ec7..e9ff0439ce14 100644
--- a/devel/p5-DateTime/Makefile
+++ b/devel/p5-DateTime/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A date and time object
 
 RUN_DEPENDS=	p5-DateTime-Locale>=0.41:${PORTSDIR}/devel/p5-DateTime-Locale \
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index e21e52ac4651..b3a259f8fbb7 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Code coverage metrics for Perl
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
diff --git a/devel/p5-Devel-Profile/Makefile b/devel/p5-Devel-Profile/Makefile
index 362fbf9309fe..9007c08ce5d7 100644
--- a/devel/p5-Devel-Profile/Makefile
+++ b/devel/p5-Devel-Profile/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tell me why my perl program runs so slowly
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
diff --git a/devel/p5-Devel-Size/Makefile b/devel/p5-Devel-Size/Makefile
index 454cd89b50de..ddc02a907e71 100644
--- a/devel/p5-Devel-Size/Makefile
+++ b/devel/p5-Devel-Size/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for finding the memory usage of Perl variables
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Devel-Trace/Makefile b/devel/p5-Devel-Trace/Makefile
index da71287570bd..074db889ac9e 100644
--- a/devel/p5-Devel-Trace/Makefile
+++ b/devel/p5-Devel-Trace/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Print out each line before it is executed (like sh -x)
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Exporter-Lite/Makefile b/devel/p5-Exporter-Lite/Makefile
index df2ea4c74028..f1cc089c3d45 100644
--- a/devel/p5-Exporter-Lite/Makefile
+++ b/devel/p5-Exporter-Lite/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight exporting of variables
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-IPC-ShareLite/Makefile b/devel/p5-IPC-ShareLite/Makefile
index 36f9c663f63c..a28792a8b08b 100644
--- a/devel/p5-IPC-ShareLite/Makefile
+++ b/devel/p5-IPC-ShareLite/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A simple interface to access shared memory
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Locale-Maketext-Gettext/Makefile b/devel/p5-Locale-Maketext-Gettext/Makefile
index 7716d1928192..a72be2c8950a 100644
--- a/devel/p5-Locale-Maketext-Gettext/Makefile
+++ b/devel/p5-Locale-Maketext-Gettext/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Joins gettext and Maketext frameworks
 
 BUILD_DEPENDS=	${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index bfe1d0a57696..406ca742bc96 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use other catalog formats in Locale::Maketext
 
 BUILD_DEPENDS=	${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index c76b72311f29..1b12ca0eb5a9 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A framework for software localization and inheritance-based lexicons
 
 PERL_CONFIGURE=	YES
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 0719b264b08d..a2391df857c6 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A suite of OO modules for logging messages to multiple outputs
 
 RUN_DEPENDS=	p5-Params-Validate>=0.15:${PORTSDIR}/devel/p5-Params-Validate
diff --git a/devel/p5-Log-Dispatch/pkg-descr b/devel/p5-Log-Dispatch/pkg-descr
index be5fe527c856..936f24073766 100644
--- a/devel/p5-Log-Dispatch/pkg-descr
+++ b/devel/p5-Log-Dispatch/pkg-descr
@@ -11,6 +11,3 @@ Subclassing is only needed to send a message to a different output, not
 to change the message format.
 
 WWW: http://search.cpan.org/dist/Log-Dispatch/
-
--Anton
-<tobez@FreeBSD.org>
diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile
index 2faaa17ae014..04932b6b852f 100644
--- a/devel/p5-NEXT/Makefile
+++ b/devel/p5-NEXT/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide a pseudo-class NEXT (et al) that allows method redispatch
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-NEXT/pkg-descr b/devel/p5-NEXT/pkg-descr
index 1635bb5c092d..2d01af089491 100644
--- a/devel/p5-NEXT/pkg-descr
+++ b/devel/p5-NEXT/pkg-descr
@@ -3,7 +3,3 @@ m calls $self-NEXT::m()>, the call to m is redispatched as if the calling
 method had not originally been found.
 
 WWW: http://search.cpan.org/dist/NEXT/
-
--- 
-Mathieu Arnold
-mat@FreeBSD.org
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index 37c20f4fed64..5c9dc9ddf187 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	CPAN \
 		http://hacks.dlux.hu/Parallel-ForkManager/download/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A simple parallel processing fork manager
 
 PERL_CONFIGURE=	YES
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index 912bfb37590b..877d00586517 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Checks if the documentation of a module is comprehensive
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Pod-Coverage/pkg-descr b/devel/p5-Pod-Coverage/pkg-descr
index fcd8f2b6e329..9bc9ac9453ee 100644
--- a/devel/p5-Pod-Coverage/pkg-descr
+++ b/devel/p5-Pod-Coverage/pkg-descr
@@ -6,6 +6,3 @@ This module provides a mechanism for determining if the pod for a given module
 is comprehensive.
 
 WWW: http://search.cpan.org/dist/Pod-Coverage/
-
--- 
-Mathieu Arnold
diff --git a/devel/p5-Set-Crontab/Makefile b/devel/p5-Set-Crontab/Makefile
index 2e53a2d47821..3c48e8025c0d 100644
--- a/devel/p5-Set-Crontab/Makefile
+++ b/devel/p5-Set-Crontab/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Set::Crontab - Expand crontab(5)-style integer lists
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Set-Infinite/Makefile b/devel/p5-Set-Infinite/Makefile
index fc1f40b9a879..68cdb5e1fedb 100644
--- a/devel/p5-Set-Infinite/Makefile
+++ b/devel/p5-Set-Infinite/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Set::Infinite - Sets of intervals
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index 98c2fa900d14..beff78420832 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for portable testing of commands and scripts
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile
index e80511c1a582..c49a7890b15c 100644
--- a/devel/p5-Test-Tester/Makefile
+++ b/devel/p5-Test-Tester/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Helps to test various Test::Builder derivatives
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile
index 648d93749813..8247a83eb85d 100644
--- a/devel/p5-Time-Local/Makefile
+++ b/devel/p5-Time-Local/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Efficiently compute time from local and GMT time
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-UNIVERSAL-exports/Makefile b/devel/p5-UNIVERSAL-exports/Makefile
index 0397f391868a..c8df70632016 100644
--- a/devel/p5-UNIVERSAL-exports/Makefile
+++ b/devel/p5-UNIVERSAL-exports/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight, universal exporting of variables
 
 BUILD_DEPENDS=	${SITE_PERL}/Exporter/Lite.pm:${PORTSDIR}/devel/p5-Exporter-Lite
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index 3357c27d088c..7a58c844d425 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MS/MSCHWERN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mix-in inheritance, an alternative to multiple inheritance
 
 PERL_CONFIGURE=	yes
diff --git a/devel/perltidy/Makefile b/devel/perltidy/Makefile
index 719dc2b73cf6..e8a1d201ebce 100644
--- a/devel/perltidy/Makefile
+++ b/devel/perltidy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/%SUBDIR%/Perl/} \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Perl-Tidy-${PORTVERSION}
 
-MAINTAINER=	mat@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Indents and reformats Perl scripts to make them easier to read
 
 PERL_CONFIGURE=	yes