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

83 files changed, 83 insertions, 83 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 5257b0313910..f81f39bc26cf 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib12 gnometarget
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure popt/configure libIDL/configure
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index ef4bb693956b..9bad7e466670 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack libidl
 CONFIGURE_ARGS=	--disable-indent \
 		--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index f195f43c5a36..c5546b018ea9 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -16,6 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstract Large File
 
 USE_PYTHON=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/devel/arm-aout-binutils/Makefile b/devel/arm-aout-binutils/Makefile
index 9837008fae8f..a3636f6e9d8b 100644
--- a/devel/arm-aout-binutils/Makefile
+++ b/devel/arm-aout-binutils/Makefile
@@ -20,7 +20,7 @@ COMMENT=	FSF Binutils for embedded ARM cross-development
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=arm-aout
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
 		gas/configure gprof/configure intl/configure ld/configure \
 		libiberty/configure opcodes/configure
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index ac7597efe902..14e040181fdd 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -19,7 +19,7 @@ COMMENT=	GNU binutils for vanilla ARM cross-development
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--target=${PKGNAMEPREFIX:S/-$//}
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index 330e38b865c2..52b569532775 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
 CONFIGURE_ARGS+=	--with-cpu="${DEFAULT_CPU}"
 .endif
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure etc/configure gcc/configure libiberty/configure \
 		libobjc/configure texinfo/configure \
 		texinfo/testsuite/configure
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index 7273ae960350..60e7cee22c3e 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A C++ reference implementation of the Atlas protocol
 
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 7273ae960350..60e7cee22c3e 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A C++ reference implementation of the Atlas protocol
 
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 1777d797d2d6..d94997ddcd23 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--target=avr
 .if (${MACHINE_ARCH} == "amd64")
 MACHINE_ARCH=	x86_64
 .endif
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
 		gas/configure gprof/configure intl/configure ld/configure \
 		libiberty/configure opcodes/configure
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index a0f1e2b638b7..d2bcebbedf73 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	gc${PORTVERSION:S/.a/alpha/}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Garbage collection and memory leak detection for C and C++
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	lthack
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index e9cd16e2fa07..4d49dac7448f 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo gconf
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index b1091959f734..646436472a3d 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -30,7 +30,7 @@ USE_PERL5_BUILD=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-clanJavaScript --disable-docs
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index d9a5af7cb99c..9288152af72d 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A static source code checker for C++
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index b3ba12fc6a2f..973f3eae850f 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_SDL=	sdl
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index b92603340b35..248cb4c74839 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 INFO=		g-wrap
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index e570c9d8423a..20c04be60e90 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index bff662dd02c7..ab6ef47179fa 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack lthack gnomehier orbit2 gtk20 libxml2 linc
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 129a4881bdd6..0aefa6fb9266 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gconf2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 03ffdf596f7c..6b5e38f314fc 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An SDL game engine library
 
 USE_SDL=	image sdl
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+=	--program-prefix=""
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 46b3441d7426..3d304ef18dca 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (previous stable version)
 
 USE_GNOME=	pkgconfig
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 172067ad5003..50fa918cb507 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -24,7 +24,7 @@ LATEST_LINK=	glib20
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack gnometarget pkgconfig
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 23e7a821319d..cf66ac8d84ac 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GCC=	3.3
 USE_GNOME=	gnomehack gnometarget lthack glib20
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 1b55d60e0694..3aef23699071 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 3d47a7d7fbe0..05351570483a 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GCC=	3.3
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gnomevfs2
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 1b55d60e0694..3aef23699071 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 4098e15e030e..e5ae841e079d 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_SDL=	image sdl
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/devel/leoarg/Makefile b/devel/leoarg/Makefile
index 5070747a47f1..d5816993b7bd 100644
--- a/devel/leoarg/Makefile
+++ b/devel/leoarg/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A class for parsing command lines
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 MAN3=	LeoArg.3 LeoArg__InvalidOption.3 LeoArg__InvalidSetting.3 \
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index d25428a68cf1..67740764d414 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 867a80de1db8..8baaea692154 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	libPropList-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Property library for gnome and Window Maker
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF_VER=	213
 
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index d4b3621cb20d..a8b4e3b69421 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index cd7ea21ad706..89bf58d63c51 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 
 USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
-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/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 30a2c068b74a..e857dd754bd8 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack libbonobo
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index dceefaa6d20c..612d086705db 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://unixcode.org/downloads/libcapsinetwork/
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Network library aimed at easy development of C++ server daemons
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index 68032f3d4758..1621ea59a6d9 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sources.redhat.com/pub/libffi/
 MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 COMMENT=	Foreign Function Interface
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	# empty
 
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 68032f3d4758..1621ea59a6d9 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sources.redhat.com/pub/libffi/
 MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 COMMENT=	Foreign Function Interface
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	# empty
 
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index 91e93ecc46e0..620a7e512590 100644
--- a/devel/libfs++/Makefile
+++ b/devel/libfs++/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library which provides a file_iterator class
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8da334dd56c7..d2ff063e3956 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -25,7 +25,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack libxml2 gtk20
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 4c9e7a70fc01..b2bffadab225 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libglade2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 44eabf0c97d3..3fb9663ab98e 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME?=	gnomehack glib20 libxml2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS?=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc --without-gnome --with-bz2
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index d9cc0b04a598..c9e0566129eb 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://osdn.dl.sourceforge.net/sourceforge/freeassociation/
 MAINTAINER=	joe@zircon.seattle.wa.us
 COMMENT=	An implementation of the IETF's Calendaring and Scheduling protocols
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 37a84c28c89d..f36f52eea7d6 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gengetopt:${PORTSDIR}/devel/gengetopt
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 545a1bab7d0f..d291f463db14 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 
 USE_BZIP2=	yes
 USE_GNOME=	glib12 glib20 gnomehack gnometarget
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-libwww
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index 8c98f422336c..da1d82e68776 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -17,7 +17,7 @@ SHLIB_VER=	1
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_GCC=	3.3
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
diff --git a/devel/libpreps/Makefile b/devel/libpreps/Makefile
index d164f6903d93..9dd09f9a921a 100644
--- a/devel/libpreps/Makefile
+++ b/devel/libpreps/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	libpreps-devel-1.9.*
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 78b42121eb05..5cfe3bd79357 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for Shared Buffer IPC
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index bacf024a60c0..1d58dacd667c 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR=	libsigc \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Callback Framework for C++
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack
 
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index bcfba6b4f997..549125c6c6e9 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -24,6 +24,6 @@ USE_GMAKE=	yes
 LATEST_LINK=	libsigc++12
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 698a724f6b88..0cbfa3a2298f 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 LATEST_LINK=	libsigc++20
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 PLIST_SUB=	VERSION="2.0" API_VERSION="2.0"
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 48e7a77aba0f..bd7a1bacb36d 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack lthack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--with-gnutls-includes=${FALSE} \
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 48e7a77aba0f..bd7a1bacb36d 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack lthack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--with-gnutls-includes=${FALSE} \
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 0d971793bed4..70acef889f00 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Provides a useful interface to system statistics
 DIST_SUBDIR=	i-scream
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack gnometarget pkgconfig lthack
 
 MAN3=		sg_get_cpu_percents.3 sg_get_cpu_stats.3 \
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 58ab9e8a9620..bb21ca1b82dc 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A stroke translation library
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index df5c8afc22d8..398a57e19e64 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -22,7 +22,7 @@ MAN3=		ukcprog.3
 DIST_SUBDIR=	i-scream
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack gnometarget pkgconfig lthack
 
 .include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 20b20764d70d..5f2ed2037af7 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A library for manipulating Unicode characters and strings
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 4f398501a325..0ac32b61ab5a 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 OPTIONS=	SDL_MIXER "music and sound support" off
 
 USE_FREETYPE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index 0bec45bb7c1d..0d9d81d28a06 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Logging for C Library
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 6857dfc37d33..cf0311bbd3f7 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A userspace thread library
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 938c29efcc9d..5c88ab8fbaf7 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_GNOME=	libxml2
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/devel/mipsel-linux-binutils/Makefile b/devel/mipsel-linux-binutils/Makefile
index d675791afc15..38ea58d075fd 100644
--- a/devel/mipsel-linux-binutils/Makefile
+++ b/devel/mipsel-linux-binutils/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --with-gnu-ld --with-gnu-as \
 		--with-gcc --without-x11
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
 		gas/configure gprof/configure ld/configure opcodes/configure
 MAN1=		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/mipsel-linux-gcc/Makefile b/devel/mipsel-linux-gcc/Makefile
index 0bbbaae0f2e1..8574fedd3a04 100644
--- a/devel/mipsel-linux-gcc/Makefile
+++ b/devel/mipsel-linux-gcc/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 ONLY_FOR_ARCHS=	i386 alpha
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_PERL5=	yes
 LIBTOOLFILES=	configure gcc/configure
 MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 \
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index dc4af2a3746d..81cdde810174 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
 		gas/configure gprof/configure ld/configure opcodes/configure
 MAN1=		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index d832a793ffd4..729bac601a9f 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-languages=c --disable-nls
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index d832a793ffd4..729bac601a9f 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-languages=c --disable-nls
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index 7169752560a9..14dc4f081119 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An interpreted dynamic parser
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 5e64091102ec..5ae11249ef2f 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C++ bindings for ORBit, a CORBA 2.2-compliant ORB
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack orbit2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index a637a0cf4dcb..4086f0e7097b 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -20,7 +20,7 @@ PCRE_CONFIG?=	${LOCALBASE}/bin/pcre-config
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
 		LDFLAGS="`${PCRE_CONFIG} --libs`"
 INSTALLS_SHLIB=	yes
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index e73fa6fcb355..9f00974e5dc9 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A smartcard development library
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index 9c6750ce3134..3a8d7340bf33 100644
--- a/devel/physfs-devel/Makefile
+++ b/devel/physfs-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A library to provide abstract access to various archives
 
 USE_GNOME=	gnometarget
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 9c6750ce3134..3a8d7340bf33 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A library to provide abstract access to various archives
 
 USE_GNOME=	gnometarget
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index a2a03b0d971e..608a29fbcb88 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	eik@FreeBSD.org
 COMMENT=	A getopt(3) like library with a number of enhancements, from Redhat
 
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index d164f6903d93..9dd09f9a921a 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	libpreps-devel-1.9.*
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 5a9109b8637d..ef4c02298387 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Library that makes it easy for programs to use privilege separation
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index 5b9794729032..d2e948c9bcfc 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -23,6 +23,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack orbit2
 USE_PYTHON=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index 4056f69375d3..456753011f05 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_QT_VER=	2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	QTDIR="${X11BASE}" QTEZ="${DATADIR}" MSG2QM="${MOC}"
 MAKE_ENV=	QTEZ="${DATADIR}"
 INSTALLS_SHLIB=	yes
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 7c0f7a3292ff..8d7919b511d6 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index bb5772bca4a9..eb1af1619e84 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 WANT_GNOME=	yes
 CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm"		\
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 29395a45bf2c..8649300907c8 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack glib12 libxml
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 8c9855b395ca..4961cb41a74f 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A scanner/parser generator
 
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 4f24faae0c8c..d1a9dd5ba365 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	tclreadline
 MAINTAINER=	darius@dons.net.au
 COMMENT=	GNU readline for TCL
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 MANN=		tclreadline.n
 
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index 82b86ce78f07..05a27dbbbc2e 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	robert@rs.tarrant.tx.us
 COMMENT=	General purpose string library for C
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index 4f398501a325..0ac32b61ab5a 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 OPTIONS=	SDL_MIXER "music and sound support" off
 
 USE_FREETYPE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index 14be939fc83a..ba13623d2180 100644
--- a/devel/xxl/Makefile
+++ b/devel/xxl/Makefile
@@ -15,7 +15,7 @@ COMMENT=		C and C++ that provides exception handling and asset management
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-threads
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 0502862e3c5e..577babbf6580 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}