From 48781afdbbd269b8ceaed59acae75d853875a642 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 22 May 2005 05:35:32 +0000
Subject: For packages that use GNU configure, don't bother adding "TOOL"
 variables into CONFIGURE_ENV if the new tools framework already takes care of
 adding them automatically.

---
 databases/postgresql73-plperl/Makefile | 3 +--
 databases/rrdtool/Makefile             | 3 +--
 devel/automake/Makefile                | 3 +--
 devel/automake14/Makefile              | 3 +--
 devel/cscope/Makefile                  | 3 +--
 devel/glib2/Makefile                   | 3 +--
 devel/libtool-base/Makefile            | 3 +--
 devel/libtool/Makefile.common          | 3 +--
 devel/p5-subversion/Makefile           | 4 +---
 devel/rpc2/Makefile                    | 3 +--
 emulators/libspectrum/Makefile         | 3 +--
 graphics/pstoedit/Makefile             | 4 ++--
 lang/objc/Makefile                     | 3 +--
 mail/courier-imap/Makefile             | 3 +--
 mail/courier-maildir/Makefile.common   | 3 +--
 mail/sqwebmail/Makefile                | 3 +--
 math/R/Makefile                        | 4 ++--
 net/irrd/Makefile                      | 4 +---
 net/samba/Makefile                     | 3 +--
 sysutils/libgtop2/Makefile             | 4 ++--
 textproc/intltool/Makefile             | 4 +---
 wm/afterstep1/Makefile                 | 3 +--
 www/squid/Makefile                     | 3 +--
 x11/xscreensaver/Makefile.common       | 2 +-
 24 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/databases/postgresql73-plperl/Makefile b/databases/postgresql73-plperl/Makefile
index 4ce7a2d990f..82cb8f83d5b 100644
--- a/databases/postgresql73-plperl/Makefile
+++ b/databases/postgresql73-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 05:35:32 jlam Exp $
 
 PKGNAME=		postgresql73-plperl-${BASE_VERS}
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
@@ -10,7 +10,6 @@ DEPENDS+=	postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-perl
-CONFIGURE_ENV+=		PERL="${PERL5}"
 
 BUILD_DIRS=		${WRKSRC}/src/pl/plperl
 MAKEFILE=		GNUmakefile
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index c2417622430..236ae21ca2a 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:32 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.0.40
@@ -19,7 +19,6 @@ USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS= --enable-shared
-CONFIGURE_ENV=	PERL=${PERL5}
 
 PERL5_CONFIGURE=	NO
 PERL5_PACKLIST+= 	${PERL5_SITEARCH}/auto/RRDp/.packlist
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 8e23f6d5ae0..cfc188143d4 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2005/05/22 05:35:32 jlam Exp $
 #
 
 DISTNAME=	automake-1.9.5
@@ -17,7 +17,6 @@ DEPENDS=	autoconf>=2.58:../../devel/autoconf
 
 PLIST_SUBST+=		PKG_DIR_VERSION=1.9
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV=		PERL=${PERL5}
 _STRIPFLAG_INSTALL=	# none
 EVAL_PREFIX+=		M4DIR=m4
 TOOLS_M4=		${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 771d6cd519c..2c86aeba830 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 05:35:32 jlam Exp $
 #
 
 DISTNAME=	automake-1.4-p6
@@ -17,7 +17,6 @@ CONFLICTS=	automake<1.6
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV=		PERL=${PERL5}
 _STRIPFLAG_INSTALL=	# none
 
 USE_MAKEINFO=		YES
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 56c4f0cf793..4a48f1fb14d 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 05:35:32 jlam Exp $
 #
 
 DISTNAME=	cscope-15.4
@@ -15,7 +15,6 @@ USE_GNU_TOOLS+=		lex
 
 CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_PREFIX.ncurses}
 CONFIGURE_ARGS+=	--with-flex
-CONFIGURE_ENV+=		LEX=${LEX}
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index c97367c7b69..f498a55cb5a 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/04/15 12:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2005/05/22 05:35:32 jlam Exp $
 
 DISTNAME=		glib-2.6.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -45,7 +45,6 @@ CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
-CONFIGURE_ENV+=		PERL=${PERL5}
 CONFIGURE_ENV+=		PERL_PATH=${PERL5}
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index e5ae99594df..41c2a7f15a9 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/05/20 16:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:32 jlam Exp $
 
 ###########################################################################
 ###########################################################################
