20 files changed, 40 insertions, 40 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 363a1cc0ade0..7f7a252ba937 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -4,7 +4,7 @@
 # Date created:                         20 May 1998
 # Whom:                                 ache
 #
-# $Id: Makefile,v 1.5 1998/09/01 06:22:49 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/01 10:39:42 ache Exp $
 #
 
 DISTNAME=       WebMagick-1.44
@@ -22,7 +22,7 @@ CONFIGURE_ENV=  webmagick_cv_rootpath=${PREFIX}/www/data \
 		webmagick_cv_prefixpath="" \
 		webmagick_cv_htimage="" \
 		webmagick_cv_maptype=ncsa \
-		PERL=${PREFIX}/bin/perl
+		PERL=${PERL5}
 
 post-install:
 		cd ${WRKSRC}; \
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index eb7f2a714fb2..d0eed67145e3 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2. Feb 1998
 # Whom:	      				wosch@FreeBSD.org
 #
-# $Id: Makefile,v 1.3 1998/03/04 16:44:58 wosch Exp $
+# $Id: Makefile,v 1.4 1998/03/07 15:24:20 wosch Exp $
 #
 
 DISTNAME=	checkbot-1.51
@@ -22,6 +22,6 @@ MAN1=		checkbot.1
 USE_PERL5=	YES
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 2d6d4a04563c..10ed0f52de4b 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 Nov 1997
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/20 23:20:22 dburr Exp $
 #
 
 DISTNAME=	htmlpp
@@ -24,7 +24,7 @@ USE_PERL5=	YES
 NO_WRKSUBDIR=	yes
 
 do-build:
-	${SED} -e '1,1s:/usr/bin/perl:${PREFIX}/bin/perl5.00404:' \
+	${SED} -e '1,1s:/usr/bin/perl:${PERL5}:' \
 		${WRKDIR}/htmlpp > ${WRKDIR}/htmlpp.temp
 	${RM} -f ${WRKDIR}/htmlpp
 	${MV} ${WRKDIR}/htmlpp.temp ${WRKDIR}/htmlpp
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 2f409d19b4dd..b29a7040b6b3 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.53 1998/09/01 21:04:57 andreas Exp $
+# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
 #
 
 DISTNAME=	apache_${APACHE_VER}
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm \
-		 --with-perl=${PREFIX}/bin/perl5 \
+		 --with-perl=${PERL5} \
 		 --activate-module=src/modules/php3/libphp3.a
 
 OPTIM=-DHARD_SERVER_LIMIT=512 \
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 2f409d19b4dd..b29a7040b6b3 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.53 1998/09/01 21:04:57 andreas Exp $
+# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
 #
 
 DISTNAME=	apache_${APACHE_VER}
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm \
-		 --with-perl=${PREFIX}/bin/perl5 \
+		 --with-perl=${PERL5} \
 		 --activate-module=src/modules/php3/libphp3.a
 
 OPTIM=-DHARD_SERVER_LIMIT=512 \
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 2f409d19b4dd..b29a7040b6b3 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.53 1998/09/01 21:04:57 andreas Exp $
+# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
 #
 
 DISTNAME=	apache_${APACHE_VER}
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm \
-		 --with-perl=${PREFIX}/bin/perl5 \
+		 --with-perl=${PERL5} \
 		 --activate-module=src/modules/php3/libphp3.a
 
 OPTIM=-DHARD_SERVER_LIMIT=512 \
diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index c2d23dbe5510..76498ac32ae4 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -3,7 +3,7 @@
 # Date created:				April 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.9 1998/06/27 01:30:25 steve Exp $
+#   $Id: Makefile,v 1.10 1998/09/03 13:45:47 asami Exp $
 #
 
 DISTNAME=	mod_perl-1.07
@@ -29,7 +29,7 @@ MAN3=		Apache.3 Apache::Constants.3  Apache::Options.3 \
 MANPREFIX=	${PREFIX}/lib/perl5
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 post-install:
 		${MKDIR} ${PREFIX}/share/doc/mod_perl
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 55a311de24d7..cac8d0d247e2 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp $
+#   $Id: Makefile,v 1.8 1998/08/23 04:45:19 jseger Exp $
 #
 
 DISTNAME=	CGI-modules-2.76
@@ -23,6 +23,6 @@ MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 55a311de24d7..cac8d0d247e2 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp $
+#   $Id: Makefile,v 1.8 1998/08/23 04:45:19 jseger Exp $
 #
 
 DISTNAME=	CGI-modules-2.76
