Use new PERL5 variable instead of ${LOCALBASE}/bin/perl.

6 files changed, 18 insertions, 19 deletions

diff --git a/net/gnapfetch/Makefile b/net/gnapfetch/Makefile
index 8597d357e25..aad99863a07 100644
--- a/net/gnapfetch/Makefile
+++ b/net/gnapfetch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2000/08/08 08:18:44 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 02:46:05 jlam Exp $
 
 DISTNAME=	gnapfetch-0.3
 CATEGORIES=	net
@@ -8,11 +8,10 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://entropy.atlantic.net/gnapfetch/
 
 USE_PERL5=	# defined
-PERL=		${LOCALBASE}/bin/perl
 
 do-build:
-	${SED} -e "s,/usr/bin/perl,${PERL},g" < ${WRKSRC}/gnapfetch \
-		> ${WRKDIR}/gnapfetch
+	${SED} -e "s,/usr/bin/perl,${PERL5},g" \
+		< ${WRKSRC}/gnapfetch > ${WRKDIR}/gnapfetch
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gnapfetch ${PREFIX}/bin
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index b9dccdcfb41..068cb753c4f 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/04/19 16:16:51 kim Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/27 02:46:05 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp 
 #
 
@@ -8,10 +8,11 @@ MASTER_SITES=	ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
 
-NO_WRKSUBDIR=	yes
+NO_WRKSUBDIR=	# defined
 MAKEFILE=	makefile
+SCRIPTS_ENV+=	PERL5=${PERL5}
 
 # If you are tempted to add a target that runs ${SED} (or other stuff)
 # on the files, please look at scripts/configure first.
diff --git a/net/mirror/scripts/configure b/net/mirror/scripts/configure
index 534d7cea982..05a4bad47a9 100644
--- a/net/mirror/scripts/configure
+++ b/net/mirror/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: configure,v 1.4 2000/03/26 22:33:18 kim Exp $
+# $NetBSD: configure,v 1.5 2000/08/27 02:46:05 jlam Exp $
 #
 # Id: configure,v 1.1.1.1 1997/10/27 05:01:31 hubertf Exp
 #
@@ -9,7 +9,7 @@ for i in do_unlinks.pl mirror.pl mm.pl pkgs_to_mmin.pl
 do
     sed \
 	-e s:!!PREFIX!!:$PREFIX:g \
-	-e s:/usr/bin/perl:${PREFIX}/bin/perl: \
+	-e s:/usr/bin/perl:${PERL5}: \
 	<$i >$i.BAK
     mv -f $i.BAK $i
 done
diff --git a/net/sirc/Makefile b/net/sirc/Makefile
index 35be925a8ba..0f9b042fb94 100644
--- a/net/sirc/Makefile
+++ b/net/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/04/06 23:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/27 02:46:05 jlam Exp $
 
 DISTNAME=	sirc-2.211
 CATEGORIES=	net
@@ -10,7 +10,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}	\
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.iagora.com/~espel/sirc/sirc.html
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 SIRC_SCRIPTS= \
@@ -54,7 +54,7 @@ do-install:
 		${ECHO} "" ; \
 		${ECHO} "-O3" ; \
 		${ECHO} "" ; \
-		${ECHO} "${PREFIX}/bin/perl" ; \
+		${ECHO} "${PERL5}" ; \
 		${ECHO} "${PREFIX}/bin" ; \
 		${ECHO} "y" ; \
 		${ECHO} "${PREFIX}/lib/sirc" ; \
diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile
index 06c3853be02..c0028108396 100644
--- a/net/sitescooper/Makefile
+++ b/net/sitescooper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/07 16:48:56 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 02:46:05 jlam Exp $
 #
 
 DISTNAME=	sitescooper-2.2.8
@@ -11,13 +11,13 @@ HOMEPAGE=	http://sitescooper.cx/
 DEPENDS+=	p5-libwww>=5.46:../../www/p5-libwww
 DEPENDS+=	pilotmgr-*:../../comms/pilotmgr
 
-USE_PERL5=	YES
-NO_BUILD=	YES
+USE_PERL5=	# defined
+NO_BUILD=	# defined
 
 do-configure:
 .for file in sitescooper rss-to-site subs-to-site
 	cd ${WRKSRC} && \
-	${SED} -e 's:/usr/bin/perl:${PREFIX}/bin/perl:g' <${file}.pl >${file}
+	${SED} -e 's:/usr/bin/perl:${PERL5}:g' <${file}.pl >${file}
 .endfor
 .for file in lib/Scoop.pm sitescooper.cf
 	cd ${WRKSRC} && ${CP} ${file} ${file}.orig && \
diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index e964977d741..1e8f453a594 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/26 06:18:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/27 02:46:06 jlam Exp $
 #
 
 DISTNAME=		speak_freely-7.2
@@ -12,7 +12,6 @@ HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
 DEPENDS+=		gsm-1.0.10:../../audio/gsm
 
 USE_PERL5=		# defined
-PERL_PATH=		${LOCALBASE}/bin/perl
 
 RESTRICTED=		Source includes crypto code
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -49,7 +48,7 @@ LICENSE=		no-commercial-use
 .endif
 
 SOUNDDIR=	${PREFIX}/share/speakfreely
-MAKE_ENV+=	PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \
+MAKE_ENV+=	PERL="${PERL5}" CCFLAGS="${CCFLAGS}" \
 		SOUNDDIR="${SOUNDDIR}"
 MAKE_ENV+=	USE_CRYPTO="${USE_CRYPTO}" HAVE_LIBCRYPTO="${HAVE_LIBCRYPTO}" \
 		SSLBASE="${SSLBASE}" USE_IDEA="${USE_IDEA}"