summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjlam <jlam>2005-05-22 05:35:32 +0000
committerjlam <jlam>2005-05-22 05:35:32 +0000
commit2901e41f3db308b64ed1adb51e919c3fc483bc49 (patch)
tree5538ac20e99097c6730389c1602b13c3a4026b76 /devel
parent44450b55820c29768f135e85f7062da218a39f1e (diff)
downloadpkgsrc-2901e41f3db308b64ed1adb51e919c3fc483bc49.tar.gz
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.
Diffstat (limited to 'devel')
-rw-r--r--devel/automake/Makefile3
-rw-r--r--devel/automake14/Makefile3
-rw-r--r--devel/cscope/Makefile3
-rw-r--r--devel/glib2/Makefile3
-rw-r--r--devel/libtool-base/Makefile3
-rw-r--r--devel/libtool/Makefile.common3
-rw-r--r--devel/p5-subversion/Makefile4
-rw-r--r--devel/rpc2/Makefile3
8 files changed, 8 insertions, 17 deletions
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