Apply a big libtool patch to allow porters to use the libtool installed by

the libtoolX ports instead of the one included with each port.  Ports that
set USE_LIBTOOL_VER=X will now use the ports version of libtool instead of
the included version.  To restore previous behavior, use the new macro,
USE_INC_LIBTOOL_VER.  Both macros accept the same argument: a libtool version.

For example, to use the ports version of libtool-1.5, add the following to
your Makefile:

USE_LIBTOOL_VER=        15

To use the included version of libtool with extra hacks provided by
libtool-1.5, add the following to your Makefile:

USE_INC_LIBTOOL_VER=    15

With this change, ports that had to add additional libtool hacks to prevent
.la files from being installed or to fix certain threading issues can now
delete those hacks (after appropriate testing, of course).

PR:		63944
Based on work by:eik and marcus
Approved by:	ade (autotools maintainer)
Tested by:	kris on pointyhat
Bound to be hidden problems:	You bet

15 files changed, 15 insertions, 15 deletions

diff --git a/multimedia/gstreamer-player/Makefile b/multimedia/gstreamer-player/Makefile
index e355e3d17eb9..13b68fc1d22d 100644
--- a/multimedia/gstreamer-player/Makefile
+++ b/multimedia/gstreamer-player/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gnomehack \
 		gnomeprefix \
 		gnomedesktop \
 		gstreamerplugins
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNOME_DESKTOP_VERSION=2
 WANT_GNOME=	yes
 PLIST_SUB=	\
diff --git a/multimedia/libdivxdecore/Makefile b/multimedia/libdivxdecore/Makefile
index c0a7656da846..fe478d114827 100644
--- a/multimedia/libdivxdecore/Makefile
+++ b/multimedia/libdivxdecore/Makefile
@@ -16,7 +16,7 @@ COMMENT=	OpenDivX decoding engine from Project Mayo
 
 ONLY_FOR_ARCHS=	i386
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SIZE=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index f3acdbe84735..e47b70f7b00e 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-transform-name=''
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 4803dd7a57c0..d9ea6105ab01 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	fame
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A video encoding library
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .if defined(WITH_SSE)
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index d3ecf3dfb8c7..321e9e0b7eeb 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
 
 USE_GNOME=	lthack
 USE_XLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index e5ffd801c1c5..cf9dc81e0abc 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-firewire
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 133e1a6aa251..794cadfa056d 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_SDL=	sdl
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--with-glib-prefix=${LOCALBASE} \
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index a1e7aeaebc5a..a43fb1eff570 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2 gstreamerplugins
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile
index 1d32dd77f003..05fcf101818f 100644
--- a/multimedia/slideshow/Makefile
+++ b/multimedia/slideshow/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-pre.*//}
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_SDL=	image ttf
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index cfb875080f2d..547a62b683c6 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SDL=	sdl
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLBASE="${X11BASE}" \
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index bb1bc8276987..0812c15e2431 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 18ec089fea0a..ac5dbf7a253f 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index eac095868eee..6b3cf953a448 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A XMMS plugin to hide the player
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 2c329d7b8c64..db1f09923e38 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_SIZE=	yes
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index 51b69e175053..f6553dd3fdda 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"