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 /devel | |
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.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/blib/Makefile | 4 | ||||
-rw-r--r-- | devel/gdb6/Makefile | 3 | ||||
-rw-r--r-- | devel/gdbada/Makefile | 3 | ||||
-rw-r--r-- | devel/gettext-tools/Makefile | 4 | ||||
-rw-r--r-- | devel/gettext/Makefile | 4 | ||||
-rw-r--r-- | devel/libextractor/Makefile | 4 | ||||
-rw-r--r-- | devel/p5-subversion/Makefile | 4 | ||||
-rw-r--r-- | devel/py-subversion/Makefile | 4 | ||||
-rw-r--r-- | devel/ruby-subversion/Makefile | 4 | ||||
-rw-r--r-- | devel/silc-toolkit/Makefile | 4 |
10 files changed, 18 insertions, 20 deletions
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" |