Remove do-configure section, use PERL_CONFIGURE now.

author: Vanilla I. Shu <vanilla@FreeBSD.org> 2001-03-01 06:39:18 +0000
committer: Vanilla I. Shu <vanilla@FreeBSD.org> 2001-03-01 06:39:18 +0000
commit: 68c2f99c6300bc38a37eb3a8292b562cc2d8952b (patch)
tree: 0898749bb767b388765958548da12c5b50b3825d
parent: 031bd55ed2b892d722ffdba72b339be33879e047 (diff)
download: ports-68c2f99c6300bc38a37eb3a8292b562cc2d8952b.tar.gz
ports-68c2f99c6300bc38a37eb3a8292b562cc2d8952b.zip
356 files changed, 376 insertions, 1235 deletions
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 0fbf5c6bee1b..6fa67632189e 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	roman@xpert.com
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MAN3=		Archive::Tar.3
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index b904f894f8eb..38df66174030 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_ZIP=	yes
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index bb20ada1b05a..67f0b88b7bb1 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Compress::Zlib.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/archivers/p5-Mac-Macbinary/Makefile b/archivers/p5-Mac-Macbinary/Makefile
index d83add39f480..78cd295a1e4f 100644
--- a/archivers/p5-Mac-Macbinary/Makefile
+++ b/archivers/p5-Mac-Macbinary/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/astro/p5-Astro-MoonPhase/Makefile b/astro/p5-Astro-MoonPhase/Makefile
index 219a43204126..c300e30990c0 100644
--- a/astro/p5-Astro-MoonPhase/Makefile
+++ b/astro/p5-Astro-MoonPhase/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index 134a7da0643c..2940a645b8f1 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 4cb912d39dbc..c84b63773ba0 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -14,14 +14,11 @@ DISTNAME=	perl-GPS-${PORTVERSION}
 
 MAINTAINER=	jeremy@external.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GPS::Garmin.3 \
 		GPS::Serial.3 \
 		GPS::Garmin::Handler.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 43fc97d0ff86..46ca8f96630d 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 22a4ba85fa0b..dc00d9f6fd00 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -16,13 +16,9 @@ MAINTAINER=	roman@xpert.com
 
 LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Audio::CD.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index fcde082c00f6..635a504d454d 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leo@florida.sarang.net
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		MP3::ID3v1Tag.3
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 3e523a34eeeb..d27dbfec5820 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leo@florida.sarang.net
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		MP3::Info.3 MPEG::MP3Info.3
diff --git a/audio/p5-MPEG-ID3v2Tag/Makefile b/audio/p5-MPEG-ID3v2Tag/Makefile
index ebeedfdf9220..5b7f52afa863 100644
--- a/audio/p5-MPEG-ID3v2Tag/Makefile
+++ b/audio/p5-MPEG-ID3v2Tag/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 581517d6f32b..121d94ecd5c8 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	xmms:${PORTSDIR}/audio/xmms \
 
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Xmms::Remote.3 \
 		Xmms::SongChange.3 \
@@ -29,8 +29,4 @@ MAN3=		Xmms::Remote.3 \
 		Bundle::Xmms.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index d11118087a95..ba2a39bd3152 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -15,7 +15,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bio@freebsd.net
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MAN3=		Ace::Sequence::Feature.3 \
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index 705807ec9e00..9ea1dc34b351 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	scrappy@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Convert::ASN1.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 8d5321feab8b..5201c60855ce 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	scrappy@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Convert::BER.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index 04bfb1411226..56b007c40e22 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -22,7 +22,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 NO_WRKSUBDIR=	yes
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index cb39466f7c57..a4912a22e702 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 
 RUN_DEPENDS=	recode:${PORTSDIR}/converters/recode
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Convert::Recode.3
@@ -25,7 +25,4 @@ post-patch:
 		${PERL} -pi -e 's#recode -\$$#${LOCALBASE}/bin/recode -\$$#' \
 		${WRKSRC}/Recode.pm
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index b3d5a66adedb..1e4f13aa73e2 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	roman@xpert.com
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Convert::TNEF.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 293bed6dd959..47eceb36fb6d 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN1=		puuencode.1 puudecode.1
 MAN3=		Convert::UU.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index f72c25ef0c5a..e78cd887d706 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -15,14 +15,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	blaz@amis.net
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Convert::UUlib.3
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 5b889678f07f..e8eb35eae2e7 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		MIME::Base64.3 \
 		MIME::QuotedPrint.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 95d318daa2c1..fd460432f1f1 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -16,17 +16,10 @@ MAINTAINER=	skv@protey.ru
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE/lib"
 
 MAN3=		Text::Iconv.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX} \
-		LIBS="-L${LOCALBASE}/lib -liconv " \
-		INC="-I ${LOCALBASE}/include " \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index ff9c9864f14d..528c4b7470b6 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	ilia@cgu.chel.su
 BUILD_DEPENDS=	${SITE_PERL}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3=		Unicode::Map8.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index 07f4df65cc19..57e7fd8289a4 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -16,14 +16,9 @@ MAINTAINER=	ilia@cgu.chel.su
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Unicode::CharName.3 Unicode::String.3
-
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-ApacheDBILogConfig/Makefile b/databases/p5-ApacheDBILogConfig/Makefile
index 4a8ecf132496..ad091096d6c6 100644
--- a/databases/p5-ApacheDBILogConfig/Makefile
+++ b/databases/p5-ApacheDBILogConfig/Makefile
@@ -18,10 +18,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/Apache/DBI.pm:${
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
-USE_PERL5=	yes
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-ApacheDBILogger/Makefile b/databases/p5-ApacheDBILogger/Makefile
index 779613a1679c..396f1565a4b7 100644
--- a/databases/p5-ApacheDBILogger/Makefile
+++ b/databases/p5-ApacheDBILogger/Makefile
@@ -18,13 +18,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/Apache/DBI.pm:${
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Apache::DBILogger.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index 230da27eed00..d02d868b25d8 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	db3.1:${PORTSDIR}/databases/db3
 
 PERL_CONFIGURE=	yes
 ALL_TARGET=	all test
-USE_PERL5=	yes
 
 post-patch:
 	${PERL} -pi -e 's|^(INCLUDE\s+= )./libraries/.*$$|$$1\$(PREFIX)/include/db3|g; \
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 1a94a16cf932..85a1e8962d54 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -19,14 +19,11 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::File.3 \
 		DBD::CSV.3 \
 		Bundle::DBD::CSV.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index 2047e4c19e35..d89386f53bca 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -17,14 +17,10 @@ MAINTAINER=	demon@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MAKE_ENV=	POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::Pg.3 DBD::dbd-pg.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 2047e4c19e35..d89386f53bca 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -17,14 +17,10 @@ MAINTAINER=	demon@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MAKE_ENV=	POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::Pg.3 DBD::dbd-pg.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile
index a91b2f3570f6..880348cc13a1 100644
--- a/databases/p5-DBD-XBase/Makefile
+++ b/databases/p5-DBD-XBase/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ilia@cgu.chel.su
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 GZIP=		-9
 
@@ -25,9 +25,6 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		XBase::FAQ.3 XBase::Memo.3 XBase::Index.3 XBase.3 \
 		DBD::XBase.3 XBase::Base.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/dbfdump ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/indexdump ${PREFIX}/bin
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 1be4a86d59fc..2769b1718f40 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -20,10 +20,10 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
+PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}" \
 		--noprompt --mysql-install --nomsql-install
 CONFIGURE_ENV=	MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
-USE_PERL5=	yes
 
 MAN1=		dbimon.1
 MAN3=		Bundle::DBD::mysql.3 \
@@ -31,8 +31,7 @@ MAN3=		Bundle::DBD::mysql.3 \
 		Mysql.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
+pre-configure:
 		@${PERL} -i -e 's| -lgz||' ${WRKSRC}/lib/DBD/mysql/Install.pm
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index 62242ca23840..aa8f111d0387 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		dbiproxy.1 \
 		dbish.1
@@ -34,8 +34,4 @@ MAN3=		Bundle::DBI.3 \
 		Win32::DBIODBC.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 62242ca23840..aa8f111d0387 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		dbiproxy.1 \
 		dbish.1
@@ -34,8 +34,4 @@ MAN3=		Bundle::DBI.3 \
 		Win32::DBIODBC.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-DBZ_File/Makefile b/databases/p5-DBZ_File/Makefile
index d3b6160d295c..3cafee3b2aaf 100644
--- a/databases/p5-DBZ_File/Makefile
+++ b/databases/p5-DBZ_File/Makefile
@@ -15,15 +15,12 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	leeym@cae.ce.ntu.edu.tw
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+CONFIGURE_ENV=	-I${FILESDIR} -L${FILESDIR}
 
 WRKSRC=		${WRKDIR}/DBZ_File
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBZ_File.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} -I ${FILESDIR} Makefile.PL \
-			LIBS= INC=-I${FILESDIR} CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index 228437c9346b..1204fe74c586 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -18,15 +18,11 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext/GDBM_File
 
 MAN3=		GDBM_File.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 89d79f9c46c8..903a4da5e633 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		MLDBM.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/databases/p5-Msql/Makefile b/databases/p5-Msql/Makefile
index c75df28f5d20..463f87ca2746 100644
--- a/databases/p5-Msql/Makefile
+++ b/databases/p5-Msql/Makefile
@@ -18,17 +18,13 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libmsql.a:${PORTSDIR}/databases/msql \
 		${LOCALBASE}/lib/perl5/site_perl/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${LOCALBASE}/lib/perl5/site_perl/DBI.pm:${PORTSDIR}/databases/p5-DBI
 
-CONFIGURE_ENV+=	PREFIX=${PREFIX} MSQL_HOME=${PREFIX}
+BROKEN=		DEPENDS on databases/msql which is currently BROKEN, also perl5 upgrade
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
+CONFIGURE_ENV+=	PREFIX=${PREFIX} MSQL_HOME=${PREFIX}
 
 MAN1=		pmsql.1 dbimon.1
 MAN3=		Msql.3 DBD::mSQL.3
 MAN3PREFIX=	${PREFIX}/lib/perl5
 
-BROKEN=		DEPENDS on databases/msql which is currently BROKEN, also perl5 upgrade
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index 1be4a86d59fc..2769b1718f40 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -20,10 +20,10 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
+PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}" \
 		--noprompt --mysql-install --nomsql-install
 CONFIGURE_ENV=	MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
-USE_PERL5=	yes
 
 MAN1=		dbimon.1
 MAN3=		Bundle::DBD::mysql.3 \
@@ -31,8 +31,7 @@ MAN3=		Bundle::DBD::mysql.3 \
 		Mysql.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