@@ -68,7 +68,6 @@ CONFIGURE_ARGS+=	--with-tags=CXX,F77,GCJ
 
 .if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		echo
-CONFIGURE_ENV+=		ECHO=${TOOLS_ECHO:Q}
 .endif
 
 .PHONY: fix-libtool
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 3cdd4818816..fcfd20f5342 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2005/05/18 14:40:04 tv Exp $
+# $NetBSD: Makefile.common,v 1.64 2005/05/22 05:35:32 jlam Exp $
 
 ###########################################################################
 ###########################################################################
@@ -53,7 +53,6 @@ CONFIGURE_ENV+=		lt_cv_path_LD=${LD:Q}
 # which breaks when SED is nbsed.  Tell it explicitly to use the sed
 # named by ${SED}.
 #
-CONFIGURE_ENV+=		SED=${SED:Q}
 CONFIGURE_ENV+=		lt_cv_path_SED=${SED:Q}
 
 # The configure script doesn't seem to be working out the need for -p
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index b7b43c54fc0..232983c3113 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/17 01:08:50 epg Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 05:35:32 jlam Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
@@ -7,8 +7,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../devel/subversion/Makefile.common"
 
-CONFIGURE_ENV+=		PERL=${PERL5}
-
 PERL5_REQD+=		5.8
 PERL_DIR=		${WRKSRC}/subversion/bindings/swig/perl
 BUILD_TARGET=		swig-pl-lib swig-pl
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 2e1d16bb2f5..104e1d9613d 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 05:35:32 jlam Exp $
 #
 
 DISTNAME=	rpc2-1.26
@@ -13,7 +13,6 @@ COMMENT=	CMU (Coda) remote procedure call package
 USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		PERL=${PERL5}
 
 USE_PERL5=		build
 USE_LIBTOOL=		YES
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index e8a09f342cc..233b4f5a19e 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 05:35:32 jlam Exp $
 
 DISTNAME=	libspectrum-0.2.2
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	ZX Spectrum emulator file format library
 USE_PERL5=		build
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PERL=${PERL5}
 
 DOCDIR=		${PREFIX}/share/doc/libspectrum
 
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index cc0c98389e2..ef191e82fac 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 05:35:32 jlam Exp $
 
 DISTNAME=	pstoedit_3_31
 PKGNAME=	pstoedit-3.31
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la"
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
 CONFIGURE_ENV+=	LDLIBS="${X11_LDFLAGS}"
-CONFIGURE_ENV+=	AWK=${AWK} GS=${LOCALBASE}/bin/gs
+CONFIGURE_ENV+=	GS=${LOCALBASE}/bin/gs
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit	# plugin dir -- unused for now
 BUILD_TARGET=
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index e29d7fb0a36..28cfd83f86a 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/15 19:28:37 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=	objc-3.2.6
 CATEGORIES=	lang
@@ -18,7 +18,6 @@ BUILD_TARGET=		default
 
 USE_GNU_TOOLS+=		lex
 USE_TOOLS+=		yacc
-CONFIGURE_ENV+=		YACC=${TOOLS_YACC:Q}
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index fc5a3f8d216..95b02db902a 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/19 17:05:38 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.2
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
-CONFIGURE_ENV+=		SETENV=${TOOLS_SETENV:Q}
 
 INSTALL_AM_MAKEFLAGS=	sysconfdir=${EGDIR}
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common
index 2a17e3c98c5..1d6bb765c71 100644
--- a/mail/courier-maildir/Makefile.common
+++ b/mail/courier-maildir/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2005/02/18 22:12:50 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/05/22 05:35:33 jlam Exp $
 #
 # Package Makefiles should include this file after setting PKGBASE and
 # PKG_SUPPORTED_OPTIONS.
@@ -21,7 +21,6 @@ USE_DB185=		yes
 CONFIGURE_ARGS+=	--with-db=db
 .include "../../mk/bdb.buildlink3.mk"
 
-CONFIGURE_ENV+=		PERL=${PERL5}
 CONFIGURE_ENV+=		SYSCONFTOOL_PERL=${PERL5}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGBASE}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index a1942bc94f7..b78712fc778 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/19 17:05:38 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=	sqwebmail-5.0.1
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
 CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 
