pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc For packages that use GNU configure, don't bother addi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/393ad92ee099
branches: trunk
changeset: 494273:393ad92ee099
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun May 22 05:35:32 2005 +0000
description:
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:
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(-)
diffs (truncated from 416 to 300 lines):
diff -r aeaa16c09ef7 -r 393ad92ee099 databases/postgresql73-plperl/Makefile
--- a/databases/postgresql73-plperl/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/databases/postgresql73-plperl/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-perl
-CONFIGURE_ENV+= PERL="${PERL5}"
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
diff -r aeaa16c09ef7 -r 393ad92ee099 databases/rrdtool/Makefile
--- a/databases/rrdtool/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/databases/rrdtool/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
-CONFIGURE_ENV= PERL=${PERL5}
PERL5_CONFIGURE= NO
PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/RRDp/.packlist
diff -r aeaa16c09ef7 -r 393ad92ee099 devel/automake/Makefile
--- a/devel/automake/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/automake/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
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 -r aeaa16c09ef7 -r 393ad92ee099 devel/automake14/Makefile
--- a/devel/automake14/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/automake14/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
#PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-CONFIGURE_ENV= PERL=${PERL5}
_STRIPFLAG_INSTALL= # none
USE_MAKEINFO= YES
diff -r aeaa16c09ef7 -r 393ad92ee099 devel/cscope/Makefile
--- a/devel/cscope/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/cscope/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
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 -r aeaa16c09ef7 -r 393ad92ee099 devel/glib2/Makefile
--- a/devel/glib2/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/glib2/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
-CONFIGURE_ENV+= PERL=${PERL5}
CONFIGURE_ENV+= PERL_PATH=${PERL5}
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
diff -r aeaa16c09ef7 -r 393ad92ee099 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/libtool-base/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= echo
-CONFIGURE_ENV+= ECHO=${TOOLS_ECHO:Q}
.endif
.PHONY: fix-libtool
diff -r aeaa16c09ef7 -r 393ad92ee099 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Sun May 22 05:32:46 2005 +0000
+++ b/devel/libtool/Makefile.common Sun May 22 05:35:32 2005 +0000
@@ -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 @@
# 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 -r aeaa16c09ef7 -r 393ad92ee099 devel/p5-subversion/Makefile
--- a/devel/p5-subversion/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/p5-subversion/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
.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 -r aeaa16c09ef7 -r 393ad92ee099 devel/rpc2/Makefile
--- a/devel/rpc2/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/devel/rpc2/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PERL=${PERL5}
USE_PERL5= build
USE_LIBTOOL= YES
diff -r aeaa16c09ef7 -r 393ad92ee099 emulators/libspectrum/Makefile
--- a/emulators/libspectrum/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/emulators/libspectrum/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
USE_PERL5= build
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PERL=${PERL5}
DOCDIR= ${PREFIX}/share/doc/libspectrum
diff -r aeaa16c09ef7 -r 393ad92ee099 graphics/pstoedit/Makefile
--- a/graphics/pstoedit/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/graphics/pstoedit/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
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 -r aeaa16c09ef7 -r 393ad92ee099 lang/objc/Makefile
--- a/lang/objc/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/lang/objc/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
USE_GNU_TOOLS+= lex
USE_TOOLS+= yacc
-CONFIGURE_ENV+= YACC=${TOOLS_YACC:Q}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff -r aeaa16c09ef7 -r 393ad92ee099 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/mail/courier-imap/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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-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 -r aeaa16c09ef7 -r 393ad92ee099 mail/courier-maildir/Makefile.common
--- a/mail/courier-maildir/Makefile.common Sun May 22 05:32:46 2005 +0000
+++ b/mail/courier-maildir/Makefile.common Sun May 22 05:35:32 2005 +0000
@@ -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 @@
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 -r aeaa16c09ef7 -r 393ad92ee099 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/mail/sqwebmail/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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-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 -r aeaa16c09ef7 -r 393ad92ee099 math/R/Makefile
--- a/math/R/Makefile Sun May 22 05:32:46 2005 +0000
+++ b/math/R/Makefile Sun May 22 05:35:32 2005 +0000
@@ -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 @@
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+= --with-zlib
CONFIGURE_ARGS+= --with-bzlib
CONFIGURE_ARGS+= --with-pcre
-CONFIGURE_ENV+= XMKMF="${XMKMF}"
# Use BLAS (math/blas)
#
diff -r aeaa16c09ef7 -r 393ad92ee099 net/irrd/Makefile
Home |
Main Index |
Thread Index |
Old Index