+pre-configure:
 		@${PERL} -i -e 's| -lgz||' ${WRKSRC}/lib/DBD/mysql/Install.pm
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index 9615b8119e8c..cc9fd909f469 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -10,23 +10,18 @@ PORTVERSION=	1.9.0
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pg
-DISTNAME=	pgsql_perl5-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	pgsql_perl5-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-USE_PERL5=	yes
-
+PERL_CONFIGURE=	yes
 POSTGRES_HOME?=	${LOCALBASE}/pgsql
 MAKE_ENV+=	POSTGRES_HOME=${POSTGRES_HOME}
 
 MAN3=		Pg.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 129c0f42fcae..684c8103c160 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wolman@cs.washington.edu
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		SQL::Eval.3 SQL::Statement.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 1f062df3a9a4..a32eb913c131 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Query.pm:${PORTSDIR}/textproc/p5-Text-Query
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Query::BuildSQLMifluz.3 Text::Query::BuildSQLMySQL.3 \
diff --git a/databases/p5-hp200lx-db/Makefile b/databases/p5-hp200lx-db/Makefile
index c2ecdc1520d5..4c58c12c377a 100644
--- a/databases/p5-hp200lx-db/Makefile
+++ b/databases/p5-hp200lx-db/Makefile
@@ -14,12 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	g.gonter@ieee.org
 
-USE_PERL5=	yes
-
-# MAN3=		HP200LX::DB.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-hp200lx-db/pkg-descr b/databases/p5-hp200lx-db/pkg-descr
index c358cae63c8e..330c76a072bc 100644
--- a/databases/p5-hp200lx-db/pkg-descr
+++ b/databases/p5-hp200lx-db/pkg-descr
@@ -19,4 +19,3 @@ array tie implementation to access database data records
   FETCH                               retrieve a record
   STORE                               store a record
   $db->get_last_index ()              return highest index
-
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 9cc2b8c139f9..bb47cec58427 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Class/Tom.pm:${PORTSDIR}/devel/p5-Class-Tom
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index 69915f305437..64fb0223f1df 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Algorithm-MDiff/Makefile b/devel/p5-Algorithm-MDiff/Makefile
index b5031f804017..68110cd22c4f 100644
--- a/devel/p5-Algorithm-MDiff/Makefile
+++ b/devel/p5-Algorithm-MDiff/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Algorithm-MarkovChain/Makefile b/devel/p5-Algorithm-MarkovChain/Makefile
index 2304ee4c5290..ae9f0f09f6b0 100644
--- a/devel/p5-Algorithm-MarkovChain/Makefile
+++ b/devel/p5-Algorithm-MarkovChain/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Algorithm-Permute/Makefile b/devel/p5-Algorithm-Permute/Makefile
index d683549100ce..dab880254936 100644
--- a/devel/p5-Algorithm-Permute/Makefile
+++ b/devel/p5-Algorithm-Permute/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Alias/Makefile b/devel/p5-Alias/Makefile
index f68696776c27..89efbdf9cef0 100644
--- a/devel/p5-Alias/Makefile
+++ b/devel/p5-Alias/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Alias.3
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index 046cab7d90a4..b8637d9e6608 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	igor@zynaps.ru
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
@@ -25,7 +25,4 @@ MAN3=		AppConfig.3 \
 		AppConfig::Getopt.3 \
 		AppConfig::Args.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index 38c09477088d..92aac49f5099 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -14,11 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leo@florida.sarang.net
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MAN3=		B::Graph.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index b53c62245a95..9e577a790faa 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		BSD::Resource.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index 7e09d2c44af3..aaa28ec844ba 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -14,14 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		C::Scan.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-MethodMaker/Makefile b/devel/p5-Class-MethodMaker/Makefile
index 7e045a9adc56..afed7bdfa236 100644
--- a/devel/p5-Class-MethodMaker/Makefile
+++ b/devel/p5-Class-MethodMaker/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		trevor@FreeBSD.org
 
-USE_PERL5=		yes
+PERL_CONFIGURE=		yes
 
 MAN3=			Class::MethodMaker.3
 MANPREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Singleton/Makefile b/devel/p5-Class-Singleton/Makefile
index e0cccdc4aef4..ebd43e562c30 100644
--- a/devel/p5-Class-Singleton/Makefile
+++ b/devel/p5-Class-Singleton/Makefile
@@ -15,7 +15,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 5340313bd219..a07ffe4aa53b 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -18,12 +18,8 @@ BUILD_DEPENDS=	${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
 		${SITE_PERL}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 
 SITE_PERL=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 63fd0c7a08f9..cd2783bd962a 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Curses.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -23,8 +23,4 @@ pre-configure:
 		@${LN} -s ${WRKSRC}/hints/c-freebsd.ncurses.h \
 			${WRKSRC}/c-config.h
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index 84db42d52a54..210bee86beb6 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Data::Flow.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 2c36a73ae366..97b8cf839939 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		showtable.1
 MAN3=		Data::ShowTable.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index fb5b75ebdb00..49aaef2c4dd6 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bradh@uunet.co.za
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Date::Calc.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 81b79e6eb2f3..1e7a9f07321a 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -15,12 +15,9 @@ DISTNAME=	DateManip-${PORTVERSION}
 
 MAINTAINER=	kapr@crosswinds.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Date::Manip.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index 2571f3328001..dd322a429002 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Date::Convert.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index 1edbde468ada..6f2ff4b03b12 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -14,15 +14,11 @@ PKGNAMEPREFIX=	p5-Devel-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1PREFIX=	${PREFIX}
 MAN1=		dprofpp.1
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::DProf.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index 72cce79816ec..991a1455121a 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::Peek.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 14052cfc25d7..607330c48395 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::Symdump.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index 3fba6868cf25..558cfd1093f6 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Errno.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Errno/pkg-descr b/devel/p5-Errno/pkg-descr
index 0867a609dd7a..ae3f7f04de23 100644
--- a/devel/p5-Errno/pkg-descr
+++ b/devel/p5-Errno/pkg-descr
@@ -1,3 +1,2 @@
-       Errno defines and conditionally exports all the error
-       constants defined in your system errno.h include file.
-
+Errno defines and conditionally exports all the error
+constants defined in your system errno.h include file.
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index a6662877ecba..49ceaaae1438 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		File::BasicFlock.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Binary/Makefile b/devel/p5-File-Binary/Makefile
index f98d36fe950c..383e06aca535 100644
--- a/devel/p5-File-Binary/Makefile
+++ b/devel/p5-File-Binary/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-File-Cache/Makefile b/devel/p5-File-Cache/Makefile
index 550b4285a770..def78e7427e9 100644
--- a/devel/p5-File-Cache/Makefile
+++ b/devel/p5-File-Cache/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-Digest-M
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index a032af9d32db..5f078cc4d2a7 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -14,10 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Lock/pkg-descr b/devel/p5-File-Lock/pkg-descr
index 5ab881e34e33..c6a32ae377e2 100644
--- a/devel/p5-File-Lock/pkg-descr
+++ b/devel/p5-File-Lock/pkg-descr
@@ -1,4 +1,3 @@
-
 This is my first alpha release of File::Lock, my version of the code
 greatfully provided by Jarrko. I've mucked about with it quite a bit,
 and there are a few policy decisions you might not agree with:
@@ -18,12 +17,13 @@ unlocked on destruction. But it isn't.
 
 File::Lock::lockfile isn't written yet, but will be.
 
-You can use a mode of "t" or "i" to get info/test a lock. fcntl in array context
-will return an array consisting of all the usual fcntl data. In any other case, a single
-letter is returned, "u", "w",  or "r", for the detected locking mode. (or unlocked.) 
+You can use a mode of "t" or "i" to get info/test a lock. fcntl in array
+context will return an array consisting of all the usual fcntl data.
+In any other case, a single letter is returned, "u", "w",  or "r",
+for the detected locking mode. (or unlocked.) 
 
-All calls return true if successful. Currently no mucking about with errno is done, so it
-might not be the same for the same condition on all systems.
+All calls return true if successful. Currently no mucking about with errno
+is done, so it might not be the same for the same condition on all systems.
 
 If you need real fcntl() and it's constants, use Fcntl. File::Lock does
 optionally export SEEK_*, and LOCK_EX|UN|SH, though. (I don't remember why,
@@ -33,4 +33,3 @@ Any comments, complaints, or bug patches would be greatly appreciated.
 
 --
 Kenneth Albanowski (kjahds@kjahds.com, CIS: 70705,126)
-
diff --git a/devel/p5-File-MMagic/Makefile b/devel/p5-File-MMagic/Makefile
index ce1992311dee..f3befb1bbb72 100644
--- a/devel/p5-File-MMagic/Makefile
+++ b/devel/p5-File-MMagic/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	knu@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		File::MMagic.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 71511a51bb0d..426446f74070 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		File::Slurp.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Slurp/pkg-descr b/devel/p5-File-Slurp/pkg-descr
index 789296403703..c84a40630d8d 100644
--- a/devel/p5-File-Slurp/pkg-descr
+++ b/devel/p5-File-Slurp/pkg-descr
@@ -1,28 +1,28 @@
-       These are quickie routines that are meant to save a couple
-       of lines of code over and over again.  They do not do
-       anything fancy.
+These are quickie routines that are meant to save a couple
+of lines of code over and over again.  They do not do
+anything fancy.
 
-       read_file() does what you would expect.  If you are using
-       its output in array context, then it returns an array of
-       lines.  If you are calling it from scalar context, then
-       returns the entire file in a single string.
+read_file() does what you would expect.  If you are using
+its output in array context, then it returns an array of
+lines.  If you are calling it from scalar context, then
+returns the entire file in a single string.
 
-       It croaks()s if it can't open the file.
+It croaks()s if it can't open the file.
 
-       write_file() creates or overwrites files.
+write_file() creates or overwrites files.
 
-       append_file() appends to a file.
+append_file() appends to a file.
 
-       overwrite_file() does an in-place update of an existing
-       file or creates a new file if it didn't already exist.
+overwrite_file() does an in-place update of an existing
+file or creates a new file if it didn't already exist.
 
-       Write_file will also replace a file.  The difference is
-       that the first that that write_file() does is to trucate
-       the file whereas the last thing that overwrite_file() is
-       to trucate the file.  Overwrite_file() should be used in
-       situations where you have a file that always needs to have
-       contents, even in the middle of an update.
+Write_file will also replace a file.  The difference is
+that the first that that write_file() does is to trucate
+the file whereas the last thing that overwrite_file() is
+to trucate the file.  Overwrite_file() should be used in
+situations where you have a file that always needs to have
+contents, even in the middle of an update.
 
-       read_dir() returns all of the entries in a directory
-       except for "."  and "..".  It croaks if it cannot open the
-       directory.
+read_dir() returns all of the entries in a directory
+except for "."  and "..".  It croaks if it cannot open the
+directory.
diff --git a/devel/p5-File-Spec/Makefile b/devel/p5-File-Spec/Makefile
index 749661f8165d..7fff0d521605 100644
--- a/devel/p5-File-Spec/Makefile
+++ b/devel/p5-File-Spec/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		File::Spec.3 \
 		File::Spec::Functions.3 \
@@ -25,8 +25,4 @@ MAN3=		File::Spec.3 \
 		File::Spec::Win32.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index a12bea0f33e5..b86a172e1e95 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -17,7 +17,6 @@ BUILD_DEPENDS=	${site_perl}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MAN3=		File::Tail.3
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index 933d01e8fca2..0cde3180bb44 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		File::Tools.3 File::Recurse.3 File::Copy.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index ab6a48df9a3c..f727d2e98d8d 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -14,19 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Filter::Util::Call.3 Filter::Util::Exec.3 Filter::cpp.3 \
 		Filter::decrypt.3 Filter::exec.3 Filter::sh.3 Filter::tee.3 \
 		perlfilter.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-		@${PERL} -i -p \
-			-e 's/^(CC = ).*/$$1 ${CC}/;' \
-			-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
-			`find ${WRKSRC} -name Makefile`
-
 .include <bsd.port.mk>
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index c873751ce830..698fec9ca2a5 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		FreezeThaw.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-FreezeThaw/pkg-descr b/devel/p5-FreezeThaw/pkg-descr
index 29bbd2ad2642..7e8c81d6124e 100644
--- a/devel/p5-FreezeThaw/pkg-descr
+++ b/devel/p5-FreezeThaw/pkg-descr
@@ -1,7 +1,6 @@
-       Converts data to/from stringified form, appropriate for
-       saving-to/reading-from permanent storage.
-
-       Deals with objects, circular lists, repeated appearence of
-       the same refence. Does not deal with overloaded stringify
-       operator yet.
+Converts data to/from stringified form, appropriate for
+saving-to/reading-from permanent storage.
 
+Deals with objects, circular lists, repeated appearence of
+the same refence. Does not deal with overloaded stringify
+operator yet.
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 5fa8a86af167..68ca226798ce 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -15,9 +15,6 @@ DISTNAME=	${PORTNAME}-.${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index d59b901a760c..ac7b2c44d0ec 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -14,14 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
 MAN3=		IO::Pty.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}" \
-		LDDLFLAGS=-shared LDFLAGS=-L/usr/lib
-
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 392ba6ad9c92..80dde5e68885 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -14,13 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MAN3=		IO::AtomicFile.3 IO::InnerFile.3 IO::Lines.3 IO::Scalar.3 \
 		IO::ScalarArray.3 IO::Stringy.3 \
 		IO::Wrap.3 IO::WrapTie.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index d32aa114945d..759787f135f4 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Include.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index d6fdbdc16e7a..2a8f3a8d1be9 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index 60140589fbea..532756629ea5 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	frank@exit.com
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Locale::Maketext.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index c11c94b5c022..c85b0f16258e 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -14,16 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nakai@FreeBSD.org
 
-USE_PERL5=	YES
-
-# There is also perl man but how to manage /usr/local/man 
-# and /usr/local/lib/perl5/%%PERL_VER%%/man
+PERL_CONFIGURE=	YES
 
 MAN1=		MsgFormat.1 XText.1
-#MAN3=		Locale::PGettext.3
-#MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+MAN3=		Locale::PGettext.3
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index e44f48f07344..9650c32c2ac0 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -1,6 +1,5 @@
 bin/XText
 bin/MsgFormat
-lib/perl5/%%PERL_VERSION%%/man/man3/Locale::PGetText.3
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Locale/PGetText.pm
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 765a7d61531a..940acc95a2a6 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Locale::gettext.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index 8e6113dc9ec2..c88e60a027b2 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Mac-FileSpec-Unixish/Makefile b/devel/p5-Mac-FileSpec-Unixish/Makefile
index 4530f96e1bef..e61efb4b2259 100644
--- a/devel/p5-Mac-FileSpec-Unixish/Makefile
+++ b/devel/p5-Mac-FileSpec-Unixish/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 3524f43a63df..06db7e472b91 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN1PREFIX=	${PREFIX}
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index df2331949da8..092371847242 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gehicks@cisco.com
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Parse::RecDescent.3 Text::Balanced.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index 749661f8165d..7fff0d521605 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		File::Spec.3 \
 		File::Spec::Functions.3 \
@@ -25,8 +25,4 @@ MAN3=		File::Spec.3 \
 		File::Spec::Win32.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index 73050ddeaf05..fe7671cd727e 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -14,16 +14,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Penguin::Easy.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-install:
 		${MKDIR} ${PREFIX}/lib/perl5/site_perl/Penguin/Easy/bin ${PREFIX}/lib/perl5/site_perl/Penguin/Easy/doc
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/bin/ep ${PREFIX}/lib/perl5/site_perl/Penguin/Easy/bin
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index b7ba512c8bd9..25c67bbe2b7d 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -16,10 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 
-USE_PERL5=	YES
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+PERL_CONFIGURE=	YES
 
 post-install:
 		${MKDIR} ${PREFIX}/lib/perl5/site_perl/Penguin/bin ${PREFIX}/lib/perl5/site_perl/Penguin/misc ${PREFIX}/lib/perl5/site_perl/Penguin/doc
diff --git a/devel/p5-Proc-Background/Makefile b/devel/p5-Proc-Background/Makefile
index c09bc30df31f..5b80c2eecc76 100644
--- a/devel/p5-Proc-Background/Makefile
+++ b/devel/p5-Proc-Background/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN1PREFIX=	${PREFIX}
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index 2770bf085776..92ca5bf8eea2 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index bb04b8c1b393..16b265896d26 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Proc::Simple.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 22346eb83dc3..dbc3ecdf440a 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -13,19 +13,11 @@ MASTER_SITE_SUBDIR=	Term
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Term-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	mph@freebsd.org
+MAINTAINER=	mph@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Term::ReadLine::Gnu.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-# We override LDDLFLAGS and LDFLAGS to keep it from adding -L/usr/local/lib
-# automatically.  There is sometimes an old libreadline in /usr/local/lib
-# and this module won't work with it.
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}" \
-			LDDLFLAGS=-shared LDFLAGS=-L/usr/lib
-
 .include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index a8a104a52a49..b2e6b0c6421b 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -13,11 +13,8 @@ MASTER_SITE_SUBDIR=	Term
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Term-ReadLine-Perl-${PORTVERSION}
 
-MAINTAINER=	mph@freebsd.org
+MAINTAINER=	mph@FreeBSD.org
 
-USE_PERL5=	YES
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+PERL_CONFIGURE=	YES
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 18e3925e03a6..83cfae15a030 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Religion.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index bdfc0e093565..8593bd5e2431 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Resources.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index 766927c58402..4b3a4e1b7d92 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Search::Binary.3
diff --git a/devel/p5-Server-FastPL/Makefile b/devel/p5-Server-FastPL/Makefile
index ec98f2ab81e1..a82704e7a2d9 100644
--- a/devel/p5-Server-FastPL/Makefile
+++ b/devel/p5-Server-FastPL/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Server::FastPL.3 Server::FastPL::Client.3 \
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index 160cdafee16c..baf0757fa233 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Set::NestedGroups.3 Set::NestedGroups::Member.3
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index 4239ddb24b0f..addd907ec641 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Set::Object.3
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index 4a55ba4223e7..d4f65ccf5713 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Set::Scalar.3 Set::Scalar::Real.3 Set::Scalar::Virtual.3 \
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 7b1684b123f3..d9788832ea09 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Approx/Makefile b/devel/p5-String-Approx/Makefile
index 49b9f61412e7..e8d9bcfa033b 100644
--- a/devel/p5-String-Approx/Makefile
+++ b/devel/p5-String-Approx/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ilia@cgu.chel.su
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		String::Approx.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 328044fcd007..83b6b281369f 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-String-Random/Makefile b/devel/p5-String-Random/Makefile
index cadd90aae1cb..76b007bca1e7 100644
--- a/devel/p5-String-Random/Makefile
+++ b/devel/p5-String-Random/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index 7e88d91b640c..de31dba9ddc1 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Term-ANSIColor/Makefile b/devel/p5-Term-ANSIColor/Makefile
index 983b4a85c643..d381a348ff9b 100644
--- a/devel/p5-Term-ANSIColor/Makefile
+++ b/devel/p5-Term-ANSIColor/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	ANSIColor-${PORTVERSION}
 
 MAINTAINER=	dsh@vlink.ru
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MAN3=		Term::ANSIColor.3
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index 32fc655cef0c..772815d0d5a4 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Term::Query.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index d54560dbee14..7affa4bfca7d 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -15,13 +15,9 @@ DISTNAME=	TermReadKey-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Term::ReadKey.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Term-Size/Makefile b/devel/p5-Term-Size/Makefile
index 06c246bc512d..e0871d6edba0 100644
--- a/devel/p5-Term-Size/Makefile
+++ b/devel/p5-Term-Size/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	brad@kazrak.com
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Term::Size.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Tie-DB_FileLock/Makefile b/devel/p5-Tie-DB_FileLock/Makefile
index 4e3b7ebcfc3c..82325188a2b5 100644
--- a/devel/p5-Tie-DB_FileLock/Makefile
+++ b/devel/p5-Tie-DB_FileLock/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	josh@zipperup.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=			Tie::DB_FileLock.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 16c91dd9079f..cf4855674e1b 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 0dd7bec1a46b..a388d8d6bb4b 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Time::HiRes.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Time-Period/Makefile b/devel/p5-Time-Period/Makefile
index 6797abe89895..7b14f86e85ce 100644
--- a/devel/p5-Time-Period/Makefile
+++ b/devel/p5-Time-Period/Makefile
@@ -15,13 +15,9 @@ DISTNAME=	Period-${PORTVERSION}
 
 MAINTAINER=	nick@netdot.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Time::Period.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Time/Makefile b/devel/p5-Time/Makefile
index 51ce0807d526..ac2602aa7226 100644
--- a/devel/p5-Time/Makefile
+++ b/devel/p5-Time/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	Time-modules-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Time::CTime.3 \
 		Time::DaysInMonth.3 \
@@ -24,7 +24,4 @@ MAN3=		Time::CTime.3 \
 		Time::Timezone.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 25e9ab7f941c..839a277fcf40 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -14,15 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Date::Format.3 \
 		Date::Parse.3 \
 		Time::Zone.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 7ee07532b444..bbdcb209ea90 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -15,12 +15,9 @@ DISTNAME=	traceFunc-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::TraceFuncs.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 8dce56d7200f..9e1750001df6 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -14,8 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
 		Net::DNS::Question.3 Net::DNS::RR.3 Net::DNS::RR::A.3 \
 		Net::DNS::RR::AFSDB.3 Net::DNS::RR::CNAME.3 Net::DNS::RR::HINFO.3 \
@@ -28,9 +29,4 @@ MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
 		Net::DNS::RR::NSAP.3 Net::DNS::RR::NULL.3 Net::DNS::RR::PX.3 \
 		Net::DNS::Update.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS/pkg-descr b/dns/p5-Net-DNS/pkg-descr
index a4489531f96f..9c055dcb935f 100644
--- a/dns/p5-Net-DNS/pkg-descr
+++ b/dns/p5-Net-DNS/pkg-descr
@@ -42,4 +42,3 @@
        Net::DNS::RR is the base class for DNS resource record
        (RR) objects in the answer, authority, and additional
        sections of a DNS packet.
-
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index cf5c2e161c32..899f1536ec57 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/graphics/GIFgraph/Makefile b/graphics/GIFgraph/Makefile
index d05d8a01466e..ebd124e55094 100644
--- a/graphics/GIFgraph/Makefile
+++ b/graphics/GIFgraph/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	ls@gambit.com.ru
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	YES
 PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index 5170cd4ebbfb..4ce868148670 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Chart::PNGgraph.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index 0c38feb34576..3c380d939b78 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	dan@trinsec.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Chart.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index 90b3a625fa29..05ad430f420b 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	demon@FreeBSD.org
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD::Graph.3 \
@@ -27,7 +27,4 @@ MAN3=		GD::Graph.3 \
 		GD::Graph::FAQ.3 \
 		GD::Graph::colour.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index d6d0ca2c20fc..68c654322bea 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -10,19 +10,16 @@ PORTVERSION=	0.55
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
-DISTNAME=	GDGraph3d-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	GDGraph3d-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD::Graph3d.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 138eb723923a..f4b678b4f933 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD::Text.3 GD::Text::Wrap.3 GD::Text::Align.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index bd04e554694b..1e2abdc47e3d 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -17,13 +17,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index bd04e554694b..1e2abdc47e3d 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -17,13 +17,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index bd04e554694b..1e2abdc47e3d 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -17,13 +17,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index c846797156f7..8d14081c9202 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -14,14 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 CONFIGURE_ARGS=	PREFIX=${PREFIX}
 
 MAN1=		imgsize.1
 MAN3=		Image::Size.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index 0c38feb34576..3c380d939b78 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	dan@trinsec.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Chart.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/irc/p5-IRC/Makefile b/irc/p5-IRC/Makefile
index 671d37867a37..645eb55e84ab 100644
--- a/irc/p5-IRC/Makefile
+++ b/irc/p5-IRC/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jedgar@fxp.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		\
@@ -23,7 +23,4 @@ MAN3=		\
 		Net::Event.3 \
 		Net::IRC.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/lang/p5-Error/Makefile b/lang/p5-Error/Makefile
index 54d9fe7bd5d8..aa7ac7f1708e 100644
--- a/lang/p5-Error/Makefile
+++ b/lang/p5-Error/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pvh@egenetics.com
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Error.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index fc8bde0c0532..9173a89e4435 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.07
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Expect
-DISTNAME=	${PORTNAME}.pm-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}.pm-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -20,11 +20,9 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3=		Expect.3 Expect_intro.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 1cbf586f3ae0..b1300ecd0375 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -14,23 +14,20 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jmz@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		ExtUtils::F77.3
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400005
-F2CLIB= -lg2c
+F2CLIB=	-lg2c
 .else
