Lots and lots of cleanups. Teach p5-* in general about PKGNAMEPREFIX.

Add some missing/wrong dependencies.  Show how to respect CC/CFLAGS.  Many
miscellaneous modifications.  I used more excessive hacks to force p5-Jcode
and p5-WWW-Search to respect CC/CFLAGS.

Patches largely done by:	Christian Weisgerber <naddy@mips.inka.de>

10 files changed, 46 insertions, 38 deletions

diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index da984d3..fcdf6344 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	matt@zigg.com
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		Authen::PAM.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 \
+			CC="${CC}" CCFLAGS="${CFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 737044d..02ef4ea 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -5,18 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Authen-Radius
+PORTNAME=	Authen-Radius
 PORTVERSION=	0.05
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Authen
 DISTNAME=	RadiusPerl-0.05
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MD5.pm:${PORTSDIR}/security/p5-MD5
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-MD5
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 MAN3=		Authen::Radius.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
@@ -24,6 +25,6 @@ pre-configure:
 		@${CP} ${WRKSRC}/Authen/Radius.pm ${WRKSRC}
 
 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/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index 28f82c8..9a012c7 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Crypt-CBC
+PORTNAME=	Crypt-CBC
 PORTVERSION=	1.23
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
-DISTNAME=	Crypt-CBC-1.23
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markm@FreeBSD.org
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/MD5.pm:${PORTSD
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::CBC.3
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 6673c7e..2c64792 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -5,23 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Crypt-DES
+PORTNAME=	Crypt-DES
 PORTVERSION=	1.01
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
-DISTNAME=	Crypt-DES-1.01
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::DES.3
 
 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/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 3cb68a1..4d6d6b2 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -5,23 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Crypt-IDEA
+PORTNAME=	Crypt-IDEA
 PORTVERSION=	1.01
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
-DISTNAME=	Crypt-IDEA-1.01
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::IDEA.3
 
 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/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index ee62b27..47ee9f4 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Digest-MD5
+PORTNAME=	Digest-MD5
 PORTVERSION=	2.09
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MD5
-DISTNAME=	Digest-MD5-2.09
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ache@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=	Digest::MD2.3 \
 	Digest::SHA1.3 \
@@ -29,6 +29,7 @@ MAN3=	Digest::MD2.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/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 2ab0495..7c78740 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -5,21 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-MD5
+PORTNAME=	MD5
 PORTVERSION=	1.7
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MD5
-DISTNAME=	MD5-1.7
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		MD5.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/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 400b20f..0ed27cf 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -5,24 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-SSLeay
+PORTNAME=	Net-SSLeay
 PORTVERSION=	1.05
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	 Net_SSLeay.pm-1.05
+DISTNAME=	Net_SSLeay.pm-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	andreas@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-
 RESTRICTED=	"Cryptography"
-USE_PERL5=	YES
+USE_PERL5=	yes
+USE_OPENSSL=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::SSLeay.3
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+			${OPENSSLBASE} CC="${CC}" CCFLAGS="${CFLAGS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 24ef642..57b3b2b 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-PGP-Sign
+PORTNAME=	PGP-Sign
 PORTVERSION=	0.16
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PGP
-DISTNAME=	PGP-Sign-0.16
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	croyle@gelemna.org
 
@@ -61,6 +61,7 @@ PGPV=	${PGP}
 CONFIG_ARGS=	PGPS=${PGPS} PGPV=${PGPV} PGPSTYLE=${PGPSTYLE}
 
 do-configure:
-	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${CONFIG_ARGS}
+	@ 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 eb57cfe..7313a1e 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-PGP
+PORTNAME=	PGP
 PORTVERSION=	0.3a
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PGP
-DISTNAME=	PGP-0.3a
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		PGP::Pipe.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}