When linking a library libA with a library libB using libtool, if libB.la

exists, libtool will add all libraries libB.la refers to (dependency_libs
field) to the linker command line and store them in the dependency_libs
field of libA.la.  So everything that subsequently links with libA will also
link to these extra libraries.  This causes too much overlinking.

This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs
field in .la libraries during staging.  However, because .la libraries have
very limited use when dependency_libs is empty it makes sense to completely
remove them during staging.

So with this commit USES=libtool is modified to remove .la libraries and a
new form (USES=libtool:keepla) is introduced in case they need to be kept
(dependency_libs is still emptied).

PORTREVISION is bumped on all ports with USES=libtool that install .la
libraries.  Most ports are also changed to add :keepla because .la
libraries have to be kept around as long as there are dependent ports with
.la libraries that refer to them in their dependency_libs field.  In most
cases :keepla can be removed again as soon as all dependent ports that
install .la libraries have some form of USES=libtool added to their
Makefile.

PR:		ports/188759
Exp-run:	bdrewery
Approved by:	portmgr (bdrewery)

34 files changed, 43 insertions, 38 deletions

diff --git a/audio/gstreamer1-plugins-a52dec/Makefile b/audio/gstreamer1-plugins-a52dec/Makefile
index a01e0f3298e6..627aa1b549ff 100644
--- a/audio/gstreamer1-plugins-a52dec/Makefile
+++ b/audio/gstreamer1-plugins-a52dec/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
diff --git a/audio/gstreamer1-plugins-amrnb/Makefile b/audio/gstreamer1-plugins-amrnb/Makefile
index 299d979c00b0..e4affcd3916a 100644
--- a/audio/gstreamer1-plugins-amrnb/Makefile
+++ b/audio/gstreamer1-plugins-amrnb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin
diff --git a/audio/gstreamer1-plugins-amrwbdec/Makefile b/audio/gstreamer1-plugins-amrwbdec/Makefile
index 16ca74769856..0306bafd62b7 100644
--- a/audio/gstreamer1-plugins-amrwbdec/Makefile
+++ b/audio/gstreamer1-plugins-amrwbdec/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	1-plugins-amrwbdec
 
