diff options
| author | jlam <jlam> | 2006-07-07 15:49:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-07 15:49:30 +0000 |
| commit | ec05c728db51c10c442350e61e4056832bda4321 (patch) | |
| tree | 5278cb82e97bb3d8e2ae6a66b9d26fa073e4d665 | |
| parent | 4509ee1306a8cea4e6ca4dd86dc60e7781035006 (diff) | |
| download | pkgsrc-ec05c728db51c10c442350e61e4056832bda4321.tar.gz | |
LIBTOOL_OVERRIDE generally doesn't need to be specified anymore... just
set OVERRIDE_DIRDEPTH to find any libtool scripts deeper in the WRKSRC
tree unless they're named something other than "libtool".
SHLIBTOOL_OVERRIDE generally doesn't need to be specified either -- just
define it to the empty list and shlibtool-override will look for libtool
scripts.
64 files changed, 112 insertions, 133 deletions
diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile index 55510bd84b6..9d496cda6d0 100644 --- a/audio/libopendaap/Makefile +++ b/audio/libopendaap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:56 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:30 jlam Exp $ DISTNAME= libopendaap-0.4.0 CATEGORIES= audio @@ -11,7 +11,6 @@ COMMENT= DAAP client library USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_TOOLS+= pkg-config SUBST_CLASSES+= pthread diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile index 910974aa468..44b765de245 100644 --- a/audio/tunesbrowser/Makefile +++ b/audio/tunesbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:16 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2006/07/07 15:49:30 jlam Exp $ # DISTNAME= tunesbrowser-0.3.0 @@ -13,7 +13,6 @@ COMMENT= Front-end for DAAP client GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile index 50a60ef8991..84230260b7c 100644 --- a/audio/xmms-alarm/Makefile +++ b/audio/xmms-alarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:59 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:30 jlam Exp $ # DISTNAME= xmms-alarm-0.3.6 @@ -12,7 +12,7 @@ COMMENT= Plugin which allows XMMS to be used as an alarm clock GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../audio/xmms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile index 88b94698676..c0fb4ec39df 100644 --- a/audio/xmms-arts/Makefile +++ b/audio/xmms-arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:30 jlam Exp $ # DISTNAME= arts_output-0.7.1 @@ -13,7 +13,7 @@ COMMENT= XMMS plugin to output sound through the aRts sound daemon GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty LIBS+= ${LIBOSSAUDIO} diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile index 26fec0e985e..aad110d6270 100644 --- a/audio/xmms-faad/Makefile +++ b/audio/xmms-faad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/13 17:59:51 drochner Exp $ +# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:31 jlam Exp $ DISTNAME= faad2-2.0 PKGNAME= xmms-faad-2.0 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/faad2 USE_TOOLS+= automake14 gmake pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index d4a4314746b..5cf50ccfcef 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2006/03/09 21:04:42 jlam Exp $ +# $NetBSD: Makefile.common,v 1.24 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= xmms-1.2.10 @@ -21,7 +21,7 @@ FILESDIR= ${.CURDIR}/../../audio/xmms/files PATCHDIR= ${.CURDIR}/../../audio/xmms/patches CONFIGURE_ARGS+= --without-gnome -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty # Broken configure script assumes that iconv_open lives in libc; work around. CPPFLAGS+= -DHAVE_ICONV_OPEN=1 diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile index 4e9490b6148..d8c57de47de 100644 --- a/chat/gaim-encryption/Makefile +++ b/chat/gaim-encryption/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/20 21:43:31 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:31 jlam Exp $ DISTNAME= gaim-encryption-2.38 PKGREVISION= 3 @@ -14,7 +14,7 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index d1afe84a841..0a6eca7a973 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2006/04/17 13:46:18 wiz Exp $ +# $NetBSD: Makefile,v 1.108 2006/07/07 15:49:31 jlam Exp $ DISTNAME= gaim-1.5.0 PKGREVISION= 6 @@ -18,7 +18,7 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --disable-binreloc CONFIGURE_ARGS+= --disable-gevolution diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile index 55389dc0b48..9ac2c86030d 100644 --- a/chat/irssi-icb/Makefile +++ b/chat/irssi-icb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/07 22:18:53 adrianp Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= irssi-icb-0.14 @@ -20,7 +20,7 @@ DEPENDS+= irssi>=${IRSSI_VERSION}:../../chat/irssi GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/${IRSSI_DISTNAME} diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile index ffe08db98d8..a09d240c399 100644 --- a/chat/licq-gui-console/Makefile +++ b/chat/licq-gui-console/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:03 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= licq-1.2.6 @@ -17,7 +17,7 @@ DEPENDS+= licq-core-[0-9]*:../../chat/licq-core GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/console} INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-* diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile index 6a2a31e9a2b..09e0503c9a3 100644 --- a/chat/licq-gui-qt/Makefile +++ b/chat/licq-gui-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/05/25 14:29:41 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= licq-1.2.6 @@ -23,8 +23,7 @@ NOT_FOR_PLATFORM= NetBSD-*-* GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= # none -SHLIBTOOL_OVERRIDE= libtool */libtool */*/libtool +SHLIBTOOL_OVERRIDE= # empty WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/qt-gui} INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-* diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 92b34b65562..b9e14fe07eb 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/02/05 23:08:26 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -20,7 +20,8 @@ COMMENT= Client for the Secure Internet Live Conferencing (SILC) GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool +OVERRIDE_DIRDEPTH= 3 +SHLIBTOOL_OVERRIDE= # empty PKG_SYSCONFSUBDIR?= ${PKGBASE} diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 335ff5515f0..a4135b1e480 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:36 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= silc-server-1.0.2 @@ -16,7 +16,8 @@ COMMENT= Server for the Secure Internet Live Conferencing (SILC) GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool */*/*/libtool +OVERRIDE_DIRDEPTH= 3 +SHLIBTOOL_OVERRIDE= # empty .include "../../mk/bsd.prefs.mk" diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index db8a8a1ca86..4284ed7f481 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/04/17 13:46:19 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2006/07/07 15:49:31 jlam Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -15,7 +15,7 @@ BUILDLINK_DEPMETHOD.jpilot= full USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-gtk2 diff --git a/devel/blib/Makefile b/devel/blib/Makefile index 86c1636b6fd..6df9545058a 100644 --- a/devel/blib/Makefile +++ b/devel/blib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:09 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= blib-1.0.2 @@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= modules/libtool +SHLIBTOOL_OVERRIDE= # empty PKGCONFIG_OVERRIDE+= blib-directfb.pc.in PKGCONFIG_OVERRIDE+= blib-gtk.pc.in PKGCONFIG_OVERRIDE+= blib.pc.in diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile index d5bd69b6a0e..55a3896b6e2 100644 --- a/devel/gdb6/Makefile +++ b/devel/gdb6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:31 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/07/07 15:49:31 jlam Exp $ # DISTNAME= gdb-6.2.1 @@ -15,7 +15,6 @@ NOT_FOR_PLATFORM= Darwin-*-* USE_TOOLS+= gmake makeinfo msgfmt USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gdb6 diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile index b6e0a6f4c24..e231158546b 100644 --- a/devel/gdbada/Makefile +++ b/devel/gdbada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/07/02 09:58:46 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:31 jlam Exp $ DISTNAME= gdbada-6.3 PKGREVISION= 2 @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/gdb-6.3 USE_TOOLS+= gmake makeinfo USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${PREFIX}/gdbada diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index 7fc95b32fc0..e7a898bef65 100644 --- a/devel/gettext-tools/Makefile +++ b/devel/gettext-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:49 reed Exp $ +# $NetBSD: Makefile,v 1.6 2006/07/07 15:49:31 jlam Exp $ DISTNAME= gettext-0.14.5 PKGNAME= gettext-tools-0.14.5 @@ -15,7 +15,7 @@ CONFLICTS= gettext<0.14.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --without-included-gettext INFO_FILES= # PLIST diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 83b90664838..61f98dbefe2 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2006/04/06 06:21:49 reed Exp $ +# $NetBSD: Makefile,v 1.73 2006/07/07 15:49:31 jlam Exp $ DISTNAME= gettext-0.14.5 CATEGORIES= devel @@ -15,7 +15,7 @@ BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile index 528e68a8936..0c82a7b77f5 100644 --- a/devel/libextractor/Makefile +++ b/devel/libextractor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/06/12 16:28:05 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:31 jlam Exp $ DISTNAME= libextractor-0.5.14 PKGREVISION= 1 @@ -19,7 +19,7 @@ PTHREAD_OPTS+= require CONFLICTS= csound-{bath,dev}-* # bin/extract # This package requires dlopen, so save on space by skipping non-PIC libs -SHLIBTOOL_OVERRIDE+= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index a39cf2b16eb..057baaaa2c4 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/04/05 01:42:00 epg Exp $ +# $NetBSD: Makefile,v 1.33 2006/07/07 15:49:31 jlam Exp $ PKGNAME= p5-subversion-${SVNVER} COMMENT= Perl bindings for Subversion @@ -7,7 +7,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../devel/subversion/Makefile.common" -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty PERL5_CONFIGURE= no PERL5_OPTIONS+= threads diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 8129dada542..1a7845e9810 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.22 2006/04/05 01:42:00 epg Exp $ +# $NetBSD: Makefile,v 1.23 2006/07/07 15:49:32 jlam Exp $ PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER} COMMENT= Python bindings and tools for Subversion .include "../../devel/subversion/Makefile.common" -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q} diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index c3050c1d984..df9743e7338 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2006/04/05 01:42:00 epg Exp $ +# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:32 jlam Exp $ PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER} COMMENT= Ruby bindings for Subversion .include "../../devel/subversion/Makefile.common" -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty REPLACE_RUBY_DIRS= ${WRKSRC}/tools diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 10d8f275b3d..55d45d2f4ba 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= silc-toolkit-0.9.13 @@ -19,7 +19,7 @@ CONFLICTS+= silc-client<1.0.1nb1 GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= libtool */*/*/libtool +OVERRIDE_DIRDEPTH= 3 # */*/*/libtool .include "../../mk/bsd.prefs.mk" diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index 189d89c7f3e..9627f1d6176 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/04/13 18:23:32 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= lpe-1.2.6 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES USE_TOOLS+= gmake msgfmt GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty # Note: pkglint warns about the following three lines, but they must not # be changed because this package uses autoconf2.13. diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 8c452f22e2c..c03100d20c4 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:24 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2006/07/07 15:49:32 jlam Exp $ DISTNAME= kmymoney2-0.8 PKGREVISION= 5 @@ -14,7 +14,7 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty .include "options.mk" diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 433f3147afe..c14c68d8a88 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/06/16 14:16:54 joerg Exp $ +# $NetBSD: Makefile,v 1.50 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= giram-0.3.5 @@ -22,7 +22,7 @@ PKG_SYSCONFSUBDIR= giram CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/0.3 -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index a47486c3dbf..7f14c561575 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/06/20 23:44:01 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= gwenview-1.3.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES # Enable kipi (KDE Image Plugin Interface) CONFIGURE_ARGS+= --enable-kipi -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../graphics/libkipi/buildlink3.mk" diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index 2d43a93a5aa..187da8d9713 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/06/20 20:43:08 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:32 jlam Exp $ DISTNAME= kipi-plugins-0.1.0-rc1 PKGNAME= kipi-plugins-0.1.0rc1 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config msgfmt USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../devel/libgphoto2/buildlink3.mk" diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile index 3789b86910d..228ac48aed7 100644 --- a/graphics/libkexif/Makefile +++ b/graphics/libkexif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/06/11 21:46:46 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ DISTNAME= libkexif-0.2.2 PKGREVISION= 3 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake pkg-config msgfmt USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../graphics/libexif/buildlink3.mk" diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index f143b54b39b..3562882f211 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/06/11 14:30:09 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ DISTNAME= libkipi-0.1.2 PKGREVISION= 3 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake msgfmt USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index f5d5943cb7b..c0f0d658583 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/12 16:28:11 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= vp-1.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://math.smsu.edu/~erik/software.php?id=63 COMMENT= Image viewer USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes .include "../../devel/SDL/buildlink3.mk" diff --git a/inputmethod/imhangul/Makefile b/inputmethod/imhangul/Makefile index 342862ab88f..2f3ffec9df4 100644 --- a/inputmethod/imhangul/Makefile +++ b/inputmethod/imhangul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/06/11 14:26:01 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/07/07 15:49:32 jlam Exp $ DISTNAME= imhangul-0.9.13 PKGREVISION= 3 @@ -13,7 +13,7 @@ COMMENT= GTK+-2.0 Hangul Input Module USE_TOOLS+= pkg-config msgfmt GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty USE_PKGLOCALEDIR= YES GTK2_IMMODULES= YES diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 7a456dfb97c..0b5dfc40447 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/04/17 13:46:38 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2006/07/07 15:49:32 jlam Exp $ DISTNAME= kbiff-3.8 PKGREVISION= 3 @@ -14,7 +14,7 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/math/cln/Makefile b/math/cln/Makefile index 54f16dfb9b8..16410fe18c7 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/06 14:56:20 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:32 jlam Exp $ DISTNAME= cln-1.1.11 CATEGORIES= math @@ -15,7 +15,6 @@ USE_TOOLS+= gmake pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE+= libtool PKGCONFIG_OVERRIDE= cln.pc.in INFO_FILES= # PLIST diff --git a/math/qalculate-bases/Makefile b/math/qalculate-bases/Makefile index 54f94e54da2..688e29c3cb9 100644 --- a/math/qalculate-bases/Makefile +++ b/math/qalculate-bases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:42 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ DISTNAME= qalculate-bases-0.9.4 CATEGORIES= math @@ -13,8 +13,6 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../math/qalculate/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/math/qalculate-currency/Makefile b/math/qalculate-currency/Makefile index f29c67404ec..5667664574c 100644 --- a/math/qalculate-currency/Makefile +++ b/math/qalculate-currency/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:43 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ DISTNAME= qalculate-currency-0.9.4 CATEGORIES= math @@ -12,7 +12,6 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake intltool msgfmt pkg-config GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../math/qalculate/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/math/qalculate-units/Makefile b/math/qalculate-units/Makefile index 0800744a8c9..21eda51c0b3 100644 --- a/math/qalculate-units/Makefile +++ b/math/qalculate-units/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:43 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ DISTNAME= qalculate-units-0.9.4 CATEGORIES= math @@ -13,7 +13,6 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../math/qalculate/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3 index 723c2bc4ffc..e9f0685cdb7 100644 --- a/meta-pkgs/kde3/Makefile.kde3 +++ b/meta-pkgs/kde3/Makefile.kde3 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kde3,v 1.34 2006/06/01 13:27:12 markd Exp $ +# $NetBSD: Makefile.kde3,v 1.35 2006/07/07 15:49:32 jlam Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE3-distributed packages (they all share common configure and build @@ -17,4 +17,4 @@ USE_TOOLS+= gmake imake USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile index 8460210325b..c90e31b78d0 100644 --- a/misc/blccc/Makefile +++ b/misc/blccc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:39 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $ # DISTNAME= blccc-1.99 @@ -13,7 +13,7 @@ COMMENT= Blinkenlights Chaos Control Center USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty EGDIR= ${PREFIX}/share/examples/blccc diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index e8de8372b4c..bf4e5d79f31 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/06/13 12:16:36 markd Exp $ +# $NetBSD: Makefile,v 1.33 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= kmplayer-0.9.2a @@ -21,7 +21,7 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+= --without-gstreamer -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty SUBST_CLASSES+= desktop SUBST_MESSAGE.desktop= Fixing application launcher. diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile index 41d9927c3b4..bc7c45df1b9 100644 --- a/multimedia/libassetml/Makefile +++ b/multimedia/libassetml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/06/11 14:29:03 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= libassetml-1.2.1 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 # share/gnome/help USE_TOOLS+= gmake pkg-config texi2html msgfmt USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libassetml.pc.in GNU_CONFIGURE= yes INFO_FILES= # PLIST diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index e4483d314ba..d7803332880 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/06/12 16:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/07/07 15:49:33 jlam Exp $ DISTNAME= mjpegtools-1.8.0 PKGREVISION= 5 @@ -19,7 +19,7 @@ USE_TOOLS+= bash:run pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty PKGCONFIG_OVERRIDE= mjpegtools.pc.in INFO_FILES= # PLIST diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 75c6838fd69..9cdcb5445ca 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:33 jlam Exp $ DISTNAME= mpeg4ip-1.5 PKGREVISION= 2 @@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= bootstrap -LIBTOOL_OVERRIDE= libtool */libtool */*/libtool */*/*/libtool +OVERRIDE_DIRDEPTH= 3 # */*/*/libtool .include "../../devel/SDL/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 13c0fce115f..36e5493c2d7 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2006/06/03 16:04:23 tron Exp $ +# $NetBSD: Makefile,v 1.132 2006/07/07 15:49:33 jlam Exp $ DISTNAME= ethereal-0.99.0 CATEGORIES= net @@ -25,7 +25,7 @@ USE_LANGUAGES+= c++ USE_TOOLS+= perl pkg-config USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gtk2 diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 2533fb63db5..f78b3ddf4dc 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/04/10 15:25:04 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2006/07/07 15:49:33 jlam Exp $ DISTNAME= freeradius-1.1.1 PKGREVISION= 3 @@ -23,7 +23,6 @@ USE_OLD_DES_API= YES BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 USE_LIBTOOL= YES -LIBTOOL_OVERRIDE+= libtool CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} diff --git a/net/gift-gnutella/Makefile b/net/gift-gnutella/Makefile index 157fa4ff004..88ca4a3803c 100644 --- a/net/gift-gnutella/Makefile +++ b/net/gift-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/06/07 12:36:20 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= gift-gnutella-0.0.9.2 @@ -16,7 +16,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config GNU_CONFIGURE= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ARGS+= --with-libxml=${BUILDLINK_PREFIX.libxml2} .include "../../devel/zlib/buildlink3.mk" diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile index de013e8e86f..b4a6f5addd4 100644 --- a/net/gift-openft/Makefile +++ b/net/gift-openft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/06/07 12:42:39 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= gift-openft-0.2.1.3 @@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config GNU_CONFIGURE= yes PTHREAD_AUTO_VARS= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../devel/zlib/buildlink3.mk" .include "../../databases/db4/buildlink3.mk" diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 5249df841fd..7552c96ebab 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/05/12 23:07:14 minskim Exp $ +# $NetBSD: Makefile,v 1.47 2006/07/07 15:49:33 jlam Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -108,7 +108,7 @@ EGDIR= ${PREFIX}/share/examples/samba USE_PKGLOCALEDIR= YES USE_LANGUAGE= c USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf CONF_FILES_PERMS+= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ diff --git a/net/lftp/Makefile b/net/lftp/Makefile index e8f1e67b804..6e56f592f38 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2006/05/31 13:44:14 salo Exp $ +# $NetBSD: Makefile,v 1.71 2006/07/07 15:49:33 jlam Exp $ DISTNAME= lftp-3.4.7 CATEGORIES= net @@ -19,7 +19,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_GNU_READLINE= # uses GNU readline internal _rl_mark_modified_lines -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty .include "options.mk" diff --git a/net/nmap/Makefile b/net/nmap/Makefile index d774d29a716..9ecb344286f 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2006/07/02 19:17:26 rillig Exp $ +# $NetBSD: Makefile,v 1.55 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= nmap-4.11 @@ -17,8 +17,6 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake -LIBTOOL_OVERRIDE+= libdnet-stripped/libtool - CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 87a7c8a9f03..0813c362870 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/07/05 06:53:13 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= nocol-4.3.1 @@ -18,8 +18,6 @@ CONFIGURE_ARGS+= < ${WRKSRC}/answers USE_TOOLS+= perl:run mkdirhier yacc USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/cmu-snmp/snmp/libtool \ - ${WRKSRC}/cmu-snmp/snmpapps/libtool INSTALL_TARGET= install root diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 677f85d12c5..5a0c2ca2d74 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/05/31 18:13:54 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2006/07/07 15:49:33 jlam Exp $ # .include "../../print/poppler/Makefile.common" @@ -7,7 +7,6 @@ COMMENT= PDF rendering library USE_TOOLS+= gmake -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool #PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 54dce1704d0..9429a578434 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/06/11 14:30:53 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2006/07/07 15:49:33 jlam Exp $ DISTNAME= scribus-1.2.4.1 PKGREVISION= 1 @@ -15,7 +15,7 @@ USE_LANGUAGES+= c++ PTHREAD_OPTS+= require USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} \ diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index 42625f48b5a..07740019927 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/05/22 17:13:53 drochner Exp $ +# $NetBSD: Makefile,v 1.21 2006/07/07 15:49:33 jlam Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} @@ -23,7 +23,6 @@ REPLACE_PERL= texk/xdvik/t1mapper \ texk/oxdvik/t1mapper USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= texk/libtool texk/kpathsea/libtool CONFIGURE_ARGS+= --without-texinfo --without-texi2html CONFIGURE_ARGS+= --with-xdvi-x-toolkit=xaw diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 31f5870e22c..adc738d816d 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/06 00:18:25 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= xmlsec1-1.2.6 @@ -13,7 +13,6 @@ COMMENT= XML signature and encryption library USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool #PKGCONFIG_OVERRIDE+= ${WRKSRC}/xmlsec-gnutls.pc.in #PKGCONFIG_OVERRIDE+= ${WRKSRC}/xmlsec-nss.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/xmlsec-openssl.pc.in diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile index 84b8d25779b..696a387f653 100644 --- a/sysutils/krusader/Makefile +++ b/sysutils/krusader/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/05/25 12:49:39 markd Exp $ +# $NetBSD: Makefile,v 1.12 2006/07/07 15:49:34 jlam Exp $ # DISTNAME= krusader-1.70.0 @@ -14,7 +14,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile index 92cfe3ce2a5..620d00cce47 100644 --- a/www/ap-php/Makefile +++ b/www/ap-php/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:59 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:34 jlam Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS} @@ -7,7 +7,7 @@ COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP} CONFLICTS= ap-php-[0-9]* APACHE_MODULE= YES -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../lang/php/phpversion.mk" .include "${PHPPKGSRCDIR}/Makefile.php" diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 2f390ae5216..4786917c565 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/07/05 05:37:46 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/07/07 15:49:34 jlam Exp $ # DISTNAME= kazehakase-0.3.3 @@ -17,8 +17,6 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -LIBTOOL_OVERRIDE= libtool - .include "options.mk" CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/www/liferea/Makefile b/www/liferea/Makefile index 70ce04d26d6..172de0e7e79 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2006/07/04 16:22:49 drochner Exp $ +# $NetBSD: Makefile,v 1.42 2006/07/07 15:49:34 jlam Exp $ DISTNAME= liferea-1.0.16 CATEGORIES= www @@ -14,7 +14,7 @@ USE_TOOLS+= gmake pkg-config msgfmt USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty GCONF2_SCHEMAS= liferea.schemas diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 36e7b526539..e31a06e9d34 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/10 12:07:18 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:34 jlam Exp $ DISTNAME= lighttpd-1.4.11 CATEGORIES= www @@ -9,7 +9,7 @@ HOMEPAGE= http://www.lighttpd.net/ COMMENT= Fast, light-footprint HTTP server USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} diff --git a/www/php4/Makefile b/www/php4/Makefile index 802a2b79bf6..7dd0bce46e7 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2006/06/06 16:42:02 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2006/07/07 15:49:34 jlam Exp $ PKGNAME= php-${PHP_BASE_VERS} PKGREVISION= 2 @@ -8,7 +8,6 @@ COMMENT= HTML-embedded scripting language CONFLICTS+= ap-php-4.0.3pl1 # PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now -# LIBTOOL_OVERRIDE= libtool LIBTOOL_OVERRIDE= # empty USE_TOOLS+= gmake lex diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile index 4dc3514f19e..e6df35a8d4f 100644 --- a/x11/gtk-engines/Makefile +++ b/x11/gtk-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:53 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2006/07/07 15:49:34 jlam Exp $ DISTNAME= gtk-engines-0.12 PKGREVISION= 9 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_X11BASE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../x11/gtk/buildlink3.mk" .include "../../graphics/imlib/buildlink3.mk" diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile index 4d2785152c6..a75d0d67e6e 100644 --- a/x11/gtk2-engines-bluecurve/Makefile +++ b/x11/gtk2-engines-bluecurve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/05/15 21:52:15 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/07/07 15:49:34 jlam Exp $ # DISTNAME= GTK2-Wonderland-Engine-1.0 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/Bluecurve -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= # empty .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |