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 | ec993afa1a03c673838b24572cfaae5ebd9fb235 (patch) | |
| tree | f363875d965b55b56e856a921189b2693e263e28 | |
| parent | 12db50c706ca0bcbc78542f31d7719bf81af8ece (diff) | |
| download | pkgsrc-ec993afa1a03c673838b24572cfaae5ebd9fb235.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.
336 files changed, 396 insertions, 824 deletions
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index fb801967140..9cc67cb8e38 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:21:24 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= libcomprex-0.3.2 @@ -13,7 +13,6 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE=${WRKSRC}/libtool .include "../../www/curl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile index 8464dd7bae6..f53cc68de22 100644 --- a/archivers/liblzo/Makefile +++ b/archivers/liblzo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/09 20:25:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= lzo-1.08 @@ -15,8 +15,6 @@ USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - # Don't spuriously detect zlib, as it's not needed for the library. CONFIGURE_ENV+= ac_cv_lib_z_gzputs=no diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile index 29cd6e3b800..492b995ba2d 100644 --- a/archivers/zziplib/Makefile +++ b/archivers/zziplib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/12/14 18:24:30 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= zziplib-0.10.82 @@ -11,8 +11,8 @@ HOMEPAGE= http://zziplib.sourceforge.net/ COMMENT= Library for ZIP archive handling USE_BUILDLINK2= yes +USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= yes CONFIGURE_ARGS= --with-zlib=${BUILDLINK_DIR} .include "../../devel/zlib/buildlink2.mk" diff --git a/audio/SDL-arts/Makefile b/audio/SDL-arts/Makefile index 4db3cf3ea15..e856ad0feb5 100644 --- a/audio/SDL-arts/Makefile +++ b/audio/SDL-arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/15 09:13:47 markd Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:32 jlam Exp $ # .include "../../devel/SDL/Makefile.common" @@ -12,7 +12,7 @@ COMMENT= SDL plugin to output sound through the aRts sound daemon CONFIGURE_ARGS+= --enable-arts -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool BUILD_DIRS= ${WRKSRC}/src/audio/arts diff --git a/audio/SDL-esound/Makefile b/audio/SDL-esound/Makefile index 06f62f087a6..64697e15367 100644 --- a/audio/SDL-esound/Makefile +++ b/audio/SDL-esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/15 09:13:47 markd Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:32 jlam Exp $ # .include "../../devel/SDL/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= SDL plugin to output sound through the esound daemon CONFIGURE_ARGS+= --enable-esd -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool BUILD_DIRS= ${WRKSRC}/src/audio/esd diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile index 252bfd762ee..f2ba662cf6a 100644 --- a/audio/SDL-nas/Makefile +++ b/audio/SDL-nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/15 09:13:47 markd Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:32 jlam Exp $ # .include "../../devel/SDL/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= SDL plugin to output sound through the Network Audio System CONFIGURE_ARGS+= --enable-nas -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool BUILD_DIRS= ${WRKSRC}/src/audio/nas diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index 21f23bdcf80..ea6327646e1 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/08 03:00:29 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= SDL_mixer-1.2.5 @@ -19,8 +19,6 @@ GNU_CONFIGURE= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CPPFLAGS= -Dunix=1 CFLAGS= -DPREFIX=\"\\\"${PREFIX}\\\"\" diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile index f19a48715d2..2babf96eefe 100644 --- a/audio/SDL_sound/Makefile +++ b/audio/SDL_sound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/18 13:51:15 cube Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= SDL_sound-1.0.1 @@ -12,8 +12,6 @@ COMMENT= SDL library to handle the decoding of different file formats GNU_CONFIGURE= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - USE_BUILDLINK2= YES .include "../../audio/libmikmod/buildlink2.mk" diff --git a/audio/arts/Makefile b/audio/arts/Makefile index a6d4166f5b0..de06082d9d2 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/06 13:48:05 tron Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:32 jlam Exp $ DISTNAME= arts-1.2.0 PKGREVISION= 1 @@ -12,7 +12,6 @@ CONFLICTS+= kdelibs-2* USE_BUILDLINK2= yes USE_PERL5= build -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool ${WRKSRC}/libltdl/libtool BUILD_DEPENDS+= pkgconfig>=0.15.0:../../devel/pkgconfig # Ensure we export symbols in the linked shared object. diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 344d35ebadb..45d9f02fcc1 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/01/22 07:15:00 grant Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= easytag-0.30 @@ -20,7 +20,6 @@ USE_X11= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../audio/flac/buildlink2.mk" .include "../../audio/id3lib/buildlink2.mk" diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 3ca30dbef95..5664529782d 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2004/01/06 07:17:03 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2004/02/14 17:21:32 jlam Exp $ DISTNAME= esound-0.2.32 CATEGORIES= audio @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/esound.pc.in GNU_CONFIGURE= YES diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index dca9bbd3ea1..5713ccdf8ce 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= faad2-1.1 @@ -21,7 +21,6 @@ USE_LIBTOOL= YES AUTOMAKE_REQD= 1.4 GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/libtool pre-configure: for dir in . common/mp4v2 ; do \ diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 77ac499bbb0..db4a467d5a6 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/09 19:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= flac-1.1.0 @@ -12,14 +12,12 @@ COMMENT= Free lossless audio codec WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_BUILDLINK3= yes +USE_LIBTOOL= yes USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no" -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile index 6b0ce135b61..a6bc4920bad 100644 --- a/audio/gnome-speech/Makefile +++ b/audio/gnome-speech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/23 21:50:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= gnome-speech-0.2.8 @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gtk-doc -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-speech-1.0.pc.in .include "../../devel/libbonobo/buildlink2.mk" diff --git a/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile index 9e9597b3c49..591ad96cba4 100644 --- a/audio/gnome2-media/Makefile +++ b/audio/gnome2-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:32 jlam Exp $ DISTNAME= gnome-media-2.4.1.1 PKGREVISION= 4 @@ -19,7 +19,6 @@ USE_LIBTOOL= yes USE_X11= yes USE_GNU_TOOLS+= make USE_PERL5= build -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index 8c515ccdef8..edd46ebc59f 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/23 21:50:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= icecast-2.0.0 @@ -16,8 +16,6 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - BUILD_DEFS+= ICECAST_CHROOTDIR PKG_SYSCONFSUBDIR= icecast diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index fdc2a23d396..f4cb87bc175 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/11 01:46:30 abs Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:32 jlam Exp $ # DISTNAME= id3lib-3.8.3 @@ -14,7 +14,6 @@ USE_GCC_SHLIB= # defined USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CPPFLAGS+=-DID3_NEED_WCHAR_TEMPLATE diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 70f96297d1a..646fc119b77 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/02/11 08:33:51 xtraeme Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= lame-${VERS} @@ -16,9 +16,7 @@ LICENSE= fee-based-commercial-use USE_BUILDLINK3= yes USE_GNU_TOOLS+= make - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-vorbis diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 675ffb307b6..5bb6b50d8d3 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/11 08:37:35 xtraeme Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= a52dec-0.7.4 @@ -14,7 +14,6 @@ COMMENT= Free ATSC A/52 stream decoder library USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --disable-oss CONFIGURE_ARGS+= --disable-mlib diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index 5dd89cd1346..75d37821edb 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/01/22 22:52:10 grant Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/02/14 17:21:33 jlam Exp $ DISTNAME= libao-0.8.4 CATEGORIES= audio devel @@ -29,8 +29,6 @@ PLIST_SUBST+= LIBOSS="" PLIST_SUBST+= LIBSUN="" .endif -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --disable-alsa09 CONFIGURE_ARGS+= --disable-arts diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index def50ef82fd..6a8034155c5 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/02/06 17:09:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:33 jlam Exp $ DISTNAME= audiofile-0.2.5 PKGNAME= lib${DISTNAME} @@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/audiofile.pc.in DOCDIR= ${PREFIX}/share/doc/libaudiofile diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile index 74795e3f272..52926daf4d6 100644 --- a/audio/libcdaudio/Makefile +++ b/audio/libcdaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/23 06:20:40 grant Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libcdaudio-0.99.9 @@ -13,6 +13,5 @@ COMMENT= Multi-platform CD player development library USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile index fbc5d5b0373..4e24d1ef343 100644 --- a/audio/libcddb/Makefile +++ b/audio/libcddb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/17 15:25:37 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libcddb-0.9.4 @@ -12,7 +12,6 @@ COMMENT= Library to access data on a CDDB server USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcddb.pc.in GNU_CONFIGURE= yes diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile index 011adeac679..60222fd4231 100644 --- a/audio/libid3tag/Makefile +++ b/audio/libid3tag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/11 08:37:35 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libid3tag-0.15.0b @@ -16,7 +16,6 @@ CONFLICTS= mad<0.15 USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool post-build: ${SED} -e 's,@PREFIX@,${PREFIX},g' \ diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile index ca02856d4b1..8d153a98fae 100644 --- a/audio/libmad/Makefile +++ b/audio/libmad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/17 03:23:45 simonb Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libmad-0.15.0b @@ -16,7 +16,6 @@ CONFLICTS= mad<0.15 USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool post-build: ${SED} -e 's,@PREFIX@,${PREFIX},g' \ diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index e74bb94ea24..c5f965b8bee 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/11 08:36:17 xtraeme Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:33 jlam Exp $ DISTNAME= libmikmod_3.1.10 PKGNAME= libmikmod-3.1.10 @@ -18,7 +18,6 @@ INFO_FILES= mikmod.info WRKSRC= ${WRKDIR}/${PKGNAME} CONFIGURE_ARGS+= --disable-threads -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.prefs.mk" diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index ffb27e32b73..137d60a46a9 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/01 01:43:28 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:33 jlam Exp $ DISTNAME= libogg-1.1 CATEGORIES= devel audio @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCC_REQD+= 2.95.3 diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile index 510fba71472..eaac9ab9459 100644 --- a/audio/libsamplerate/Makefile +++ b/audio/libsamplerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:22:43 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libsamplerate-0.0.13 @@ -10,11 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.mega-nerd.com/SRC/ COMMENT= Sample rate converter library -GNU_CONFIGURE= YES USE_BUILDLINK2= YES - -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +GNU_CONFIGURE= YES +USE_LIBTOOL= YES TEST_TARGET= check diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile index 5dc594bc9b7..1119d085e4c 100644 --- a/audio/libshout/Makefile +++ b/audio/libshout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/12 03:56:19 kim Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libshout-2.0 @@ -12,7 +12,6 @@ COMMENT= Connects and sends data to icecast servers USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PTHREAD_OPTS+= require .include "../../audio/libvorbis/buildlink2.mk" diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile index bcf1af0c528..ffc04a5df92 100644 --- a/audio/libsidplay/Makefile +++ b/audio/libsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/22 07:15:00 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= libsidplay-1.36.57 @@ -12,12 +12,10 @@ COMMENT= Sidplay Library CONFLICTS= sidplay-1.36.* +USE_BUILDLINK2= yes GNU_CONFIGURE= yes +USE_LIBTOOL= yes USE_GNU_TOOLS+= make -USE_BUILDLINK2= yes USE_GCC_SHLIB= yes -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index e26a523c6b2..d0ba5b087ef 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:28 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:33 jlam Exp $ DISTNAME= libvorbis-1.0.1 CATEGORIES= devel audio @@ -11,7 +11,6 @@ COMMENT= Library for the Ogg Vorbis audio encoding format USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCC_REQD+= 2.95.3 diff --git a/audio/mserv-devel/Makefile b/audio/mserv-devel/Makefile index a9f49c8ba0d..3c34742f1d0 100644 --- a/audio/mserv-devel/Makefile +++ b/audio/mserv-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/23 06:37:00 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= mserv-0.39a @@ -15,7 +15,6 @@ CONFIGURE_ARGS+= --with-engine-icecast CONFIGURE_ARGS+= --datadir=${PREFIX}/share/mserv USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool REPLACE_PERL= support/mservedit webclient/main.cgi \ webclient/margin.cgi webclient/mserv.cgi diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index a68f754c129..ee46361b0e1 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/23 06:37:00 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= mserv-0.35 @@ -17,7 +17,6 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/mserv CONFIGURE_ENV+= MY_LIBS="-lvorbisfile -lvorbis" USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool REPLACE_PERL= support/mservedit webclient/main.cgi \ webclient/margin.cgi webclient/mserv.cgi diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile index ef2648edf86..06d978d2523 100644 --- a/audio/musicbrainz/Makefile +++ b/audio/musicbrainz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/09 00:07:36 chris Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:33 jlam Exp $ DISTNAME= libmusicbrainz-2.0.2 PKGNAME= ${DISTNAME:S/lib//} @@ -15,7 +15,6 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libmusicbrainz.pc.in CONFIGURE_ARGS+= --enable-cpp-headers diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile index 2bd9dbe52fb..fc4259bb3a7 100644 --- a/audio/normalize/Makefile +++ b/audio/normalize/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:23:04 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= normalize-0.7.6 @@ -13,7 +13,6 @@ COMMENT= Wave (.wav) file volume normalizer USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES #CONFIGURE_ARGS+= --with-audiofile diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index ae9c336d799..4f6d378fb9c 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= rhythmbox-0.6.5 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 9538c845e3f..05d29896e4d 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/12/08 19:28:49 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= speex-1.0.3 @@ -11,7 +11,6 @@ COMMENT= Open-source, patent-free voice codec USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES # previous versions of the package were called Speex diff --git a/audio/streamtuner-live365/Makefile b/audio/streamtuner-live365/Makefile index 0f1aa5ee95a..eb51c0a43d3 100644 --- a/audio/streamtuner-live365/Makefile +++ b/audio/streamtuner-live365/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= streamtuner-live365-0.3.2 @@ -15,7 +15,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_X11= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool .include "../../audio/streamtuner/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile index 7de44e38da8..18a6e7a67a4 100644 --- a/audio/streamtuner-local/Makefile +++ b/audio/streamtuner-local/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= streamtuner-local-0.2.1 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_X11= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --with-id3lib="${BUILDLINK_PREFIX.id3lib}" diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index f62ad5ab39b..d89e480b338 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= streamtuner-${DIST_VER} @@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/extras/streamtuner.pc.in DIST_VER= 0.10.2 diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 866ee3edadf..eea1fde93ce 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= sweep-0.8.2 @@ -14,15 +14,13 @@ DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs BUILD_USES_MSGFMT= YES -GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES USE_X11= YES -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-oggtest CONFIGURE_ARGS+= --disable-vorbistest diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 90f7be2c504..c8afb5c9b07 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/10 17:54:14 gavan Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:33 jlam Exp $ # DISTNAME= taglib-1.0 @@ -14,7 +14,6 @@ USE_LANGUAGES= c c++ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool pre-build: ${CP} ${FILESDIR}/id3lib_strings.h ${WRKSRC}/taglib/toolkit/. diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index 2f112214e52..6bc4a488aaa 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:33 jlam Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 @@ -19,7 +19,6 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ --with-ao-prefix=${BUILDLINK_PREFIX.libao} diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile index ab253d23697..32790b5b978 100644 --- a/audio/tremor/Makefile +++ b/audio/tremor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:34 jlam Exp $ DISTNAME= tremor_snapshot_030406 PKGNAME= tremor-1.0.2 @@ -16,7 +16,6 @@ AUTOMAKE_REQD= 1.4 GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -#LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= DISTNAME=${DISTNAME} diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index d7b822a79e1..3b267b01192 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/12/08 14:43:48 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:34 jlam Exp $ DISTNAME= vorbis-tools-1.0.1 CATEGORIES= audio @@ -17,7 +17,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ --with-ao-prefix=${BUILDLINK_PREFIX.libao} diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile index 4134e7361bd..64f84c8ccfc 100644 --- a/audio/xmms-alarm/Makefile +++ b/audio/xmms-alarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/08/12 07:10:07 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= xmms-alarm-0.3.3 @@ -13,7 +13,7 @@ USE_BUILDLINK2= YES USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool .include "../../audio/xmms/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile index dea478f3c64..d5e3c09074a 100644 --- a/audio/xmms-arts/Makefile +++ b/audio/xmms-arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= xmmsarts-0.4 @@ -16,8 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes - -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool LIBS+= ${LIBOSSAUDIO} diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile index 6377f45e4f9..1330c07015d 100644 --- a/audio/xmms-blursk/Makefile +++ b/audio/xmms-blursk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/11/25 22:32:00 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:34 jlam Exp $ DISTNAME= Blursk-1.3 PKGNAME= xmms-blursk-1.3 @@ -17,8 +17,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .if !exists(${X11BASE}/include/X11/extensions/Xvlib.h) PKG_FAIL_REASON= "${PKGNAME} requires libXv.a" .endif diff --git a/audio/xmms-bump-scope/Makefile b/audio/xmms-bump-scope/Makefile index 362af56a3a5..e4849c5a849 100644 --- a/audio/xmms-bump-scope/Makefile +++ b/audio/xmms-bump-scope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:23:54 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= bump_scope-0.0.3 @@ -13,7 +13,6 @@ COMMENT= Moving light embossing occiliscope USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES MAKE_ENV+= plugindir=${PREFIX}/lib/xmms/Visualization diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index 0e8efef6574..de5feb2224f 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= flac-1.1.0 @@ -16,8 +16,7 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool-disable-static +SHLIBTOOL_OVERRIDE= libtool-disable-static XMMS_WRKSRC= ${WRKSRC}/src/plugin_xmms diff --git a/audio/xmms-infinity/Makefile b/audio/xmms-infinity/Makefile index 5d8932e6eda..247d0d11afe 100644 --- a/audio/xmms-infinity/Makefile +++ b/audio/xmms-infinity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/26 21:41:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= infinity-0.2 @@ -13,7 +13,6 @@ COMMENT= Psychedelic visualization plug-in for xmms USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../audio/xmms/buildlink2.mk" diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile index eef0ec96820..f29d831774b 100644 --- a/audio/xmms-iris/Makefile +++ b/audio/xmms-iris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:05 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= iris-0.11 @@ -13,7 +13,6 @@ COMMENT= OpenGL Spectrum Analyzer with theme engine and fullscreen modes USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES # Needs libXxf86vm.so which isn't provided on NetBSD currently. diff --git a/audio/xmms-jess/Makefile b/audio/xmms-jess/Makefile index 84240b2a37b..cfd6937efc4 100644 --- a/audio/xmms-jess/Makefile +++ b/audio/xmms-jess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/26 21:41:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= JESS-2.9.1 @@ -13,7 +13,6 @@ COMMENT= XMMS plugin with Blur, image distortion, and others USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../audio/xmms/buildlink2.mk" diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile index 417c299d6b5..16812d3e603 100644 --- a/audio/xmms-liveice/Makefile +++ b/audio/xmms-liveice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= liveice-xmms @@ -16,8 +16,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CFLAGS+= -DLAME=\"\\\"${BUILDLINK_PREFIX.lame}/bin/lame\\\"\" .include "../../audio/lame/buildlink2.mk" diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile index 42e7c9c5f55..742442a9b75 100644 --- a/audio/xmms-madspin/Makefile +++ b/audio/xmms-madspin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= madspin-0.05 @@ -13,7 +13,6 @@ COMMENT= Based on the madspin winamp plugin USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES USE_GNU_TOOLS+= make diff --git a/audio/xmms-nebulus/Makefile b/audio/xmms-nebulus/Makefile index 00eb9f80468..af8c60eaac0 100644 --- a/audio/xmms-nebulus/Makefile +++ b/audio/xmms-nebulus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/14 03:58:01 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= xmms-nebulus-0.6.0 @@ -12,7 +12,6 @@ COMMENT= Xmms plugin that uses OpenGL USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../audio/xmms/buildlink2.mk" diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile index 6f72c293a37..b1b05c26749 100644 --- a/audio/xmms-tv-scope/Makefile +++ b/audio/xmms-tv-scope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/26 21:41:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= tv_scope-0.0.2 @@ -13,7 +13,6 @@ COMMENT= 3D Representation of a waveform USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES ONLY_FOR_PLATFORM= SunOS-*-* Linux-*-* Darwin-*-* diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index 999a21583dd..7d64ba5434e 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/01/22 07:26:08 grant Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= xmms-1.2.7 @@ -22,8 +22,7 @@ FILESDIR= ${.CURDIR}/../../audio/xmms/files PATCHDIR= ${.CURDIR}/../../audio/xmms/patches CONFIGURE_ARGS+= --without-gnome -LIBTOOL_OVERRIDE= ${WRKSRC}/libxmms/libtool -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool # Broken configure script assumes that iconv_open lives in libc; work around. CPPFLAGS+= -DHAVE_ICONV_OPEN=1 diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 83da92cfeea..aad43f650ce 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # #DISTNAME= gtkwave-2.0.0pre3 @@ -16,7 +16,6 @@ COMMENT= Electronic waveform viewer USE_X11= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes .include "../../devel/glib/buildlink2.mk" diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile index 988f960fccb..c3f96415aaf 100644 --- a/cad/libgeda/Makefile +++ b/cad/libgeda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= libgeda-${PKGVERSION} @@ -24,8 +24,6 @@ USE_BUILDLINK2= YES INFO_FILES= libgedadoc.info -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/libstroke/buildlink2.mk" .include "../../graphics/libgdgeda/buildlink2.mk" .include "../../lang/guile/buildlink2.mk" diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index 48c95172155..55d67e20041 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:28 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:34 jlam Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 3 @@ -14,7 +14,6 @@ USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCC_REQD+= 2.95.3 diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common index 3095d63744d..04c779a5833 100644 --- a/chat/gaim-gtk1/Makefile.common +++ b/chat/gaim-gtk1/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2004/01/22 07:49:20 grant Exp $ +# $NetBSD: Makefile.common,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= gaim-0.59.8 @@ -22,9 +22,7 @@ DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs USE_GNU_TOOLS+= make USE_X11BASE= YES USE_PKGLOCALEDIR= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-artsc diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 849ea569516..2a46ae73b61 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2004/01/27 01:24:51 recht Exp $ +# $NetBSD: Makefile,v 1.52 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= gaim-0.75 @@ -23,8 +23,6 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --disable-nas CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-nss diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index 9dd1db03ddb..9142fabc2ca 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= gossip-0.7 @@ -22,7 +22,6 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes GCONF2_SCHEMAS= gossip.schemas -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/chat/ickle/Makefile b/chat/ickle/Makefile index 8216f356dba..5ac2cd4965e 100644 --- a/chat/ickle/Makefile +++ b/chat/ickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/13 13:50:47 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:34 jlam Exp $ DISTNAME= ickle-0.3.2 PKGREVISION= 2 @@ -11,7 +11,6 @@ COMMENT= Simplistic gtk+ icq client USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../chat/libicq2000/buildlink2.mk" diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile index eeb61816cde..8ac0eafbe3e 100644 --- a/chat/irssi-icb/Makefile +++ b/chat/irssi-icb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= irssi-icb-0.14 @@ -21,7 +21,7 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/${IRSSI_DISTNAME} diff --git a/chat/libicq2000/Makefile b/chat/libicq2000/Makefile index c911c92f6b1..6b91e8cfeb4 100644 --- a/chat/libicq2000/Makefile +++ b/chat/libicq2000/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:58 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= libicq2000-0.3.2 @@ -12,7 +12,6 @@ COMMENT= Library for icq 2000/2001 clients USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../devel/libsigc++10/buildlink2.mk" diff --git a/chat/libirc/Makefile b/chat/libirc/Makefile index d3953df7574..097f52d615a 100644 --- a/chat/libirc/Makefile +++ b/chat/libirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:25:59 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= libirc-0.2 @@ -13,7 +13,6 @@ COMMENT= libirc is a C-library for the IRC protocol GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/glib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/libyahoo/Makefile b/chat/libyahoo/Makefile index 85f690024a1..b9aa90e5ef2 100644 --- a/chat/libyahoo/Makefile +++ b/chat/libyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/09/21 06:59:15 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $ DISTNAME= libyahoo-0.18.4 CATEGORIES= chat @@ -11,7 +11,6 @@ COMMENT= Yahoo! Messenger client library USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool post-install: ${INSTALL_DATA} ${WRKSRC}/libyahoo-authors.h ${PREFIX}/include/libyahoo diff --git a/chat/naim/Makefile b/chat/naim/Makefile index 53a98e83957..b8dee60d439 100644 --- a/chat/naim/Makefile +++ b/chat/naim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/02/13 22:15:32 snj Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= naim-0.11.6.6 @@ -13,7 +13,6 @@ COMMENT= Ncurses-based AIM, ICQ, IRC and Lily client GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_NCURSES= # assertion "COLOR_PAIRS >= (COLORS*COLORS)" failed: file "./win.c", line 250, function "wsetup_colors" CONFIGURE_ARGS+= --mandir=${PREFIX}/man diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 0e08dd76b1b..796fe384bf9 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/22 07:49:21 grant Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/14 17:21:34 jlam Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -21,8 +21,7 @@ USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \ - ${WRKSRC}/lib/silcmath/mpi/libtool +SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool PKG_SYSCONFSUBDIR?= silc diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 454fc3ff93d..06f20c9da4b 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/03 18:02:52 salo Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= silc-server-0.9.16 @@ -18,7 +18,7 @@ USE_BUILDLINK2= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool +SHLIBTOOL_OVERRIDE= libtool */*/*/libtool DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index 4292eb82def..1aa6e5d4039 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/10 16:59:21 minskim Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= xchat-2.0.7 @@ -22,8 +22,6 @@ USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --enable-textfe CONFIGURE_ARGS+= --enable-tcl=no CONFIGURE_ARGS+= --disable-perl diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile index 43e5b769eea..73cd74a8a27 100644 --- a/comms/gnome-pilot/Makefile +++ b/comms/gnome-pilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= gnome-pilot-0.1.71 @@ -24,7 +24,6 @@ USE_PKGLOCALEDIR= YES USE_LIBINTL= YES USE_LIBTOOL= YES USE_PERL5= build -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index ba73ed2a2c0..b8c525e4259 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/22 07:51:12 grant Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/14 17:21:35 jlam Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -17,7 +17,7 @@ USE_X11= # defined USE_GNU_TOOLS+= make USE_LIBTOOL= # defined -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-gtk2 diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index a10bb325a3d..b8d146f81a2 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.39 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= jpilot-0.99.5 @@ -16,6 +16,7 @@ DEPENDS+= gnome-dirs>=1.0:../../misc/gnome-dirs CONFLICTS+= jpilot-libplugin-[0-9]* USE_BUILDLINK2= YES +USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES @@ -25,9 +26,6 @@ CONFIGURE_ARGS+= --with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}" CONFIGURE_ARGS+= --enable-gtk2 LDFLAGS+= -export-dynamic -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - DOCDIR= ${PREFIX}/share/doc/jpilot INCDIR= ${PREFIX}/include/jpilot HTMLDIR= ${PREFIX}/share/doc/html/jpilot diff --git a/comms/pilot-link/Makefile.common b/comms/pilot-link/Makefile.common index 1df2a9b47e5..21ca1b00333 100644 --- a/comms/pilot-link/Makefile.common +++ b/comms/pilot-link/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2003/07/17 21:26:54 grant Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/02/14 17:21:35 jlam Exp $ DISTNAME= pilot-link-${PILOT_LINK_VERS} CATEGORIES= comms @@ -11,8 +11,6 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE?= http://www.pilot-link.org/ USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index bc2f8f56e52..8e4ee8497b9 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/14 01:16:39 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= fribidi-0.10.4 @@ -14,7 +14,6 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/fribidi.pc.in TEST_TARGET= check diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index a29a787d524..0630ac7a2b7 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/05 11:17:10 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= libiconv-1.9.1 @@ -16,8 +16,6 @@ USE_BUILDLINK3= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libcharset/libtool TEST_TARGET= check diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 0922b4c8966..0e3cd454f36 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= psiconv-0.8.3 @@ -12,13 +12,10 @@ COMMENT= PSION 5 file format data conversion utilities USE_BUILDLINK2= YES USE_X11= YES - +USE_LIBTOOL= YES GNU_CONFIGURE= YES CPPFLAGS+= -DIMAGEMAGICK -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - DOCDIR= ${PREFIX}/share/doc/psiconv post-install: diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 258ddd5a64b..54124db5e7d 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= wv-1.0.0 @@ -17,7 +17,6 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/wv-1.0.pc.in MAKEFILE= GNUmakefile diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index a9920c5db7a..2cf12ab547c 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= wv2-0.2.1 @@ -17,8 +17,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.libiconv} diff --git a/databases/db3/Makefile b/databases/db3/Makefile index a10baba8786..4c0def7ae6d 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/14 15:29:15 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:35 jlam Exp $ DISTNAME= db-3.3.11 PKGNAME= db3-3.11.2 @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ -LIBTOOL_OVERRIDE= ${WRKDIR}/${DISTNAME}/build_unix/libtool GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure diff --git a/databases/db4/Makefile b/databases/db4/Makefile index fa66274d973..0a8880be3e4 100644 --- a/databases/db4/Makefile +++ b/databases/db4/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:35 jlam Exp $ DISTNAME= db-4.2.52 PKGNAME= ${DISTNAME:S/db/db4/} @@ -15,7 +15,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_BUILDLINK3= YES USE_LANGUAGES= c c++ USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKDIR}/${DISTNAME}/build_unix/libtool GNU_CONFIGURE= YES CONFIGURE_SCRIPT= ../dist/configure diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index 6c84d6c2e04..2a7cd480bf3 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/22 05:22:58 martti Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:35 jlam Exp $ DISTNAME= dbh_1.0-15 PKGNAME= dbh-1.0.15 @@ -12,7 +12,6 @@ COMMENT= Library to create disk based Hashtables GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/src/dbh-1.0.pc.in post-install: diff --git a/databases/dbxml/Makefile b/databases/dbxml/Makefile index 2c5f7c26756..d7da1952685 100644 --- a/databases/dbxml/Makefile +++ b/databases/dbxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/13 19:39:35 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:35 jlam Exp $ DISTNAME= dbxml-1.2.1 CATEGORIES= databases @@ -13,7 +13,6 @@ USE_BUILDLINK3= YES GNU_CONFIGURE= YES CONFIGURE_SCRIPT= ../dist/configure USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-berkeleydb=${BUILDLINK_PREFIX.db4} CONFIGURE_ARGS+= --with-xerces=${BUILDLINK_PREFIX.xerces-c} diff --git a/databases/edb/Makefile b/databases/edb/Makefile index 0343e1876de..b607e6ab1a1 100644 --- a/databases/edb/Makefile +++ b/databases/edb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/11/03 11:01:05 gavan Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= edb-1.0.3 @@ -15,7 +15,6 @@ USE_LIBTOOL= YES USE_BUILDLINK2= YES USE_GCC_SHLIB= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-cxx .include "../../x11/gtk/buildlink2.mk" diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 7d764e0284a..67ecefb5ae2 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/22 08:02:15 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:35 jlam Exp $ DISTNAME= freetds-0.61.2 CATEGORIES= databases @@ -9,6 +9,7 @@ HOMEPAGE= http://www.freetds.org/ COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs USE_BUILDLINK2= yes +USE_LIBTOOL= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make @@ -18,9 +19,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --with-tdsver=7.0 -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - EGDIR= ${PREFIX}/share/examples/freetds CONF_FILES= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf CONF_FILES+= ${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 6187bf7d259..1cd51cf97cb 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/02/14 00:54:44 grant Exp $ +# $NetBSD: Makefile,v 1.34 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= gdbm-1.8.3 @@ -12,7 +12,6 @@ COMMENT= The GNU database manager USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INFO_FILES= gdbm.info .include "../../mk/bsd.pkg.mk" diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile index fc8335f3032..1ff5b92a8b8 100644 --- a/databases/guile-pg/Makefile +++ b/databases/guile-pg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/22 08:02:15 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= guile-pg-0.07 @@ -15,7 +15,6 @@ DEPENDS+= postgresql-lib>=7.3.1:../../databases/postgresql-lib USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile index 304ce3a20a2..fba1189dead 100644 --- a/databases/java-db3/Makefile +++ b/databases/java-db3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/20 12:12:49 agc Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $ DISTNAME= db-3.3.11 PKGNAME= java-db3-3.11.2 @@ -23,7 +23,6 @@ JAVACABS= ${JAVAC} WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index e87edf9989f..65ee15abfe5 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2004/02/11 05:28:58 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/02/14 17:21:35 jlam Exp $ # DISTNAME?= libgda-1.0.0 @@ -17,8 +17,6 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share/doc/html" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index d5c9e0e8264..30d6663a4ce 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/11 05:28:58 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= libgnomedb-1.0.0 @@ -21,7 +21,6 @@ USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomedb.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index bc1c5deae5a..6a2fe355503 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/05 09:28:59 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:35 jlam Exp $ # .include "../../databases/libpqxx/Makefile.common" @@ -9,6 +9,7 @@ NOT_FOR_PLATFORM= NetBSD-*-pc532 USE_LANGUAGES= c c++ USE_BUILDLINK2= yes +USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE+= ${WRKSRC}/libpqxx.pc.in @@ -17,8 +18,5 @@ PG_PREFIX= ${BUILDLINK_PREFIX.postgresql-lib} CONFIGURE_ARGS+= --with-postgres-lib=${PG_PREFIX}/lib CONFIGURE_ARGS+= --with-postgres-include=${PG_PREFIX}/include/postgresql -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../databases/postgresql-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 07bb61ebfe4..9dc5b4be64c 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= mergeant-0.12.1 @@ -20,7 +20,6 @@ USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../databases/libgnomedb/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile index 8cdeb2a438c..fa3554590d2 100644 --- a/databases/metakit-lib/Makefile +++ b/databases/metakit-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:12:49 agc Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= metakit-2.4.8-38 @@ -15,7 +15,6 @@ GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../unix/configure CONFIGURE_ARGS+= --with-tcl= USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= yes post-install: diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index b59677793d7..bf3a2053f95 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2004/01/22 08:02:16 grant Exp $ +# $NetBSD: Makefile.common,v 1.22 2004/02/14 17:21:36 jlam Exp $ DISTNAME= mysql-3.23.58 CATEGORIES= databases @@ -60,7 +60,6 @@ CXXFLAGS+= -DHAVE_CURSES_H USE_PERL5= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql post-extract: diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 78945750dff..c0d99540c0b 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2004/02/14 11:31:50 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2004/02/14 17:21:36 jlam Exp $ DISTNAME= openldap-2.1.25 SVR4_PKGNAME= oldap @@ -18,7 +18,6 @@ USE_BUILDLINK3= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PTHREAD_OPTS+= require TEST_TARGET= test diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile index 3df6d5e0b48..2a3776ae6a8 100644 --- a/databases/py-metakit/Makefile +++ b/databases/py-metakit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:12:49 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= metakit-2.4.8-38 @@ -15,7 +15,6 @@ GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../unix/configure CONFIGURE_ARGS+= --with-tcl= --enable-python USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= yes ALL_TARGET= python INSTALL_TARGET= install-python diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 5fc3840845a..511b7084551 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/08 03:47:08 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= rrdtool-1.0.40 @@ -16,8 +16,6 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ USE_LIBTOOL= yes USE_BUILDLINK3= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool USE_GNU_TOOLS+= make GNU_CONFIGURE= yes diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile index 77ecf1d6a08..779a010a3a5 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/22 08:02:16 grant Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:36 jlam Exp $ DISTNAME= sqlite-2.8.5 CATEGORIES= databases @@ -13,7 +13,6 @@ WRKSRC= ${WRKDIR}/sqlite-build USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_SCRIPT= ../sqlite/configure diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 74470e81cb2..84e6728f93d 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/22 08:02:16 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:36 jlam Exp $ # DISTNAME= tdb-1.0.6 @@ -13,6 +13,5 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index adb53ee7cd9..81d82be9ef5 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/01/27 00:53:10 heinz Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/02/14 17:21:36 jlam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} PKGREVISION= 1 @@ -18,7 +18,6 @@ ODBC_BASE_VERS= ${ODBC_DIST_VERS} USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 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" diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index 462dff49143..68df1d9795f 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= conglomerate-0.7.11 @@ -22,8 +22,6 @@ USE_GNU_TOOLS+= make USE_PERL5= yes USE_PKGLOCALEDIR= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --enable-printing CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 4868ac3fea5..5ea7a4f1117 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/11 05:15:40 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= gedit-2.4.1 @@ -21,7 +21,6 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCONF2_SCHEMAS= gedit.schemas diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index a0ffb6adadb..db9ee05aeb9 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/22 08:30:30 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= lpe-1.2.6 @@ -20,7 +20,7 @@ USE_LIBTOOL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool CONFIGURE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" MAKE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 2b19758d778..a782ea75df3 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2004/02/09 03:26:39 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= lyx-1.3.3 @@ -30,8 +30,6 @@ USE_PKGLOCALEDIR= YES USE_X11= YES GCC_REQD+= 2.95 -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ --with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \ --with-pspell diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 9d82dc467e9..0b6ac0ee3fe 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:05 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= nvi-1.81.5 @@ -24,8 +24,6 @@ CONFIGURE_SCRIPT= ../dist/configure CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3} CONFIGURE_ARGS+= --program-transform-name='s,^,n,' USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - USE_BUILDLINK2= YES .include "../../databases/db3/buildlink2.mk" diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile index 517075f936b..f8c5f8429ba 100644 --- a/emulators/gpsim/Makefile +++ b/emulators/gpsim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/22 08:36:04 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= gpsim-0.20.7 @@ -16,7 +16,6 @@ CONFIGURE_ARGS+= --with-exdbm=${BUILDLINK_PREFIX.eXdbm} USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_READLINE= # rl_callback_read_char, rl_copy_text, # rl_callback_handler_remove, rl_forced_update_display, diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile index edcbd3dea37..57534545d1b 100644 --- a/emulators/libspectrum/Makefile +++ b/emulators/libspectrum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/13 13:36:43 adam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= libspectrum-0.2.1 @@ -12,7 +12,6 @@ COMMENT= ZX Spectrum emulator file format library USE_PERL5= build USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL=${PERL5} diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile index ca21c4cc431..1d3a511b531 100644 --- a/emulators/p11/Makefile +++ b/emulators/p11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/22 08:36:04 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= p11-2.10a @@ -14,7 +14,6 @@ DEPENDS+= libbegemot-[0-9]*:../../devel/libbegemot GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-begemot=${PREFIX} USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_TOOLS+= make # override MAKEFLAGS in the build and install stages diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index fa29f376521..016f0481c97 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/06 08:53:41 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:39 jlam Exp $ # DISTNAME= tme-0.2 @@ -13,7 +13,6 @@ COMMENT= The Machine Emulator USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_GNU_TOOLS+= make diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 5aac12e99f3..55e58f9dee7 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/02/08 03:00:29 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2004/02/14 17:21:39 jlam Exp $ DISTNAME= gnucash-1.8.8 PKGREVISION= 2 @@ -21,7 +21,6 @@ BUILD_DEPENDS+= bison>=1.28:../../devel/bison USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool # LIBTOOL_FLAGS+= --preserve-dup-deps USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 7396be0c75c..42babff46d5 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:40 jlam Exp $ DISTNAME= kmymoney2-0.5.1 PKGREVISION= 6 @@ -14,7 +14,7 @@ USE_BUILDLINK2= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --enable-mt diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 8dfcf60b19b..2e05d6d24af 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/09 04:17:28 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= xft-2.1.2 @@ -23,7 +23,6 @@ USE_X11= YES USE_GNU_TOOLS+= awk PKGCONFIG_OVERRIDE= ${WRKSRC}/xft.pc.in -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool MAKE_ENV+= EGREP="${EGREP}" BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2 diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 6824995096f..dc65dd95efd 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/12 20:52:55 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= fontconfig-2.2.1 @@ -22,7 +22,6 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/fontconfig.pc.in PKG_SYSCONFSUBDIR= fontconfig diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile index dc4d8717836..8fac2e780eb 100644 --- a/fonts/gucharmap/Makefile +++ b/fonts/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= gucharmap-1.2.0 @@ -21,7 +21,6 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/gucharmap.pc.in .include "../../devel/libgnomeui/buildlink2.mk" diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile index 5fceaf41148..9266ec20d12 100644 --- a/fonts/pfaedit/Makefile +++ b/fonts/pfaedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/22 08:38:29 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= pfaedit_full-${VERSION} @@ -16,7 +16,6 @@ VERSION= 040102 WRKSRC= ${WRKDIR}/pfaedit-${VERSION} USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_X11= YES diff --git a/games/asc/Makefile b/games/asc/Makefile index 2edf9bd6e82..2c0224a4ee0 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= asc-source-1.13.8.0 @@ -20,7 +20,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes # ../weaponguide.cpp:1205: virtual memory exhausted diff --git a/games/boson/Makefile b/games/boson/Makefile index b7dd4fa5f97..5517a5097ef 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= boson-all-0.8 @@ -22,7 +22,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-debug -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../audio/libvorbis/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 78de5a7e585..fc72cab3caf 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:40 jlam Exp $ DISTNAME= dopewars-1.5.9 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= Make a fortune dealing drugs on the streets of New York USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 3d4638b16b0..1fd12274ba1 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/12/24 09:53:49 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= freesci-0.3.4a @@ -12,7 +12,6 @@ COMMENT= Interpreter for Sierra On-Line's SCI games USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes post-install: diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 88bd7122cc0..4bb6bc4436c 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/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:40 jlam Exp $ # DISTNAME= gnocatan-0.8.0.0 @@ -14,7 +14,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 1a8e46ce936..88ce0a9123c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/01/24 13:30:56 grant Exp $ +# $NetBSD: Makefile,v 1.60 2004/02/14 17:21:40 jlam Exp $ DISTNAME= gnome-games-1.4.0.4 PKGREVISION= 9 @@ -26,7 +26,6 @@ USE_GNU_TOOLS+= make USE_X11BASE= YES USE_CONFIG_WRAPPER= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index b4b01ceb32c..9ac3f779d2a 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/11 08:06:32 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:40 jlam Exp $ DISTNAME= gnome-games-2.4.2 PKGREVISION= 1 @@ -21,7 +21,6 @@ USE_X11= yes USE_CONFIG_WRAPPER= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGINSTALL= yes INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 2cd50db4246..c1ac6408e87 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= gturing-0.1.1 @@ -19,7 +19,6 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../textproc/scrollkeeper/omf.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/games/sirius/Makefile b/games/sirius/Makefile index 9fbcfbe4825..1eef72c262c 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= sirius-0.7.0 @@ -20,8 +20,6 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/GConf2/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index f0a2a8a9887..88a18586788 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/17 21:39:45 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= xscorch-0.1.15 @@ -14,8 +14,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --without-gnome .include "../../audio/libmikmod/buildlink2.mk" diff --git a/games/zoom/Makefile b/games/zoom/Makefile index 86e3568fd66..7812d2a0dfe 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -17,7 +17,6 @@ COMMENT= Plays Infocom-compatible games, with graphics support USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_X11= yes USE_GNU_TOOLS+= make diff --git a/geography/gpspoint/Makefile b/geography/gpspoint/Makefile index 49e9de38ba1..b1de6b8c805 100644 --- a/geography/gpspoint/Makefile +++ b/geography/gpspoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/10/04 20:51:16 jschauma Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:40 jlam Exp $ DISTNAME= gpspoint-2.030521 CATEGORIES= geography @@ -13,7 +13,6 @@ DEPENDS+= dialog>=0.6:../../misc/dialog USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 82a4cfe3cf4..d9cd23921aa 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2004/02/13 23:43:19 abs Exp $ +# $NetBSD: Makefile,v 1.111 2004/02/14 17:21:40 jlam Exp $ .include "Makefile.common" @@ -19,7 +19,6 @@ USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_LANGUAGES= c c++ -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common index a61940b2ca6..80c6b8f2a21 100644 --- a/graphics/aalib/Makefile.common +++ b/graphics/aalib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2004/02/11 08:44:23 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.17 2004/02/14 17:21:40 jlam Exp $ DISTNAME= aalib-${DIST_VERS} CATEGORIES+= graphics @@ -16,7 +16,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/aalib/patches WRKSRC= ${WRKDIR}/aalib-1.4.0 GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-curses-driver=no diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 4eead22e002..a6d67311f23 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/26 12:43:21 grant Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= autotrace-0.31.1 @@ -14,7 +14,6 @@ USE_BUILDLINK2= YES USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/autotrace.pc.in diff --git a/graphics/avi-xmms/Makefile b/graphics/avi-xmms/Makefile index ab1222ee35b..d4583432ce4 100644 --- a/graphics/avi-xmms/Makefile +++ b/graphics/avi-xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/26 15:16:53 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= avi-xmms-1.2.2 @@ -15,9 +15,7 @@ COMMENT= Avifile and SDL based video plugin for XMMS GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../audio/xmms/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index c906bdc8ad4..c64ffd9b70b 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/24 15:46:43 grant Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= blender-2.31a @@ -17,7 +17,6 @@ HAS_CONFIGURE= YES USE_GNU_TOOLS+= make USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool LDFLAGS+= -lcrypto diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index a035c98fcbf..f0f722ef272 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:16:42 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= cairo-0.1.17 @@ -13,7 +13,6 @@ USE_X11= yes USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/cairo.pc.in GNU_CONFIGURE= yes diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common index c065cfb0461..f834d3a4b0d 100644 --- a/graphics/cal3d/Makefile.common +++ b/graphics/cal3d/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/02/11 01:32:06 garbled Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= cal3d-${CAL3D_VERSION} @@ -17,7 +17,6 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes AUTOMAKE_REQD= 1.8 #AUTOMAKE_OVERRIDE= NO -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/autoconf.mk" .include "../../mk/automake.mk" diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 25b4812a01f..728fe9b63fc 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:41 jlam Exp $ DISTNAME= dia-0.92.2 PKGREVISION= 5 @@ -16,7 +16,6 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/graphics/filmgimp/Makefile b/graphics/filmgimp/Makefile index 27342f5f607..3d89b384bfc 100644 --- a/graphics/filmgimp/Makefile +++ b/graphics/filmgimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:42 reed Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:41 jlam Exp $ DISTNAME= filmgimp-0.15 PKGREVISION= 3 @@ -12,7 +12,6 @@ COMMENT= Motion picture editing tool USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index dbe5115aa68..b9f2f6a7c7c 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/07 10:46:10 seb Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:41 jlam Exp $ # DISTNAME= freetype-2.1.5 @@ -20,13 +20,12 @@ COMMENT= Font rendering engine and library API PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES +USE_LIBTOOL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES CONFIGURE_DIRS= ${WRKSRC}/builds/unix CONFIGURE_ARGS+= --includedir=${PREFIX}/include -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/builds/unix/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/builds/unix/freetype2.in .include "../../mk/bsd.prefs.mk" diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 93244d6be6d..45dcfac6dfd 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2004/02/04 15:50:37 adam Exp $ +# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:41 jlam Exp $ # DISTNAME= gd-2.0.22 @@ -16,7 +16,6 @@ USE_LIBTOOL= YES USE_X11= YES GNU_CONFIGURE= YES REPLACE_PERL= bdftogd -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool LIBS+= -lpthread BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.4 diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index d2f74049e44..a8f87798bb6 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2004/01/24 15:46:43 grant Exp $ +# $NetBSD: Makefile.common,v 1.35 2004/02/14 17:21:41 jlam Exp $ # DISTNAME= gdk-pixbuf-${VER}.0 @@ -16,7 +16,6 @@ USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt" diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 0477b0755e4..94baf01ac1a 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:41 jlam Exp $ DISTNAME= gimageview-0.2.24 PKGREVISION= 10 @@ -18,8 +18,6 @@ GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --disable-xinetest CONFIGURE_ARGS+= --with-gtk2 diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile index 9e02f47061b..de6e1915c90 100644 --- a/graphics/gimp-base/Makefile +++ b/graphics/gimp-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/08 04:03:15 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:41 jlam Exp $ # DISTNAME= gimp-1.2.5 @@ -23,9 +23,7 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.prefs.mk" diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 901f58f4522..375c5c7a3ce 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/24 15:46:43 grant Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:41 jlam Exp $ # DISTNAME= giram-0.3.5 @@ -25,7 +25,7 @@ PKG_SYSCONFSUBDIR= giram CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/0.3 -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool OWN_DIRS+= ${PKG_SYSCONFDIR}/0.3 CONF_FILES+= ${PREFIX}/share/examples/giram/giramrc \ diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index a85855056d1..92ffc47582d 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= gle-3.1.0 @@ -15,9 +15,7 @@ COMMENT= GL subroutines for drawing tubing and extrusions USE_BUILDLINK3= YES USE_X11= YES GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 1231d12c605..cf2b762e179 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/11/12 01:31:49 salo Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= gphoto2-2.1.2 @@ -15,7 +15,6 @@ CONFLICTS= gphoto-[0-9]* USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 149b84e7bee..1769423752a 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/10/11 13:40:19 grant Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= graphviz-1.10 @@ -16,7 +16,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes USE_X11= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool XAW_TYPE= standard CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 22a53080e07..1ea9ae18939 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:43 reed Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= gtkam-0.1.10 @@ -13,7 +13,6 @@ COMMENT= Digital camera access graphical client (GTK2) USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 2407d8020f8..1bec36960e1 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/10 20:58:04 garbled Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= gtkglext-0.7.1 @@ -18,7 +18,6 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkglext.pc.in LIBS+= -lm diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile index ee8ab9032b3..9931ec5fa5e 100644 --- a/graphics/hermes/Makefile +++ b/graphics/hermes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:42 jlam Exp $ DISTNAME= Hermes-1.3.3 CATEGORIES= graphics @@ -12,8 +12,6 @@ COMMENT= Library for conversion of pixel graphics WRKSRC= ${WRKDIR}/Hermes-1.3.3 USE_BUILDLINK3= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_GNU_TOOLS+= make diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 661004ba13a..1c84998a347 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2004/01/24 15:46:43 grant Exp $ +# $NetBSD: Makefile,v 1.83 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= imlib-1.9.14 @@ -13,7 +13,6 @@ COMMENT= Image manipulation library for X11 USE_BUILDLINK3= yes USE_X11BASE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib.pc.in GNU_CONFIGURE= yes PLIST_SUBST+= LOCALBASE=${LOCALBASE} diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 69be2f6a17d..690f6618987 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/11 22:54:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= imlib2-1.1.0 @@ -15,7 +15,6 @@ USE_X11= YES USE_LIBTOOL= YES USE_BUILDLINK3= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib2.pc.in LIBS.SunOS= -lm diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index 7fed618e7ac..204afc4c8be 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/11 09:10:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= jasper-1.600.0 @@ -14,7 +14,6 @@ COMMENT= Software-based reference implementation of the JPEG-2000 codec GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl post-install: diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index cebeb28c7f1..9aa29c362e7 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= jpegsrc.v6b @@ -19,8 +19,6 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-static diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 5114ed5e308..8afe6812a00 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/09 12:03:27 seb Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:42 jlam Exp $ # FreeBSD: ports/graphics/lcms/Makefile,v 1.2 2000/12/19 15:36:26 sobomax Exp DISTNAME= lcms-1.12 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool TEST_TARGET= check CONFIGURE_ARGS+= --without-jpeg diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile index a8d0b864dfd..1760ea6b24f 100644 --- a/graphics/libart2/Makefile +++ b/graphics/libart2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/11 01:25:25 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:42 jlam Exp $ DISTNAME= libart_lgpl-2.3.16 PKGNAME= ${DISTNAME:S/_lgpl/2/} @@ -13,9 +13,7 @@ COMMENT= High-performance 2D graphics library GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_X11= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libart-2.0.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index a41dbcdaf2d..c908a0446b7 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:43 reed Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:42 jlam Exp $ DISTNAME= libexif-gtk-0.3.3 PKGREVISION= 7 @@ -14,7 +14,6 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libexif-gtk/libexif-gtk.pc.in .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile index 8c2edd0f93d..e9c46a6a270 100644 --- a/graphics/libexif/Makefile +++ b/graphics/libexif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/11 04:58:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ DISTNAME= libexif-0.5.12 PKGREVISION= 1 @@ -13,7 +13,6 @@ USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libexif/libexif.pc.in .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile index 8ce1dc2c499..1c020f65bfa 100644 --- a/graphics/libgdgeda/Makefile +++ b/graphics/libgdgeda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/14 04:43:48 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libgdgeda-2.0.15 @@ -18,7 +18,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_BUILDLINK3= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 4ce987efa14..b9c7f895f81 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:31:34 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libgdiplus-0.1 @@ -14,7 +14,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgdiplus.pc.in GNU_CONFIGURE= yes diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index 5fb06c09471..1cd66a7747b 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/20 12:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libggi-2.0.4.src @@ -17,9 +17,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_X11= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-debug diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile index 3797f7da6bb..7fe08a65643 100644 --- a/graphics/libggigcp/Makefile +++ b/graphics/libggigcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/20 12:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libggigcp-0.8.2.src @@ -17,7 +17,6 @@ USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= ggi diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile index ed1f9be4e60..c582eaf62d0 100644 --- a/graphics/libggiwmh/Makefile +++ b/graphics/libggiwmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/20 12:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libggiwmh-0.1.0.src @@ -17,7 +17,6 @@ USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= ggi diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile index 71ec148c257..3cebc0ddb59 100644 --- a/graphics/libgii/Makefile +++ b/graphics/libgii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libgii-0.8.4.src @@ -17,9 +17,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_X11= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-mutexes=int diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 77a910d01f3..6054eb635ce 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/13 12:16:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libgnomecanvas-2.4.0 @@ -18,9 +18,8 @@ USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomecanvas/libgnomecanvas-2.0.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/graphics/libpixman/Makefile b/graphics/libpixman/Makefile index c590b87eae6..e4c3b1ccb0c 100644 --- a/graphics/libpixman/Makefile +++ b/graphics/libpixman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:07:57 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $ # DISTNAME= libpixman-0.1.0 @@ -12,7 +12,6 @@ COMMENT= Pixel manipulation library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libpixman.pc.in GNU_CONFIGURE= yes diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common index e45315bc65f..1844930463d 100644 --- a/graphics/librsvg2/Makefile.common +++ b/graphics/librsvg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/02/11 06:22:08 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= librsvg-2.5.0 @@ -17,7 +17,6 @@ USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in CONFIGURE_ARGS+= --disable-gtk-doc diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile index b3db94852cd..96a6d86949c 100644 --- a/graphics/libvideogfx/Makefile +++ b/graphics/libvideogfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:41:39 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= libvideogfx-1.0.3 @@ -13,7 +13,6 @@ COMMENT= C++ library for low-level video processing USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES USE_X11= yes diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 59369dd2d3d..61b3a28fbd3 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/01/23 21:50:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= libwmf-0.2.8 @@ -14,7 +14,6 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --disable-gd CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/libwmf diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile index dbb6fb634a7..707307f5908 100644 --- a/graphics/mng/Makefile +++ b/graphics/mng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 00:59:26 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:43 jlam Exp $ DISTNAME= libmng-1.0.5 PKGNAME= ${DISTNAME:S/lib//} @@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_PREFIX.lcms} diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index 7cc5a5a7136..dafa8f8015d 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/09/18 17:51:45 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $ .include "../../graphics/ImageMagick/Makefile.common" @@ -15,8 +15,6 @@ FILESDIR= ${.CURDIR}/../../graphics/ImageMagick/files PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - USE_BUILDLINK2= YES USE_PERL5= run diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile index 7c995c37038..ff61e531583 100644 --- a/graphics/pixieplus/Makefile +++ b/graphics/pixieplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/24 15:46:44 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= pixieplus-0.5.4 @@ -17,8 +17,6 @@ USE_LIBTOOL= YES USE_X11= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../graphics/kdegraphics3/buildlink2.mk" .include "../../graphics/ImageMagick/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index 0853dc0bdb7..f5c664a0e9e 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/01/25 03:08:47 grant Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $ DISTNAME= plplot-5.2.1 CATEGORIES= graphics @@ -15,7 +15,6 @@ USE_FORTRAN= # defined USE_X11= # defined USE_PERL5= build USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ENV+= GDINCDIR=${BUILDLINK_PREFIX.gd}/include CONFIGURE_ENV+= GDLIBDIR=${BUILDLINK_PREFIX.gd}/lib diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 8ea334c01c4..6e48131d253 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/01/24 15:46:44 grant Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/02/14 17:21:43 jlam Exp $ CATEGORIES?= graphics MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \ @@ -24,7 +24,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ENV+= ac_cv_path_LATEX="no" .include "../../mk/bsd.prefs.mk" diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile index 9b3b54135eb..352fc8ba140 100644 --- a/graphics/smpeg-xmms/Makefile +++ b/graphics/smpeg-xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/24 15:46:44 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= smpeg-xmms-0.3.5 @@ -15,8 +15,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/smpeg/buildlink2.mk" .include "../../devel/glib/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" diff --git a/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common index 8c7e2dd96c0..e662c691b81 100644 --- a/graphics/swfdec/Makefile.common +++ b/graphics/swfdec/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/02/11 08:55:58 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= swfdec-0.2.1 @@ -18,7 +18,6 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/swfdec.pc.in pre-install: diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile index 4692185b338..007f00c7f21 100644 --- a/graphics/transcode/Makefile +++ b/graphics/transcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/28 14:39:37 recht Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:43 jlam Exp $ DISTNAME= transcode-0.6.11 PKGREVISION= 2 @@ -15,7 +15,7 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool .include "../../mk/bsd.prefs.mk" diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile index ee3b4d34311..8169733e2ad 100644 --- a/ham/hamlib/Makefile +++ b/ham/hamlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/24 13:40:43 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= hamlib-1.1.4 @@ -12,7 +12,6 @@ COMMENT= API for digital communications equipment USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE=${WRKSRC}/libtool CONFIGURE_ENV+= CPP="${CPP}" diff --git a/inputmethod/imhangul/Makefile b/inputmethod/imhangul/Makefile index d61bf3a8bbc..67d117f99aa 100644 --- a/inputmethod/imhangul/Makefile +++ b/inputmethod/imhangul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/10 08:58:17 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:43 jlam Exp $ DISTNAME= imhangul-0.9.9 CATEGORIES= inputmethod korean @@ -12,7 +12,6 @@ COMMENT= GTK+-2.0 Hangul Input Module USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GTK2_IMMODULES= YES .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile index 92f42c19224..41b8383c1ae 100644 --- a/inputmethod/libtabe/Makefile +++ b/inputmethod/libtabe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:18:53 agc Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= libtabe-0.2.5 @@ -13,7 +13,6 @@ WRKSRC= ${WRKDIR}/libtabe USE_BUILDLINK2= # defined USE_X11= # defined USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3 diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile index f9dc93fd9c5..4ae71f246b1 100644 --- a/inputmethod/xcin/Makefile +++ b/inputmethod/xcin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:18:53 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= xcin-2.5.3.pre2 @@ -16,7 +16,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_X11BASE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index 1d58cd3e312..4c7910d8f4e 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/09/12 10:01:12 itojun Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= chicken-1.17 @@ -12,6 +12,5 @@ COMMENT= Scheme to C compiler, handling R5RS GNU_CONFIGURE= yes USE_LIBTOOL= yes TEST_TARGET= test -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile index d10cc40c595..594fe4343d1 100644 --- a/lang/cilk/Makefile +++ b/lang/cilk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/24 13:51:13 grant Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:43 jlam Exp $ DISTNAME= cilk-5.3.1 PKGREVISION= 2 @@ -17,7 +17,6 @@ USE_BUILDLINK2= # defined USE_GNU_TOOLS+= make USE_PERL5= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PTHREAD_OPTS+= require INFO_FILES= cilk-faq.info diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile index eda6298e831..c762dce5bd8 100644 --- a/lang/classpath/Makefile +++ b/lang/classpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:44:07 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $ DISTNAME= classpath-0.05 CATEGORIES= devel @@ -13,6 +13,5 @@ DEPENDS+= jikes>=1.18:../../lang/jikes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-jikes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 5f084e763b4..1e37bed2efe 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/01/20 12:19:16 agc Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $ DISTNAME= clisp-2.30 CATEGORIES= lang @@ -19,13 +19,6 @@ CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ GNU_CONFIGURE= YES UNLIMIT_RESOURCES= stacksize USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/avcall/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/vacall_r/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/trampoline_r/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libcharset/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libtool ${WRKSRC}/sigsegv/libtool - USE_GNU_READLINE= YES post-patch: diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common index ee5e31feb1c..4f9668678ed 100644 --- a/lang/dylan-interpreter/Makefile.common +++ b/lang/dylan-interpreter/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2004/01/24 13:51:14 grant Exp $ +# $NetBSD: Makefile.common,v 1.13 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= gwydion-dylan-${DYLAN_VERSION} @@ -19,6 +19,7 @@ COMMENT= Functional language USE_BUILDLINK2= yes USE_GNU_TOOLS+= make +USE_LIBTOOL= yes MAKEFILE= GNUmakefile ALL_TARGET= default @@ -30,9 +31,6 @@ DYLAN_VERSION= 2.3.6 # other architecture changes will be gratefully received ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-powerpc -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 497a3027af5..4360059dc92 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2004/02/11 07:16:47 xtraeme Exp $ +# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:43 jlam Exp $ DISTNAME= guile-1.6.4 CATEGORIES= lang @@ -13,12 +13,7 @@ CONFLICTS= guile14<1.4.1nb1 USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/guile-readline/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libltdl/libtool - USE_GNU_READLINE= YES USE_MAKEINFO= YES diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile index 8d89a6ebd14..dbaac892e2a 100644 --- a/lang/guile14/Makefile +++ b/lang/guile14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:43 jlam Exp $ DISTNAME= guile-1.4.1 PKGNAME= guile14-1.4.1 @@ -14,12 +14,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make NO_MTREE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/guile-readline/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libltdl/libtool - USE_GNU_READLINE= YES INFO_FILES= guile.info diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 43d2abb93b7..b50f89629cc 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/12 21:50:07 kristerw Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $ DISTNAME= ksi-3.4.1 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Portable, embeddable Scheme implementation written in C USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_GNU_READLINE= # uses rl_event_hook() interface CPPFLAGS+= -Dunix diff --git a/lang/librep/Makefile b/lang/librep/Makefile index a70315fee3d..a78a49e848d 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/02/14 00:59:11 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:43 jlam Exp $ # DISTNAME= librep-${REP_VERS} @@ -19,7 +19,6 @@ USE_GNU_TOOLS+= make USE_GNU_READLINE= # uses rl_basic_quote_characters USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool REP_LIBTOOL= ${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/libtool GNU_CONFIGURE= yes diff --git a/lang/mono/Makefile b/lang/mono/Makefile index dd79b7fb8e9..e3a610e7338 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/03 12:30:11 recht Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= mono-0.30 @@ -23,15 +23,12 @@ NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-* USE_GNU_TOOLS+= make USE_BUILDLINK3= yes USE_PKGINSTALL= yes +USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gc=included CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libgc/libtool - PKGCONFIG_OVERRIDE= mint.pc.in PKGCONFIG_OVERRIDE= mono.pc.in PKG_SYSCONFSUBDIR= mono diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 09f64db39c3..2cdce6bdd57 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/24 13:51:15 grant Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:44 jlam Exp $ DISTNAME= smalltalk-2.1.4 CATEGORIES= lang @@ -13,9 +13,7 @@ ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-powerpc USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_GNU_READLINE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INFO_FILES= gst-base.info gst-libs.info gst.info diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 98aba8e9c44..6a61a7ee48d 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:45 reed Exp $ +# $NetBSD: Makefile,v 1.39 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= balsa-1.4.3 @@ -17,8 +17,6 @@ USE_LIBTOOL= yes USE_X11BASE= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_DIRS= ${WRKSRC} CONFIGURE_DIRS+= ${WRKSRC}/libmutt diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index c38d1fbdf46..b825cf61260 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/11 04:36:58 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= balsa-2.0.16 @@ -19,7 +19,6 @@ USE_PKGINSTALL= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index d96a9c31b4c..2ac047a8bf2 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/11 10:55:49 recht Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:44 jlam Exp $ DISTNAME= clamav-0.66 CATEGORIES= mail @@ -13,7 +13,6 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool # disable the configure check for user and group: CONFIGURE_ARGS+= --disable-clamav CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index f74e2096319..f00cb37c0e6 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/10 00:32:35 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $ DISTNAME= dovecot-0.99.10.4 CATEGORIES= mail @@ -17,8 +17,6 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-ssldir=${SSLCERTS} diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 84c90ba736d..a117339a5f7 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2004/02/11 04:02:48 xtraeme Exp $ +# $NetBSD: Makefile,v 1.53 2004/02/14 17:21:44 jlam Exp $ DISTNAME= evolution-1.4.5 PKGREVISION= 5 @@ -35,7 +35,6 @@ GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/libical/libtool USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES YACC= ${PREFIX}/bin/bison -y diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile index 35d1f5d1673..e2188b9d510 100644 --- a/mail/evolution12/Makefile +++ b/mail/evolution12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/24 13:55:30 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:44 jlam Exp $ DISTNAME= evolution-1.2.4 PKGREVISION= 6 @@ -34,7 +34,6 @@ GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/libical/libtool USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES YACC= ${PREFIX}/bin/bison -y diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index 432f32950cf..3d07654322c 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/11 02:54:41 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:44 jlam Exp $ DISTNAME= libesmtp-1.0.1 PKGREVISION= 1 @@ -17,8 +17,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --enable-all CONFIGURE_ARGS+= --disable-isoc diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile index 61d2d55a05c..692ff302b50 100644 --- a/mail/sylpheed-claws-ghostscript-viewer/Makefile +++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/29 07:42:23 cube Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= ghostscript-viewer-0.6 @@ -15,7 +15,6 @@ COMMENT= Plugin to make Sylpheed-claws display PostScript and PDF attachments USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins PLIST_SUBST+= PLUGIN_NAME=ghostscript_viewer diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index 454778a0610..994ea6dbf98 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/13 13:03:46 adam Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:44 jlam Exp $ # .include "Makefile.common" @@ -12,7 +12,6 @@ CONFLICTS= sylpheed-[0-9]* sylpheed-gtk2-[0-9]* BUILD_USES_MSGFMT= YES USE_PKGINSTALL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/sylpheed-claws.pc.in CONFIGURE_ARGS+= --enable-aspell diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk index 0fe13140ab5..4c1376fd01f 100644 --- a/mail/sylpheed-claws/plugins.mk +++ b/mail/sylpheed-claws/plugins.mk @@ -1,4 +1,4 @@ -# $NetBSD: plugins.mk,v 1.1 2004/01/01 21:39:02 cube Exp $ +# $NetBSD: plugins.mk,v 1.2 2004/02/14 17:21:44 jlam Exp $ # .include "../../mail/sylpheed-claws/Makefile.common" @@ -10,7 +10,7 @@ CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME} DEPENDS+= sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws -LIBTOOL_OVERRIDE= ${WRKDIR}/${DISTNAME}/libtool +LIBTOOL_OVERRIDE= ../../../libtool CONFIGURE_ARGS+= --disable-aspell CONFIGURE_ARGS+= --disable-nls diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile index 94adf7804d3..315028c51e8 100644 --- a/math/cassowary/Makefile +++ b/math/cassowary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/24 13:58:23 grant Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= cassowary-0.60 @@ -15,7 +15,6 @@ BUILD_DEPENDS+= bison>=1.34:../../devel/bison USE_BUILDLINK2= # defined USE_GNU_TOOLS+= make USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-fd-solver diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 2468ee59cb8..3c87a0eeb27 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 13:58:23 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $ .if (${MACHINE_ARCH} == "powerpc") DISTNAME= fftw-3.0.1-fma @@ -15,7 +15,6 @@ HOMEPAGE= http://www.fftw.org/ COMMENT= Collection of fast C routines to compute DFTs USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/fftw.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index c34d5ed30cd..7535395e529 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2004/01/24 13:58:23 grant Exp $ +# $NetBSD: Makefile,v 1.79 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= gnumeric-1.0.13 @@ -19,15 +19,13 @@ USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_PERL5= YES +USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-psiconv LIBS+= -lunicode -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/bonobo/buildlink2.mk" .include "../../devel/gal/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile index 68adae47b57..51c3534d6ff 100644 --- a/math/gnumeric0/Makefile +++ b/math/gnumeric0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/24 13:58:23 grant Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= gnumeric-0.75 @@ -17,15 +17,13 @@ USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_PERL5= YES +USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-guile # needs CVS-only guile-1.5 CONFIGURE_ARGS+= --without-python LIBS+= -lunicode -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - pre-configure: for i in ${WRKSRC}/plugins/*/Makefile.in ; do \ ${SED} <$$i >$$i.fixed \ diff --git a/math/gsl/Makefile b/math/gsl/Makefile index ce02ef27c95..23fae498d25 100644 --- a/math/gsl/Makefile +++ b/math/gsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/09/14 21:13:49 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:44 jlam Exp $ DISTNAME= gsl-1.4 PKGREVISION= 2 @@ -11,7 +11,6 @@ COMMENT= The GNU Scientific Library GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INFO_FILES= gsl-ref.info TEST_TARGET= check diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 698f89938d2..20829cf6b78 100644 --- a/math/guppi/Makefile +++ b/math/guppi/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:44 jlam Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -30,9 +30,7 @@ USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= LOCALBASE=${LOCALBASE} post-install: diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 8ed7b517899..e9bfc9deef6 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= ${SCIBASE}.src @@ -26,9 +26,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ USE_BUILDLINK2= yes USE_FORTRAN= yes USE_X11BASE= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-xaw3d diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3 index c5db9ba50ab..16420ed196c 100644 --- a/meta-pkgs/kde3/Makefile.kde3 +++ b/meta-pkgs/kde3/Makefile.kde3 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kde3,v 1.8 2004/02/06 00:28:09 xtraeme Exp $ +# $NetBSD: Makefile.kde3,v 1.9 2004/02/14 17:21:44 jlam Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE3-distributed packages (they all share common configure and build @@ -31,4 +31,4 @@ HOMEPAGE?= http://www.kde.org/ USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index 5809c2bc175..691261fea05 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/02/14 17:21:44 jlam Exp $ MASTER_SITES= http://www.xfce.org/archive/xfce-4.0.3.1/src/ \ http://linux.imp.mx/xfce4/xfce_4.0.3.1/src/ @@ -11,10 +11,7 @@ XFCE4_VERSION= 4.0.3 USE_BUILDLINK2= # defined USE_X11BASE= # defined USE_PKGLOCALEDIR= # defined - USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - GNU_CONFIGURE= # defined USE_GNU_TOOLS+= make diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile index 8935bdbebde..5a3c8c0ab78 100644 --- a/misc/blccc/Makefile +++ b/misc/blccc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:46 reed Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:44 jlam Exp $ # DISTNAME= blccc-1.99 @@ -13,8 +13,7 @@ COMMENT= Blinkenlights Chaos Control Center USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES - -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool EGDIR= ${PREFIX}/share/examples/blccc diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common index ca9463f5b1a..06f7cbde767 100644 --- a/misc/celestia/Makefile.common +++ b/misc/celestia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2004/01/24 14:11:09 grant Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= celestia-${CELESTIA_VERS} @@ -19,8 +19,6 @@ USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --includedir=${PREFIX}/include CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua} diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index 2f4ff9bd98f..2a354b6e9ac 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/24 08:42:29 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= dirdiff-1.6 @@ -11,7 +11,6 @@ COMMENT= Displays differences between directories USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../x11/tk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile index 8d050a8d541..88d410a62c1 100644 --- a/misc/gnome2-user-docs/Makefile +++ b/misc/gnome2-user-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/11 09:59:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= gnome2-user-docs-2.4.1 @@ -19,8 +19,6 @@ USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gok/Makefile b/misc/gok/Makefile index 1c01537f4c9..3a86837be31 100644 --- a/misc/gok/Makefile +++ b/misc/gok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= gok-0.8.4 @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --disable-gtk-doc -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/gok-1.0.pc.in GCONF2_SCHEMAS= gok.schemas diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index c300b889994..ef4882bd0dc 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/06 10:48:58 markd Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:45 jlam Exp $ DISTNAME= kdepim-${_KDE_VERSION} PKGREVISION= 1 @@ -8,7 +8,6 @@ COMMENT= Personal Information Management tools for the KDE desktop .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES -LIBTOOL_OVERRIDE+= ${WRKSRC}/libical/libtool REPLACE_PERL= kmail/kmail-3.1-update-new-mail-notification-settings.pl \ kmail/kmail-3.1-use-UOID-for-identities.pl \ diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index f3603faf8b8..121aa65603f 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/02/10 21:06:33 markd Exp $ +# $NetBSD: Makefile,v 1.38 2004/02/14 17:21:45 jlam Exp $ DISTNAME= koffice-1.3 PKGREVISION= 1 @@ -18,7 +18,6 @@ USE_BUILDLINK2= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCC_REQD+= 2.95.3 diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile index 134ccd75826..034ae6e8f89 100644 --- a/misc/libcdio/Makefile +++ b/misc/libcdio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/17 14:38:22 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= libcdio-0.65 @@ -12,7 +12,6 @@ COMMENT= CD-ROM access library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcdio.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/libiso9660.pc.in GNU_CONFIGURE= yes diff --git a/misc/proj/Makefile b/misc/proj/Makefile index 26aa620099d..ad6feb732b3 100644 --- a/misc/proj/Makefile +++ b/misc/proj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/24 14:11:10 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:45 jlam Exp $ DISTNAME= proj-4.4.7 CATEGORIES= misc @@ -13,7 +13,6 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool NAD27_FILES=FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla \ conus.lla hawaii.lla ntv1_can.dat prvi.lla stgeorge.lla \ diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index 9424359231b..bc08e2454b7 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/11 07:43:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= yelp-2.4.2 @@ -20,7 +20,6 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 44a7e90146f..327e7e61adf 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 12:59:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= avidemux-2.0.18 @@ -17,8 +17,6 @@ USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CFLAGS+= -DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\" LDFLAGS+= ${LIBOSSAUDIO} diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile index c2074ab6bcd..a1196963858 100644 --- a/multimedia/gst-plugins/Makefile +++ b/multimedia/gst-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= gst-plugins-0.6.4 @@ -18,7 +18,6 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/gst-libs/gst/gconf/gstreamer-gconf.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-libs.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-play.pc.in diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 701f9890335..72417a6f81d 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/11 08:16:09 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= gstreamer-0.6.4 @@ -22,7 +22,6 @@ USE_PERL5= build CONFIGURE_ARGS+= --disable-plugin-builddir -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/libs/ext/cothreads/cothreads.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-control.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer.pc.in diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 335e358cc33..131a85f70ac 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:18:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= gxine-0.3.3 @@ -13,7 +13,6 @@ COMMENT= Gtk-based media player USE_BUILDLINK2= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../devel/glib2/buildlink2.mk" diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index f6f193df34a..eb9f56eb047 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/08 13:11:27 markd Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= kmplayer-0.8.2 @@ -22,7 +22,7 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PERL5= build -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool SUBST_CLASSES+= desktop SUBST_MESSAGE.desktop= "Fixing application launcher." diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile index fc8e2565877..11c68f9cab1 100644 --- a/multimedia/libdvdcss/Makefile +++ b/multimedia/libdvdcss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/28 14:25:37 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ # # Unfortunately, some reading of the United States law (DMCA) means # that we are not able to provide pointers to the source or homepage @@ -26,7 +26,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile index e5c1d53d059..9edb6bc5468 100644 --- a/multimedia/libdvdplay/Makefile +++ b/multimedia/libdvdplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/28 14:30:24 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ DISTNAME= libdvdplay-1.0.1 PKGREVISION= 1 @@ -14,7 +14,5 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_BUILDLINK2= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../multimedia/libdvdread/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile index 3991ae0a1a3..ed3e49cf1f6 100644 --- a/multimedia/libdvdread/Makefile +++ b/multimedia/libdvdread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/11 08:59:40 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ DISTNAME= libdvdread-0.9.4 CATEGORIES= multimedia @@ -13,8 +13,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_BUILDLINK3= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - MESSAGE_SUBST+= PKGBASE=${PKGBASE} .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 097c6da9726..87821b0bba9 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/13 23:50:17 snj Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $ DISTNAME= mjpegtools-1.6.1.93 CATEGORIES= multimedia @@ -15,7 +15,7 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool PKGCONFIG_OVERRIDE= mjpegtools.pc.in GNU_CONFIGURE= yes diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile index 578f3b1e674..a003facf2db 100644 --- a/multimedia/mplex/Makefile +++ b/multimedia/mplex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/26 12:57:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ DISTNAME= mjpegtools-1.6.0 PKGNAME= mplex-1.6.0 @@ -15,7 +15,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_GCC_SHLIB= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool do-build: cd ${WRKSRC}/utils && ${GMAKE} diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index 3dc3dde6c20..f0a4e538bc0 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 00:24:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= nautilus-media-0.3.3.1 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= yes DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index e89d233483f..ba659bdad4f 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/03 05:27:03 reed Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ DISTNAME= ogle-0.9.2 PKGREVISION= 1 @@ -20,7 +20,6 @@ USE_BUILDLINK2= yes USE_X11= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile index 93e61c36960..5647212fd1b 100644 --- a/multimedia/ogle_gui/Makefile +++ b/multimedia/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/03 04:36:19 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ DISTNAME= ogle_gui-0.9.2 PKGREVISION= 2 @@ -13,15 +13,13 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_X11= yes USE_GNU_TOOLS+= make +USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --bindir=${PREFIX}/lib/ogle GCC_REQD+= 2.95.3 -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - LDFLAGS+= ${BUILDLINK_LDFLAGS.ogle} .include "../../devel/binutils/buildlink2.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 34597c262cc..282f2655713 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= xine-lib-1-rc0a @@ -19,8 +19,7 @@ GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool-nofpic +LIBTOOL_OVERRIDE= libtool libtool-nofpic PKGCONFIG_OVERRIDE= ${WRKSRC}/misc/libxine.pc.in USE_GNU_TOOLS+= make diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index 8bf084ab08c..087fd7d2c83 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:04:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= xine-ui-0.9.22 @@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= YES USE_BUILDLINK2= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES .include "../../converters/libiconv/buildlink2.mk" diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index 904c4bec951..5302d2df8cd 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/12/28 12:31:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $ # DISTNAME= GeoIP-1.3.1 @@ -14,8 +14,6 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes USE_PKGINSTALL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/GeoIP diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index e3e679894f4..1196da10ab3 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2004/02/14 15:29:15 jlam Exp $ +# $NetBSD: Makefile,v 1.102 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -19,11 +19,7 @@ DEPENDS+= gindent-[0-9]*:../../devel/gindent .endif USE_GNU_TOOLS+= make - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/popt/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libIDL/libtool GNU_CONFIGURE= YES CONFIGURE_ENV+= LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index aa8d95a3e59..6ea09155680 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/10 02:16:02 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= ORBit2-2.8.3 @@ -20,8 +20,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - PKGCONFIG_OVERRIDE= ${WRKSRC}/ORBit-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-CosNaming-2.0.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-imodule-2.0.pc.in diff --git a/net/bind9/Makefile b/net/bind9/Makefile index b9558db536f..9dbe585b207 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2003/12/28 10:30:07 tron Exp $ +# $NetBSD: Makefile,v 1.55 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= bind-${BIND_VERSION} @@ -21,8 +21,6 @@ BUILD_DEFS+= USE_INET6 USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/lib/bind/libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libtool=yes \ diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index 1749e9c6887..237b95738f9 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/11 04:47:34 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= bug-buddy-2.4.2 @@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../textproc/scrollkeeper/omf.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/dante/Makefile b/net/dante/Makefile index 611d2e2769b..161e104fc19 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/06 22:03:31 keihan Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= dante-1.1.14 @@ -15,7 +15,6 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-socks-conf=${PKG_SYSCONFDIR}/socks.conf CONFIGURE_ARGS+= --with-sockd-conf=${PKG_SYSCONFDIR}/sockd.conf diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 21537142426..5a2522973a4 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2004/01/03 18:49:47 reed Exp $ +# $NetBSD: Makefile,v 1.91 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= ethereal-0.10.0a @@ -23,7 +23,7 @@ USE_X11= YES USE_PERL5= build USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gtk2 diff --git a/net/gini/Makefile b/net/gini/Makefile index 18afb6111e6..4b8f7019fd4 100644 --- a/net/gini/Makefile +++ b/net/gini/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/24 14:50:05 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= gini-0.5.1 @@ -16,8 +16,6 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../audio/libvorbis/buildlink2.mk" .include "../../devel/glib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile index 8eb30371006..2e322b64e80 100644 --- a/net/gnapster/Makefile +++ b/net/gnapster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/24 14:50:05 grant Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:46 jlam Exp $ DISTNAME= gnapster-1.5.0 PKGREVISION= 7 @@ -15,9 +15,7 @@ USE_BUILDLINK2= YES USE_X11= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/gettext-lib/buildlink2.mk" .include "../../x11/gnome-core/buildlink2.mk" diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 2e828701347..1716a452ff6 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/07/30 13:49:47 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= gnet-2.0.4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.gnetlibrary.org/ COMMENT= Simple network library USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in GNU_CONFIGURE= YES USE_BUILDLINK2= YES diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile index 956417491dd..1bf5df8f103 100644 --- a/net/gnet1/Makefile +++ b/net/gnet1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/07/21 17:10:43 martti Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= gnet-1.1.8 @@ -14,7 +14,6 @@ COMMENT= Simple network library (older version) CONFLICTS= gnet<=1.1.8 USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in GNU_CONFIGURE= YES USE_BUILDLINK2= YES diff --git a/net/lftp/Makefile b/net/lftp/Makefile index db54f8171c4..e8ecbc142f5 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/23 21:38:27 cube Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= lftp-2.6.12 @@ -18,7 +18,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_GNU_READLINE= # uses GNU readline internal _rl_mark_modified_lines -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --with-ssl=${SSLBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile index 58499f05d38..bd1c0114abc 100644 --- a/net/libIDL/Makefile +++ b/net/libIDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/10 02:16:02 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= libIDL-0.8.3 @@ -14,7 +14,6 @@ USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= lex USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libIDL-2.0.pc.in INFO_FILES= libIDL2.info diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index 180605e439a..2dcd01c684d 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/11 03:06:30 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= libsoup-1.99.26 @@ -14,7 +14,6 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/soup-2.0.pc.in CONFIGURE_ARGS+= --disable-gtk-doc diff --git a/net/linc/Makefile b/net/linc/Makefile index f8c22aa7608..b2dcc4d5dba 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/12/14 19:41:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= linc-1.1.1 @@ -16,7 +16,6 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/linc.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 06067e74e2c..6f90b916bd6 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/12/30 05:29:45 christos Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:46 jlam Exp $ DISTNAME= net-snmp-5.0.9 PKGREVISION= 2 @@ -22,12 +22,11 @@ NET_SNMP_PERSISTENTDIR?= /var/net-snmp NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs USE_BUILDLINK2= yes +USE_LIBTOOL= yes + USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .if ${OPSYS} == "NetBSD" && empty(CFLAGS:U:M*-Dnetbsd1*) CFLAGS+= -Dnetbsd1 .endif diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index ef05686bf64..00c00a945ff 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/24 14:50:06 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:46 jlam Exp $ DISTNAME= netatalk-1.6.2 CATEGORIES= net print @@ -13,13 +13,11 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_PERL5= YES +USE_LIBTOOL= YES USE_PKGINSTALL= YES INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]* RCD_SCRIPTS= atalkd afpd papd timelord diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile index 8fcbfa44aa8..2593997ecc1 100644 --- a/net/ntop2/Makefile +++ b/net/ntop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/24 14:50:06 grant Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:46 jlam Exp $ DISTNAME= ntop-2.2 PKGNAME= ntop2-2.2 @@ -19,7 +19,6 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool # --enable-micro-ntop causes compile to fail CONFIGURE_ARGS+= --enable-automake171 diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index eb791065c65..6c38630b918 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:06 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= pyorbit-2.0.0 @@ -16,7 +16,6 @@ PY_PATCHPLIST= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/pyorbit-2.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/net/soup/Makefile b/net/soup/Makefile index bda032d7fae..5c917b9476e 100644 --- a/net/soup/Makefile +++ b/net/soup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:51 reed Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= soup-0.7.10 @@ -14,7 +14,6 @@ COMMENT= Callback-based mechanism for sending and servicing SOAP requests GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/soup.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/net/trickle/Makefile b/net/trickle/Makefile index cad828eb341..257b6dc00b1 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 10:30:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:46 jlam Exp $ # DISTNAME= trickle-1.06 @@ -15,8 +15,6 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/trickle diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 7cceab12a9e..be4e781f7a2 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2003/11/12 03:39:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.53 2004/02/14 17:21:47 jlam Exp $ DISTNAME= ucd-snmp-4.2.4 PKGREVISION= 2 @@ -18,13 +18,11 @@ BUILD_DEFS+= USE_INET6 USE_BUILDLINK2= # defined USE_PERL5= build +USE_LIBTOOL= yes USE_PKGINSTALL= yes .include "../../mk/bsd.prefs.mk" -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-defaults CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} |