Remove do-configure section, use PERL_CONFIGURE now.

svn path=/head/; revision=38917
2001-03-01 06:39:18 +00:00 · 2001-03-01 06:39:18 +00:00 · 68c2f99c63 · 2021-03-31 03:12:20 +00:00
commit 68c2f99c63
parent 031bd55ed2
356 changed files with 377 additions and 1236 deletions
--- 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
--- 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}
--- 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>
--- 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}
--- 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}
--- 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>
--- 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>
--- 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}
--- 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>
--- 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
--- 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
--- 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}
--- 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>
--- 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 \
--- 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>
--- 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>
--- 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}
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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; \
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 \
--- 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>
--- 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
-
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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}
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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.
--- 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>
--- 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}
--- 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}
--- 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>
--- 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)
-
--- 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>
--- 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>
--- 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.
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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.
--- 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>
--- 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>
--- 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>
--- 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>
--- 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}
--- 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>
--- 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>
--- 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
--- 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>
--- 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}
--- 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}
--- 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}
--- 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>
--- 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>
--- 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
--- 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
--- 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}
--- a/Show More
+++ b/Show More