pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc LIBTOOL_OVERRIDE generally doesn't need to be specifie...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b3a8d8c9340
branches:  trunk
changeset: 515750:9b3a8d8c9340
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 07 15:49:30 2006 +0000

description:
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.

diffstat:

 audio/libopendaap/Makefile          |  3 +--
 audio/tunesbrowser/Makefile         |  3 +--
 audio/xmms-alarm/Makefile           |  4 ++--
 audio/xmms-arts/Makefile            |  4 ++--
 audio/xmms-faad/Makefile            |  4 ++--
 audio/xmms/Makefile.common          |  4 ++--
 chat/gaim-encryption/Makefile       |  4 ++--
 chat/gaim/Makefile                  |  4 ++--
 chat/irssi-icb/Makefile             |  4 ++--
 chat/licq-gui-console/Makefile      |  4 ++--
 chat/licq-gui-qt/Makefile           |  5 ++---
 chat/silc-client/Makefile           |  5 +++--
 chat/silc-server/Makefile           |  5 +++--
 comms/jpilot-syncmal/Makefile       |  4 ++--
 devel/blib/Makefile                 |  4 ++--
 devel/gdb6/Makefile                 |  3 +--
 devel/gdbada/Makefile               |  3 +--
 devel/gettext-tools/Makefile        |  4 ++--
 devel/gettext/Makefile              |  4 ++--
 devel/libextractor/Makefile         |  4 ++--
 devel/p5-subversion/Makefile        |  4 ++--
 devel/py-subversion/Makefile        |  4 ++--
 devel/ruby-subversion/Makefile      |  4 ++--
 devel/silc-toolkit/Makefile         |  4 ++--
 editors/lpe/Makefile                |  4 ++--
 finance/kmymoney2/Makefile          |  4 ++--
 graphics/giram/Makefile             |  4 ++--
 graphics/gwenview/Makefile          |  4 ++--
 graphics/kipi-plugins/Makefile      |  4 ++--
 graphics/libkexif/Makefile          |  4 ++--
 graphics/libkipi/Makefile           |  4 ++--
 graphics/vp/Makefile                |  3 +--
 inputmethod/imhangul/Makefile       |  4 ++--
 mail/kbiff/Makefile                 |  4 ++--
 math/cln/Makefile                   |  3 +--
 math/qalculate-bases/Makefile       |  4 +---
 math/qalculate-currency/Makefile    |  3 +--
 math/qalculate-units/Makefile       |  3 +--
 meta-pkgs/kde3/Makefile.kde3        |  4 ++--
 misc/blccc/Makefile                 |  4 ++--
 multimedia/kmplayer/Makefile        |  4 ++--
 multimedia/libassetml/Makefile      |  3 +--
 multimedia/mjpegtools/Makefile      |  4 ++--
 multimedia/mpeg4ip/Makefile         |  4 ++--
 net/ethereal/Makefile               |  4 ++--
 net/freeradius/Makefile             |  3 +--
 net/gift-gnutella/Makefile          |  4 ++--
 net/gift-openft/Makefile            |  4 ++--
 net/ja-samba/Makefile               |  4 ++--
 net/lftp/Makefile                   |  4 ++--
 net/nmap/Makefile                   |  4 +---
 net/nocol/Makefile                  |  4 +---
 print/poppler/Makefile              |  3 +--
 print/scribus/Makefile              |  4 ++--
 print/teTeX3-bin/Makefile           |  3 +--
 security/xmlsec1/Makefile           |  3 +--
 sysutils/krusader/Makefile          |  4 ++--
 www/ap-php/Makefile                 |  4 ++--
 www/kazehakase/Makefile             |  4 +---
 www/liferea/Makefile                |  4 ++--
 www/lighttpd/Makefile               |  4 ++--
 www/php4/Makefile                   |  3 +--
 x11/gtk-engines/Makefile            |  4 ++--
 x11/gtk2-engines-bluecurve/Makefile |  4 ++--
 64 files changed, 112 insertions(+), 133 deletions(-)

diffs (truncated from 1136 to 300 lines):

diff -r fea279dcd95d -r 9b3a8d8c9340 audio/libopendaap/Makefile
--- a/audio/libopendaap/Makefile        Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/libopendaap/Makefile        Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 USE_TOOLS+=            pkg-config
 
 SUBST_CLASSES+=                pthread
diff -r fea279dcd95d -r 9b3a8d8c9340 audio/tunesbrowser/Makefile
--- a/audio/tunesbrowser/Makefile       Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/tunesbrowser/Makefile       Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
-LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 USE_TOOLS+=            pkg-config
 
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/tunesbrowser
diff -r fea279dcd95d -r 9b3a8d8c9340 audio/xmms-alarm/Makefile
--- a/audio/xmms-alarm/Makefile Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/xmms-alarm/Makefile Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
-SHLIBTOOL_OVERRIDE=    libtool
+SHLIBTOOL_OVERRIDE=    # empty
 
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fea279dcd95d -r 9b3a8d8c9340 audio/xmms-arts/Makefile
--- a/audio/xmms-arts/Makefile  Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/xmms-arts/Makefile  Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
-SHLIBTOOL_OVERRIDE=    libtool
+SHLIBTOOL_OVERRIDE=    # empty
 
 LIBS+=                 ${LIBOSSAUDIO}
 
