From ec993afa1a03c673838b24572cfaae5ebd9fb235 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 14 Feb 2004 17:21:32 +0000 Subject: 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. --- audio/SDL-arts/Makefile | 4 ++-- audio/SDL-esound/Makefile | 4 ++-- audio/SDL-nas/Makefile | 4 ++-- audio/SDL_mixer/Makefile | 4 +--- audio/SDL_sound/Makefile | 4 +--- audio/arts/Makefile | 3 +-- audio/easytag/Makefile | 3 +-- audio/esound/Makefile | 3 +-- audio/faad2/Makefile | 3 +-- audio/flac/Makefile | 6 ++---- audio/gnome-speech/Makefile | 3 +-- audio/gnome2-media/Makefile | 3 +-- audio/icecast/Makefile | 4 +--- audio/id3lib/Makefile | 3 +-- audio/lame/Makefile | 4 +--- audio/liba52/Makefile | 3 +-- audio/libao/Makefile.common | 4 +--- audio/libaudiofile/Makefile | 3 +-- audio/libcdaudio/Makefile | 3 +-- audio/libcddb/Makefile | 3 +-- audio/libid3tag/Makefile | 3 +-- audio/libmad/Makefile | 3 +-- audio/libmikmod/Makefile | 3 +-- audio/libogg/Makefile | 3 +-- audio/libsamplerate/Makefile | 8 +++----- audio/libshout/Makefile | 3 +-- audio/libsidplay/Makefile | 8 +++----- audio/libvorbis/Makefile | 3 +-- audio/mserv-devel/Makefile | 3 +-- audio/mserv/Makefile | 3 +-- audio/musicbrainz/Makefile | 3 +-- audio/normalize/Makefile | 3 +-- audio/rhythmbox/Makefile | 3 +-- audio/speex/Makefile | 3 +-- audio/streamtuner-live365/Makefile | 4 ++-- audio/streamtuner-local/Makefile | 4 ++-- audio/streamtuner/Makefile | 3 +-- audio/sweep/Makefile | 8 +++----- audio/taglib/Makefile | 3 +-- audio/tremor-tools/Makefile | 3 +-- audio/tremor/Makefile | 3 +-- audio/vorbis-tools/Makefile | 3 +-- audio/xmms-alarm/Makefile | 4 ++-- audio/xmms-arts/Makefile | 5 ++--- audio/xmms-blursk/Makefile | 4 +--- audio/xmms-bump-scope/Makefile | 3 +-- audio/xmms-flac/Makefile | 5 ++--- audio/xmms-infinity/Makefile | 3 +-- audio/xmms-iris/Makefile | 3 +-- audio/xmms-jess/Makefile | 3 +-- audio/xmms-liveice/Makefile | 4 +--- audio/xmms-madspin/Makefile | 3 +-- audio/xmms-nebulus/Makefile | 3 +-- audio/xmms-tv-scope/Makefile | 3 +-- audio/xmms/Makefile.common | 5 ++--- 55 files changed, 71 insertions(+), 131 deletions(-) (limited to 'audio') 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 -- cgit v1.2.3