diff options
-rw-r--r-- | comms/fidogate/Makefile | 6 | ||||
-rw-r--r-- | comms/pilot-link/Makefile | 8 | ||||
-rw-r--r-- | converters/uulib/Makefile | 8 | ||||
-rw-r--r-- | devel/libslang/Makefile | 6 | ||||
-rw-r--r-- | graphics/giflib/Makefile | 6 | ||||
-rw-r--r-- | graphics/jpeg/Makefile | 8 | ||||
-rw-r--r-- | graphics/mpeg-lib/Makefile | 9 | ||||
-rw-r--r-- | graphics/png/Makefile | 5 | ||||
-rw-r--r-- | lang/guile/Makefile | 8 | ||||
-rw-r--r-- | misc/amanda/Makefile | 7 | ||||
-rw-r--r-- | print/a2ps/Makefile | 7 | ||||
-rw-r--r-- | sysutils/amanda/Makefile | 7 | ||||
-rw-r--r-- | www/libwww/Makefile | 6 | ||||
-rw-r--r-- | x11/gtk/Makefile | 8 | ||||
-rw-r--r-- | x11/lesstif-current/Makefile | 8 | ||||
-rw-r--r-- | x11/lesstif/Makefile | 7 |
16 files changed, 44 insertions, 70 deletions
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index aa6c6b91d38..4564c7e2d02 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/07/18 14:50:38 tv Exp $ +# $NetBSD: Makefile,v 1.4 1998/07/24 01:56:59 tv Exp $ # DISTNAME= fidogate-4.2.9 @@ -7,11 +7,9 @@ MASTER_SITES= ftp://ftp.fido.de/pub/fidogate/ MAINTAINER= tv@netbsd.org # aka "Todd Vierling" @ 1:396/1.5 -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - USE_GMAKE= yes USE_PERL5= yes -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool +USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/fidogate NO_CDROM= "extremely limited usefulness to the general public" diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 8145786695c..8e0ba27860b 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/07/17 20:59:41 tv Exp $ +# $NetBSD: Makefile,v 1.12 1998/07/24 01:56:59 tv Exp $ # DISTNAME= pilot-link.0.8.13 @@ -8,12 +8,10 @@ MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/ MAINTAINER= sommerfeld@alum.mit.edu -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - USE_PERL5= yes +USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBTOOL=${PREFIX}/bin/libtool \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ +CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile index 30730f265e4..1067e92eb90 100644 --- a/converters/uulib/Makefile +++ b/converters/uulib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/07/20 15:10:35 tv Exp $ +# $NetBSD: Makefile,v 1.11 1998/07/24 01:56:59 tv Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp # @@ -10,15 +10,13 @@ MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - # "kdesupport-2.1b" included "uu" library. CONFLICTS= kdesupport-2.1b GNU_CONFIGURE= yes +USE_LIBTOOL= yes ALL_TARGET= libuu.la -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool WRKSRC= ${WRKDIR}/${DISTNAME}/uulib @@ -29,7 +27,7 @@ DOCFILES= HISTORY doc/Makefile doc/README doc/binhex.fig \ .include "../../mk/bsd.prefs.mk" do-install: - ${PREFIX}/bin/libtool ${INSTALL_DATA} ${WRKSRC}/libuu.la ${PREFIX}/lib + ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libuu.la ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/uudeview.h ${PREFIX}/include/uu.h ${SED} -e 's|FUNKYTOKENHERE|${PREFIX}|g' <${FILESDIR}/uulib.3 >${WRKSRC}/uulib.3 ${INSTALL_MAN} ${WRKSRC}/uulib.3 ${PREFIX}/man/man3 diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index aaf94855bb9..dbdd5f52847 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/07/15 14:15:59 tv Exp $ +# $NetBSD: Makefile,v 1.10 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp # @@ -9,10 +9,8 @@ MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - GNU_CONFIGURE= yes -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool +USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/slang .include "../../mk/bsd.pkg.mk" diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 61453ef46fd..69adf657ff0 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/07/14 19:55:49 tv Exp $ +# $NetBSD: Makefile,v 1.11 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp # @@ -8,9 +8,7 @@ MASTER_SITES= http://www.ccil.org/~esr/giflib/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool +USE_LIBTOOL= yes post-install: @${MKDIR} ${PREFIX}/share/doc/giflib diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 074710e907a..a54281638b9 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/07/17 14:33:52 tv Exp $ +# $NetBSD: Makefile,v 1.11 1998/07/24 01:57:00 tv Exp $ # DISTNAME= jpegsrc.v6b @@ -8,11 +8,11 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/ MAINTAINER= mycroft@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool +USE_LIBTOOL= yes -WRKSRC= ${WRKDIR}/jpeg-6b GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBTOOL=${PREFIX}/bin/libtool INSTALL_TARGET= install install-lib +WRKSRC= ${WRKDIR}/jpeg-6b + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index fda6df71050..58c1ab178fe 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/07/14 19:29:27 tv Exp $ +# $NetBSD: Makefile,v 1.9 1998/07/24 01:57:00 tv Exp $ DISTNAME= mpeg_lib-1.2.1 PKGNAME= mpeg-1.2.1 @@ -9,17 +9,14 @@ MASTER_SITES= ftp://ftp.mni.mcgill.ca/pub/mpeg/ \ MAINTAINER= tron@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - +USE_LIBTOOL= yes GNU_CONFIGURE= yes -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool WRKSRC= ${WRKDIR}/mpeg_lib do-install: cd ${WRKSRC} && \ - ${PREFIX}/bin/libtool --mode=install ${INSTALL_DATA} \ - libmpeg.la ${PREFIX}/lib/ + ${LIBTOOL} ${INSTALL_DATA} libmpeg.la ${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/mpeg.h ${PREFIX}/include/ .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 83f668a9f46..054c376bd24 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/07/15 11:45:54 tv Exp $ +# $NetBSD: Makefile,v 1.10 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp # @@ -9,11 +9,10 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/png/src/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool +USE_LIBTOOL= yes CONFLICTS= png-0.96 MAKEFILE= scripts/makefile.std -MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 2322c5c0b84..3c4e1f41bea 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/07/17 19:39:42 tv Exp $ +# $NetBSD: Makefile,v 1.3 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -8,11 +8,9 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= perry@piermont.com -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - +USE_LIBTOOL= yes GNU_CONFIGURE= YES -CONFIGURE_ENV= LIBTOOL=${PREFIX}/bin/libtool \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ +CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile index 483c70904e0..b41b7b2dd2e 100644 --- a/misc/amanda/Makefile +++ b/misc/amanda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1998/07/18 14:39:40 tv Exp $ +# $NetBSD: Makefile,v 1.16 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -8,7 +8,6 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool DEPENDS+= readline-2.2:../../devel/readline DEPENDS+= addnerd-1.5:../../sysutils/addnerd DEPENDS+= gnuplot-3.5:../../graphics/gnuplot @@ -17,11 +16,11 @@ DEPENDS+= gtar-1.12:../../archivers/gtar AMANDA_USER?= backup AMANDA_GROUP= operator +USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ --with-mmap -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LIBTOOL=${PREFIX}/bin/libtool +CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" pre-install: @${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER} diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 45c0cfa36fa..8c5048248d4 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1998/07/17 19:08:40 tv Exp $ +# $NetBSD: Makefile,v 1.16 1998/07/24 01:57:01 tv Exp $ # FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp # @@ -9,15 +9,14 @@ MASTER_SITES= http://www-inf.enst.fr/~demaille/ftp/a2ps/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - CONFLICTS= a2ps-A4-4.9.9 a2ps-Letter-4.9.9 a2ps-Letterdj-4.9.9 STRIP= GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-medium=${PAPERSIZE} -CONFIGURE_ENV+= LPR=lpr LIBTOOL=${PREFIX}/bin/libtool +CONFIGURE_ENV+= LPR=lpr USE_GTEXINFO= YES +USE_LIBTOOL= yes INFO_FILES= a2ps.info ogonkify.info regex.info ALL_TARGET= all PAPERSIZE=${PAPERSIZE} diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile index 483c70904e0..b41b7b2dd2e 100644 --- a/sysutils/amanda/Makefile +++ b/sysutils/amanda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1998/07/18 14:39:40 tv Exp $ +# $NetBSD: Makefile,v 1.16 1998/07/24 01:57:00 tv Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -8,7 +8,6 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool DEPENDS+= readline-2.2:../../devel/readline DEPENDS+= addnerd-1.5:../../sysutils/addnerd DEPENDS+= gnuplot-3.5:../../graphics/gnuplot @@ -17,11 +16,11 @@ DEPENDS+= gtar-1.12:../../archivers/gtar AMANDA_USER?= backup AMANDA_GROUP= operator +USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ --with-mmap -CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LIBTOOL=${PREFIX}/bin/libtool +CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" pre-install: @${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER} diff --git a/www/libwww/Makefile b/www/libwww/Makefile index df16f93571e..2a9deac9494 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/07/14 17:12:35 tv Exp $ +# $NetBSD: Makefile,v 1.4 1998/07/24 01:57:01 tv Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # @@ -9,12 +9,10 @@ MASTER_SITES= ftp://ftp.w3.org/pub/libwww/ MAINTAINER= tv@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - GNU_CONFIGURE= yes USE_GMAKE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --with-zlib --with-regex --without-x -CONFIGURE_ENV= LIBTOOL=${PREFIX}/bin/libtool WRKSRC= ${WRKDIR}/w3c-libwww-5.1m DOCDIR= ${PREFIX}/share/doc/libwww diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 0933f8f672a..bbedbb71fbe 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1998/07/19 21:21:20 tv Exp $ +# $NetBSD: Makefile,v 1.15 1998/07/24 01:57:01 tv Exp $ DISTNAME= gtk+-1.0.4 CATEGORIES= x11 @@ -8,15 +8,13 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.0/ \ MAINTAINER= bsieker@techfak.uni-bielefeld.de -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:../../devel/libtool - CONFLICTS= gtk+-1.0.0 +USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBTOOL=${LOCALBASE}/bin/libtool \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ +CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" CFLAGS= -pipe -O2 diff --git a/x11/lesstif-current/Makefile b/x11/lesstif-current/Makefile index 7cae49fcbe3..315e85afff2 100644 --- a/x11/lesstif-current/Makefile +++ b/x11/lesstif-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/07/22 01:06:40 tv Exp $ +# $NetBSD: Makefile,v 1.12 1998/07/24 01:57:01 tv Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -9,17 +9,15 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:../../devel/libtool - CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-0.84 lesstif-0.85 \ lesstif-0.85.2 lesstif-0.85.3 MIRROR_DISTFILE= no GNU_CONFIGURE= yes +USE_LIBTOOL= yes USE_X11= yes # change this for debugging -CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LIBTOOL=${LOCALBASE}/bin/libtool +CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" pre-fetch: @if [ -d ${X11BASE}/include/Xm ]; then \ diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index dfd3cd4d73f..7d9254db7a6 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 1998/07/22 01:06:39 tv Exp $ +# $NetBSD: Makefile,v 1.28 1998/07/24 01:57:01 tv Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -10,19 +10,18 @@ MASTER_SITES= ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \ MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:../../devel/libtool - CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-0.84 lesstif-0.85 \ lesstif-19980510 lesstif-0.85.2 GNU_CONFIGURE= yes +USE_LIBTOOL= yes USE_X11= yes # disable this for debugging CONFIGURE_ARGS+=--enable-production CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - VarHaveMan2html=0 LIBTOOL=${LOCALBASE}/bin/libtool + VarHaveMan2html=0 pre-fetch: @if [ -d ${X11BASE}/include/Xm ]; then \ |