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

31 files changed, 31 insertions, 31 deletions

diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 15042dc8ef2c..1ac2e03efe5a 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free C OLE library
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 4bf292e5e5ae..f3f3272db763 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget glib20 lthack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 64e712efd548..ac8de59648ab 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	expat
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	XML 1.0 parser written in C
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 499f7110b8ff..b76bf67f4048 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GNOME=	glib20 gnomehack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" CPPFLAGS="-I${LOCALBASE}/include"
 PLIST_SUB=	DOCSDIR="share/doc/${DISTNAME}"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 1e4e7562d22b..64c3f01f572d 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index 1e4e7562d22b..64c3f01f572d 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 8d8d3bc292c0..5ac4fe4bcafc 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iiimf-gtk
 PORTVERSION=	${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/docs/im-sdk/
 DISTNAME=	im-sdk
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index d45292634590..10e22e8aed18 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A KDE3 graphical frontend for diff
 
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 46163d3faa45..c95fac3eb2ab 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -18,7 +18,7 @@ USE_BISON=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 490b037a1110..6a2b27836bd1 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -16,7 +16,7 @@ COMMENT=	CSS2 parsing library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gtk20 libxml2
 
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index fb9760f523a8..b3c52636054f 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
 USE_GMAKE=		yes
 USE_GNOME=		gnomehack gnometarget libxml2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
 
 .if defined(WITH_COMP)
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index e8306493c227..a784b124aad9 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
 
 USE_GNOME=	gnomehack gnometarget lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 0fcb24243137..173c8dfd465d 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 2a1bca7ce89c..713becb9d6f0 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A lightweight fully POSIX compliant regexp matching library
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig lthack
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index cecb94c48d17..d29485feff7b 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	reed@pugetsoundtechnology.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index cecb94c48d17..d29485feff7b 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	reed@pugetsoundtechnology.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 3ea46d078691..7ec61752345e 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
 USE_GNOME=	gnomehack lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 3ea46d078691..7ec61752345e 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
 USE_GNOME=	gnomehack lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 4c9f855803cd..166a9674792a 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Xml parser library for GNOME
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 2faca4f0f464..d7a27535b88e 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index fe94da55282e..70932d6b1b35 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -18,7 +18,7 @@ COMMENT?=	The XSLT C library for GNOME
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME?=	gnomehack lthack gnometarget libxml2
 USE_REINPLACE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 806868451800..e6216b315c3f 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--without-unac
 INSTALLS_SHLIB=	yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index 36459a6708f6..778862e280b4 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-libxml2=yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index c1e0da086abb..fbcf3af24607 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	YES
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index a445d37af507..776ef7ea9e3f 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index a445d37af507..776ef7ea9e3f 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 9b86e93cee85..98520cba0239 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -35,7 +35,7 @@ DOCBOOK_VERSION=	4.1.2
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index dccc5375c264..b863d76e96b7 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -25,7 +25,7 @@ WANT_GNOME=	yes
 USE_GNOME=	lthack gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index dc480ef77df7..0d14c73b0b31 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-exporter --with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 88bb7d06b617..fd28e4d9a80d 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lcole"
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index a3b5aba14c80..e67482df40bd 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XML Parser and Validator
 USE_REINPLACE=	yes
 FETCH_CMD=	/usr/bin/fetch
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \