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>

15 files changed, 53 insertions, 47 deletions

diff --git a/net/p5-Archie/Makefile b/net/p5-Archie/Makefile
index b7fb7abd0217..84d22f69b275 100644
--- a/net/p5-Archie/Makefile
+++ b/net/p5-Archie/Makefile
@@ -5,19 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Archie
+PORTNAME=	Archie
 PORTVERSION=	1.5
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Archie
-DISTNAME=	perl_archie.1.5
+DISTNAME=	perl_archie.${PORTVERSION}
+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:
 		@ ${CP} ${WRKDIR}/Archie.pm ${WRKDIR}/Archie-1.5.pm
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 11365bcbb706..72d8a994cab2 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-DNS
+PORTNAME=	Net-DNS
 PORTVERSION=	0.12
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	Net-DNS-0.12
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 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 \
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 704d322dc529..728f84ea5b22 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-Daemon
+PORTNAME=	Net-Daemon
 PORTVERSION=	0.29
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	Net-Daemon-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		Net::Daemon.3 \
 		Net::Daemon::Log.3 \
diff --git a/net/p5-Net-IPv4Addr/Makefile b/net/p5-Net-IPv4Addr/Makefile
index cfacd3bc4f23..51b18c597dc7 100644
--- a/net/p5-Net-IPv4Addr/Makefile
+++ b/net/p5-Net-IPv4Addr/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-IPv4Addr
-PORTVERSION=	0.08
+PORTNAME=	Net-IPv4Addr
+PORTVERSION=	0.09
 CATEGORIES=	net perl5
-# not using CPAN due to them messing up the filename and version numbers
-MASTER_SITES=	http://indev.insu.com/sources/
-DISTNAME=	Net-IPv4Addr-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Net
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bradh@uunet.co.za
 
@@ -21,6 +21,7 @@ MAN3=		Net::IPv4Addr.3
 
 do-configure:
 
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX}
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+			PREFIX=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-IPv4Addr/distinfo b/net/p5-Net-IPv4Addr/distinfo
index de43ba0e5e0a..738fa96d1fa7 100644
--- a/net/p5-Net-IPv4Addr/distinfo
+++ b/net/p5-Net-IPv4Addr/distinfo
@@ -1 +1 @@
-MD5 (Net-IPv4Addr-0.08.tar.gz) = e8600b1d64b8dc3e5edc34ac7e197f21
+MD5 (Net-IPv4Addr-0.09.tar.gz) = 9c1a7f72b632c6babb52b7368fe5cf83
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index f12d9a47fcdb..70b6c3b550e0 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-RawIP
+PORTNAME=	Net-RawIP
 PORTVERSION=	0.09
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		http://quake.skif.net/RawIP/files/ \
 		http://www.ic.al.lg.ua/~ksv/
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	Net-RawIP-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dima@chg.ru
 
@@ -21,7 +21,7 @@ MAN3=		Net::RawIP.3 Net::RawIP::libpcap.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/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 86bef1b4a48b..deffef2b3353 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -5,20 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Net-Telnet
+PORTNAME=	Net-Telnet
 PORTVERSION=	3.01
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	Net-Telnet-3.01
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		Net::Telnet.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-ext/Makefile b/net/p5-Net-ext/Makefile
index bec96ff5eace..29222a8edfa9 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -26,6 +26,7 @@ MAN3=		Net::Gen.3 \
 		Net::UNIX::Server.3
 
 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/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 18957f1cadd1..0a6a0ba2d403 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-PlRPC
+PORTNAME=	PlRPC
 PORTVERSION=	0.2012
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RPC
-DISTNAME=	PlRPC-0.2012
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.org
 
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index 574159da0e78..e1566db80e67 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-SNMP-Util
+PORTNAME=	SNMP-Util
 PORTVERSION=	1.6
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SNMP
-DISTNAME=	SNMP-Util-1.6
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fenner@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		SNMP::Util.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 46c99fd7b433..5b8f730ae20b 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -5,23 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-SNMP
+PORTNAME=	SNMP
 PORTVERSION=	1.8.1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SNMP
-DISTNAME=	SNMP-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jfitz@FreeBSD.org
 
 LIB_DEPENDS= 	snmp.4:${PORTSDIR}/net/ucd-snmp
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+			CC="${CC}" CCFLAGS="${CFLAGS}"
 
 post-install:
-		@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/lib/perl5/site_perl/README.SNMP
+		@${INSTALL_DATA} ${WRKSRC}/README \
+			${PREFIX}/lib/perl5/site_perl/README.SNMP
 
 .include <bsd.port.mk>
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index 2354f04df7f0..35246635ab16 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-SNMP_Session
+PORTNAME=	SNMP_Session
 PORTVERSION=	0.75
 CATEGORIES=	net perl5
 MASTER_SITES=	ftp://ftp.switch.ch/software/sources/network/snmp/perl/
-DISTNAME=	SNMP_Session-0.75
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 287af2445f53..3780b3637dba 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -18,6 +18,6 @@ USE_PERL5=	yes
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CCFLAGS="${CFLAGS}"
+		CC="${CC}" CCFLAGS="${CFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 643f24e95383..4a4861ba8041 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -5,21 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-Socks
+PORTNAME=	SOCKS
 PORTVERSION=	0.03
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
-DISTNAME=	SOCKS-0.03
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nakai@FreeBSD.org
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAN3=		Net::SOCKS.3
 MANPREFIX=	${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/net/p5-pRPC/Makefile b/net/p5-pRPC/Makefile
index 2a11262e4e3c..eaab93e2b365 100644
--- a/net/p5-pRPC/Makefile
+++ b/net/p5-pRPC/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-pRPC-modules
+PORTNAME=	pRPC-modules
 PORTVERSION=	0.1005
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RPC
-DISTNAME=	pRPC-modules-0.1005
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.org
 
@@ -24,6 +24,6 @@ MAN3=		Bundle::pRPC-modules.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>