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

4 files changed, 18 insertions, 18 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 372f8256486..715bd18ac39 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2000/06/18 00:07:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/27 02:46:07 jlam Exp $
 #
 
 DISTNAME=	adzap-20000616
-CATEGORIES=	www perl
+CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
 MAINTAINER=	packages@netbsd.org
@@ -10,14 +10,14 @@ HOMEPAGE=	http://www.zip.com.au/~cs/adzap/index.html
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
-NO_WRKSUBDIR=	YES
-NO_BUILD=	YES
-USE_PERL5=	YES
+NO_WRKSUBDIR=	# defined
+NO_BUILD=	# defined
+USE_PERL5=	# defined
 
 do-configure:
 .for FILE in squid_redirect wrapzap
 	${CP} ${WRKSRC}/${FILE} ${WRKSRC}/${FILE}.orig
-	${SED} -e "s:/usr/bin/perl:${PREFIX}/bin/perl:g" \
+	${SED} -e "s:/usr/bin/perl:${PERL5}:g" \
 	       -e "s:@@PREFIX@@:${PREFIX}:g" \
 		<${WRKSRC}/${FILE}.orig >${WRKSRC}/${FILE}
 .endfor
diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile
index 18956834c1c..6c0addd28b7 100644
--- a/www/ap-php3/Makefile
+++ b/www/ap-php3/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.5 1999/11/21 22:12:59 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/27 02:46:07 jlam Exp $
 #
 
 PKGNAME=	ap-${DISTNAME}
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
 
 CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
-CONFIGURE_ENV+=		PERL_PATH=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=		PERL_PATH=${PERL5}
 
-BUILDING_SERVER_MODULE=yes
+BUILDING_SERVER_MODULE=	yes
 
 do-install:
 	@cd ${WRKSRC} && ${CP} libphp3.so mod_php3.so
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 479dc730c6a..b7a1c6eb4c8 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/06/13 10:40:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/27 02:46:08 jlam Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -10,7 +10,7 @@ DISTFILES+=	${DISTNAME}.tar.gz
 MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.php.net/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 
 .include "../../mk/bsd.prefs.mk"
@@ -29,7 +29,7 @@ PATCHDIR?=	${PKGSRCDIR}/www/php3/patches
 .endif
 
 # Here we configure only for what NetBSD ships.  We add the rest via modules.
-GNU_CONFIGURE=  YES
+GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+=--with-system-regex --without-gd \
 		--with-gdbm=${PREFIX} \
 		--with-yp --with-zlib --with-dbase --with-filepro \
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--with-system-regex --without-gd \
 		--enable-track-vars --enable-force-cgi-redirect \
 		--enable-discard-path --enable-memory-limit \
 		--enable-sysvsem --enable-sysvshm
-CONFIGURE_ENV+=	PERL_PATH=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=	PERL_PATH=${PERL5}
 
 .if !defined(BUILDING_EXTENSION_MODULE)
 CONFIGURE_ENV+=	CPPFLAGS="-DPHP_INTERNAL_FUNCS"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 4af1a5fde9f..598b65d9391 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/05/19 07:18:55 tron Exp $
+# $NetBSD: Makefile,v 1.30 2000/08/27 02:46:08 jlam Exp $
 
 DISTNAME=	squid-2.3.STABLE3-src
 PKGNAME=	squid-2.3s3
@@ -18,15 +18,15 @@ PATCHFILES=	squid-2.3.stable3-carp_compile.patch \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+= --sysconfdir=/etc \
 		--localstatedir=/var/squid \
 		${SQUID_CONFIGURE_ARGS}
 CONFIGURE_ENV+=	CACHE_HTTP_PORT=${SQUID_HTTP_PORT} \
 		CACHE_ICP_PORT=${SQUID_ICP_PORT} \
-		PERL=${LOCALBASE}/bin/perl
+		PERL=${PERL5}
 
 BUILD_DEFS+=	SQUID_CONFIGURE_ARGS SQUID_HTTP_PORT SQUID_ICP_PORT
 MAKEFILE=	makefile