diff options
34 files changed, 48 insertions, 117 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 9dfe30bf67c..df47e5e8854 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/03/22 22:43:41 agc Exp $ +# $NetBSD: Makefile,v 1.5 1999/05/20 20:09:49 tron Exp $ DISTNAME= esound-0.2.8 CATEGORIES= audio @@ -14,6 +14,5 @@ DEPENDS+= libaudiofile-0.1.6:../../audio/libaudiofile GNU_CONFIGURE= yes USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index 24d5dfe1e67..d0b06e53f2a 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/03/09 09:10:05 agc Exp $ +# $NetBSD: Makefile,v 1.4 1999/05/20 20:09:49 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp # @@ -13,6 +13,5 @@ MAINTAINER= tron@netbsd.org GNU_CONFIGURE= yes USE_LIBTOOL= yes -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include <../../mk/bsd.pkg.mk> diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index e17794ca958..c79fd1dfe2d 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/05/12 22:32:14 tron Exp $ +# $NetBSD: Makefile,v 1.15 1999/05/20 20:09:50 tron Exp $ # DISTNAME= pilot-link.0.9.0 @@ -13,8 +13,6 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl5=${PERL5_BIN} --without-tcl \ --without-python --without-java -CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" PERL5_BIN= ${LOCALBASE}/bin/perl diff --git a/corba/ORBit/Makefile b/corba/ORBit/Makefile index 01021bde515..64a93b1277a 100644 --- a/corba/ORBit/Makefile +++ b/corba/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/05/02 14:29:16 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/05/20 20:09:50 tron Exp $ # DISTNAME= ORBit-0.4.3 @@ -16,7 +16,6 @@ DEPENDS+= gindent-1.9.1:../../devel/gindent GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_GMAKE= yes -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" LIBTOOL_FLAGS= --install-la INFO_FILES= libIDL.info diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index e6b98a58b00..c7d8ec3932f 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:50 tron Exp $ # DISTNAME= mysql-3.22.22 @@ -20,9 +20,6 @@ CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \ CONFIGURE_ARGS+=--without-readline .endif -CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" CFLAGS+= -Dunix USE_GMAKE= yes diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 2b211ff21aa..dcc02247135 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:50 tron Exp $ # DISTNAME= mysql-3.22.22 @@ -23,9 +23,6 @@ CONFIGURE_ARGS+=--localstatedir=${MYSQL_DATADIR} \ --with-named-z-libs=z --with-named-curses=curses \ --without-perl --without-debug --without-bench \ --without-docs --with-low-memory -CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" CXX="${CXX}" CFLAGS+= -Dunix diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 0b9dc680416..1fa314915b9 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/04/06 15:42:55 agc Exp $ +# $NetBSD: Makefile,v 1.10 1999/05/20 20:09:50 tron Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -8,9 +8,8 @@ MASTER_SITES= ftp://alpha.gnu.org/gnu/ MAINTAINER= tron@netbsd.org -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" +GNU_CONFIGURE= yes +USE_LIBTOOL= yes INFO_FILES= gettext.info diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index fd2b5badbd8..1c6bbfa007c 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1999/04/04 21:05:59 tron Exp $ +# $NetBSD: Makefile,v 1.17 1999/05/20 20:09:50 tron Exp $ # DISTNAME= libgtop-1.0.1 @@ -26,8 +26,6 @@ IGNORE= "got broken by removal of Mach VM" CONFIGURE_ARGS+= --with-glib-prefix=${LOCALBASE} \ --with-libgtop-guile --with-catgets CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index fbe7af0cdf9..c650eb00ca9 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/04/14 21:39:03 tron Exp $ +# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:50 tron Exp $ # DISTNAME= libtool-1.2 @@ -12,8 +12,6 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.profitpress.com/libtool/ GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DATA="${INSTALL_DATA}" .if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) CONFIGURE_ARGS= --disable-shared .endif diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index b76f149e518..d679af690d4 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 1999/04/24 06:53:41 tron Exp $ +# $NetBSD: Makefile,v 1.30 1999/05/20 20:09:50 tron Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -23,10 +23,6 @@ CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL="/usr/bin/install" + all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 15360de94dd..be88332d615 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 1999/04/25 18:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.44 1999/05/20 20:09:50 tron Exp $ # DISTNAME= ImageMagick-4.2.2 @@ -18,7 +18,6 @@ MIRROR_DISTFILE= no USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" # For things for which we do not specify an explicit dependency above, disable # so that we don't cause implicit "hidden" dependencies. Users may reenable @@ -31,6 +30,6 @@ CONFIGURE_ARGS= --without-perl \ post-install: ${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \ - ${PREFIX}/share/ImageMagick/ + ${PREFIX}/share/ImageMagick .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index 1413a1607b0..ebc878b3ec5 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/04/24 06:53:41 tron Exp $ +# $NetBSD: Makefile,v 1.18 1999/05/20 20:09:51 tron Exp $ # DISTNAME= kdegraphics-1.1 @@ -24,11 +24,6 @@ CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL="/usr/bin/install" + all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 688b05aa5b9..b9a1b9757dc 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1999/04/14 21:39:04 tron Exp $ +# $NetBSD: Makefile,v 1.13 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -11,10 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/guile/guile.html USE_LIBTOOL= yes GNU_CONFIGURE= YES -CONFIGURE_ENV= CPPFLAGS="-Dunix" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" +CONFIGURE_ENV= CPPFLAGS="-Dunix" INFO_FILES= data-rep.info diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index 3c24283dfdd..c2aae49595f 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/04/05 04:19:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.3 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp # @@ -29,8 +29,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS= --enable-acegr-home=${PREFIX} \ --enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \ --enable-extra-ldpath=${LOCALBASE}/lib -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" -CONFIGURE_ENV+= INSTALL_DATA="${INSTALL_DATA}" ALL_TARGET= INSTALL_TARGET= install diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index cd8c4aaf379..bccc12cadcc 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 1999/04/24 06:53:41 tron Exp $ +# $NetBSD: Makefile,v 1.28 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -21,10 +21,6 @@ CONFIGURE_ARGS= "--with-qt-dir=${PREFIX}" \ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL="/usr/bin/install" + all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 01021bde515..64a93b1277a 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/05/02 14:29:16 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/05/20 20:09:50 tron Exp $ # DISTNAME= ORBit-0.4.3 @@ -16,7 +16,6 @@ DEPENDS+= gindent-1.9.1:../../devel/gindent GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_GMAKE= yes -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" LIBTOOL_FLAGS= --install-la INFO_FILES= libIDL.info diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index 127f81118ce..4acf7c52d30 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 1999/04/24 06:53:42 tron Exp $ +# $NetBSD: Makefile,v 1.31 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -31,10 +31,7 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" GCC_VERSION!= gcc --version .if (${GCC_VERSION:C/-.*$$//} == egcs) diff --git a/pkgtools/pkglibtool/Makefile b/pkgtools/pkglibtool/Makefile index 3627bf4622b..8815f597089 100644 --- a/pkgtools/pkglibtool/Makefile +++ b/pkgtools/pkglibtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/04/14 21:39:04 tron Exp $ +# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:51 tron Exp $ # DISTNAME= libtool-1.2 @@ -10,8 +10,6 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.profitpress.com/libtool/ GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DATA="${INSTALL_DATA}" .if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) CONFIGURE_ARGS= --disable-shared .endif diff --git a/print/enscript/Makefile b/print/enscript/Makefile index 0c0fa6d10b6..6d2950b0792 100644 --- a/print/enscript/Makefile +++ b/print/enscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1999/04/14 21:39:04 tron Exp $ +# $NetBSD: Makefile,v 1.14 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp # @@ -12,6 +12,5 @@ HOMEPAGE= http://www.ngs.fi/mtr/genscript/ DEPENDS+= papersize-1.0:../../print/papersize GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index f985fc4f024..9259937ec98 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/04/21 15:31:05 agc Exp $ +# $NetBSD: Makefile,v 1.6 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -44,7 +44,4 @@ CONFIGURE_ARGS+= --with-smbclient DEPENDS+= samba-2.0.3:../../net/samba .endif -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" - - .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index fc8fd8e1e70..1b329628874 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/04/21 14:14:32 agc Exp $ +# $NetBSD: Makefile,v 1.5 1999/05/20 20:09:51 tron Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -38,7 +38,6 @@ CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \ --with-dump-honor-nodump \ --without-server --without-restore --without-client -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" CPPFLAGS= pre-install: diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index a11471c72df..1bb6f236e3d 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/04/26 19:25:06 garbled Exp $ +# $NetBSD: Makefile,v 1.7 1999/05/20 20:09:52 tron Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -40,7 +40,6 @@ CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \ --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \ --with-dump-honor-nodump \ --without-client -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" post-install: ${MKDIR} ${PREFIX}/share/doc/amanda diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index fcc510cd5a5..2631cf00ce9 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/05/03 17:43:58 rh Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:52 tron Exp $ # DISTNAME= libxml-1.0.0 @@ -10,6 +10,5 @@ HOMEPAGE= http://rufus.w3.org/veillard/XML/xml.html USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index d2542b6d14b..d73ee00b66d 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/05/20 19:12:12 tron Exp $ +# $NetBSD: Makefile,v 1.18 1999/05/20 20:09:53 tron Exp $ # DISTNAME= gnome-core-1.0.5 @@ -27,8 +27,7 @@ LOCALSTATEDIR= /var/gnome CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --with-glib-prefix=${LOCALBASE} CPPFLAGS= -I${LOCALBASE}/include -I${WRKDIR} -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ CPPFLAGS="${CPPFLAGS}" pre-configure: diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 54bf4be6b1d..716545145c6 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 1999/05/04 20:31:32 tron Exp $ +# $NetBSD: Makefile,v 1.24 1999/05/20 20:09:52 tron Exp $ # DISTNAME= gnome-libs-1.0.9 @@ -24,7 +24,6 @@ LDFLAGS+= "-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --with-glib-prefix=${LOCALBASE} CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile index 5a2b6ddbe3e..9c2a43f0c66 100644 --- a/x11/gtk--/Makefile +++ b/x11/gtk--/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/05/02 14:35:58 tron Exp $ +# $NetBSD: Makefile,v 1.6 1999/05/20 20:09:52 tron Exp $ # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp # @@ -23,7 +23,6 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" CONFIGURE_ARGS= --without-gnome .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 856271f0551..737e1c64a8f 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 1999/05/02 14:24:58 tron Exp $ +# $NetBSD: Makefile,v 1.31 1999/05/20 20:09:52 tron Exp $ DISTNAME= gtk+-1.2.2 CATEGORIES= x11 @@ -19,9 +19,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= gdk.info gtk.info diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile index 6b9d714152b..bd2d46b9c9b 100644 --- a/x11/gtk10/Makefile +++ b/x11/gtk10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/19 14:22:47 rh Exp $ +# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:53 tron Exp $ DISTNAME= gtk+-1.0.6 PKGNAME= gtk10-1.0.6 @@ -16,8 +16,6 @@ USE_LIBTOOL= yes USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DATA="${INSTALL_DATA}" CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk10 CFLAGS= -pipe -O2 diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 8b330c8958e..5475bd89a49 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 1999/04/24 06:53:42 tron Exp $ +# $NetBSD: Makefile,v 1.35 1999/05/20 20:09:52 tron Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp # @@ -25,10 +25,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" PLIST_SRC= ${WRKDIR}/PLIST PLIST_DIRS= share/kde/applnk share/kde/apps/kappfinder \ diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 00c189a5831..d138ea5cdc7 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/04/01 23:03:38 garbled Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:53 tron Exp $ # DISTNAME= khostchooser-0.3 @@ -27,9 +27,6 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + all_libraries="-L${LOCALBASE}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 14a6a4454d3..ba0c471131c 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 1999/02/20 22:48:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.38 1999/05/20 20:09:52 tron Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -17,8 +17,7 @@ USE_X11BASE= yes # disable this for debugging CONFIGURE_ARGS+=--enable-production -CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - VarHaveMan2html=0 +CONFIGURE_ENV= CCFLAGS="-O -pipe" VarHaveMan2html=0 pre-fetch: @if [ -d ${X11BASE}/include/Xm ]; then \ diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 95d641f6c00..67cad95c122 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 1999/05/02 17:59:21 rh Exp $ +# $NetBSD: Makefile,v 1.29 1999/05/20 20:09:53 tron Exp $ DISTNAME= WindowMaker-0.53.0 PKGNAME= windowmaker-0.53.0 @@ -25,9 +25,6 @@ CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/share/locale \ --with-incs-from="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/giflib" LDFLAGS+= -L${LOCALBASE}/lib # for libintl.a -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options # to support. Currently supported options: diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile index f38a6e952d1..a6cfed90745 100644 --- a/x11/wmakerconf/Makefile +++ b/x11/wmakerconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/05/03 17:28:22 rh Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:53 tron Exp $ # DISTNAME= wmakerconf-1.99.4 @@ -19,7 +19,6 @@ DEPENDS+= gtk+-1.2.2:../../x11/gtk USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmextra/Makefile b/x11/wmextra/Makefile index 8626004c095..ca8054adbd6 100644 --- a/x11/wmextra/Makefile +++ b/x11/wmextra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/05/02 18:04:50 rh Exp $ +# $NetBSD: Makefile,v 1.3 1999/05/20 20:09:53 tron Exp $ DISTNAME= WindowMaker-extra-0.1 PKGNAME= wmextra-0.1 @@ -13,8 +13,5 @@ DEPENDS+= windowmaker-0.53.0:../../x11/windowmaker USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include "../../mk/bsd.pkg.mk" |