Use libtool port instead of included version to avoid objformat a.out botch

25 files changed, 26 insertions, 2 deletions

diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 12e7207ab6c0..ccf7ffd777dd 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.cmis.csiro.au/maaate/packages/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MPEG audio analysis toolkit
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
 USE_LDCONFIG=	yes
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 62d6ba709fb0..08857dcbe43c 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	lib${PKGNAMEPREFIX}${PORTNAME}.so
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 82c88d3d8cf3..d7e6a1f8d8a9 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -23,6 +23,7 @@ COMMENT=	A modplug-based plugin for beep-media-player
 LIB_DEPENDS?=	beep.2:${PORTSDIR}/multimedia/beep-media-player
 LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index c7c6d32740a6..e7c504c25159 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A sound library for enlightenment package
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gnomehack
 USE_LDCONFIG=	yes
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 3ab5e47b99c3..e0328f1ec0ec 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Free lossless audio codec
 
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
+USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 6930fc03e4f1..4d8fd995d79b 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://finarfinek.republika.pl/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A guitar effects processor for GTK
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index ecc566e56e53..b58135d681e1 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
+USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 9c4ae6903302..5e12a3a5748b 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	lame
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	ISO code based fast MP3 encoder kit
 
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 61968663f066..ee6a95dd0184 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	a52dec-${PORTVERSION:S/.b/b/}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A free library for decoding ATSC A/52 streams, aka AC-3
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-oss --enable-shared
diff --git a/audio/libdssialsacompat/Makefile b/audio/libdssialsacompat/Makefile
index b4c4b7eb3c11..e78957f8cb5d 100644
--- a/audio/libdssialsacompat/Makefile
+++ b/audio/libdssialsacompat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://home.jps.net/~musound/
 MAINTAINER=	mahonmesr@googlemail.com
 COMMENT=	Alsa compatibility library to build DSSI
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 981d09a3aa44..63c3953e0630 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -18,6 +18,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	david@trucs.org
 COMMENT=	MikMod Sound Library
 
+USE_AUTOTOOLS=	libtool:15
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 8f9e369f314f..857eeae36f4f 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://download.qballcow.nl/programs/gmpc-0.13/
 MAINTAINER=	redchrom@gmail.com
 COMMENT=	Abstraction around libmpdclient
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index 6461dec6c813..6050cd0080ff 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -16,6 +16,7 @@ COMMENT=	C library, API for communicating with Creative and Dell audio players
 
 LIB_DEPENDS=	usb:${PORTSDIR}/devel/libusb
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index f8a6f48d5251..5903667ae4d7 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index 6b88f5ad00bb..febd999e6463 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -15,6 +15,7 @@ COMMENT=	Routines for connecting and transmitting data to the icecast server
 
 CONFLICTS=	libshout2-*
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 07061509e86b..f252652fb2fb 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Audio compression codec library
 
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index a2d5157568db..982a9202042e 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Digit@lway MPIO MP3 player tool
 
 LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb
 
+USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
diff --git a/audio/polypaudio/Makefile b/audio/polypaudio/Makefile
index e6d4c4a4ddc3..250234c27dac 100644
--- a/audio/polypaudio/Makefile
+++ b/audio/polypaudio/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnometarget gnomehack glib20
 WANT_GNOME=	yes
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index 9fcef8b5440e..9bc4222cdf21 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR=	ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 5103c6ecbb01..030ff15dda6e 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A program to inferface with the Rio600, Rio800 and psa[play devices
 
 LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb
 
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 4e132553bef2..5e99ec7a90c5 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 CONFLICTS=	speex-devel-[0-9]*
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index dc67fc7be4e1..85a8e96b2fdd 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
 MAINTAINER=	laszlof@FreeBSD.org
 COMMENT=	Library for manipulating ID3 tags and Ogg comments
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/audio/taglib/pkg-plist b/audio/taglib/pkg-plist
index 7e242bbdb975..ff18d72db724 100644
--- a/audio/taglib/pkg-plist
+++ b/audio/taglib/pkg-plist
@@ -46,9 +46,11 @@ include/taglib/vorbisfile.h
 include/taglib/vorbisproperties.h
 include/taglib/xingheader.h
 include/taglib/xiphcomment.h
+lib/libtag.a
 lib/libtag.la
 lib/libtag.so
 lib/libtag.so.5
+lib/libtag_c.a
 lib/libtag_c.la
 lib/libtag_c.so
 lib/libtag_c.so.0
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 45afaa1cacd7..37faf8ebb8d8 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.zorg.org/vsound/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility for capturing audio streams from programs with OSS output
 
+USE_AUTOTOOLS=	libtool:15
 BUILD_DEPENDS=	sox:${PORTSDIR}/audio/sox
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
diff --git a/audio/vsound/pkg-plist b/audio/vsound/pkg-plist
index 2a26e8d3c89d..7d45c4ac3c8e 100644
--- a/audio/vsound/pkg-plist
+++ b/audio/vsound/pkg-plist
@@ -1,4 +1,5 @@
 bin/vsound
+lib/vsound/libvsound.a
 lib/vsound/libvsound.la
 lib/vsound/libvsound.so
 @dirrm lib/vsound