-F2CLIB= -lf2c
+F2CLIB=	-lf2c
 .endif
 
 post-patch:
 	@cd ${WRKSRC}; ${PERL5} -i.orig -pe \
 		's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.post.mk>
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index 1cbf586f3ae0..b1300ecd0375 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -14,23 +14,20 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jmz@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		ExtUtils::F77.3
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400005
-F2CLIB= -lg2c
+F2CLIB=	-lg2c
 .else
-F2CLIB= -lf2c
+F2CLIB=	-lf2c
 .endif
 
 post-patch:
 	@cd ${WRKSRC}; ${PERL5} -i.orig -pe \
 		's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.post.mk>
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index f4e4cbc30dda..fc2e25fd79d3 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -16,15 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	yes
-
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Tcl.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/lang/p5-Tcl/pkg-descr b/lang/p5-Tcl/pkg-descr
index 8e1f32b60d9c..5142825a6362 100644
--- a/lang/p5-Tcl/pkg-descr
+++ b/lang/p5-Tcl/pkg-descr
@@ -1,30 +1,30 @@
-       The Tcl extension module gives access to the Tcl library
-       with functionality and interface similar to the C
-       functions of Tcl.  In other words, you can
+The Tcl extension module gives access to the Tcl library
+with functionality and interface similar to the C
+functions of Tcl.  In other words, you can
 
-       create Tcl interpreters
-               The Tcl interpreters so created are Perl objects
-               whose destructors delete the interpreters cleanly
-               when appropriate.
+create Tcl interpreters
+        The Tcl interpreters so created are Perl objects
+        whose destructors delete the interpreters cleanly
+        when appropriate.
 
-       execute Tcl code in an interpreter
-               The code can come from strings, files or Perl
-               filehandles.
+execute Tcl code in an interpreter
+        The code can come from strings, files or Perl
+        filehandles.
 
-       bind in new Tcl procedures
-               The new procedures can be either C code (with
-               addresses presumably obtained using dl_open and
-               dl_find_symbol) or Perl subroutines (by name,
-               reference or as anonymous subs). The (optional)
-               deleteProc callback in the latter case is another
-               perl subroutine which is called when the command
-               is explicitly deleted by name or else when the
-               destructor for the interpreter object is
-               explicitly or implicitly called.
+bind in new Tcl procedures
+        The new procedures can be either C code (with
+        addresses presumably obtained using dl_open and
+        dl_find_symbol) or Perl subroutines (by name,
+        reference or as anonymous subs). The (optional)
+        deleteProc callback in the latter case is another
+        perl subroutine which is called when the command
+        is explicitly deleted by name or else when the
+        destructor for the interpreter object is
+        explicitly or implicitly called.
 
-       Manipulate the result field of a Tcl interpreter
+Manipulate the result field of a Tcl interpreter
 
-       Set and get values of variables in a Tcl interpreter
+Set and get values of variables in a Tcl interpreter
 
-       Tie perl variables to variables in a Tcl interpreter
-               The variables can be either scalars or hashes.
+Tie perl variables to variables in a Tcl interpreter
+        The variables can be either scalars or hashes.
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index 352cf79a855f..58ae5cfd8d72 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -17,13 +17,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rse@engelschall.com
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Parse::ePerl.3 Apache::ePerl.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/lang/p5-ePerl/pkg-message b/lang/p5-ePerl/pkg-message
index b82d39eac9e6..9596ee1faefd 100644
--- a/lang/p5-ePerl/pkg-message
+++ b/lang/p5-ePerl/pkg-message
@@ -11,4 +11,3 @@
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See either the Artistic License or the
   GNU General Public License for more details.
-
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 9ad5f094364b..7afe9ca1096e 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tobez@tobez.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Email::Find.3
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 381446dc970a..70ef39402deb 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Email::Valid.3
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index b9920ed45019..bba3cbcf0de5 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -14,14 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	martti.kuparinen@iki.fi
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		IMAP::Admin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/p5-IMAP-Admin
 	@${INSTALL_DATA} ${WRKSRC}/examples/create.pl \
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index 7e299c8ee332..239e9990e915 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	veers@disturbed.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		MIME::Lite.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 0a99f74fe50f..74c49758a40a 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Net/Config.pm:${PORTSDIR}/net/p5-Net \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 403a7da36e22..f57ee65c6a34 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -25,7 +25,6 @@ BROKEN=		"Requires Perl 5.6.0 for 'our' keyword"
 .endif
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile
index 403a7da36e22..f57ee65c6a34 100644
--- a/mail/p5-Mail-Box1/Makefile
+++ b/mail/p5-Mail-Box1/Makefile
@@ -25,7 +25,6 @@ BROKEN=		"Requires Perl 5.6.0 for 'our' keyword"
 .endif
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index 5a7d3923e0e2..2a5a50b38b84 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-CClient/Makefile b/mail/p5-Mail-CClient/Makefile
index c1866139f8f1..25db0cad456d 100644
--- a/mail/p5-Mail-CClient/Makefile
+++ b/mail/p5-Mail-CClient/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=		kbyanc@posi.net
 
 LIB_DEPENDS=		c-client4.7:${PORTSDIR}/mail/cclient
 
-USE_PERL5=		yes
+PERL_CONFIGURE=		yes
 
 MANPREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=			Mail::Cclient.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-CClient/pkg-plist b/mail/p5-Mail-CClient/pkg-plist
