summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2000-06-17 02:37:15 +0000
committerWill Andrews <will@FreeBSD.org>2000-06-17 02:37:15 +0000
commit1e60866cc19e399726a715fe8f90de75614755d9 (patch)
tree919603a1bf324ecbe31827d6a9441e11e58f98a0
parentUse the distfiles now on ftp.freebsd.org instead of from my home directory (diff)
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>
Notes
Notes: svn path=/head/; revision=29658
-rw-r--r--converters/p5-Convert-Recode/Makefile5
-rw-r--r--converters/p5-Convert-UU/Makefile11
-rw-r--r--databases/p5-DBD-CSV/Makefile4
-rw-r--r--databases/p5-DBD-Pg-13/Makefile11
-rw-r--r--databases/p5-DBD-Pg/Makefile11
-rw-r--r--databases/p5-DBD-mysql/Makefile8
-rw-r--r--databases/p5-DBI-137/Makefile10
-rw-r--r--databases/p5-DBI/Makefile10
-rw-r--r--databases/p5-GDBM/Makefile9
-rw-r--r--databases/p5-MLDBM/Makefile6
-rw-r--r--databases/p5-Mysql/Makefile8
-rw-r--r--databases/p5-Pg/Makefile8
-rw-r--r--databases/p5-SQL-Statement/Makefile9
-rw-r--r--databases/p5-hp200lx-db/Makefile8
-rw-r--r--devel/p5-BSD-Resource/Makefile5
-rw-r--r--devel/p5-Curses/Makefile8
-rw-r--r--devel/p5-Data-ShowTable/Makefile6
-rw-r--r--devel/p5-Date-Calc/Makefile5
-rw-r--r--devel/p5-Devel-DProf/Makefile6
-rw-r--r--devel/p5-Devel-Peek/Makefile5
-rw-r--r--devel/p5-File-Lock/Makefile5
-rw-r--r--devel/p5-File-Sync/Makefile6
-rw-r--r--devel/p5-Filter/Makefile9
-rw-r--r--devel/p5-IO-Stty/Makefile4
-rw-r--r--devel/p5-IO-Tty/Makefile4
-rw-r--r--devel/p5-Locale-gettext/Makefile5
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile8
-rw-r--r--devel/p5-ReadLine-Gnu/files/patch-aa11
-rw-r--r--devel/p5-Storable/Makefile5
-rw-r--r--devel/p5-Term-ReadKey/Makefile5
-rw-r--r--devel/p5-Time-HiRes/Makefile4
-rw-r--r--dns/p5-Net-DNS/Makefile6
-rw-r--r--graphics/p5-Chart/Makefile9
-rw-r--r--graphics/p5-GD-Graph3d/Makefile7
-rw-r--r--graphics/p5-GD/Makefile5
-rw-r--r--graphics/p5-GD1/Makefile5
-rw-r--r--graphics/p5-GD2/Makefile5
-rw-r--r--graphics/p5-chart/Makefile9
-rw-r--r--irc/p5-IRC/Makefile8
-rw-r--r--japanese/p5-Jcode/Makefile13
-rw-r--r--japanese/p5-Text-Kakasi/Makefile5
-rw-r--r--japanese/p5-nkf/Makefile5
-rw-r--r--lang/p5-Expect/Makefile13
-rw-r--r--lang/p5-ExtUtils-F77/Makefile12
-rw-r--r--lang/p5-F77/Makefile12
-rw-r--r--lang/p5-Tcl/Makefile11
-rw-r--r--lang/p5-ePerl/Makefile9
-rw-r--r--lang/p5-ePerl/files/patch-aa53
-rw-r--r--mail/p5-Mail-Tools/Makefile5
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/Makefile13
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/distinfo2
-rw-r--r--net-mgmt/p5-SNMP-Util/Makefile6
-rw-r--r--net-mgmt/p5-SNMP/Makefile12
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile6
-rw-r--r--net/p5-Archie/Makefile11
-rw-r--r--net/p5-Net-DNS/Makefile6
-rw-r--r--net/p5-Net-Daemon/Makefile6
-rw-r--r--net/p5-Net-IPv4Addr/Makefile13
-rw-r--r--net/p5-Net-IPv4Addr/distinfo2
-rw-r--r--net/p5-Net-RawIP/Makefile8
-rw-r--r--net/p5-Net-Telnet/Makefile7
-rw-r--r--net/p5-Net-ext/Makefile3
-rw-r--r--net/p5-PlRPC/Makefile4
-rw-r--r--net/p5-SNMP-Util/Makefile6
-rw-r--r--net/p5-SNMP/Makefile12
-rw-r--r--net/p5-SNMP_Session/Makefile6
-rw-r--r--net/p5-Socket6/Makefile2
-rw-r--r--net/p5-Socks/Makefile8
-rw-r--r--net/p5-pRPC/Makefile6
-rw-r--r--news/p5-NNTPClient/Makefile10
-rw-r--r--news/p5-News-Article/Makefile6
-rw-r--r--security/p5-Authen-PAM/Makefile5
-rw-r--r--security/p5-Authen-Radius/Makefile9
-rw-r--r--security/p5-Crypt-CBC/Makefile6
-rw-r--r--security/p5-Crypt-DES/Makefile9
-rw-r--r--security/p5-Crypt-IDEA/Makefile9
-rw-r--r--security/p5-Digest-MD5/Makefile9
-rw-r--r--security/p5-MD5/Makefile9
-rw-r--r--security/p5-Net-SSLeay/Makefile15
-rw-r--r--security/p5-PGP-Sign/Makefile7
-rw-r--r--security/p5-PGP/Makefile6
-rw-r--r--sysutils/p5-SyslogScan/Makefile6
-rw-r--r--textproc/p5-Text-CSV_XS/Makefile9
-rw-r--r--textproc/p5-XML-DOM/Makefile8
-rw-r--r--textproc/p5-XML-Parser/Makefile9
-rw-r--r--www/p5-Apache-ASP/Makefile6
-rw-r--r--www/p5-Apache-DBI/Makefile9
-rw-r--r--www/p5-Apache-Radius/Makefile12
-rw-r--r--www/p5-Apache-Session/Makefile8
-rw-r--r--www/p5-Apache/Makefile13
-rw-r--r--www/p5-CGI-FastTemplate/Makefile6
-rw-r--r--www/p5-CGI-modules/Makefile7
-rw-r--r--www/p5-CGI/Makefile7
-rw-r--r--www/p5-CGI_Lite/Makefile6
-rw-r--r--www/p5-FastCGI/Makefile8
-rw-r--r--www/p5-HTML-Embperl/Makefile9
-rw-r--r--www/p5-HTML-Mason/Makefile5
-rw-r--r--www/p5-HTML-Parser/Makefile3
-rw-r--r--www/p5-HTML-QuickCheck/Makefile6
-rw-r--r--www/p5-HTML-Summary/Makefile7
-rw-r--r--www/p5-HTML-TableLayout/Makefile5
-rw-r--r--www/p5-HTML-Tree/Makefile7
-rw-r--r--www/p5-HTML/Makefile10
-rw-r--r--www/p5-HTTPD-Tools/Makefile6
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile6
-rw-r--r--www/p5-ParallelUA/Makefile5
-rw-r--r--www/p5-WWW-Search/Makefile12
-rw-r--r--www/p5-libapreq/Makefile16
-rw-r--r--x11-fonts/p5-type1inst/Makefile13
-rw-r--r--x11-toolkits/p5-Gtk/Makefile11
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile12
-rw-r--r--x11-toolkits/p5-TclTk/Makefile12
-rw-r--r--x11-toolkits/p5-Tk/Makefile16
113 files changed, 532 insertions, 393 deletions
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index 95d097123e2a..042799b1a3fe 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -19,14 +19,13 @@ RUN_DEPENDS= recode:${PORTSDIR}/converters/recode
USE_PERL5= YES
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-
MAN3= Convert::Recode.3
post-patch:
- ${PERL} -pi -e 's#recode -\$$#${PREFIX}/bin/recode -\$$#' \
+ ${PERL} -pi -e 's#recode -\$$#${LOCALBASE}/bin/recode -\$$#' \
${WRKSRC}/Recode.pm
do-configure:
- @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX}
+ @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 acb2e0c7e168..2e3171d6f751 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -5,24 +5,23 @@
# $FreeBSD$
#
-PORTNAME= p5-Convert-UU
+PORTNAME= Convert-UU
PORTVERSION= 0.40
CATEGORIES= converters perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Convert
-DISTNAME= Convert-UU-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
-.include <bsd.port.pre.mk>
-
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}
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ PREFIX=${PREFIX}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index d6126849aaf8..1a94a16cf932 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -5,12 +5,12 @@
# $FreeBSD$
#
-PORTNAME= p5-DBD-CSV
+PORTNAME= DBD-CSV
PORTVERSION= 0.1022
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-DISTNAME= DBD-CSV-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= dirk.meyer@dinoex.sub.org
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index c5e3167831a5..cbe362cf3ff7 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -5,25 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-DBD-Pg
+PORTNAME= DBD-Pg
PORTVERSION= 0.93
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-DISTNAME= DBD-Pg-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@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/postgresql
-USE_PERL5= YES
-CONFIGURE_ENV= POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
+USE_PERL5= 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} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+ @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 c5e3167831a5..cbe362cf3ff7 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -5,25 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-DBD-Pg
+PORTNAME= DBD-Pg
PORTVERSION= 0.93
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-DISTNAME= DBD-Pg-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@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/postgresql
-USE_PERL5= YES
-CONFIGURE_ENV= POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
+USE_PERL5= 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} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ CC="${CC}" CCFLAGS="${CFLAGS}"
.include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 1e0f354d24b9..c3f0ea7135e0 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -5,12 +5,13 @@
# $FreeBSD$
#
-PORTNAME= p5-Mysql-modules
+PORTNAME= Mysql-modules
PORTVERSION= 1.2213
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
DISTNAME= Msql-Mysql-modules-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jedgar@FreeBSD.org
@@ -21,9 +22,10 @@ LIB_DEPENDS= mysqlclient.6:${PORTSDIR}/databases/mysql322-client
Y2K= http://forteviot.symbolstone.org/technology/perl/DBI/doc/faq.html
-CONFIGURE_ARGS= PREFIX=${PREFIX} --noprompt --mysql-install --nomsql-install
+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
+USE_PERL5= yes
MAN1= dbimon.1
MAN3= Bundle::DBD::mysql.3 \
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index c599b36f97a1..c687ab6ceb7d 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -5,19 +5,18 @@
# $FreeBSD$
#
-PORTNAME= p5-DBI
+PORTNAME= DBI
PORTVERSION= 1.13
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBI
-DISTNAME= DBI-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
-USE_PERL5= YES
-CONFIGURE_ARGS= PREFIX=${PREFIX}
+USE_PERL5= yes
MAN1= dbiproxy.1 \
dbish.1
@@ -35,6 +34,7 @@ MAN3= Bundle::DBI.3 \
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @ cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
+ @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 c599b36f97a1..c687ab6ceb7d 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -5,19 +5,18 @@
# $FreeBSD$
#
-PORTNAME= p5-DBI
+PORTNAME= DBI
PORTVERSION= 1.13
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBI
-DISTNAME= DBI-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
-USE_PERL5= YES
-CONFIGURE_ARGS= PREFIX=${PREFIX}
+USE_PERL5= yes
MAN1= dbiproxy.1 \
dbish.1
@@ -35,6 +34,7 @@ MAN3= Bundle::DBI.3 \
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @ cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ PREFIX="${PREFIX}" CC="${CC}" CCFLAGS="${CFLAGS}"
.include <bsd.port.mk>
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index 374a709ac26d..4debb759aba4 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -18,16 +18,15 @@ MAINTAINER= nsayer@FreeBSD.ORG
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
-USE_PERL5= YES
+USE_PERL5= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/ext/GDBM_File
MAN3= GDBM_File.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-.include <bsd.port.pre.mk>
-
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.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index fc211ee1c165..7546ede16e75 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -5,19 +5,19 @@
# $FreeBSD$
#
-PORTNAME= p5-MLDBM
+PORTNAME= MLDBM
PORTVERSION= 2.00
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MLDBM
-DISTNAME= MLDBM-${PORTVERSION}
+PKGNAMEPREFIX= p5-
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
+USE_PERL5= yes
MAN3= MLDBM.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index 1e0f354d24b9..c3f0ea7135e0 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -5,12 +5,13 @@
# $FreeBSD$
#
-PORTNAME= p5-Mysql-modules
+PORTNAME= Mysql-modules
PORTVERSION= 1.2213
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
DISTNAME= Msql-Mysql-modules-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jedgar@FreeBSD.org
@@ -21,9 +22,10 @@ LIB_DEPENDS= mysqlclient.6:${PORTSDIR}/databases/mysql322-client
Y2K= http://forteviot.symbolstone.org/technology/perl/DBI/doc/faq.html
-CONFIGURE_ARGS= PREFIX=${PREFIX} --noprompt --mysql-install --nomsql-install
+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
+USE_PERL5= yes
MAN1= dbimon.1
MAN3= Bundle::DBD::mysql.3 \
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index 1740e4087799..4b2af7241ec7 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -5,18 +5,19 @@
# $FreeBSD$
#
-PORTNAME= p5-Pg
+PORTNAME= Pg
PORTVERSION= 1.8.1
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pg
DISTNAME= pgsql_perl5-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/pgsql/lib/libpq.a:${PORTSDIR}/databases/postgresql
-USE_PERL5= YES
+USE_PERL5= yes
POSTGRES_HOME?= ${PREFIX}/pgsql
MAKE_ENV+= POSTGRES_HOME=${POSTGRES_HOME}
@@ -25,6 +26,7 @@ MAN3= Pg.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/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 3d5aeed60745..129c0f42fcae 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -5,21 +5,22 @@
# $FreeBSD$
#
-PORTNAME= p5-SQL-Statement
+PORTNAME= SQL-Statement
PORTVERSION= 0.1016
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SQL
-DISTNAME= SQL-Statement-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= wolman@cs.washington.edu
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SQL::Eval.3 SQL::Statement.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/databases/p5-hp200lx-db/Makefile b/databases/p5-hp200lx-db/Makefile
index da135db2af07..c2ecdc1520d5 100644
--- a/databases/p5-hp200lx-db/Makefile
+++ b/databases/p5-hp200lx-db/Makefile
@@ -5,21 +5,21 @@
# $FreeBSD$
#
-PORTNAME= p5-hp200lx-db
+PORTNAME= hp200lx-db
PORTVERSION= 0.07
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HP200LX
-DISTNAME= hp200lx-db-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= g.gonter@ieee.org
-USE_PERL5= YES
+USE_PERL5= yes
# MAN3= HP200LX::DB.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
.include <bsd.port.mk>
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 8e82d9b8506a..e1dfbbb93512 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= BSD::Resource.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/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index d60905ed271c..93287a14be12 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -14,15 +14,17 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Curses.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
- @ ${LN} -s ${WRKSRC}/hints/c-freebsd.ncurses.h ${WRKSRC}/c-config.h
+ @${LN} -s ${WRKSRC}/hints/c-freebsd.ncurses.h \
+ ${WRKSRC}/c-config.h
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/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index a1e9ce984346..b52fe51e64ac 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -14,14 +14,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
-CONFIGURE_ARGS= PREFIX=${PREFIX} INSTALLSCRIPT=${PREFIX}/bin INSTALLMAN1DIR=${PREFIX}/man/man1
+USE_PERL5= yes
MAN1= showtable.1
MAN3= Data::ShowTable.3
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
+ @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 d599db5d9299..fb5b75ebdb00 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bradh@uunet.co.za
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Date::Calc.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/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index 058dd1036b8c..50d96894f785 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= p5-Devel-
MAINTAINER= jfitz@FreeBSD.org
-CONFIGURE_ARGS= PREFIX=${PREFIX}
-USE_PERL5= YES
+USE_PERL5= yes
MAN1PREFIX= ${PREFIX}
MAN1= dprofpp.1
@@ -23,6 +22,7 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::DProf.3
do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${CONFIGURE_ARGS}
+ @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 6456bc70378f..2b5b95649246 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::Peek.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/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 937b10b87b53..6d4b94809832 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -14,9 +14,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-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}"
.include <bsd.port.mk>
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index abd8c7d5810e..b890cfa00bd7 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -14,13 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= File::Sync.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/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index 83e25ccbd440..7c94c396b5af 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Filter::Util::Call.3 Filter::Util::Exec.3 Filter::cpp.3 \
@@ -22,6 +22,11 @@ MAN3= Filter::Util::Call.3 Filter::Util::Exec.3 Filter::cpp.3 \
perlfilter.3
do-configure:
- @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
+ @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-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 201be84b1cd2..4408037e348f 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -11,13 +11,13 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-.02
+DISTNAME= ${PORTNAME}-.${PORTVERSION:E}
MAINTAINER= will@FreeBSD.org
USE_PERL5= yes
do-configure:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL LDDLFLAGS=-shared LDFLAGS=-L/usr/lib)
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
.include <bsd.port.mk>
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 852f818191c8..4521947f2310 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -20,6 +20,8 @@ MAN3= IO::Pty.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL LDDLFLAGS=-shared LDFLAGS=-L/usr/lib)
+ @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-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 627fa05ab6c8..d6512cbaac36 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Locale::gettext.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 \
+ CC="${CC}" CCFLAGS="${CFLAGS}"
.include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 4b6e756c63f1..22346eb83dc3 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -11,11 +11,11 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
-DISTNAME= Term-ReadLine-Gnu-${PORTVERSION}
+DISTNAME= Term-${PORTNAME}-${PORTVERSION}
MAINTAINER= mph@freebsd.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Term::ReadLine::Gnu.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -24,6 +24,8 @@ MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
# 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 LDDLFLAGS=-shared LDFLAGS=-L/usr/lib
+ @ 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-Gnu/files/patch-aa b/devel/p5-ReadLine-Gnu/files/patch-aa
new file mode 100644
index 000000000000..e117ab71ec84
--- /dev/null
+++ b/devel/p5-ReadLine-Gnu/files/patch-aa
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig Mon Jun 12 23:43:42 2000
++++ Makefile.PL Mon Jun 12 23:45:21 2000
+@@ -76,7 +76,7 @@
+ close(F);
+
+ # compile it
+-$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $Config{ldflags} $libs";
++$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $libs";
+ print $comp_cmd, "\n";
+ system($comp_cmd);
+ if ($?) {
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 08dc460067b8..7aeae15ff8d8 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -14,12 +14,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Storable.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/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 0a651a088356..9e0430fa6ce2 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -15,12 +15,13 @@ DISTNAME= TermReadKey-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Term::ReadKey.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/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 334b1b3f50bf..0dd7bec1a46b 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -17,10 +17,10 @@ MAINTAINER= ports@FreeBSD.org
USE_PERL5= yes
MAN3= Time::HiRes.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/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 11365bcbb706..72d8a994cab2 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/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/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index 48252f3556bb..2b97b6b9636c 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -5,26 +5,23 @@
# $FreeBSD$
#
-PORTNAME= chart
+PORTNAME= Chart
PORTVERSION= 0.99b
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Chart
PKGNAMEPREFIX= p5-
-DISTNAME= Chart-${PORTVERSION}
MAINTAINER= dan@trinsec.com
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/GD.pm:${PORTSDIR}/graphics/p5-GD
-WRKSRC= ${WRKDIR}/Chart-0.99b
-
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Chart.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
.include <bsd.port.mk>
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index a8391fbc9682..955d497bec8f 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -5,23 +5,24 @@
# $FreeBSD$
#
-PORTNAME= p5-GD-Graph3d
+PORTNAME= GD-Graph3d
PORTVERSION= 0.40
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
DISTNAME= GDGraph3d-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD::Graph::Graph3d.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/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index c6c8e13bb974..f60efa1aafa7 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -16,12 +16,13 @@ MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD.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/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index c6c8e13bb974..f60efa1aafa7 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -16,12 +16,13 @@ MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD.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/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index c6c8e13bb974..f60efa1aafa7 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -16,12 +16,13 @@ MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD.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/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index 48252f3556bb..2b97b6b9636c 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -5,26 +5,23 @@
# $FreeBSD$
#
-PORTNAME= chart
+PORTNAME= Chart
PORTVERSION= 0.99b
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Chart
PKGNAMEPREFIX= p5-
-DISTNAME= Chart-${PORTVERSION}
MAINTAINER= dan@trinsec.com
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/GD.pm:${PORTSDIR}/graphics/p5-GD
-WRKSRC= ${WRKDIR}/Chart-0.99b
-
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Chart.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
.include <bsd.port.mk>
diff --git a/irc/p5-IRC/Makefile b/irc/p5-IRC/Makefile
index 2d2f8a4441d8..d19c70ca9452 100644
--- a/irc/p5-IRC/Makefile
+++ b/irc/p5-IRC/Makefile
@@ -5,16 +5,16 @@
# $FreeBSD$
#
-PORTNAME= p5-IRC
+PORTNAME= Net-IRC
PORTVERSION= 0.63
CATEGORIES= irc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
-DISTNAME= Net-IRC-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jedgar@fxp.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= \
@@ -24,6 +24,6 @@ MAN3= \
Net::IRC.3
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/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 42822a4ba819..c806aefab352 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DANKOGAI
MAINTAINER= kuriyama@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
+RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_PERL5= YES
-USE_ZIP= YES
+USE_PERL5= yes
+USE_ZIP= yes
MAN3= Jcode.3 Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
Jcode::Unicode::NoXS.3
@@ -28,6 +28,11 @@ MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5-
do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ CC="${CC}" CCFLAGS="${CFLAGS}"
+.for DIR in Unicode Jcode
+ ${PERL} -pi -e "s:CCFLAGS = :CCFLAGS = ${CFLAGS}:g" ${WRKSRC}/${DIR}/Makefile
+ ${PERL} -pi -e "s:CC = cc:CC = ${CC}:g" ${WRSRC}/${DIR}/Makefile
+.endfor
.include <bsd.port.post.mk>
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
index 332ba436dfa5..e3c701b83fb9 100644
--- a/japanese/p5-Text-Kakasi/Makefile
+++ b/japanese/p5-Text-Kakasi/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= knu@FreeBSD.org
LIB_DEPENDS= kakasi.2:${PORTSDIR}/japanese/kakasi
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::Kakasi.3
@@ -24,6 +24,7 @@ MAN3= Text::Kakasi.3
PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5-
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.post.mk>
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index acb6215ab220..a1c5e6fb82ad 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}171
MAINTAINER= max@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
EXTRACT_CMD= ${SH}
EXTRACT_BEFORE_ARGS= # Empty
@@ -30,6 +30,7 @@ MAN3= NKF.3
PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5-
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.post.mk>
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index 88e6e011aa17..4e99b698fef3 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -5,25 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-Expect
+PORTNAME= Expect
PORTVERSION= 1.07
CATEGORIES= lang perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Expect
-DISTNAME= Expect.pm-1.07
+DISTNAME= ${PORTNAME}.pm-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= will@FreeBSD.org
-BUILD_DEPENDS= ${SITE_PERL}/IO-Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
- ${SITE_PERL}/IO-Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
+ ${SITE_PERL}/IO/Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
USE_PERL5= yes
MAN3= Expect.3 Expect_intro.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL LDDLFLAGS=-shared LDFLAGS=-L/usr/lib)
+ @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 5dc3f9db1d6d..92899a77ade8 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -5,16 +5,16 @@
# $FreeBSD$
#
-PORTNAME= p5-ExtUtils-F77
+PORTNAME= ExtUtils-F77
PORTVERSION= 1.12
CATEGORIES= lang perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ExtUtils
-DISTNAME= ExtUtils-F77-1.12
+PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ExtUtils::F77.3
@@ -27,10 +27,10 @@ F2CLIB= -lf2c
.endif
post-patch:
- @(cd ${WRKSRC}; ${MV} -f F77.pm F77.pm~; \
- ${PERL5} -e 'while(<>){s/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/;print $$_;}' < F77.pm~ > F77.pm)
+ @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
+ @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 5dc3f9db1d6d..92899a77ade8 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -5,16 +5,16 @@
# $FreeBSD$
#
-PORTNAME= p5-ExtUtils-F77
+PORTNAME= ExtUtils-F77
PORTVERSION= 1.12
CATEGORIES= lang perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ExtUtils
-DISTNAME= ExtUtils-F77-1.12
+PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ExtUtils::F77.3
@@ -27,10 +27,10 @@ F2CLIB= -lf2c
.endif
post-patch:
- @(cd ${WRKSRC}; ${MV} -f F77.pm F77.pm~; \
- ${PERL5} -e 'while(<>){s/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/;print $$_;}' < F77.pm~ > F77.pm)
+ @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
+ @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 c24c5b47c917..9bf3768ba7b8 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -5,25 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-Tcl
+PORTNAME= Tcl
PORTVERSION= b2
CATEGORIES= lang perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-DISTNAME= Tcl-b2
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
-USE_PERL5= YES
+USE_PERL5= yes
-WRKSRC= ${WRKDIR}/Tcl
+WRKSRC= ${WRKDIR}/${PORTNAME}
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl.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/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index e9274b1f0371..352cf79a855f 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= p5-ePerl
+PORTNAME= eperl
PORTVERSION= 2.2.14
CATEGORIES= lang www perl5
MASTER_SITES= http://www.engelschall.com/sw/eperl/distrib/ \
@@ -13,16 +13,17 @@ MASTER_SITES= http://www.engelschall.com/sw/eperl/distrib/ \
ftp://ftp.hyperreal.org/software/engelschall/eperl/ \
${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=Parse
-DISTNAME= eperl-2.2.14
+PKGNAMEPREFIX= p5-
MAINTAINER= rse@engelschall.com
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Parse::ePerl.3 Apache::ePerl.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/lang/p5-ePerl/files/patch-aa b/lang/p5-ePerl/files/patch-aa
new file mode 100644
index 000000000000..1fb2377c53d9
--- /dev/null
+++ b/lang/p5-ePerl/files/patch-aa
@@ -0,0 +1,53 @@
+--- configure Sun Aug 2 09:48:40 1998
++++ configure.new Fri Jun 16 19:59:15 2000
+@@ -901,7 +901,6 @@
+ GCC=yes
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+- CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:907: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -918,16 +917,17 @@
+ fi
+
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++ if false; then
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+- CFLAGS="-g -O2"
++ CFLAGS="$CFLAGS -g -O2"
+ else
+- CFLAGS="-O2"
++ CFLAGS="$CFLAGS -O2"
+ fi
++ fi
+ else
+ GCC=
+- test "${CFLAGS+set}" = set || CFLAGS="-g"
+ fi
+
+ # Extract the first word of "ranlib", so it can be a program name with args.
+@@ -1025,11 +1025,8 @@
+ if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+ if test ".$ac_cv_prog_gcc" = ".yes"; then
+- CFLAGS="-Wall -g -ggdb3"
++ CFLAGS="$CFLAGS -Wall -g -ggdb3"
+ LDFLAGS="-g -ggdb3"
+-else
+- CFLAGS="-g"
+- LDFLAGS="-g"
+ fi
+ x="enabled"
+ debug=on
+@@ -1039,8 +1036,6 @@
+
+
+ else
+- CFLAGS=""
+-LDFLAGS=""
+ x=disabled
+ debug=off
+
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index ddfe4b4c2ae0..a59068597920 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -5,12 +5,13 @@
# $FreeBSD$
#
-PORTNAME= p5-Mail-Tools
+PORTNAME= Mail-Tools
PORTVERSION= 1.1401
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
DISTNAME= MailTools-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
@@ -19,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSD
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Mail::Address.3 \
Mail::Alias.3 \
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index cfacd3bc4f23..51b18c597dc7 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/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-mgmt/p5-Net-IPv4Addr/distinfo b/net-mgmt/p5-Net-IPv4Addr/distinfo
index de43ba0e5e0a..738fa96d1fa7 100644
--- a/net-mgmt/p5-Net-IPv4Addr/distinfo
+++ b/net-mgmt/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-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 574159da0e78..e1566db80e67 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/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-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index 46c99fd7b433..5b8f730ae20b 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/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-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 2354f04df7f0..35246635ab16 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/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-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>
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index bdd371701af6..2aa138ae2c65 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -5,18 +5,16 @@
# $FreeBSD$
#
-PORTNAME= p5-NNTPClient
+PORTNAME= NNTPClient
PORTVERSION= 0.36
CATEGORIES= news perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= News
-DISTNAME= NNTPClient-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= ade@FreeBSD.org
-USE_PERL5= YES
-
-.include <bsd.port.pre.mk>
+USE_PERL5= yes
MAN3= News::NNTPClient.3
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -24,4 +22,4 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index ac1478ad3041..7dc2626a0192 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -5,12 +5,14 @@
# $FreeBSD$
#
-PORTNAME= p5-News-Article
+PORTNAME= News-Article
PORTVERSION= 1.21
CATEGORIES= news perl5
MASTER_SITES= http://www.erlenstar.demon.co.uk/perl/ \
http://www.gelemna.org/ports/
-DISTNAME= News-Article-1.21
+PKGNAMEPREFIX= p5-
+
+BROKEN= unfetchable distfile
MAINTAINER= croyle@gelemna.org
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index da984d34022c..fcdf6344785f 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 737044d2a043..02ef4eaabf81 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 28f82c892b7f..9a012c75cf29 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 6673c7e35c15..2c64792cc074 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 3cb68a1304fe..4d6d6b289fe7 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 ee62b2747cd6..47ee9f4e3fb7 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 2ab0495370fb..7c787402c693 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 400b20fc09dc..0ed27cff263d 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 24ef64201529..57b3b2b07ef9 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 eb57cfe4c69e..7313a1e1dd9f 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}
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 6a48f198513b..d1824ec47e1c 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -5,12 +5,12 @@
# $FreeBSD$
#
-PORTNAME= p5-SyslogScan
+PORTNAME= SyslogScan
PORTVERSION= 0.32
CATEGORIES= sysutils perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SyslogScan
-DISTNAME= SyslogScan-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
@@ -25,6 +25,6 @@ MAN3= SyslogScan::ByGroup.3 SyslogScan::Delivery.3 \
SyslogScan::Usage.3 SyslogScan::WhereIs.3 read_mail_log.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/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 4997f6b241d6..5f12c02004e3 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -5,21 +5,22 @@
# $FreeBSD$
#
-PORTNAME= p5-Text-CSV_XS
+PORTNAME= Text-CSV_XS
PORTVERSION= 0.20
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Text
-DISTNAME= Text-CSV_XS-0.20
+PKGNAMEPREFIX= p5-
MAINTAINER= ache@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Text::CSV_XS.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/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index cfd431694cf0..534fed749ca5 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -5,18 +5,18 @@
# $FreeBSD$
#
-PORTNAME= p5-XML-DOM
+PORTNAME= XML-DOM
PORTVERSION= 1.25
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/E/EN/ENNO
-DISTNAME= XML-DOM-1.25
+MASTER_SITE_SUBDIR= XML
+PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= XML::DOM.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 5d1a51b7d9cb..83869b6ab610 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -10,17 +10,20 @@ PORTVERSION= 2.28
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
http://wwwx.netheaven.com/~coopercc/xmlparser/
-MASTER_SITE_SUBDIR= ../by-authors/id/C/CO/COOPERCL
+MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= XML::Parser.3 XML::Parser::Expat.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}"
+ @${PERL} -i -pe 's/^(CC = ).*/$$1 ${CC}/;' \
+ -e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' ${WRKSRC}/Expat/Makefile
.include <bsd.port.mk>
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>
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 092bd93264e3..896fe6c085d0 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -5,27 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-type1inst
+PORTNAME= type1inst
PORTVERSION= 0.6.1
CATEGORIES= x11-fonts perl5
-MASTER_SITES= $(MASTER_SITE_SUNSITE)
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=X11/xutils
-DISTNAME= type1inst-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= giffunip@asme.org
-RUN_DEPENDS= $(X11BASE)/bin/mkfontdir:${PORTSDIR}/x11/XFree86
-
USE_PERL5= yes
+USE_XLIB= yes
NO_BUILD= yes
STRIP=
-MANN= type1inst.n
+MAN1= type1inst.1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/type1inst ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/t1embed ${PREFIX}/bin
- $(INSTALL_MAN) ${WRKSRC}/type1inst.man ${PREFIX}/man/mann/type1inst.n
+ ${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1
.if !defined(NOPORTDOCS)
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.type1inst
.endif
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 144c41af4773..5fbcce3abd6c 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -5,25 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-Gtk
+PORTNAME= Gtk
PORTVERSION= 0.7000
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/perl/ \
${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Gtk
-DISTNAME= Gtk-Perl-0.7000
+DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib
-USE_PERL5= YES
+USE_PERL5= yes
MAN3= Gtk::GtkColorSelectButton.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
- --with-gdkimlib --without-gnome
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ --with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}"
.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index e8c1d24ca93b..c0590bf50b1b 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -5,26 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-Tcl-Tk
+PORTNAME= TclTk
PORTVERSION= b2
CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-DISTNAME= TclTk-b2
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
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
-
-WRKSRC= ${WRKDIR}/TclTk
+USE_PERL5= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl::Tk.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/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index e8c1d24ca93b..c0590bf50b1b 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -5,26 +5,26 @@
# $FreeBSD$
#
-PORTNAME= p5-Tcl-Tk
+PORTNAME= TclTk
PORTVERSION= b2
CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-DISTNAME= TclTk-b2
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
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
-
-WRKSRC= ${WRKDIR}/TclTk
+USE_PERL5= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl::Tk.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/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 5e5783724277..0ef8793e12ab 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -5,17 +5,18 @@
# $FreeBSD$
#
-PORTNAME= p5-Tk
+PORTNAME= Tk
PORTVERSION= 800.021
CATEGORIES= x11-toolkits tk80 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tk
-DISTNAME= Tk${PORTVERSION}
+DISTNAME= ${PORTNAME}${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
-USE_XLIB= YES
-USE_PERL5= YES
+USE_XLIB= yes
+USE_PERL5= yes
MAN1= ptked.1 \
ptksh.1 \
@@ -124,6 +125,11 @@ MAN3= Tk.3 \
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-configure:
- @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL PREFIX=${PREFIX} INSTALLSCRIPT=${PREFIX}/bin INSTALLMAN1DIR=${PREFIX}/man/man1
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+ PREFIX=${PREFIX} 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>