diff --git a/audio/gstreamer1-plugins-cdparanoia/Makefile b/audio/gstreamer1-plugins-cdparanoia/Makefile
index b6db5390dfc8..39955348eda7 100644
--- a/audio/gstreamer1-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer1-plugins-cdparanoia/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/gstreamer1-plugins-faac/Makefile b/audio/gstreamer1-plugins-faac/Makefile
index 02fb5733f92d..1951541b7552 100644
--- a/audio/gstreamer1-plugins-faac/Makefile
+++ b/audio/gstreamer1-plugins-faac/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
diff --git a/audio/gstreamer1-plugins-faad/Makefile b/audio/gstreamer1-plugins-faad/Makefile
index 8bc4a9be70a9..5342fcd19c95 100644
--- a/audio/gstreamer1-plugins-faad/Makefile
+++ b/audio/gstreamer1-plugins-faad/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
diff --git a/audio/gstreamer1-plugins-flac/Makefile b/audio/gstreamer1-plugins-flac/Makefile
index 32c266fdd22a..2cf089220a98 100644
--- a/audio/gstreamer1-plugins-flac/Makefile
+++ b/audio/gstreamer1-plugins-flac/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-flite/Makefile b/audio/gstreamer1-plugins-flite/Makefile
index 9668cf960a40..10fbbd152823 100644
--- a/audio/gstreamer1-plugins-flite/Makefile
+++ b/audio/gstreamer1-plugins-flite/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer flite run-time speech synthesis engine plugin
diff --git a/audio/gstreamer1-plugins-gme/Makefile b/audio/gstreamer1-plugins-gme/Makefile
index 538deb08fdae..0d923e5015ad 100644
--- a/audio/gstreamer1-plugins-gme/Makefile
+++ b/audio/gstreamer1-plugins-gme/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gme plugin
diff --git a/audio/gstreamer1-plugins-gsm/Makefile b/audio/gstreamer1-plugins-gsm/Makefile
index bd12b0e89580..a25366bb139d 100644
--- a/audio/gstreamer1-plugins-gsm/Makefile
+++ b/audio/gstreamer1-plugins-gsm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gsm encoding/decoding plugin
diff --git a/audio/gstreamer1-plugins-jack/Makefile b/audio/gstreamer1-plugins-jack/Makefile
index f83f8ca4b91b..c5cd3594858e 100644
--- a/audio/gstreamer1-plugins-jack/Makefile
+++ b/audio/gstreamer1-plugins-jack/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer low-latency audio server plugin
diff --git a/audio/gstreamer1-plugins-lame/Makefile b/audio/gstreamer1-plugins-lame/Makefile
index 2acfcc012a94..689c067b5094 100644
--- a/audio/gstreamer1-plugins-lame/Makefile
+++ b/audio/gstreamer1-plugins-lame/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 encode plugin
diff --git a/audio/gstreamer1-plugins-mad/Makefile b/audio/gstreamer1-plugins-mad/Makefile
index b1d6ec73fa9b..71bb2fa45010 100644
--- a/audio/gstreamer1-plugins-mad/Makefile
+++ b/audio/gstreamer1-plugins-mad/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 decoder plugin
diff --git a/audio/gstreamer1-plugins-modplug/Makefile b/audio/gstreamer1-plugins-modplug/Makefile
index 77e06c33ab9a..d901a1091b53 100644
--- a/audio/gstreamer1-plugins-modplug/Makefile
+++ b/audio/gstreamer1-plugins-modplug/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer modplug plugin
diff --git a/audio/gstreamer1-plugins-ogg/Makefile b/audio/gstreamer1-plugins-ogg/Makefile
index d072013cc22b..2a4b912ae688 100644
--- a/audio/gstreamer1-plugins-ogg/Makefile
+++ b/audio/gstreamer1-plugins-ogg/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Ogg bitstream plugin
diff --git a/audio/gstreamer1-plugins-opus/Makefile b/audio/gstreamer1-plugins-opus/Makefile
index f8080177e474..a08d9426effc 100644
--- a/audio/gstreamer1-plugins-opus/Makefile
+++ b/audio/gstreamer1-plugins-opus/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Opus audio encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-shout2/Makefile b/audio/gstreamer1-plugins-shout2/Makefile
index bbd80d4c11e3..48a04b3d9bd1 100644
--- a/audio/gstreamer1-plugins-shout2/Makefile
+++ b/audio/gstreamer1-plugins-shout2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
diff --git a/audio/gstreamer1-plugins-sidplay/Makefile b/audio/gstreamer1-plugins-sidplay/Makefile
index 34ceef01da44..20c4ce11f107 100644
--- a/audio/gstreamer1-plugins-sidplay/Makefile
+++ b/audio/gstreamer1-plugins-sidplay/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Commodore SID decoder plugin
diff --git a/audio/gstreamer1-plugins-soundtouch/Makefile b/audio/gstreamer1-plugins-soundtouch/Makefile
index e47e9b95084a..f9b0d047dc87 100644
--- a/audio/gstreamer1-plugins-soundtouch/Makefile
+++ b/audio/gstreamer1-plugins-soundtouch/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	GStreamer soundtouch plugin
diff --git a/audio/gstreamer1-plugins-speex/Makefile b/audio/gstreamer1-plugins-speex/Makefile
index 3645d07e676d..6d1b7d98b89d 100644
--- a/audio/gstreamer1-plugins-speex/Makefile
+++ b/audio/gstreamer1-plugins-speex/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer speex voice plugin
diff --git a/audio/gstreamer1-plugins-taglib/Makefile b/audio/gstreamer1-plugins-taglib/Makefile
index affe2063feea..890e674540f4 100644
--- a/audio/gstreamer1-plugins-taglib/Makefile
+++ b/audio/gstreamer1-plugins-taglib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer taglib plugin
diff --git a/audio/gstreamer1-plugins-twolame/Makefile b/audio/gstreamer1-plugins-twolame/Makefile
index 7703d2435d69..ade9a987e4b3 100644
--- a/audio/gstreamer1-plugins-twolame/Makefile
+++ b/audio/gstreamer1-plugins-twolame/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer High-quality free MP2 encoder plugin
diff --git a/audio/gstreamer1-plugins-vorbis/Makefile b/audio/gstreamer1-plugins-vorbis/Makefile
index d247bf880775..15be70724e9f 100644
--- a/audio/gstreamer1-plugins-vorbis/Makefile
+++ b/audio/gstreamer1-plugins-vorbis/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-wavpack/Makefile b/audio/gstreamer1-plugins-wavpack/Makefile
index 34b2fe9212e6..7c9535ed22ea 100644
--- a/audio/gstreamer1-plugins-wavpack/Makefile
+++ b/audio/gstreamer1-plugins-wavpack/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer wavpack plugin
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index bd4b8e121ec4..4a2d2f164a9e 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	id3lib
 PORTVERSION=	3.8.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -11,7 +11,7 @@ MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
 GNU_CONFIGURE=	yes
