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

8 files changed, 8 insertions, 8 deletions

diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 9663d752d6e..d693b846515 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index e4c31616671..d117ae44486 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
 USE_OPENSSL=	yes
 USE_AUTOCONF_VER=213
 USE_AUTOMAKE_VER=14
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index b2dd8d12793..4029603f486 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_SIZE=	yes
 
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 2a3b12c43d0..bb1e727021c 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	flathill@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index aab68ddff81..5e3c7b48028 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Lightweight Jabber client library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 6ff2653d118..53a61f92fc3 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-gaim-source=${X11BASE}/include/gaim
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 074d794d145..16cc24ea20c 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -18,6 +18,6 @@ COMMENT=	Open Source implementation of the Lotus Sametime protocol
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 9663d752d6e..d693b846515 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>