@@ -23,6 +23,6 @@ MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 3bd43cf88eff..724ff1d96e32 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.9 1997/09/11 19:38:01 jfitz Exp $
+#   $Id: Makefile,v 1.10 1998/08/23 13:44:24 jseger Exp $
 #
 
 DISTNAME=	CGI_Lite-1.8
@@ -20,6 +20,6 @@ MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		CGI_Lite.3
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl 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 f7a7bec16f6b..e3e4392431e0 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				28 April 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1998/08/06 15:07:46 vanilla Exp $
+# $Id: Makefile,v 1.6 1998/08/19 12:41:20 vanilla Exp $
 #
 
 DISTNAME=	HTML-Parser-2.20
@@ -26,6 +26,6 @@ MAN3=		HTML::Entities.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 5133bf700944..17c1ee764013 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/06/24 18:43:20 jfitz Exp $
+#   $Id: Makefile,v 1.7 1998/08/23 13:47:19 jseger Exp $
 #
 
 DISTNAME=	HTML-QuickCheck-1.0b1
@@ -20,6 +20,6 @@ MAN3=		HTML::QuickCheck.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 1251594536b1..b6e337c90948 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1998/02/18 18:24:01 vanilla Exp $
+# $Id: Makefile,v 1.10 1998/08/23 13:56:19 jseger Exp $
 #
 
 DISTNAME=	HTML-Stream-1.44
@@ -20,6 +20,6 @@ MAN3=		HTML::Stream.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 242ae2a14140..b18e2de252fe 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.8 1997/09/14 02:54:47 jfitz Exp $
+#   $Id: Makefile,v 1.9 1998/08/23 14:04:49 jseger Exp $
 #
 
 DISTNAME=	HTTPD-Tools-0.55
@@ -20,6 +20,6 @@ MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 242ae2a14140..b18e2de252fe 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.8 1997/09/14 02:54:47 jfitz Exp $
+#   $Id: Makefile,v 1.9 1998/08/23 14:04:49 jseger Exp $
 #
 
 DISTNAME=	HTTPD-Tools-0.55
@@ -20,6 +20,6 @@ MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 31fb47746174..6178f69bbb96 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -4,7 +4,7 @@
 # Date created:                         Sep 8 1998
 # Whom:                                 ache@freebsd.org
 #
-# $Id: Makefile,v 1.20 1998/08/19 13:09:15 vanilla Exp $
+# $Id: Makefile,v 1.1.1.1 1998/09/08 17:25:20 ache Exp $
 #
 
 DISTNAME=       ParallelUserAgent-2.36
@@ -30,6 +30,6 @@ MAN3=           LWP::Parallel.3 \
 		LWP::RobotPUA.3
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 3a2beb002a65..bf09d2e6716e 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/08/19 13:13:11 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/09/08 15:32:21 vanilla Exp $
 #
 
 DISTNAME=	WWW-Search-1.021
@@ -47,6 +47,6 @@ MAN3=		WWW::Search.3 \
 		WWW::Search::Simple.3
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 752e5eb0ca70..acf6db619db3 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -4,7 +4,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.21 1998/09/08 16:24:16 ache Exp $
+# $Id: Makefile,v 1.22 1998/09/08 16:47:53 ache Exp $
 #
 
 DISTNAME=       libwww-perl-5.36
@@ -57,6 +57,6 @@ MAN3=           Bundle::LWP.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index ec736717b3d5..c9c1f0cc34a7 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -3,7 +3,7 @@
 # Date created:                         9 May 1998
 # Whom:                                 ache
 #
-# $Id: Makefile,v 1.7 1998/08/23 15:02:59 jseger Exp $
+# $Id: Makefile,v 1.8 1998/09/07 18:55:24 ache Exp $
 #
 
 DISTNAME=       w3mir-1.0.4pre2
@@ -20,7 +20,7 @@ USE_PERL5=	Yes
 MAN1=           w3mir.1 w3mfix.1
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 post-install:
 		${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 34ad4f10fb45..fb06b59088ef 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -3,7 +3,7 @@
 # Date created:		09-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.23 1998/08/25 00:16:46 asami Exp $
+# $Id: Makefile,v 1.24 1998/08/25 11:18:06 rse Exp $
 #
 
 DISTNAME=	wml-1.6.7
@@ -18,7 +18,7 @@ MAINTAINER=	rse@engelschall.com
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-perl=${PREFIX}/bin/perl
+		--with-perl=${PERL5}
 
 CAT1=	wml_aux_linklint.1 wml_aux_txt2html.1 \
 	wml_aux_wwwtable.1 wml_p2_mhc.1 wml_p4_gm4.1