-USES=		iconv libtool
+USES=		iconv libtool:keepla
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index ed9e534c315b..367058441e91 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcddb
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 2759dc2b4070..91c75f7b3bca 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmad
 PORTVERSION=	0.15.1b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION}
 
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 5a0b6ac0209a..43e179b31f16 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmikmod
 PORTVERSION=	3.3.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/mikmod/libmikmod/${PORTVERSION}/
 
@@ -11,7 +12,7 @@ COMMENT=	MikMod Sound Library
 
 LICENSE=	LGPL21
 
-USES=		gmake libtool pkgconfig
+USES=		gmake libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-esd
 USE_LDCONFIG=	yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 0cc0b3a1dc8e..9592060ad4b9 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libsamplerate
 PORTVERSION=	0.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/SRC/
 
@@ -12,7 +12,7 @@ COMMENT=	Secret Rabbit Code: a Sample Rate Converter for audio
 
 LICENSE=	GPLv2
 
-USES=	pathfix pkgconfig libtool:oldver
+USES=		libtool:oldver pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index 51a7500e980f..3a2d376a4514 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libtremor
 PORTVERSION=	1.2.0.s20040213
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://members.chello.nl/~g.mast/distfiles/
 DISTNAME=	tremor_snapshot_${SNAP_DATE}
@@ -13,7 +14,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USES=		libtool
+USES=		libtool:keepla
 USE_AUTOTOOLS=	aclocal automake autoconf libtoolize
 AUTOMAKE_ARGS=	-a -c
 LIBTOOLIZE_ARGS=-i -c
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 2e864596522f..3518ea23651b 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpg123
 PORTVERSION=	1.19.0
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF \
 		http://www.mpg123.de/download/
@@ -12,7 +13,7 @@ COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files
 
 LICENSE=	LGPL21
 
-USES=		libtool gmake pathfix
+USES=		gmake libtool:keepla pathfix
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index e7627af4c442..082409de7c8f 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	pd
 DISTVERSION=	0.45-4
 DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://msp.ucsd.edu/Software/
 
@@ -20,7 +21,7 @@ OPTIONS_DEFAULT=FFTW
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
 
-USES=		gettext gmake libtool pkgconfig shebangfix tk:wrapper
+USES=		gettext gmake libtool:keepla pkgconfig shebangfix tk:wrapper
 SHEBANG_FILES=	tcl/pkg_mkIndex.tcl
 SHEBANG_LANG=	tclsh
 tclsh_OLD_CMD=	/usr/bin/tclsh
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 2e42d4d94981..aecf7e16db9c 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.12.8
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,7 +24,8 @@ LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
 
 CONFLICTS=	rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:bzip2 libtool desktop-file-utils
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 USE_GNOME=	intlhack gnomeprefix gtk20 nautilus2
 WANT_GNOME=	yes
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index deeabe59ccd2..5efdef4ee21b 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	speex
 DISTVERSION=	1.2rc1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
@@ -13,7 +13,7 @@ COMMENT=	Open-source patent-free voice codec
 
 LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}