-CONFIGURE_ENV+=		SETENV=${TOOLS_SETENV:Q}
 CONFIGURE_ENV+=		GPG="${LOCALBASE}/bin/gpg"
 CONFIGURE_ENV+=		ldapsearch="${LOCALBASE}/bin/ldapsearch"
 
diff --git a/math/R/Makefile b/math/R/Makefile
index 5732c7b8fd9..7cecd8931a0 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/05/19 13:12:52 markd Exp $
+# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=		R-2.1.0
 CATEGORIES=		math
@@ -18,6 +18,7 @@ TEST_TARGET=		check
 USE_X11=		# defined
 USE_PERL5=		# defined
 USE_GNU_TOOLS+=		make
+USE_TOOLS+=		xmkmf
 USE_GNU_READLINE=	# uses callback interface
 USE_MAKEINFO=		# defined
 TEXINFO_REQD=		4.5
@@ -33,7 +34,6 @@ CONFIGURE_ARGS+=	--without-gnome		# not yet stable
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--with-bzlib
 CONFIGURE_ARGS+=	--with-pcre
-CONFIGURE_ENV+=		XMKMF="${XMKMF}"
 
 # Use BLAS (math/blas)
 #
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index dce5fde620c..fcf8ad61669 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=		irrd2.2.3
 PKGNAME=		irrd-2.2.3
@@ -24,8 +24,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-thread
-CONFIGURE_ENV+=		EGREP=${EGREP}
-CONFIGURE_ENV+=		YACC=${TOOLS_YACC:Q}
 
 BUILD_DEFS+=		USE_INET6
 
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 605c1fdcf7e..3a96931ad01 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2005/04/15 11:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=		samba-3.0.10
 PKGREVISION=		2
@@ -22,7 +22,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PERL="${PERL5}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 442ceb33e8f..b1d76d4702b 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/26 21:27:33 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=		libgtop-2.10.1
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -35,7 +35,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib2}
 CONFIGURE_ARGS+=	--with-catgets --with-libgtop-guile=no
 CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
+CONFIGURE_ENV+=		LN_S="${LN} -s"
 
 PRINT_PLIST_AWK+=	/^bin\/libgtop_server2$$/ \
 				{ print "$${LIBGTOP_SERVER}" $$0; next }
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 5040eef6185..bc2e4743b12 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:35 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 05:35:33 jlam Exp $
 #
 
 DISTNAME=		intltool-0.33
@@ -19,8 +19,6 @@ CONFLICTS=		xml-i18n-tools-[0-9]*
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
-CONFIGURE_ENV+=		PERL=${PERL5}
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile
index 0b22af25bbe..e7f5e38bcae 100644
--- a/wm/afterstep1/Makefile
+++ b/wm/afterstep1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=	AfterStep-1.8.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--disable-staticlibs
 CONFIGURE_ARGS+=	--disable-xinerama
 CONFIGURE_ARGS+=	--with-helpcommand=xpman
 CONFIGURE_ARGS+=	--with-xpm-includes='${BUILDLINK_DIR}/include/X11'
-CONFIGURE_ENV+=		PERL='${LOCALBASE}/bin/perl'
 CONFIGURE_ENV+=		ac_cv_prog_sgmltools='no'
 
 post-patch:
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 83dcafdd027..17fbadc13ac 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2005/05/12 16:09:48 taca Exp $
+# $NetBSD: Makefile,v 1.151 2005/05/22 05:35:33 jlam Exp $
 
 DISTNAME=	squid-2.5.STABLE9
 PKGNAME=	squid-2.5.9
@@ -83,7 +83,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--localstatedir=${DATADIR} \
 			${SQUID_CONFIGURE_ARGS}
-#CONFIGURE_ENV+=		PERL=${PERL5}
 
 BUILD_DEFS+=	SQUID_CONFIGURE_ARGS
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 7773cf0d310..b82ddfe5807 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-pam
 
 CONFIGURE_ENV+=		X_PRE_LIBS=-lXt
 CONFIGURE_ENV+=		ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
-CONFIGURE_ENV+=		PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
+CONFIGURE_ENV+=		ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
 CONFIGURE_ENV+=		INTLTOOL_PERL="${PERL5}"
 .if defined(PKGREVISION)
 CONFIGURE_ENV+=		X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
-- 
cgit v1.2.3