index b3e7cb24e494..ea0d7163568f 100644
--- a/mail/p5-Mail-CClient/pkg-plist
+++ b/mail/p5-Mail-CClient/pkg-plist
@@ -3,6 +3,3 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient
-
-
-
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 7921ba4a2299..d2bf96960326 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Mail/Audit.pm:${PORTSDIR}/mail/p5-Mail-Audit \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 9bde909c260e..8666da5c4467 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -23,13 +23,10 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${POR
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Mail::Folder.3 Mail::Folder::Emaul.3 Mail::Folder::Mbox.3 \
 		Mail::Folder::NNTP.3 Mail::Folder::Maildir.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 2e5b8c712d33..77b1bb2f562f 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 5b3ef3e96117..7e72774efc6b 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 INSTALL_TARGET=	pure_site_install
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index f06a56b1dbaa..9741f93cf8d9 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 2aac0eff83f9..dbd208efb039 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -15,12 +15,9 @@ DISTNAME=	POP3Client-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Mail::POP3Client.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index 2b0f8fa8ebdd..2e4b350064e3 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -17,9 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
-
 IS_INTERACTIVE=	yes
 
 MAN3=		Mail::Sender.3
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index a1bf74a1ca4e..aa9c5604c5c9 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -14,11 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wchao@isi.edu
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::Sendmail.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 82aa632f221c..83ff4e3c1b19 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.15
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
-DISTNAME=	MailTools-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	MailTools-${PORTVERSION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
@@ -22,6 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR
 
 PERL_CONFIGURE=	yes
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::Address.3 \
 		Mail::Cap.3 \
 		Mail::Field.3 \
@@ -33,6 +34,4 @@ MAN3=		Mail::Address.3 \
 		Mail::Send.3 \
 		Mail::Util.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 .include <bsd.port.mk>
diff --git a/math/p5-AI-NeuralNet-BackProp/Makefile b/math/p5-AI-NeuralNet-BackProp/Makefile
index 9aa6dbe42f71..eda940022675 100644
--- a/math/p5-AI-NeuralNet-BackProp/Makefile
+++ b/math/p5-AI-NeuralNet-BackProp/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 PERL_CONFIGURE=	yes
diff --git a/math/p5-AI-NeuralNet-Mesh/Makefile b/math/p5-AI-NeuralNet-Mesh/Makefile
index 1040b201a9c2..d225544f123a 100644
--- a/math/p5-AI-NeuralNet-Mesh/Makefile
+++ b/math/p5-AI-NeuralNet-Mesh/Makefile
@@ -15,7 +15,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 PERL_CONFIGURE=	yes
 
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index 3dffde624b50..9dd01c886a4e 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Bit-ShiftReg/Makefile b/math/p5-Bit-ShiftReg/Makefile
index d7ec884fa846..336fad570799 100644
--- a/math/p5-Bit-ShiftReg/Makefile
+++ b/math/p5-Bit-ShiftReg/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index bede6dacd461..c98348cf78d1 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile
index cf1371844df7..8ed28973b664 100644
--- a/math/p5-Math-Bezier/Makefile
+++ b/math/p5-Math-Bezier/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Math-BigIntFast/Makefile b/math/p5-Math-BigIntFast/Makefile
index 8cd0d0d1c579..b05081378b86 100644
--- a/math/p5-Math-BigIntFast/Makefile
+++ b/math/p5-Math-BigIntFast/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Bit/Vector.pm:${PORTSDIR}/math/p5-Bit-V
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile
index 2a8247d28b85..e3328ac52bac 100644
--- a/math/p5-Math-Currency/Makefile
+++ b/math/p5-Math-Currency/Makefile
@@ -24,7 +24,6 @@ BROKEN=		"Needs Perl 5.6.0 for Math::BigFloat"
 .endif
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 USE_ZIP=	yes
 PERL_CONFIGURE=	yes
 
diff --git a/math/p5-Math-Expr/Makefile b/math/p5-Math-Expr/Makefile
index 3aad5e194440..94b2e56f92c4 100644
--- a/math/p5-Math-Expr/Makefile
+++ b/math/p5-Math-Expr/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lioux@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
+
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Math::Expr.3 Math::Expr::FormulaDB.3 \
 		Math::Expr::MatchSet.3 Math::Expr::Node.3 \
diff --git a/math/p5-Math-Financial/Makefile b/math/p5-Math-Financial/Makefile
index cf5c2e161c32..899f1536ec57 100644
--- a/math/p5-Math-Financial/Makefile
+++ b/math/p5-Math-Financial/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Math-FixedPrecision/Makefile b/math/p5-Math-FixedPrecision/Makefile
index 9c1927a69f18..8f5e00d67111 100644
--- a/math/p5-Math-FixedPrecision/Makefile
+++ b/math/p5-Math-FixedPrecision/Makefile
@@ -20,8 +20,7 @@ MAINTAINER=	ports@FreeBSD.org
 BROKEN=		"Needs Perl 5.6.0 for Math::BigFloat"
 .endif
 
-USE_PERL5=	yes
-PERL_CONFIGURE= yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Math::FixedPrecision.3
diff --git a/math/p5-Math-GMP/Makefile b/math/p5-Math-GMP/Makefile
index 2304195beda7..247839767140 100644
--- a/math/p5-Math-GMP/Makefile
+++ b/math/p5-Math-GMP/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index 46a06d37ec82..8515adb1be44 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lioux@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Math::Logic.3
diff --git a/math/p5-MatrixReal/Makefile b/math/p5-MatrixReal/Makefile
index a1eaa91fe482..aac77fa8637d 100644
--- a/math/p5-MatrixReal/Makefile
+++ b/math/p5-MatrixReal/Makefile
@@ -4,22 +4,19 @@
 #
 # $FreeBSD$
 
-PORTNAME=		MatrixReal
-PORTVERSION=		1.3a5
-CATEGORIES=		math perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+PORTNAME=	MatrixReal
+PORTVERSION=	1.3a5
+CATEGORIES=	math perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Math
-PKGNAMEPREFIX=		p5-
-DISTNAME=		Math-${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
+DISTNAME=	Math-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sander@haldjas.folklore.ee
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Math::MatrixReal.3 Math::Kleene.3
-
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+MAN3=		Math::MatrixReal.3 Math::Kleene.3
 
 .include <bsd.port.mk>
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index 48fbd497c574..b4cd251e26a3 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	croyle@gelemna.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Set::IntSpan.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index c60d9b0704e5..4ac30d4402e5 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Set::Window.3
diff --git a/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index f2672ab59280..2ce7ebcafeab 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/Statistics/ChiSquare
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index 05a09d43eb82..d90b52baddd5 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Statistics::Descriptive.3
diff --git a/math/p5-Statistics-Distributions/Makefile b/math/p5-Statistics-Distributions/Makefile
index 65a522b96263..080a9d311b02 100644
--- a/math/p5-Statistics-Distributions/Makefile
+++ b/math/p5-Statistics-Distributions/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Statistics::Distributions.3
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index a5e257ff8dbd..801d59b49554 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Statistics::LTU.3
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index 4cf95abf3fa7..01b337744442 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Statistics::OLS.3
diff --git a/math/p5-Statistics-Table-F/Makefile b/math/p5-Statistics-Table-F/Makefile
index 5d8b5d6b53d7..13dc48ce7a6a 100644
--- a/math/p5-Statistics-Table-F/Makefile
+++ b/math/p5-Statistics-Table-F/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/Statistics/Table/F
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index b24781224ddf..4b52c3aeead2 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Array::PrintCols.3
diff --git a/misc/p5-File-CounterFile/Makefile b/misc/p5-File-CounterFile/Makefile
index 800ba992ba72..08eadaa649d7 100644
--- a/misc/p5-File-CounterFile/Makefile
+++ b/misc/p5-File-CounterFile/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wchao@isi.edu
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		File::CounterFile.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index dc942913319e..1f7034242874 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		I18N::Charset.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile
index 2be97fd04523..34d4c540a1ab 100644
--- a/misc/p5-I18N-LangTags/Makefile
+++ b/misc/p5-I18N-LangTags/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		I18N::LangTags.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/misc/p5-LEGO-RCX/Makefile b/misc/p5-LEGO-RCX/Makefile
index 9a08e203b88e..f344acc3927f 100644
--- a/misc/p5-LEGO-RCX/Makefile
+++ b/misc/p5-LEGO-RCX/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kbyanc@posi.net
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		LEGO::RCX.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index 6aa3fab227a3..59ebe17c1e54 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -14,13 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Locale::Country.3 \
 		Locale::Language.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index 2c7d5e121b58..596306bb1380 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -15,15 +15,11 @@ DISTNAME=	Mon-${PORTVERSION}
 
 MAINTAINER=	nick@netdot.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mon::SNMP.3 \
 		Mon::Client.3 \
 		Mon::Protocol.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Mon/pkg-descr b/net-mgmt/p5-Mon/pkg-descr
index 5d6b8678a322..a97b1716a277 100644
--- a/net-mgmt/p5-Mon/pkg-descr
+++ b/net-mgmt/p5-Mon/pkg-descr
@@ -4,4 +4,5 @@ things like special logging routines and persistent monitors are being
 considered.
 
 "mon" is a tool for monitoring the availability of services.
-More information can be found at http://www.kernel.org/software/mon/.
+
+WWW: http://www.kernel.org/software/mon/.
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index 51b18c597dc7..ef34bababbe4 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bradh@uunet.co.za
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN1=		ipv4calc.1
 MAN3=		Net::IPv4Addr.3
 
-do-configure:
-
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index 20028a3bf3ff..5cd8d012e6ab 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wchao@isi.edu
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Netmask.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 0b7393700223..974a033225ac 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.6
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::SNMP.3
diff --git a/net-mgmt/p5-Net-SNMP3/Makefile b/net-mgmt/p5-Net-SNMP3/Makefile
index 0b7393700223..974a033225ac 100644
--- a/net-mgmt/p5-Net-SNMP3/Makefile
+++ b/net-mgmt/p5-Net-SNMP3/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.6
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::SNMP.3
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 54ae0256110d..d9090c307854 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@freebsd.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		NetAddr::IP.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index e1566db80e67..558fcdc7262d 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -14,14 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fenner@FreeBSD.org
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		SNMP::Util.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index 6c8dbc430d20..b20696c57b45 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS= 	snmp.4:${PORTSDIR}/net/net-snmp
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 post-install:
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 846aa5a7ce07..18467d482485 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -13,7 +13,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 pre-install:
diff --git a/net/p5-Mon/Makefile b/net/p5-Mon/Makefile
index 2c7d5e121b58..596306bb1380 100644
--- a/net/p5-Mon/Makefile
+++ b/net/p5-Mon/Makefile
@@ -15,15 +15,11 @@ DISTNAME=	Mon-${PORTVERSION}
 
 MAINTAINER=	nick@netdot.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mon::SNMP.3 \
 		Mon::Client.3 \
 		Mon::Protocol.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Mon/pkg-descr b/net/p5-Mon/pkg-descr
index 5d6b8678a322..a97b1716a277 100644
--- a/net/p5-Mon/pkg-descr
+++ b/net/p5-Mon/pkg-descr
@@ -4,4 +4,5 @@ things like special logging routines and persistent monitors are being
 considered.
 
 "mon" is a tool for monitoring the availability of services.
-More information can be found at http://www.kernel.org/software/mon/.
+
+WWW: http://www.kernel.org/software/mon/.
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 8dce56d7200f..9e1750001df6 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -14,8 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
 		Net::DNS::Question.3 Net::DNS::RR.3 Net::DNS::RR::A.3 \
 		Net::DNS::RR::AFSDB.3 Net::DNS::RR::CNAME.3 Net::DNS::RR::HINFO.3 \
@@ -28,9 +29,4 @@ MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
 		Net::DNS::RR::NSAP.3 Net::DNS::RR::NULL.3 Net::DNS::RR::PX.3 \
 		Net::DNS::Update.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-DNS/pkg-descr b/net/p5-Net-DNS/pkg-descr
index a4489531f96f..9c055dcb935f 100644
--- a/net/p5-Net-DNS/pkg-descr
+++ b/net/p5-Net-DNS/pkg-descr
@@ -42,4 +42,3 @@
        Net::DNS::RR is the base class for DNS resource record
        (RR) objects in the answer, authority, and additional
        sections of a DNS packet.
-
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index f59ba23e5d5d..0d7200b760dc 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -14,15 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Daemon.3 \
 		Net::Daemon::Log.3 \
 		Net::Daemon::Test.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-IPv4Addr/Makefile b/net/p5-Net-IPv4Addr/Makefile
index 51b18c597dc7..ef34bababbe4 100644
--- a/net/p5-Net-IPv4Addr/Makefile
+++ b/net/p5-Net-IPv4Addr/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bradh@uunet.co.za
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN1=		ipv4calc.1
 MAN3=		Net::IPv4Addr.3
 
-do-configure:
-
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Netmask/Makefile b/net/p5-Net-Netmask/Makefile
index 20028a3bf3ff..5cd8d012e6ab 100644
--- a/net/p5-Net-Netmask/Makefile
+++ b/net/p5-Net-Netmask/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wchao@isi.edu
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Netmask.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index c0358ecaab64..d4be6305f122 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -16,12 +16,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MAN3=		Net::RawIP.3 Net::RawIP::libpcap.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile
index 0b7393700223..974a033225ac 100644
--- a/net/p5-Net-SNMP/Makefile
+++ b/net/p5-Net-SNMP/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.6
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::SNMP.3
diff --git a/net/p5-Net-SNMP3/Makefile b/net/p5-Net-SNMP3/Makefile
index 0b7393700223..974a033225ac 100644
--- a/net/p5-Net-SNMP3/Makefile
+++ b/net/p5-Net-SNMP3/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.6
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::SNMP.3
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 4968088a3187..4038e355f74e 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Whois.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index 29222a8edfa9..ca7886d1d17a 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	igor@zynaps.ru
 
-USE_PERL5=	yes
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+PERL_CONFIGURE=	yes
 
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Gen.3 \
 		Net::Inet.3 \
 		Net::TCP.3 \
@@ -25,8 +25,4 @@ MAN3=		Net::Gen.3 \
 		Net::UNIX.3 \
 		Net::UNIX::Server.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index ce10b0698829..73dbc978281d 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	libnet-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		\
@@ -31,7 +31,4 @@ MAN3=		\
 		Net::Time.3 \
 		Net::libnetFAQ.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile
index 54ae0256110d..d9090c307854 100644
--- a/net/p5-NetAddr-IP/Makefile
+++ b/net/p5-NetAddr-IP/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@freebsd.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		NetAddr::IP.3
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 981f80a332ef..ba618ad8a104 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -17,14 +17,11 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Bundle::PlRPC.3 \
 		RPC::PlClient.3 \
 		RPC::PlServer.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index e1566db80e67..558fcdc7262d 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -14,14 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fenner@FreeBSD.org
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		SNMP::Util.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 6c8dbc430d20..b20696c57b45 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS= 	snmp.4:${PORTSDIR}/net/net-snmp
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 post-install:
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index 846aa5a7ce07..18467d482485 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -13,7 +13,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 pre-install:
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 54b667146b4a..aef6f1140ca4 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/net/p5-SOAP/pkg-descr b/net/p5-SOAP/pkg-descr
index d3ad370d2cd3..bae2cfcb844d 100644
--- a/net/p5-SOAP/pkg-descr
+++ b/net/p5-SOAP/pkg-descr
@@ -2,6 +2,5 @@ SOAP/Perl is a collection of Perl modules which provides a simple
 and consistent application programming interface (API) to the 
 Simple Object Access Protocol (SOAP).
 
-To learn more about SOAP, see http://www.w3.org/TR/SOAP/.
-
+WWW: http://www.w3.org/TR/SOAP/
 --will
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index e739b114edf3..a179d56aacf7 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -14,10 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ume@FreeBSD.org
 
-USE_PERL5=	yes
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 4a4861ba8041..0bdf5955a8aa 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nakai@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Net::SOCKS.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index 80256d359d2f..07ac2c01fd71 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ache@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+
 MAN3=	URI.3 \
 	URI::data.3 \
 	URI::Escape.3 \
@@ -25,10 +26,6 @@ MAN3=	URI.3 \
 	URI::ldap.3 \
 	URI::URL.3 \
 	URI::WithBase.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index d7bc296c962d..159f9eae5e76 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -19,6 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Convert/ASN1.pm:${PO
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
 
+PERL_CONFIGURE=	yes
+
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::LDAP::Control::VLVResponse.3 \
 		Net::LDAP::Entry.3 \
@@ -44,7 +46,4 @@ MAN3=		Net::LDAP::Control::VLVResponse.3 \
 		Net::LDAP::Reference.3 \
 		Net::LDAP::RFC.3
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 11724abfb583..96e7558878d9 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -5,25 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=		Gateway
-PORTVERSION=		0.42
-CATEGORIES=		news perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+PORTNAME=	Gateway
+PORTVERSION=	0.42
+CATEGORIES=	news perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	News
-PKGNAMEPREFIX=		p5-
+PKGNAMEPREFIX=	p5-
 
-MAINTAINER=		croyle@gelemna.org
+MAINTAINER=	croyle@gelemna.org
 
-BUILD_DEPENDS=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
-RUN_DEPENDS=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
 
-USE_PERL5=		yes
+PERL_CONFIGURE=	yes
 
-MAN3=			News::Gateway.3
-MANPREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+MAN3=		News::Gateway.3
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index 27d1707d4532..7c7727b909d1 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		News::NNTPClient.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 89cd6e23d071..86656eca06bb 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -18,13 +18,10 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PGP/Sign.pm:${PORTSDIR}/security/p5-PGP-Sign
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		News::Article.3 News::AutoReply.3 News::FormArticle.3 \
 		News::FormReply.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 85f90bc84315..9e024c780e9e 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	croyle@gelemna.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		News::Newsrc.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/palm/p5-Palm/Makefile b/palm/p5-Palm/Makefile
index 31310d8e07f3..bdcd3c15573f 100644
--- a/palm/p5-Palm/Makefile
+++ b/palm/p5-Palm/Makefile
@@ -12,12 +12,12 @@ MASTER_SITES=	http://www.ooblick.com/software/coldsync/
 
 MAINTAINER=	arensb@ooblick.com
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
-CONFIGURE_ARGS=	PREFIX=${PREFIX}
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+# Just so that the .packlist conforms to reality
+NOMANCOMPRESS=	yes
 MAN1=		pdbdump.1
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Palm::Address.3 \
 		Palm::Datebook.3 \
 		Palm::Mail.3 \
@@ -27,10 +27,4 @@ MAN3=		Palm::Address.3 \
 		Palm::StdAppInfo.3 \
 		Palm::ToDo.3
 
-# Just so that the .packlist conforms to reality
-NOMANCOMPRESS=	yes
-
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
-
 .include <bsd.port.mk>
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 9e21701cb2fd..e08489438a8f 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::PDF::Pages.3 Text::PDF::Page.3 Text::PDF::Name.3 \
diff --git a/russian/p5-Lingua-RU-Charset/Makefile b/russian/p5-Lingua-RU-Charset/Makefile
index ad772a835970..e07600df0c6f 100644
--- a/russian/p5-Lingua-RU-Charset/Makefile
+++ b/russian/p5-Lingua-RU-Charset/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kapr@crosswinds.net
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Lingua::RU::Charset.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/russian/p5-Lingua-RU-Charset/pkg-comment b/russian/p5-Lingua-RU-Charset/pkg-comment
index f51c13aaf91c..4dc0896a890a 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-comment
+++ b/russian/p5-Lingua-RU-Charset/pkg-comment
@@ -1 +1 @@
-Perl extension for detecting and converting various russian character sets.
+Perl extension for detecting and converting various russian character sets
diff --git a/russian/p5-Lingua-RU-Charset/pkg-descr b/russian/p5-Lingua-RU-Charset/pkg-descr
index 5b6bef2c2f36..da92b25d6130 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-descr
+++ b/russian/p5-Lingua-RU-Charset/pkg-descr
@@ -1,12 +1,12 @@
 From the README file for Lingua::RU::Charset:
-	Lingua::RU::Charset - Perl extension for detecting and converting
-	various russian character sets: KOI8-r, Windows-1251, CP866,
-	ISO-8859-5, X-Mac-Cyrillic, russian text in english letters,
-	russian part of Unicode and UTF-8. This module can be especially
-	useful for computers with broken cyrillic locales (like foreign
-	web hosts).
+Lingua::RU::Charset - Perl extension for detecting and converting
+various russian character sets: KOI8-r, Windows-1251, CP866,
+ISO-8859-5, X-Mac-Cyrillic, russian text in english letters,
+russian part of Unicode and UTF-8. This module can be especially
+useful for computers with broken cyrillic locales (like foreign
+web hosts).
 
-	This module does not use locale or unicode and is written in pure Perl, 
-	so it will probably work at any computer.
+This module does not use locale or unicode and is written in pure Perl, 
+so it will probably work at any computer.
 
 Alex Kapranoff <kapr@crosswinds.net>
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index fcdf6344785f..f850f52419ea 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	matt@zigg.com
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Authen::PAM.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index bb01c4c9c469..38e7f396f4d0 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -17,14 +17,11 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-MD5
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 MAN3=		Authen::Radius.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 pre-configure:
 		@${CP} ${WRKSRC}/Authen/Radius.pm ${WRKSRC}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/security/p5-Authen-TacacsPlus/Makefile b/security/p5-Authen-TacacsPlus/Makefile
index 1ac123c6368d..a94faaca0702 100644
--- a/security/p5-Authen-TacacsPlus/Makefile
+++ b/security/p5-Authen-TacacsPlus/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 MAKE_ENV+=	CCFLAGS="${CFLAGS}"
 
diff --git a/security/p5-Authen-Ticket/Makefile b/security/p5-Authen-Ticket/Makefile
index 124fda8d3244..4474fa5c0eae 100644
--- a/security/p5-Authen-Ticket/Makefile
+++ b/security/p5-Authen-Ticket/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index 938dc98662ad..fd98498b7879 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -14,14 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	patrick@mindstep.com
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Crypt::Blowfish.3
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index 03187c8eeabb..517df82f4764 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -18,12 +18,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MD5.pm:${
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::CBC.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 2f6b50899921..2befa7b07540 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index cce391aefc44..a1af69dc1d25 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=INC="-I${LOCALBASE}/include"
 
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index 09bce82fe095..cbe80de99409 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index f5b8cd6d9321..851d59cdb614 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index 9055e181b20a..361cb07bddac 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -18,13 +18,9 @@ RESTRICTED=	"Crypto; export-controlled"
 
 IS_INTERACTIVE=	"asks about openssl"
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::SSLeay.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist
index f8e076d62b52..7bf4fc4a1607 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -8,5 +8,4 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/MainContext.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSL.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
-lib/perl5/%%PERL_VER%%/man/man3/Crypt::SSLeay.3
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
diff --git a/security/p5-Crypt-TripleDES/Makefile b/security/p5-Crypt-TripleDES/Makefile
index 1fe1d23a597d..63bc672e7218 100644
--- a/security/p5-Crypt-TripleDES/Makefile
+++ b/security/p5-Crypt-TripleDES/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 9a3097710261..075aa8ed6b4d 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -15,7 +15,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/Crypt/Twofish
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Crypt-UnixCrypt/Makefile b/security/p5-Crypt-UnixCrypt/Makefile
index d0f4dc9e7bc4..dfa264bf8e96 100644
--- a/security/p5-Crypt-UnixCrypt/Makefile
+++ b/security/p5-Crypt-UnixCrypt/Makefile
@@ -15,7 +15,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 7d598ad81c2e..24bd2a4526ad 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ache@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=	Digest::MD2.3 \
 	Digest::SHA1.3 \
@@ -28,8 +28,4 @@ MAN3=	Digest::MD2.3 \
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 714d8968493f..6c9dc6813031 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	GnuPG-Interface
 PORTVERSION=	0.11
 CATEGORIES=	security perl5
-MASTER_SITES=	http://download.sourceforge.net/${PORTNAME}/ \
-		ftp://download.sourceforge.net/pub/sourceforge/${PORTNAME}/ \
-		ftp://ftp.kddlabs.co.jp/sourceforge/${PORTNAME}/ \
-		${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GnuPG
 PKGNAMEPREFIX=	p5-
 
@@ -20,7 +17,7 @@ MAINTAINER=	trevor@FreeBSD.org
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=	GnuPG::Handles.3 \
 	GnuPG::SecretKey.3 \
@@ -32,10 +29,6 @@ MAN3=	GnuPG::Handles.3 \
 	GnuPG::Key.3 \
 	GnuPG::UserId.3 \
 	GnuPG::Options.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index f49c2ba3e10f..c1a321f3b903 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -18,12 +18,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSL
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 $MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 $MAN3=		IO::Socket::SSL.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index bb9c13ac1f45..d2677689e7be 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		MD5.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 7988e6b1d181..e64118fb3368 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -16,14 +16,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.ORG
 
 RESTRICTED=	"Cryptography"
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::SSLeay.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			${OPENSSLBASE} CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 6b482469607a..cf6668f2037b 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	croyle@gelemna.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+CONFIG_ARGS=	PGPS=${PGPS} PGPV=${PGPV} PGPSTYLE=${PGPSTYLE}
 
 MAN3=		PGP::Sign.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -69,10 +70,4 @@ PGPS?=	${PGP}
 PGPV?=	${PGP}
 .endif
 
-CONFIG_ARGS=	PGPS=${PGPS} PGPV=${PGPV} PGPSTYLE=${PGPSTYLE}
-
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		${CONFIG_ARGS}
-
 .include <bsd.port.mk>
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 7ef02f5559c2..9dc6b7dacbaf 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		PGP::Pipe.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -24,7 +24,4 @@ MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 pre-configure:
 		@${CP} ${WRKSRC}/PGP/Pipe.pm ${WRKSRC}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index 08adbb5dcd37..6271fe0180ca 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Filesys::DiskSpace.3
diff --git a/sysutils/p5-Quota/Makefile b/sysutils/p5-Quota/Makefile
index ea3beae38d68..91e48a2cf6bf 100644
--- a/sysutils/p5-Quota/Makefile
+++ b/sysutils/p5-Quota/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index dc3ef527b56a..f0267ab2651a 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Schedule::Cron.3
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index 86b600216435..c7c1d977db10 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Schedule::Match.3
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 8b7cae7c27dc..3cfdb92a286b 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		SyslogScan::ByGroup.3 SyslogScan::Delivery.3 \
@@ -24,7 +24,4 @@ MAN3=		SyslogScan::ByGroup.3 SyslogScan::Delivery.3 \
 		SyslogScan::Summary.3 SyslogScan::SyslogEntry.3 \
 		SyslogScan::Usage.3 SyslogScan::WhereIs.3 read_mail_log.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index b439ab0988dc..b69310e73f9e 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index 23162d09d2d7..e8b7a1959f8d 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -15,14 +15,9 @@ DISTNAME=	Syslog-${PORTVERSION}
 
 MAINTAINER=	blaz@amis.net
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Unix::Syslog.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index 268bd779d784..ca5ee44104d5 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::DelimMatch.3
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index ff1438adf1c5..4d2e0e532704 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Sort::ArbBiLex.3
diff --git a/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index c6dda91e478d..45fcfd34cd01 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Sort::Fields.3
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 84affeb343d4..6d2a11c5f320 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -14,14 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@protey.ru
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Spreadsheet::ParseExcel.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index e3246184642c..f5208b2531e7 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@protey.ru
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Spreadsheet::WriteExcel::Worksheet.3 \
 		Spreadsheet::WriteExcel::BIFFwriter.3 \
@@ -22,11 +22,6 @@ MAN3=		Spreadsheet::WriteExcel::Worksheet.3 \
 		Spreadsheet::WriteExcel::Workbook.3 \
 		Spreadsheet::WriteExcel::examples::WorkbookBig.3 \
 		Spreadsheet::WriteExcel.3 Spreadsheet::WriteExcel::Format.3
-
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 32873a9f5599..9d5f3d430dca 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		String::ShellQuote.3
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 58d96e97d35e..9853d90930f8 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		String::Strip.3
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index f2b257f1efed..4d59bab333a2 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Autoformat.3
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index 022901f48b36..ec43ad613abe 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Bind.3
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 3ec337c75659..4981aa7bd125 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ache@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Text::CSV_XS.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index bf15bfcf5330..e20a53c74e8f 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::DoubleMetaphone.3
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index f8b76f32019a..1ae6bbfe28ce 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::FillIn.3
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 9cf32414d0ba..5ff9ca5f7848 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tobez@tobez.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Filter::Chain.3
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index 62e68b621990..c042c39faaae 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Filter.3
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index 77448f8373b7..93fc0bc01e39 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::FixedLength.3
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 736a0be154b4..b6038453271b 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Flowchart.3
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index c1dcc35f8b3b..d6cba4938a2e 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Format.3
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index b72de67b6954..9b877f0ab92e 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Graphics.3
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 053a32420687..65fdb138052e 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Query.3 Text::Query::Build.3 \
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 9d44c2bfde93..f2d2b3f48122 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -15,12 +15,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		Text::Template.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 8fef0c7dbcca..9a79a047043e 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		template_syntax.3 Text::Tmpl.3 template_extend.3
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 2ea53c43316a..b107f603242f 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@tobez.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Text::Wrapper.3
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 9619d841cfef..4db7d37de653 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		XML::DT.3
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index e9d37b425c4f..277e68dc35b0 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	tobez@tobez.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		XML::Dumper.3
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index b7881731abd2..0d37dbc9e358 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -16,13 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		XML::RSS.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 5ad739fc5181..426edd2abba5 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	andrew@ugh.net.au
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		XML::Simple.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index c746ea788e28..2e1c6da0a029 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index 44b637db6220..76db526f6a66 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -14,10 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PERL_CONFIGURE=	yes
+
 MAN3=		XML::Writer.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index e78766a1a282..c84f68fbeeee 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	skv@protey.ru
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		XML::XPath.3 XML::XPath::Boolean.3 XML::XPath::Builder.3 \
 		XML::XPath::Literal.3 XML::XPath::Node.3 \
@@ -29,9 +29,4 @@ MAN3=		XML::XPath.3 XML::XPath::Boolean.3 XML::XPath::Builder.3 \
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX} \
-					INSTALLSCRIPT=${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-XPath/pkg-descr b/textproc/p5-XML-XPath/pkg-descr
index 81db740f73d4..e035bb6f0fa8 100644
--- a/textproc/p5-XML-XPath/pkg-descr
+++ b/textproc/p5-XML-XPath/pkg-descr
@@ -2,3 +2,5 @@ This module aims to comply exactly to the XPath specification at
 http://www.w3.org/TR/xpath and yet allow extensions to be added in the
 form of functions. Modules such as XSLT and XPointer may need to do
 this as they support functionality beyond XPath.
+
+WWW: http://www.w3.org/TR/xpath
diff --git a/textproc/p5-dTemplate/Makefile b/textproc/p5-dTemplate/Makefile
index a47ee890661a..62342fb978a1 100644
--- a/textproc/p5-dTemplate/Makefile
+++ b/textproc/p5-dTemplate/Makefile
@@ -13,10 +13,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jeremy@external.org
 
+PERL_CONFIGURE=	yes
+
 MAN3=		dTemplate.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 21c990c427ef..c999e40c442c 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -14,18 +14,15 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	igor@zynaps.ru
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/p5-Apache \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Apache::ASP.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 6f1de3440b29..57540e9032ab 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index ac02f3458a2a..7941162c4ca9 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -12,17 +12,16 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
+MAINTAINER=	ports@FreeBSD.org
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${PREFIX}/sbin/apxs:${PORTSDIR}/www/${APACHE_PORT}
+		${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${APACHE_PORT}
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-MAINTAINER=	ports@FreeBSD.org
-
 APACHE_PORT?=	apache13
 CURUSER?=	`whoami`
 CURGRP?=	`groups | awk '{print $1}'`
 TESTPORT?=	8228
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	APACHE="${PREFIX}/sbin/apache" \
 		TESTUSER="${CURUSER}" \
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 7354e1981dae..0f2da1583f57 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 8755af20cd13..18af8b01a644 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index 4843702d147f..af9d855b7ea3 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index e0e09f1ca341..13bbd91557b9 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -14,12 +14,11 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/p5-Apache \
-		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
-		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
-		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index e4ce5501a9c3..3d2fd97806ba 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -10,21 +10,18 @@ PORTVERSION=	0.88
 CATEGORIES=	www databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	ApacheDBI-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	ApacheDBI-${PORTVERSION}
 
 MAINTAINER=	igor@zynaps.ru
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 MAN3=		Apache::DBI.3 \
 		Apache::AuthDBI.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index ab32ca1d6fe1..aac0e49ab917 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -14,9 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/p5-Apache
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index f8924a10863d..29994dab70fd 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -14,10 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/p5-Apache \
-		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-Language/pkg-descr b/www/p5-Apache-Language/pkg-descr
index 749328f51f81..f7192ea8d539 100644
--- a/www/p5-Apache-Language/pkg-descr
+++ b/www/p5-Apache-Language/pkg-descr
@@ -1,6 +1,7 @@
-Apache::Language objects act like language-aware hashes.  They store key/language/values
-triplets.  Using the Accept-Language: field sent by HTTP clients, they can pick the
-best fit language for that specific client.  Apache::Language's usage is transparent
+Apache::Language objects act like language-aware hashes.  They store
+key/language/values triplets.  Using the Accept-Language: field sent by
+HTTP clients, they can pick the best fit language for that specific client.
+Apache::Language's usage is transparent
 and should prove to be quite convenient (and hopefully, efficient).
 
 --will
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index 9d4f343f3f8c..c590028b20bf 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -17,12 +17,9 @@ MAINTAINER=	leo@florida.sarang.net
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
+
 MAN3=		Apache::Peek.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index 2d42424a9a8b..1033c275225c 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	0.3
 CATEGORIES=	www security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	Apache-AuthenRadius-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	Apache-AuthenRadius-${PORTVERSION}
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
@@ -19,12 +19,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_per
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Apache::AuthenRadius.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 963083c09116..d39f44aa3462 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	frank@exit.com
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Apache::Session.3 \
@@ -44,7 +44,4 @@ MAN3=		Apache::Session.3 \
 		Apache::Session::Store::Sybase.3 \
 		Apache::Session::Sybase.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 96578a6f93c7..168d81f2cff0 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index 0712535d677c..dc0837526040 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/String/Checker.pm:${PORTSDIR}/devel/p5-String-Checke
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 99fb2f19ad47..7c1600e2cca5 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/File/Cache.pm:${PORTSDIR}/devel/p5-File-Cache
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index c7b0938f93fd..1e074de629f5 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		CGI::FastTemplate.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index eb4dac008fc2..dabc50732b37 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Minimal.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 36d340df465c..62d1927ea7c0 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -10,20 +10,17 @@ PORTVERSION=	2.76
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
-DISTNAME=	CGI-modules-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	CGI-modules-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 36d340df465c..62d1927ea7c0 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -10,20 +10,17 @@ PORTVERSION=	2.76
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
-DISTNAME=	CGI-modules-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	CGI-modules-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 0ab71f5c470c..78c0c6836478 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		CGI_Lite.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index faa0b0ce0d23..da0fe3ca5127 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -10,20 +10,16 @@ PORTVERSION=	0.52
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	FCGI
-DISTNAME=	FCGI-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	FCGI-${PORTVERSION}
 
 MAINTAINER=	kbyanc@posi.net
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libfcgi.a:${PORTSDIR}/www/fcgi
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		FCGI.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 438c31adea64..95507ea24f6d 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -16,14 +16,10 @@ MAINTAINER=	kapr@crosswinds.net
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/p5-Apache
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
 
 MAN3=		HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			${LOCALBASE}/sbin CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Navigation/Makefile b/www/p5-HTML-Navigation/Makefile
index fd927f801cc5..d6ee1e73699d 100644
--- a/www/p5-HTML-Navigation/Makefile
+++ b/www/p5-HTML-Navigation/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index 82ba6ba7868f..d4a7ccbf6fa8 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 931f34ca3870..597909887bdc 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTML::Entities.3 \
 		HTML::Filter.3 \
@@ -24,11 +24,6 @@ MAN3=		HTML::Entities.3 \
 		HTML::LinkExtor.3 \
 		HTML::Parser.3 \
 		HTML::TokeParser.3
-
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index b055c6210c2a..7f5410fc6f59 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTML::QuickCheck.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/pkg-descr b/www/p5-HTML-QuickCheck/pkg-descr
index 8441fa4d9f4f..d4dc53d68ad1 100644
--- a/www/p5-HTML-QuickCheck/pkg-descr
+++ b/www/p5-HTML-QuickCheck/pkg-descr
@@ -20,4 +20,3 @@
 
        HTMLQuickCheck currently supports HTML 1.0, 2.x (draft),
        3.0 (draft) and netscape extensions (1.1).
-
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 5d431b24eca0..473bb26420bd 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	YES
+PERL_CONFIGURE=	YES
 
 MAN3=		HTML::Stream.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index 2588f60538bd..4fa125ccf04d 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -16,12 +16,9 @@ MAINTAINER=	demon@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		HTML::Summary.3 Text::Sentence.3 Lingua::JA::Jtruncate.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index ef5008d53e1b..b0959e2cc73f 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTML::TableExtract.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index e0044a57ea8b..6ef813c677d4 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTML::TableLayout.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 550d61ff59ee..50baaee5d071 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -14,13 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTML::Tagset.3
-
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 3b697977d89b..7be563ca5cb3 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -16,13 +16,10 @@ MAINTAINER=	demon@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		HTML::Parse.3 HTML::TreeBuilder.3 HTML::AsSubs.3 \
 		HTML::Element.3 HTML::Element::traverse.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML/pkg-descr b/www/p5-HTML/pkg-descr
index 97a2ffdd87f3..98cf1acfb3e7 100644
--- a/www/p5-HTML/pkg-descr
+++ b/www/p5-HTML/pkg-descr
@@ -1,11 +1,10 @@
-       HTML::Base is an expansion module for PERL version 5 which
-       provides an object-oriented way to build pages of HTML.
-       It's purpose is to create HTML tags at the lowest level of
-       functionality, that is to say, it creates HTML and doesn't
-       do much else.  Specifically, it does not provide any
-       CGI-like services (see the CGI modules for that!).
-
-       Currently, the module supports all of the standard HTML
-       2.0 tags, plus some selected tags from the proposed HTML
-       3.0 standard, and some NetScapeisms.
+HTML::Base is an expansion module for PERL version 5 which
+provides an object-oriented way to build pages of HTML.
+It's purpose is to create HTML tags at the lowest level of
+functionality, that is to say, it creates HTML and doesn't
+do much else.  Specifically, it does not provide any
+CGI-like services (see the CGI modules for that!).
 
+Currently, the module supports all of the standard HTML
+2.0 tags, plus some selected tags from the proposed HTML
+3.0 standard, and some NetScapeisms.
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 3bf91941a515..bf2cc8a9e9e0 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 3bf91941a515..bf2cc8a9e9e0 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -14,12 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 7c37351723d4..4b06378776e2 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -11,8 +11,8 @@ PORTVERSION=	2.49
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	LWP
-DISTNAME=	ParallelUserAgent-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	ParallelUserAgent-${PORTVERSION}
 
 MAINTAINER=	ache@FreeBSD.org
 
@@ -20,10 +20,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/w
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 MAN3=		Bundle::ParallelUA.3 \
 		LWP::Parallel.3 \
 		LWP::Parallel::Protocol.3 \
@@ -32,7 +31,4 @@ MAN3=		Bundle::ParallelUA.3 \
 		LWP::ParallelUA.3 \
 		LWP::RobotPUA.3
 
-do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index d364bfcecba6..837d3d837efd 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 174ee7f1a9c9..d368028860b0 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index cd87548a24f2..d21eb95ce897 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		AutoSearch.1 \
 		WebSearch.1
@@ -74,8 +74,4 @@ MAN3=		WWW::Search.3 \
 		WWW::Search::ZDNet.3 \
 		WWW::SearchResult.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			PREFIX="${PREFIX}"
-
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index eb93ae89e570..d050e857caee 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -15,17 +15,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	frank@exit.com
 
 BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/include/apache/modules/perl/mod_perl.h:${PORTSDIR}/www/p5-Apache
+		${LOCALBASE}/include/apache/modules/perl/mod_perl.h:${PORTSDIR}/www/mod_perl
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=		Apache::Request.3 Apache::Cookie.3 libapreq.3 Apache::libapreq.3
-
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
+post-configure:
 	@${PERL} -i -p \
 		-e 's/^(CC = ).*/$$1 ${CC}/;' \
 		-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
@@ -34,6 +32,5 @@ do-configure:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/blib/arch/auto/libapreq/libapreq.so \
 		${PREFIX}/lib
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq/pkg-plist b/www/p5-libapreq/pkg-plist
index a6f92d24542a..5ba54d180ab4 100644
--- a/www/p5-libapreq/pkg-plist
+++ b/www/p5-libapreq/pkg-plist
@@ -13,12 +13,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/libapreq.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Request.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Cookie.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/.packlist
-@exec ldconfig -m lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq
-@exec ldconfig -m lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request
-@exec ldconfig -m lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie
-@unexec /sbin/ldconfig -R
-@unexec /sbin/ldconfig -R
-@unexec /sbin/ldconfig -R
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index c523a2e45dca..9baf29dcf20e 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest.
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		lwp-download.1 \
 		lwp-mirror.1 \
@@ -54,10 +54,4 @@ MAN3=		Bundle::LWP.3 \
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PERL} Makefile.PL PREFIX=${PREFIX} \
-		INSTALLMAN1DIR=${PREFIX}/man/man1 \
-		INSTALLSCRIPT=${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 3b1ac73f6563..d47e917f1ece 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -17,12 +17,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 
-USE_PERL5=	yes
 USE_IMLIB=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index 69c83bb9a598..a17d1ae74c07 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -18,12 +18,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
-USE_PERL5=	yes
 USE_GNOME=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Glade/Makefile b/x11-toolkits/p5-Glade/Makefile
index 79e6d651fa00..5e0de470f869 100644
--- a/x11-toolkits/p5-Glade/Makefile
+++ b/x11-toolkits/p5-Glade/Makefile
@@ -18,12 +18,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
-USE_PERL5=	yes
 USE_GNOME=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 79e6d651fa00..5e0de470f869 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -18,12 +18,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
-USE_PERL5=	yes
 USE_GNOME=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index b47f1ed58d1b..1eb3d750d1c9 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -15,14 +15,10 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-USE_PERL5=	yes
-USE_IMLIB=	yes
+USE_GTK=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=		Gtk::GtkColorSelectButton.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-GtkGLArea/Makefile b/x11-toolkits/p5-GtkGLArea/Makefile
index cab659f90921..059dbede9bc9 100644
--- a/x11-toolkits/p5-GtkGLArea/Makefile
+++ b/x11-toolkits/p5-GtkGLArea/Makefile
@@ -20,13 +20,9 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
 BROKEN=		"It need p5-OpenGL, I will commit p5-OpenGl soon!"
 
-USE_PERL5=	yes
 USE_MESA=	yes
 USE_GTK=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index 857e229daab3..f45b819ccbfb 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -17,12 +17,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 
-USE_PERL5=	yes
 USE_GNOMELIBS=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	CC="${CC}" CCFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 9af6c49702d5..3ce135bdf39f 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -14,17 +14,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Tcl::Tk.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 9af6c49702d5..3ce135bdf39f 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -14,17 +14,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Tcl::Tk.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index c250a3cff793..412318e25e1d 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=	ptked.1 \
 	ptksh.1 \
@@ -124,9 +124,7 @@ MAN3=	Tk.3 \
 	Tk::widgets.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}"
+post-configure:
 	@${PERL} -i -p \
 		-e 's/^(CC = ).*/$$1 ${CC}/;' \
 		-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
diff --git a/x11/p5-X11-Protocol/Makefile b/x11/p5-X11-Protocol/Makefile
index 58f6bc4554f3..04150fef5484 100644
--- a/x11/p5-X11-Protocol/Makefile
+++ b/x11/p5-X11-Protocol/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
author	Vanilla I. Shu <vanilla@FreeBSD.org>	2001-03-01 06:39:18 +0000
committer	Vanilla I. Shu <vanilla@FreeBSD.org>	2001-03-01 06:39:18 +0000
commit	68c2f99c6300bc38a37eb3a8292b562cc2d8952b (patch)
tree	0898749bb767b388765958548da12c5b50b3825d
parent	031bd55ed2b892d722ffdba72b339be33879e047 (diff)
download	ports-68c2f99c6300bc38a37eb3a8292b562cc2d8952b.tar.gz ports-68c2f99c6300bc38a37eb3a8292b562cc2d8952b.zip