diff -r fea279dcd95d -r 9b3a8d8c9340 audio/xmms-faad/Makefile
--- a/audio/xmms-faad/Makefile  Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/xmms-faad/Makefile  Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 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 -r fea279dcd95d -r 9b3a8d8c9340 audio/xmms/Makefile.common
--- a/audio/xmms/Makefile.common        Fri Jul 07 15:25:05 2006 +0000
+++ b/audio/xmms/Makefile.common        Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 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 -r fea279dcd95d -r 9b3a8d8c9340 chat/gaim-encryption/Makefile
--- a/chat/gaim-encryption/Makefile     Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/gaim-encryption/Makefile     Fri Jul 07 15:49:30 2006 +0000
@@ -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_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 -r fea279dcd95d -r 9b3a8d8c9340 chat/gaim/Makefile
--- a/chat/gaim/Makefile        Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/gaim/Makefile        Fri Jul 07 15:49:30 2006 +0000
@@ -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_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
-SHLIBTOOL_OVERRIDE=    libtool
+SHLIBTOOL_OVERRIDE=    # empty
 
 CONFIGURE_ARGS+=       --disable-binreloc
 CONFIGURE_ARGS+=       --disable-gevolution
diff -r fea279dcd95d -r 9b3a8d8c9340 chat/irssi-icb/Makefile
--- a/chat/irssi-icb/Makefile   Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/irssi-icb/Makefile   Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 GNU_CONFIGURE= yes
 
 USE_LIBTOOL=   yes
-SHLIBTOOL_OVERRIDE=    libtool
+SHLIBTOOL_OVERRIDE=    # empty
 
 CONFIGURE_ARGS+=       --with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
 
diff -r fea279dcd95d -r 9b3a8d8c9340 chat/licq-gui-console/Makefile
--- a/chat/licq-gui-console/Makefile    Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/licq-gui-console/Makefile    Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 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 -r fea279dcd95d -r 9b3a8d8c9340 chat/licq-gui-qt/Makefile
--- a/chat/licq-gui-qt/Makefile Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/licq-gui-qt/Makefile Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 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 -r fea279dcd95d -r 9b3a8d8c9340 chat/silc-client/Makefile
--- a/chat/silc-client/Makefile Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/silc-client/Makefile Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake
 USE_LIBTOOL=           YES
-SHLIBTOOL_OVERRIDE=    libtool */libtool */*/*/libtool
+OVERRIDE_DIRDEPTH=     3
+SHLIBTOOL_OVERRIDE=    # empty
 
 PKG_SYSCONFSUBDIR?=    ${PKGBASE}
 
diff -r fea279dcd95d -r 9b3a8d8c9340 chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Fri Jul 07 15:25:05 2006 +0000
+++ b/chat/silc-server/Makefile Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
-SHLIBTOOL_OVERRIDE=    libtool */*/*/libtool
+OVERRIDE_DIRDEPTH=     3
+SHLIBTOOL_OVERRIDE=    # empty
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r fea279dcd95d -r 9b3a8d8c9340 comms/jpilot-syncmal/Makefile
--- a/comms/jpilot-syncmal/Makefile     Fri Jul 07 15:25:05 2006 +0000
+++ b/comms/jpilot-syncmal/Makefile     Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 USE_TOOLS+=            gmake pkg-config
 
 USE_LIBTOOL=           yes
-SHLIBTOOL_OVERRIDE=    libtool
+SHLIBTOOL_OVERRIDE=    # empty
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-gtk2
diff -r fea279dcd95d -r 9b3a8d8c9340 devel/blib/Makefile
--- a/devel/blib/Makefile       Fri Jul 07 15:25:05 2006 +0000
+++ b/devel/blib/Makefile       Fri Jul 07 15:49:30 2006 +0000
@@ -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_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 -r fea279dcd95d -r 9b3a8d8c9340 devel/gdb6/Makefile
--- a/devel/gdb6/Makefile       Fri Jul 07 15:25:05 2006 +0000
+++ b/devel/gdb6/Makefile       Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 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 -r fea279dcd95d -r 9b3a8d8c9340 devel/gdbada/Makefile
--- a/devel/gdbada/Makefile     Fri Jul 07 15:25:05 2006 +0000
+++ b/devel/gdbada/Makefile     Fri Jul 07 15:49:30 2006 +0000
@@ -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 @@
 
 USE_TOOLS+=            gmake makeinfo



Home | Main Index | Thread Index | Old Index