49 files changed, 74 insertions, 116 deletions

diff --git a/devel/eieio/Makefile b/devel/eieio/Makefile
index f5985ece7aa7..f32236021025 100644
--- a/devel/eieio/Makefile
+++ b/devel/eieio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 #DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/devel/eieio/pkg-descr b/devel/eieio/pkg-descr
index 93b9ff8628d7..140881ebeb0f 100644
--- a/devel/eieio/pkg-descr
+++ b/devel/eieio/pkg-descr
@@ -4,6 +4,3 @@ standard. EIEIO also has object browsing functions, and custom widget
 types.
 
 WWW: http://cedet.sourceforge.net/eieio.shtml
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index 6d756db191f7..b0da6e8c7523 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -12,15 +12,15 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	AppConfig
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A subclass of AppConfig that provides standard options
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		AppConfig::Std.3
 
 post-patch:
diff --git a/devel/p5-AppConfig-Std/pkg-descr b/devel/p5-AppConfig-Std/pkg-descr
index 507bd193d544..57248d74123d 100644
--- a/devel/p5-AppConfig-Std/pkg-descr
+++ b/devel/p5-AppConfig-Std/pkg-descr
@@ -4,6 +4,3 @@ as a subclass of AppConfig; AppConfig provides a general mechanism for
 handling global configuration variables.
 
 WWW: http://search.cpan.org/search?dist=AppConfig-Std
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index b4c2dc07b30b..edcf5c9e2e9c 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -12,16 +12,16 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Date
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts dates between ISO and Gregorian formats
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/ICal.pm:${PORTSDIR}/devel/p5-Date-ICal \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Leapyear.pm:${PORTSDIR}/devel/p5-Date-Leapyear \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize
+BUILD_DEPENDS=	${SITE_PERL}/Date/ICal.pm:${PORTSDIR}/devel/p5-Date-ICal \
+		${SITE_PERL}/Date/Leapyear.pm:${PORTSDIR}/devel/p5-Date-Leapyear \
+		${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Date::ISO.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Date-ISO/pkg-descr b/devel/p5-Date-ISO/pkg-descr
index 018efcb4b966..789b2435f020 100644
--- a/devel/p5-Date-ISO/pkg-descr
+++ b/devel/p5-Date-ISO/pkg-descr
@@ -2,6 +2,3 @@ Date::ISO is a perl extension for converting dates between ISO and
 Gregorian formats.
 
 WWW: http://search.cpan.org/search?dist=Date-ISO
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/devel/p5-Date-ISO/pkg-plist b/devel/p5-Date-ISO/pkg-plist
index f71e3c40facf..f5425e6a3388 100644
--- a/devel/p5-Date-ISO/pkg-plist
+++ b/devel/p5-Date-ISO/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/ISO.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/ISO/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/ISO
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/ISO.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index f60648b20bb1..4df66fb4b5dd 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	VCS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for generic Version Control System access in Perl
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
@@ -24,7 +24,6 @@ PERL_CONFIGURE=	yes
 MAN1=		diff-hist.1
 MAN3=		VCS.3 VCS::Cvs.3 VCS::Dir.3 VCS::File.3 \
 		VCS::Hms.3 VCS::Rcs.3 VCS::Version.3 VCS_dev.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p5-VCS/pkg-descr b/devel/p5-VCS/pkg-descr
index 2d404708e82c..60d435f0916c 100644
--- a/devel/p5-VCS/pkg-descr
+++ b/devel/p5-VCS/pkg-descr
@@ -4,6 +4,3 @@ suite of modules. It comes with example CVS and RCS wrappers.
 
 WWW: http://www.astray.com/VCS/
 WWW: http://search.cpan.org/search?dist=VCS
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index b60055a0dce9..c4644a794237 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 #DISTNAME=       ${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lexer, parser-generator, and parser for Emacs
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/devel/semantic/pkg-descr b/devel/semantic/pkg-descr
index b99378e4f62f..b9947a6a603d 100644
--- a/devel/semantic/pkg-descr
+++ b/devel/semantic/pkg-descr
@@ -3,6 +3,3 @@ written in Emacs Lisp and is customized to the way Emacs thinks about
 language files, and is optimized to use Emacs' parsing capabilities.
 
 WWW: http://cedet.sourceforge.net/semantic.shtml
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index dec82364182f..8373d7c24b8a 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quick access to files and tags in an Emacs frame
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/editors/speedbar/pkg-descr b/editors/speedbar/pkg-descr
index aa8316e8c339..af15f1a768fd 100644
--- a/editors/speedbar/pkg-descr
+++ b/editors/speedbar/pkg-descr
@@ -6,6 +6,3 @@ tags that are in them and jump to those tags. You can also expand
 multiple directories into your speedbar frame.
 
 WWW: http://cedet.sourceforge.net/speedbar.shtml
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 4b8592b33aa5..46f49c5bb6b7 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	gauche-
 DISTNAME=	Gauche-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL binding for Gauche
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
diff --git a/japanese/cal.rb/Makefile b/japanese/cal.rb/Makefile
index aaeb3dbc6bbe..b18566c23000 100644
--- a/japanese/cal.rb/Makefile
+++ b/japanese/cal.rb/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://aglaia.c.u-tokyo.ac.jp/~yamamoto/Script/Calendar/
 DISTFILES=	cal.rb Calendar.rb era_name
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays a Japanese calendar
 
 EXTRACT_CMD=	${CP}
diff --git a/japanese/cal.rb/pkg-descr b/japanese/cal.rb/pkg-descr
index c8588cd09a24..ac40719eae70 100644
--- a/japanese/cal.rb/pkg-descr
+++ b/japanese/cal.rb/pkg-descr
@@ -1,5 +1,5 @@
-cal.rb is a cal(1)-like program which shows a calendar with
-the Japanese holidays.  It can also display years in the
-Japanese era.
+cal.rb is a cal(1)-like program which shows a calendar with the
+Japanese holidays.  It can also display years and months in Japanese
+style.
 
 WWW: http://aglaia.c.u-tokyo.ac.jp/~yamamoto/Script/Calendar/
diff --git a/japanese/drpl/Makefile b/japanese/drpl/Makefile
index 80b97460b2e0..52c1f107185b 100644
--- a/japanese/drpl/Makefile
+++ b/japanese/drpl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.04
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.yk.rim.or.jp/~tomoto/archives/drpl/
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Replaces words in a Japanese text using dictionaries
 
 USE_PERL5=	yes
diff --git a/japanese/gauche-kakasi/Makefile b/japanese/gauche-kakasi/Makefile
index 5f1187385014..26fa195c0d26 100644
--- a/japanese/gauche-kakasi/Makefile
+++ b/japanese/gauche-kakasi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	gauche
 DISTNAME=	Gauche-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KAKASI binding for Gauche
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index a33f52fe7de1..a82b88cfc38c 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	japanese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Date
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Conversion between Japanese Era / Gregorian calendar
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
@@ -23,7 +23,6 @@ MAN3=		Date::Japanese::Era.3 \
 		Date::Japanese::Era.ja.3 \
 		Date::Japanese::Era::Table.3 \
 		Date::Japanese::Era::Table::JIS_X0301.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index c1092ca176bc..2ece8bc8f2cb 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.jar
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible Java-based Scheme interpreter
 
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/jakarta-ant
diff --git a/net-mgmt/p5-Net-IP/Makefile b/net-mgmt/p5-Net-IP/Makefile
index c2cb9cc8eb34..29c46031dff3 100644
--- a/net-mgmt/p5-Net-IP/Makefile
+++ b/net-mgmt/p5-Net-IP/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl extension for manipulating IPv4/IPv6 addresses
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::IP.3
 
 post-patch:
diff --git a/net-mgmt/p5-Net-IP/pkg-descr b/net-mgmt/p5-Net-IP/pkg-descr
index 99b6c56a85a0..a11a8dcb4cf7 100644
--- a/net-mgmt/p5-Net-IP/pkg-descr
+++ b/net-mgmt/p5-Net-IP/pkg-descr
@@ -6,6 +6,3 @@ functions.  Most subroutines can take either IPv4 or IPv6 addresses
 transparently.
 
 WWW: http://search.cpan.org/search?dist=Net-IP
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/net-mgmt/p5-Net-IP/pkg-plist b/net-mgmt/p5-Net-IP/pkg-plist
index ae134f1ba1a2..2845219738ab 100644
--- a/net-mgmt/p5-Net-IP/pkg-plist
+++ b/net-mgmt/p5-Net-IP/pkg-plist
@@ -1,7 +1,7 @@
 bin/iptab
 bin/ipcount
-lib/perl5/site_perl/%%PERL_VER%%/Net/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/6to4/Makefile b/net/6to4/Makefile
index 0ad493d2c812..fabb8913533e 100644
--- a/net/6to4/Makefile
+++ b/net/6to4/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	6to4\?rev=1.9\&content-type=text%2fplain \
 		6to4.conf\?rev=1.3\&content-type=text%2fplain
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enables 6to4 IPv6 automatic tunnels
 
 USE_REINPLACE=	yes
diff --git a/net/gini/Makefile b/net/gini/Makefile
index e70cabf66658..48cd92f9fe17 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight media streaming server
 
 LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 0c1590e11853..97b14e90ede8 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}-java
 PKGNAMEPREFIX=	java-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An implementation of BEEP core and BEEP mapping for TCP in Java
 
 RUN_DEPENDS=	${LOCALBASE}/share/java/classes/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile
index 6b02ea187cc4..91e8df8ab0a4 100644
--- a/net/p5-Net-Dict/Makefile
+++ b/net/p5-Net-Dict/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple client API for the DICT protocol
 
 BUILD_DEPENDS=	${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
diff --git a/net/p5-Net-Finger/Makefile b/net/p5-Net-Finger/Makefile
index de65135f5f8d..3eaf05cfb98d 100644
--- a/net/p5-Net-Finger/Makefile
+++ b/net/p5-Net-Finger/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Perl implementation of a finger client
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Finger.3
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Finger/pkg-plist b/net/p5-Net-Finger/pkg-plist
index fc86e62732b5..70ec68021e50 100644
--- a/net/p5-Net-Finger/pkg-plist
+++ b/net/p5-Net-Finger/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Finger.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Finger/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Finger
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Finger.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-IP/Makefile b/net/p5-Net-IP/Makefile
index c2cb9cc8eb34..29c46031dff3 100644
--- a/net/p5-Net-IP/Makefile
+++ b/net/p5-Net-IP/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl extension for manipulating IPv4/IPv6 addresses
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::IP.3
 
 post-patch:
diff --git a/net/p5-Net-IP/pkg-descr b/net/p5-Net-IP/pkg-descr
index 99b6c56a85a0..a11a8dcb4cf7 100644
--- a/net/p5-Net-IP/pkg-descr
+++ b/net/p5-Net-IP/pkg-descr
@@ -6,6 +6,3 @@ functions.  Most subroutines can take either IPv4 or IPv6 addresses
 transparently.
 
 WWW: http://search.cpan.org/search?dist=Net-IP
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/net/p5-Net-IP/pkg-plist b/net/p5-Net-IP/pkg-plist
index ae134f1ba1a2..2845219738ab 100644
--- a/net/p5-Net-IP/pkg-plist
+++ b/net/p5-Net-IP/pkg-plist
@@ -1,7 +1,7 @@
 bin/iptab
 bin/ipcount
-lib/perl5/site_perl/%%PERL_VER%%/Net/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/ruby-dict/Makefile b/net/ruby-dict/Makefile
index 49050fe403fe..db28666febe1 100644
--- a/net/ruby-dict/Makefile
+++ b/net/ruby-dict/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A client-side implementation of the DICT protocol in Ruby
 
 USE_RUBY=	yes
diff --git a/security/p5-Crypt-CAST5_PP/Makefile b/security/p5-Crypt-CAST5_PP/Makefile
index 8cc18a899bf4..41f96bc48081 100644
--- a/security/p5-Crypt-CAST5_PP/Makefile
+++ b/security/p5-Crypt-CAST5_PP/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CAST5 block cipher in pure Perl
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::CAST5_PP.3
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-CAST5_PP/pkg-descr b/security/p5-Crypt-CAST5_PP/pkg-descr
index 07df29d57f5a..a880f82cd15f 100644
--- a/security/p5-Crypt-CAST5_PP/pkg-descr
+++ b/security/p5-Crypt-CAST5_PP/pkg-descr
@@ -3,6 +3,3 @@ cipher.  CAST5 is also known as CAST-128.  It is a product of the CAST
 design procedure developed by C. Adams and S. Tavares.
 
 WWW: http://search.cpan.org/search?dist=Crypt-CAST5_PP
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/security/p5-Crypt-CAST5_PP/pkg-plist b/security/p5-Crypt-CAST5_PP/pkg-plist
index 4457cd550aa5..104880503e66 100644
--- a/security/p5-Crypt-CAST5_PP/pkg-plist
+++ b/security/p5-Crypt-CAST5_PP/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/CAST5_PP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/CAST5_PP/Tables.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/CAST5_PP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/CAST5_PP/decrypt.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/CAST5_PP/encrypt.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/CAST5_PP/init.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/CAST5_PP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/CAST5_PP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/CAST5_PP.pm
+%%SITE_PERL%%/Crypt/CAST5_PP/Tables.pm
+%%SITE_PERL%%/auto/Crypt/CAST5_PP/autosplit.ix
+%%SITE_PERL%%/auto/Crypt/CAST5_PP/decrypt.al
+%%SITE_PERL%%/auto/Crypt/CAST5_PP/encrypt.al
+%%SITE_PERL%%/auto/Crypt/CAST5_PP/init.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP/.packlist
+@dirrm %%SITE_PERL%%/Crypt/CAST5_PP
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Crypt/CAST5_PP
+@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 4ff1b1990902..4505a524a12a 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc net elisp
 MASTER_SITES=	http://me.in-berlin.de/~myrkr/dictionary/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dictionary client for Emacs
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/textproc/gauche-sxml/Makefile b/textproc/gauche-sxml/Makefile
index 9922e79de0c6..ceb5c298f4e7 100644
--- a/textproc/gauche-sxml/Makefile
+++ b/textproc/gauche-sxml/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	gauche-
 DISTNAME=	SXML-gauche-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A port of Oleg Kiselyov's (S)XML utilities to Gauche
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
diff --git a/textproc/manued.el/Makefile b/textproc/manued.el/Makefile
index 0252b26b5d54..4915b4c8ab03 100644
--- a/textproc/manued.el/Makefile
+++ b/textproc/manued.el/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.mpi-sb.mpg.de/~hitoshi/otherprojects/manued/arcs/ \
 		http://www.archi.is.tohoku.ac.jp/~yamauchi/otherprojects/manued/arcs/
 DISTNAME=	manued-${PORTVERSION}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs minor mode for manued proofreading method
 
 NO_BUILD=	yes
diff --git a/textproc/manued.el/pkg-descr b/textproc/manued.el/pkg-descr
index 36c53087405c..27ba32585216 100644
--- a/textproc/manued.el/pkg-descr
+++ b/textproc/manued.el/pkg-descr
@@ -6,6 +6,3 @@ Manued.el is an emacs lisp implementation for supporting manued
 method.
 
 WWW: http://www.mpi-sb.mpg.de/~hitoshi/otherprojects/manued/index.shtml
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/textproc/manued.el/pkg-message b/textproc/manued.el/pkg-message
index 54407e8be112..6f2b6186e71f 100644
--- a/textproc/manued.el/pkg-message
+++ b/textproc/manued.el/pkg-message
@@ -1,3 +1,3 @@
-To use manued.el, add to your ~/.emacs the following lines:
+To use manued.el, add to your ~/.emacs the following line:
 
 (autoload 'manued-minor-mode "manued" "manuscript editing mode" t)
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index a8ba0f08747b..a1447e6d3d94 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple XML-editing for GNU Emacs
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index 151b2b70b238..0fb8d0499130 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML character entities
 
 USE_ZIP=	yes
diff --git a/textproc/xmlcharent/pkg-descr b/textproc/xmlcharent/pkg-descr
index ec8a47994ac4..d7b03519ac4f 100644
--- a/textproc/xmlcharent/pkg-descr
+++ b/textproc/xmlcharent/pkg-descr
@@ -1,6 +1,3 @@
 XML character entity sets derived from ISO 8879.
 
 WWW: http://www.oasis-open.org/docbook/xmlcharent/
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile
index 90c66fd73388..04f079b6954f 100644
--- a/www/guile-www/Makefile
+++ b/www/guile-www/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guile modules for WWW interaction
 
 RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
diff --git a/www/guile-www/pkg-descr b/www/guile-www/pkg-descr
index 00248489daaf..dce663966fc9 100644
--- a/www/guile-www/pkg-descr
+++ b/www/guile-www/pkg-descr
@@ -3,6 +3,3 @@ navigating HTTP connections, parsing URLs, handling CGI operations,
 and fetching WWW resources.
 
 WWW: http://www.gnu.org/software/guile/
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 954499a2311e..a40b6374e250 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	gauche-
 DISTNAME=	Gauche-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 binding for Gauche
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index e1fbcceeafc3..cf6cf9432b5c 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OpenGL extension to GTK
 
 USE_BZIP2=	yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 9e7d3ef325c4..3ac6da8ddb58 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkglext
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GtkGLExt
 
 LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \