diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-14 17:21:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-14 17:21:32 +0000 |
| commit | 445b2e9398f9730ac770e0e9639e0329f6ada7c7 (patch) | |
| tree | f363875d965b55b56e856a921189b2693e263e28 /devel | |
| parent | 18b40ae33e0c58e7e58ae1f8c9f9c40d57573cdc (diff) | |
| download | pkgsrc-445b2e9398f9730ac770e0e9639e0329f6ada7c7.tar.gz | |
LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}. Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
Diffstat (limited to 'devel')
77 files changed, 89 insertions, 190 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index daf2b70a980..ee2b3b8d611 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2004/02/14 00:54:44 grant Exp $ +# $NetBSD: Makefile,v 1.42 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= GConf-1.0.9 @@ -20,7 +20,6 @@ USE_X11BASE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf.pc.in CPPFLAGS+= -I${BUILDLINK_PREFIX.db3}/include/db3 diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index 49fd690d695..e447b28c5d3 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/02/12 19:07:00 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= GConf-2.4.0.1 @@ -23,7 +23,6 @@ USE_LIBTOOL= yes USE_GNU_TOOLS+= make USE_PERL5= build -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf-2.0.pc.in PKG_SYSCONFSUBDIR= gconf diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 875736bc468..40612d6f089 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2004/01/05 22:44:04 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2004/02/14 17:21:36 jlam Exp $ # PKG_INSTALLATION_TYPES= overwrite pkgviews .include "Makefile.common" - -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile index 8e0a65badf3..665923592f8 100644 --- a/devel/SDL_gfx/Makefile +++ b/devel/SDL_gfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= SDL_gfx-2.0.3 @@ -15,7 +15,6 @@ USE_X11= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .if (${MACHINE_ARCH} != "i386") CONFIGURE_ARGS+= --disable-mmx diff --git a/devel/SDLmm/Makefile b/devel/SDLmm/Makefile index b091805215a..397e7ed5d85 100644 --- a/devel/SDLmm/Makefile +++ b/devel/SDLmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/08/28 20:05:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= SDLmm-0.1.8 @@ -14,7 +14,5 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/SDL/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/Makefile b/devel/apr/Makefile index f2ea2307087..da7008abb98 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/13 18:03:40 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:36 jlam Exp $ PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} PKGREVISION= 1 @@ -13,7 +13,6 @@ CONFLICTS= apache2<=2.0.45 USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/apr/libtool WRKSRC= ${WRKDIR}/${DISTNAME}/srclib BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 24b7aed10ac..7e926002327 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/13 17:02:08 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= at-spi-1.3.9 @@ -21,7 +21,6 @@ USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/cspi-1.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/libspi-1.0.pc.in diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 5f27fffd77e..b303d2a0b09 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/10 01:56:42 xtraeme Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= atk-1.4.1 @@ -15,7 +15,6 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/atk.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index 955fc2dd190..ad7dce8a8bd 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:36 jlam Exp $ DISTNAME= autogen-5.5.3 PKGREVISION= 5 @@ -13,7 +13,6 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_MAKEINFO= YES INFO_FILES= autogen.info diff --git a/devel/blib/Makefile b/devel/blib/Makefile index c77c6e19478..3839d4be53b 100644 --- a/devel/blib/Makefile +++ b/devel/blib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:37 reed Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= blib-1.0.2 @@ -14,8 +14,7 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -SHLIBTOOL_OVERRIDE= ${WRKSRC}/modules/libtool +SHLIBTOOL_OVERRIDE= modules/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib-directfb.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib-gtk.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib.pc.in diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 9bdb335b4e2..9e0ab16ae93 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= gc6.2 @@ -17,7 +17,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INSTALLATION_DIRS= man/man3 MAKE_ENV+= COPTS="${CFLAGS}" diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 246982912a0..e2e102565ff 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:36 jlam Exp $ DISTNAME= bonobo-conf-0.14 PKGREVISION= 7 @@ -13,13 +13,11 @@ BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES +USE_LIBTOOL= YES USE_X11BASE= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonobo-conf .for doc in bonobo-conf.pdf bonobo-conf.sgml diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index a133eb1c463..69652850f13 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.43 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= bonobo-1.0.18 @@ -17,6 +17,7 @@ BUILDLINK_DEPENDS.libxml= libxml>1.8.15 USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_X11BASE= YES +USE_LIBTOOL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES @@ -24,8 +25,6 @@ CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" CONFIGURE_ENV+= X11BASE="${X11BASE}" CONFIGURE_ARGS+= --enable-gtk-doc=no -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/libefs/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libefs/libefs.pc.in post-install: diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index 150e9afc4ca..34766ae71ac 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= coconut-0.3.0 @@ -16,7 +16,6 @@ USE_LIBTOOL= YES USE_X11= YES GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY -LIBTOOL_OVERRIDE=${WRKSRC}/libtool pre-configure: cd ${WRKSRC} && \ diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile index 06def469369..2b2f386dcf8 100644 --- a/devel/devIL/Makefile +++ b/devel/devIL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/20 12:13:28 agc Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= DevIL-1.6.6 @@ -19,8 +19,6 @@ USE_X11= yes CONFIGURE_ARGS+= --disable-lcms -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/SDL/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index ba35301bef4..e0a6799ac70 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/11 07:43:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:36 jlam Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 7 @@ -18,7 +18,6 @@ USE_LIBTOOL= yes USE_PERL5= build USE_PKGLOCALEDIR= yes USE_X11= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index 9581c9123a3..c5ec3afc61e 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/13 23:29:17 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= eel-2.4.1 @@ -21,7 +21,6 @@ USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/eel-2.0.pc.in .include "../../devel/GConf2/buildlink3.mk" diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index 75596dda5f2..ed15a5de6e5 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/22 08:24:29 grant Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $ DISTNAME= g-wrap-1.3.4 PKGREVISION= 3 @@ -26,8 +26,6 @@ CONFIGURE_ENV+= BUILD_GUILE=${GUILE14_CONFIG} CONFIGURE_ENV+= ac_cv_path_RSCHEME="nope" CONFIGURE_ENV+= ac_cv_path_GUILE="${LOCALBASE}/guile/1.4/bin/guile" -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/glib/buildlink2.mk" .include "../../lang/guile14/buildlink2.mk" .include "../../devel/guile-gtk/buildlink2.mk" diff --git a/devel/gail/Makefile b/devel/gail/Makefile index 71f6bd3611d..4a8a5b56622 100644 --- a/devel/gail/Makefile +++ b/devel/gail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/02/13 17:05:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gail-1.4.1 @@ -17,7 +17,6 @@ USE_GNU_TOOLS+= make USE_X11= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= gail.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/gal/Makefile b/devel/gal/Makefile index cd3bff11e6e..519fa1d187f 100644 --- a/devel/gal/Makefile +++ b/devel/gal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/01/03 18:49:37 reed Exp $ +# $NetBSD: Makefile,v 1.38 2004/02/14 17:21:37 jlam Exp $ DISTNAME= gal-0.22 PKGREVISION= 4 @@ -13,10 +13,8 @@ COMMENT= Gnome Application Libraries USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_X11BASE= YES -GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +GNU_CONFIGURE= YES INCOMPAT_ICONV= SunOS-*-* diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile index edbfec7b67b..473cf9e9971 100644 --- a/devel/gal2/Makefile +++ b/devel/gal2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/11 03:04:28 xtraeme Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gal-1.99.10 @@ -18,7 +18,6 @@ USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes BUILD_USES_MSGFMT= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/gal-2.0.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gtk-doc=no diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index 8b14b3b3835..3be07e0d66f 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gconfmm-2.0.1 @@ -15,7 +15,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf/gconfmm-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.0-uninstalled.pc.in diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index bef5ed4d650..ca506910d87 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/22 08:24:29 grant Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gdb-5.3 @@ -15,7 +15,6 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/bfd/libtool ${WRKSRC}/opcodes/libtool REPLACE_LOCALEDIR_PATTERNS+= Make-in INSTALL_TARGET= install install-info TEST_TARGET= check diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index ce8cacf170e..7a88798c3f5 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/02/14 16:17:02 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2004/02/14 17:21:37 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -19,7 +19,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-included-gettext diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 4111802b21f..8d0aeacf9b0 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.55 2004/02/14 17:21:37 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -18,7 +18,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_GETTEXT= yes CONFIGURE_ARGS+= --without-included-gettext diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile index c94b09993d5..9103920d8b8 100644 --- a/devel/giblib/Makefile +++ b/devel/giblib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/11 22:56:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= giblib-1.2.3 @@ -14,7 +14,6 @@ GNU_CONFIGURE= YES USE_X11= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../graphics/imlib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 7cf9881e692..382cf96d876 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/01/22 08:24:29 grant Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:37 jlam Exp $ DISTNAME= glade-0.6.4 PKGREVISION= 5 @@ -15,7 +15,6 @@ USE_X11BASE= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-bonobo diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index f722bfad065..b1ad679cc96 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/11 05:32:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= glade-2.0.1 @@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../databases/libgnomedb/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 95c46112e3f..3cea4c674e5 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2004/02/11 17:14:13 jmmv Exp $ +# $NetBSD: Makefile,v 1.40 2004/02/14 17:21:37 jlam Exp $ DISTNAME= glib-2.2.3 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -20,9 +20,8 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ USE_PERL5= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + PKGCONFIG_OVERRIDE= ${WRKSRC}/glib-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/gobject-2.0.pc.in diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index 6acf15e7ffd..0b893700920 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/12 09:00:29 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gmp-4.1.2 @@ -14,9 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_LANGUAGES= c c++ USE_GNU_TOOLS+= m4 - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-cxx --without-readline diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile index 2f23ab9b541..70e0f34e928 100644 --- a/devel/gnome2-libole2/Makefile +++ b/devel/gnome2-libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:30:51 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= libole2-2.2.8 @@ -18,7 +18,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile index 87c670bae30..7b49ca8aca6 100644 --- a/devel/gscope/Makefile +++ b/devel/gscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:38 reed Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= gscope-0.4.1 @@ -16,7 +16,6 @@ USE_BUILDLINK2= # defined USE_X11= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/popt/buildlink2.mk" .include "../../graphics/gdk-pixbuf/buildlink2.mk" diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile index 6b9e2239eae..97ccc6b7c48 100644 --- a/devel/gtl/Makefile +++ b/devel/gtl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/02 13:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:37 jlam Exp $ DISTNAME= GTL-0.3.3 PKGNAME= gtl-0.3.3 @@ -10,9 +10,6 @@ HOMEPAGE= http://www.fmi.uni-passau.de/Graphlet/GTL/ COMMENT= C++ graph data structure library based on the STL USE_LIBTOOL= # defined -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - USE_BUILDLINK2= # defined USE_LANGUAGES= c c++ diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile index a7145ef86e9..31ab13b9998 100644 --- a/devel/hdf5/Makefile +++ b/devel/hdf5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/08/04 17:26:59 jtb Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:37 jlam Exp $ DISTNAME= hdf5-1.6.0 CATEGORIES= devel @@ -13,7 +13,6 @@ COMMENT= Hierarchical Data Format (new generation) GNU_CONFIGURE= # defined USE_BUILDLINK2= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool TEST_TARGET= check post-install: diff --git a/devel/isect/Makefile b/devel/isect/Makefile index c9bd5442810..4cda0f39fd4 100644 --- a/devel/isect/Makefile +++ b/devel/isect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/04 01:58:35 grant Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= isect-1.6.2 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PTHREAD_OPTS+= require INFO_FILES= isect.info diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index d5dd964fe10..b5ee0d6d58e 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/01/23 21:50:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:37 jlam Exp $ DISTNAME= kdbg-1.2.9 PKGREVISION= 3 @@ -17,8 +17,6 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --with-kde-version=3 .include "../../meta-pkgs/kde3/buildlink2.mk" diff --git a/devel/libargparse/Makefile b/devel/libargparse/Makefile index c2081c484f4..90342d592ce 100644 --- a/devel/libargparse/Makefile +++ b/devel/libargparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/02 13:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= libargparse-0.1.0000 @@ -11,9 +11,6 @@ COMMENT= Argument parsing library in C++ GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - USE_BUILDLINK2= yes USE_LANGUAGES= c c++ diff --git a/devel/libast/Makefile b/devel/libast/Makefile index cb70d699508..ecc7ae398be 100644 --- a/devel/libast/Makefile +++ b/devel/libast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/11 22:56:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:37 jlam Exp $ DISTNAME= libast-0.5 PKGREVISION= 6 @@ -12,7 +12,6 @@ COMMENT= The Library of Assorted Spiffy Things GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool TEST_TARGET= test .include "../../mk/bsd.prefs.mk" diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile index f55b31f58ff..f5f353ff49b 100644 --- a/devel/libbegemot/Makefile +++ b/devel/libbegemot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/21 16:43:26 martti Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:37 jlam Exp $ # DISTNAME= libbegemot-1.9 @@ -11,6 +11,5 @@ COMMENT= Base development library, contains useful routines GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index aad5ee22792..2c52ade4d1d 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/12 13:06:32 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/14 17:21:38 jlam Exp $ DISTNAME= libbonobo-2.4.3 CATEGORIES= devel gnome @@ -18,7 +18,6 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index 88e64176666..dc44068984c 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/13 12:13:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libbonoboui-2.4.3 @@ -19,9 +19,8 @@ USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index a87d6258d7f..025a9ddef2f 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.52 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libglade-0.17 @@ -14,11 +14,8 @@ BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES USE_X11BASE= YES - GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.prefs.mk" diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 6610424b331..e1bfc6bc6c7 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/12 15:17:49 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libglade-2.0.1 @@ -17,7 +17,6 @@ USE_BUILDLINK3= YES USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libglade-2.0.pc.in CONFIGURE_ENV+= jh_cv_path_python="${PYTHONBIN}" diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index d6ed2e06c59..c024403dce4 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/13 11:53:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libgnome-2.4.0 @@ -23,7 +23,6 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_PKGINSTALL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index b3b8d410ef1..4866a64ec07 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/13 12:59:13 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libgnomeui-2.4.0.1 @@ -20,12 +20,11 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_PERL5= yes USE_X11= yes +USE_LIBTOOL= yes CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_BASE= ${WRKSRC}/libgnomeui/libgnomeui-2.0.pc PKGCONFIG_OVERRIDE= ${PKGCONFIG_BASE}.in diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 349dc7dc555..e5fc97e9484 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/09/28 18:08:59 is Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libgphoto2-2.1.2 @@ -14,8 +14,6 @@ CONFLICTS+= gphoto<2.1.1 USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libgphoto2_port/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgphoto2/libgphoto2.pc.in USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 368fc18393c..581df9b620e 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/11 05:43:54 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libgsf-1.8.2 @@ -15,7 +15,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgsf-1.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgsf-gnome-1.pc.in diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 692c315acce..f778dc6692d 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2004/01/22 08:48:49 grant Exp $ +# $NetBSD: Makefile,v 1.78 2004/02/14 17:21:38 jlam Exp $ DISTNAME= libgtop-1.0.13 PKGREVISION= 4 @@ -36,7 +36,6 @@ USE_PKGLOCALEDIR= yes USE_X11BASE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_MAKEINFO= YES INFO_FILES= libgtop.info diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index dbe9ac591f0..95c56e0dad8 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/10 02:08:09 xtraeme Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/14 17:21:38 jlam Exp $ DISTNAME= libgtop-2.0.8 PKGNAME= ${DISTNAME:S/-/2-/} @@ -36,7 +36,6 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgtop-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/support/gnome-support-2.0.pc.in USE_MAKEINFO= YES diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index f5ba0ca9965..85d3e55e1f2 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/10 00:20:29 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libidn-0.3.3 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libidn.pc.in INFO_FILES= libidn.info diff --git a/devel/libmm/Makefile b/devel/libmm/Makefile index ae64f963eab..88e94977917 100644 --- a/devel/libmm/Makefile +++ b/devel/libmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/05 12:53:31 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= mm-1.2.2 @@ -14,8 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile index 66e1c84ddc8..c9af70d3fe1 100644 --- a/devel/libntlm/Makefile +++ b/devel/libntlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/10 00:20:29 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libntlm-0.3.2 @@ -13,7 +13,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libntlm.pc.in .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 1f11397615d..4864591a822 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/04 04:38:54 grant Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libole2-0.2.4 @@ -13,7 +13,6 @@ COMMENT= OLE2 streams parsing library for GNOME GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_BUILDLINK2= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/glib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile index f0d96770c27..c37d94bbf6a 100644 --- a/devel/liboop/Makefile +++ b/devel/liboop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/09/27 08:14:50 grant Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= liboop-0.9 @@ -13,7 +13,6 @@ COMMENT= Event loop management library USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../devel/glib/buildlink2.mk" diff --git a/devel/librsync/Makefile b/devel/librsync/Makefile index 51a55689c2f..0ff89097a7c 100644 --- a/devel/librsync/Makefile +++ b/devel/librsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:48 salo Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= librsync-0.9.6 @@ -13,7 +13,6 @@ COMMENT= Checksum-based differencing library GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --without-included-popt USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= yes .include "../../archivers/bzip2/buildlink2.mk" diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index a58fede4921..8bec07bee60 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/02 13:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $ DISTNAME= libsigc++-1.2.5 CATEGORIES= devel @@ -14,7 +14,6 @@ USE_LIBTOOL= YES USE_GNU_TOOLS+= m4 make USE_LANGUAGES= c c++ -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/sigc++-1.2.pc.in CONFIGURE_ENV+= ac_cv_prog_M4=${M4} diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile index 7a891106305..8f0eb360bae 100644 --- a/devel/libusb/Makefile +++ b/devel/libusb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 21:31:46 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libusb-0.1.7 @@ -13,6 +13,5 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-build-docs USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile index 9fd0841eff5..eb07243acb2 100644 --- a/devel/libwnck/Makefile +++ b/devel/libwnck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/11 05:38:35 xtraeme Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= libwnck-2.4.0.1 @@ -19,7 +19,6 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libwnck-1.0.pc.in .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/loudmouth/Makefile b/devel/loudmouth/Makefile index 181bf970959..5bb967cff14 100644 --- a/devel/loudmouth/Makefile +++ b/devel/loudmouth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/23 09:45:51 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= loudmouth-0.15.1 @@ -15,7 +15,6 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/loudmouth-1.0.pc.in CONFIGURE_ARGS+= --disable-debug diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile index 78348073891..90803bd229b 100644 --- a/devel/lwp/Makefile +++ b/devel/lwp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/08/25 10:20:15 drochner Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:38 jlam Exp $ # DISTNAME= lwp-1.10 @@ -19,6 +19,5 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile index 4246c144ad9..4223e382254 100644 --- a/devel/mrproject/Makefile +++ b/devel/mrproject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= mrproject-0.5.1 @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-evolution-idldir CFLAGS+= -I${BUILDLINK_DIR}/include/gconf/1 -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool DEPENDS+= skill-[0-9]*:../../sysutils/skill diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 39c5db0d12c..c0c864401ac 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= oaf-0.6.10 @@ -15,10 +15,8 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES - USE_GNU_TOOLS+= lex yacc USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile index fc05fd73dcb..4e7a5161925 100644 --- a/devel/ogre/Makefile +++ b/devel/ogre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= ogre-v0-12-1 @@ -21,7 +21,6 @@ USE_X11= yes CONFIGURE_ARGS+= --with-platform=SDL -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/OGRE.pc.in .include "../../devel/devIL/buildlink2.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index bb7581375db..14e207b195f 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/02/11 01:46:30 abs Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= pango-1.2.5 @@ -20,9 +20,8 @@ USE_X11= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes TEST_TARGET= check - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + PKGCONFIG_OVERRIDE= ${WRKSRC}/pango.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoft2.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangox.pc.in diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 1590b2d35ff..7cb9de9a100 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/05 23:22:51 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:39 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $ DISTNAME= pcre-4.5 @@ -15,9 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes GNU_CONFIGURE= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool TEST_TARGET= test diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index 2d2ad079201..988dd081061 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/11/06 17:39:30 gavan Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= physfs-0.1.8 @@ -12,7 +12,6 @@ COMMENT= Library providing abstract access to various archives USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_GCC_SHLIB= yes diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 63d0645e5d5..6840601c4af 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/05 20:52:10 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= pkgconfig-0.15.0 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/glib-1.2.8/libtool CONFIGURE_ARGS+= --disable-threads TEST_TARGET= check diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 1fcc2e4ea3d..06296f594f9 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= popt-1.7 @@ -23,7 +23,6 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pth/Makefile b/devel/pth/Makefile index f530f408803..43349377886 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.62 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= pth-2.0.0 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-pthread CONFIGURE_ARGS+= --with-fdsetsize=1024 diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 7537c90f1c3..59ca5913d81 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/03 06:36:55 epg Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:39 jlam Exp $ DISTNAME= rapidsvn-0.5.0 CATEGORIES= devel x11 @@ -11,9 +11,7 @@ COMMENT= Cross-platform Subversion GUI USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES - -GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-svn-include=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --with-svn-lib=${BUILDLINK_DIR}/lib diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 021fee5ef18..4185ac609c1 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= rpc2-1.19 @@ -18,7 +18,6 @@ CONFIGURE_ENV+= PERL=${PERL5} USE_PERL5= build USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/lwp/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile index c9fce4c9102..73f687c99a2 100644 --- a/devel/rvm/Makefile +++ b/devel/rvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= rvm-1.8 @@ -12,13 +12,11 @@ COMMENT= Recoverable Virtual Memory USE_BUILDLINK2= YES USE_GNU_TOOLS+= make +USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_PREFIX.lwp}/include -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - pre-build: cd ${WRKSRC}/rvm; \ for file in *.c; do \ diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index 350904de847..3da8e9e4864 100644 --- a/devel/smpeg/Makefile +++ b/devel/smpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/08 23:54:53 snj Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= smpeg-0.4.4 @@ -17,11 +17,9 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_X11= yes +USE_LIBTOOL= yes -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - -CPPFLAGS+= -Dunix=1 +CPPFLAGS+= -Dunix=1 .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 1fe47756e3f..4be0279d6d1 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2003/12/07 01:21:03 epg Exp $ +# $NetBSD: Makefile.common,v 1.11 2004/02/14 17:21:39 jlam Exp $ DISTNAME= subversion-${SVNVER} CATEGORIES= devel @@ -19,7 +19,6 @@ PATCHDIR= ${.CURDIR}/../../devel/subversion/patches GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} diff --git a/devel/swig-build/Makefile.common b/devel/swig-build/Makefile.common index 8c927136a1d..c82f5bd786a 100644 --- a/devel/swig-build/Makefile.common +++ b/devel/swig-build/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2003/11/06 18:14:03 gavan Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/02/14 17:21:39 jlam Exp $ DISTNAME= swig-${SWIG_VERSION} CATEGORIES= devel @@ -20,7 +20,6 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GCC_SHLIB= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/Tools/libtool CONFIGURE_ARGS+= --without-guile CONFIGURE_ARGS+= --without-java diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile index 8355faa1379..f218a685a4e 100644 --- a/devel/ucl/Makefile +++ b/devel/ucl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/12/31 14:58:50 cjep Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= ucl-1.02 @@ -11,8 +11,6 @@ COMMENT= Portable lossless data compression library USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-shared=yes diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile index 8228fb92db4..5b5ccd9958d 100644 --- a/devel/yasm/Makefile +++ b/devel/yasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/08/28 20:05:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= yasm-0.2.2 @@ -17,8 +17,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_PERL5= build -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |