23 files changed, 97 insertions, 82 deletions

diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index da800cbc05ab..21c990c427ef 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Apache-ASP
+PORTNAME=	Apache-ASP
 PORTVERSION=	0.18
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	Apache-ASP-0.18
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	igor@zynaps.ru
 
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_per
 		${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
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Apache::ASP.3
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 3149691bd4c0..917bae310de7 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -5,18 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Apache-DBI
+PORTNAME=	Apache-DBI
 PORTVERSION= 	0.87
 CATEGORIES=	www databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	ApacheDBI-0.87
+DISTNAME=	ApacheDBI-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 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
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
@@ -24,6 +25,6 @@ MAN3=		Apache::DBI.3 \
 		Apache::AuthDBI.3
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index d6800fc25322..4a2a3cc51023 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -5,26 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Apache-Radius
+PORTNAME=	Apache-Radius
 PORTVERSION= 	0.3
 CATEGORIES=	www security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	Apache-AuthenRadius-0.3
+DISTNAME=	Apache-AuthenRadius-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
 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}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		Apache::AuthenRadius.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+		@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 7278606d8cb5..00681620645d 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Apache-Session
+PORTNAME=	Apache-Session
 PORTVERSION= 	1.51
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	Apache-Session-1.51
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	frank@exit.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/p5-Apache \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Apache::Session.3 \
@@ -42,6 +42,6 @@ MAN3=		Apache::Session.3 \
 		Apache::Session::Store::Postgres.3
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index 9146bc949d45..833b60dbe18f 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -5,12 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Apache
+PORTNAME=	Apache
 PORTVERSION=	1.24
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 DISTNAME=	mod_perl-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
@@ -20,7 +21,7 @@ APACHE_PORT=apache13
 BUILD_DEPENDS=	${PREFIX}/sbin/apxs:${PORTSDIR}/www/${APACHE_PORT} \
 		${PREFIX}/bin/lwp-download:${PORTSDIR}/www/p5-libwww
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 MAN3=		Apache.3 \
 		Apache::Constants.3 \
 		Apache::Debug.3 \
@@ -59,7 +60,13 @@ MAN3=		Apache.3 \
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL USE_APXS=1 WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+			CC="${CC}" CCFLAGS="${CFLAGS}" \
+			USE_APXS=1 WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
+		@${PERL} -i -p \
+			-e 's/^(CC = ).*/$$1 ${CC}/;' \
+			-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
+                	${WRKSRC}/Leak/Makefile ${WRKSRC}/Symbol/Makefile
 
 post-install:
 		${MKDIR} ${PREFIX}/include/apache/modules/perl
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 2d34d54d5f09..55190562d09b 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-CGI-FastTemplate
+PORTNAME=	CGI-FastTemplate
 PORTVERSION= 	1.09
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
-DISTNAME=	CGI-FastTemplate-1.09
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		CGI::FastTemplate.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 8931cfaa9448..75fa33716bdb 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -5,18 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-CGI
+PORTNAME=	CGI
 PORTVERSION= 	2.76
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
-DISTNAME=	CGI-modules-2.76
+DISTNAME=	CGI-modules-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 8931cfaa9448..75fa33716bdb 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -5,18 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-CGI
+PORTNAME=	CGI
 PORTVERSION= 	2.76
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
-DISTNAME=	CGI-modules-2.76
+DISTNAME=	CGI-modules-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS= 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index e02a67103c18..294a8d182c33 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-CGI_Lite
+PORTNAME=	CGI_Lite
 PORTVERSION= 	1.8
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI_Lite
-DISTNAME=	CGI_Lite-1.8
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		CGI_Lite.3
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index 0d0e3b148b80..5284b84cded6 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -5,23 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-FastCGI
+PORTNAME=	FastCGI
 PORTVERSION= 	0.52
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	FCGI
 DISTNAME=	FCGI-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kbyanc@posi.net
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libfcgi.a:${PORTSDIR}/www/fcgi
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		FCGI.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL)
+		@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 c60f989860f7..6a73e0fe3351 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -5,23 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML-Embperl
+PORTNAME=	HTML-Embperl
 PORTVERSION= 	1.3b2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-Embperl-1.3b2
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/p5-Apache
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		HTML::Embperl.3 HTML::EmbperlD.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${LOCALBASE}/sbin
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+			${LOCALBASE}/sbin CC="${CC}" CCFLAGS="${CFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 63767b0d91d7..3996d54ff167 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -11,14 +11,13 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PKGNAME:S/p5-//}
 
 MAINTAINER=	dsh@vlink.ru
 
 RUN_DEPENDS=	${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/
-USE_PERL5=	YES
+USE_PERL5=	yes
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 MAN3=		Bundle::HTML::Mason.3 HTML::Mason.3 HTML::Mason::Admin.3 \
@@ -28,6 +27,6 @@ MAN3=		Bundle::HTML::Mason.3 HTML::Mason.3 HTML::Mason::Admin.3 \
 		HTML::Mason::Parser.3 HTML::Mason::Request.3
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 4b840be67700..11de932e5f88 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -26,6 +26,7 @@ MAN3=		HTML::Entities.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+		@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 067416abe7c8..8d9893fd2a4d 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML-QuickCheck
+PORTNAME=	HTML-QuickCheck
 PORTVERSION= 	1.0b1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-QuickCheck-1.0b1
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		HTML::QuickCheck.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index 672de712c534..0ac4187c7398 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -5,21 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML-Summary
+PORTNAME=	HTML-Summary
 PORTVERSION= 	0.017
 CATEGORIES=     www perl5
 MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-Summary-0.017
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dima@Chg.RU
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 MAN3=		HTML::Summary.3 Text::Sentence.3 Lingua::JA::Jtruncate.3
 
 do-configure:
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index fec316213e78..cb76188c53ce 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -5,19 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML-TableLayout
+PORTNAME=	HTML-TableLayout
 PORTVERSION= 	1.001008
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-TableLayout-1.001008
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dima@Chg.RU
 
 USE_PERL5=	yes
 
 MAN3=		HTML::TableLayout.3
-
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index aca8bfd95860..4ae424dc4f96 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -5,21 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML-Tree
+PORTNAME=	HTML-Tree
 PORTVERSION= 	0.62
 CATEGORIES=     www perl5
 MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-Tree-0.62
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dima@Chg.RU
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 MAN3=		HTML::Parse.3 HTML::TreeBuilder.3 HTML::AsSubs.3 HTML::Element.3
 
 do-configure:
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index f1b6cc41ebad..a00f9c604b36 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTML
+PORTNAME=	HTML
 PORTVERSION= 	0.6
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
-DISTNAME=	HTML-0.6
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
-NO_WRKSUBDIR=	YES
-NO_BUILD=	YES
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
 
 do-install:
 		@ ${MKDIR} ${PREFIX}/lib/perl5/site_perl/HTML/
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 5b728e802807..81082f1180d3 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTTPD-Tools
+PORTNAME=	HTTPD-Tools
 PORTVERSION= 	0.55
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTTPD
-DISTNAME=	HTTPD-Tools-0.55
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 5b728e802807..81082f1180d3 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-HTTPD-Tools
+PORTNAME=	HTTPD-Tools
 PORTVERSION= 	0.55
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTTPD
-DISTNAME=	HTTPD-Tools-0.55
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 6e5d83d5eaea..772721833445 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -6,12 +6,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-ParallelUA
+PORTNAME=	ParallelUA
 PORTVERSION= 	2.48
 CATEGORIES=     www perl5 devel
 MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     LWP
 DISTNAME=	ParallelUserAgent-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=     ache@FreeBSD.org
 
@@ -19,7 +20,7 @@ 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
+USE_PERL5=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index f2ba65992495..2690c9e50e4a 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-WWW-Search
+PORTNAME=	WWW-Search
 PORTVERSION= 	2.10
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
-DISTNAME=	WWW-Search-2.10
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@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
+USE_PERL5=	yes
 
 MAN1=		AutoSearch.1 \
 		WebSearch.1
@@ -74,10 +74,8 @@ MAN3=		WWW::Search.3 \
 		WWW::Search::ZDNet.3 \
 		WWW::SearchResult.3
 
-post-patch:
-		@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Makefile.PL
-
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+		@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 d198da42fd9c..95c5528af866 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -5,29 +5,35 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-libapreq
+PORTNAME=	libapreq
 PORTVERSION= 	0.31
 CATEGORIES=     www perl5 devel
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     Apache
-DISTNAME=	libapreq-0.31
+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
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=           Apache::Request.3 Apache::Cookie.3 libapreq.3 Apache::libapreq.3
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-	cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${PERL} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL} Makefile.PL \
+		CC="${CC}" CCFLAGS="${CFLAGS}"
+	@${PERL} -i -p \
+		-e 's/^(CC = ).*/$$1 ${CC}/;' \
+		-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
+		`find ${WRKSRC} -name Makefile`
 
 post-install:
-	${CP} ${WRKSRC}/blib/arch/auto/libapreq/libapreq.so ${LOCALBASE}/lib
+	${INSTALL_DATA} ${WRKSRC}/blib/arch/auto/libapreq/libapreq.so \
+		${PREFIX}/lib
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>