6 files changed, 83 insertions, 27 deletions

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
+