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
author: Joe Marcus Clarke <marcus@FreeBSD.org> 2004-07-09 17:43:11 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2004-07-09 17:43:11 +0000
commit: 9e5632dd661f75b5801706e55659a4da501e49b5 (patch)
tree: 1a0770d8cc1771f94f7777b9a986bb87029c35d9
parent: 90c653ebbfee158880bc5fc4eb15ad057288510a (diff)
download: ports-9e5632dd661f75b5801706e55659a4da501e49b5.tar.gz
ports-9e5632dd661f75b5801706e55659a4da501e49b5.zip
558 files changed, 570 insertions, 557 deletions
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index c0db71d4d128..e5d105c37cca 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -266,6 +266,9 @@ LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl15
 .if defined(USE_LIBTOOL_VER)
 GNU_CONFIGURE?=		yes
 WANT_LIBTOOL_VER?=	${USE_LIBTOOL_VER}
+.elif defined(USE_INC_LIBTOOL_VER)
+GNU_CONFIGURE?=		yes
+WANT_LIBTOOL_VER?=	${USE_INC_LIBTOOL_VER}
 .endif
 
 # Note that there aren't any non-versioned libtools, so we can skip
@@ -384,7 +387,7 @@ run-autotools:
 #
 .if !target(patch-autotools)
 patch-autotools:
-. if defined(USE_LIBTOOL_VER)
+. if defined(USE_INC_LIBTOOL_VER)
 	@(cd ${PATCH_WRKSRC}; \
 	for file in ${LIBTOOLFILES}; do \
 		${CP} $$file $$file.tmp; \
@@ -393,6 +396,16 @@ patch-autotools:
 			$$file.tmp > $$file; \
 		${RM} $$file.tmp; \
 	done);
+. elif defined(USE_LIBTOOL_VER)
+	@(cd ${PATCH_WRKSRC}; \
+	for file in ${LIBTOOLFILES}; do \
+		${CP} $$file $$file.tmp; \
+		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+			     -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+			     -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+			$$file.tmp > $$file; \
+		${RM} $$file.tmp; \
+	done);
 . else
 	@${DO_NADA}
 . endif
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 7c4127cd412f..6ef7247bf96a 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo lthack intlhack
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 55abbe377a57..be46b0402422 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A GNOME accessibility toolkit (ATK)
 
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack glib20
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a6f1a5526270..6e6c2b7c4863 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack libgnomecanvas lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 70811f7dbe75..5416df80c64e 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo lthack intlhack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile
index 70811f7dbe75..5416df80c64e 100644
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo lthack intlhack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index fe62785d6a57..c227cb809a78 100644
--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@@ -20,7 +20,7 @@ MAN1=		katoob.1
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GETOPT_LONG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 77c887c8c952..35ef9f1d2aca 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 77c887c8c952..35ef9f1d2aca 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index c81616774e1e..d2cb03d950b0 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index c81616774e1e..d2cb03d950b0 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index db82a6bc5b8d..7052db14b9b2 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
 USE_AUTOCONF_VER=213
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-glob
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index d37f1254eccb..2cf202727522 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A data compression library with low memory usage during decompression
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 3abe8e7011f7..1295071b29c1 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.jormas.com/~vesuri/xpk/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The eXternal PacKer (XPK) library system
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 037cca0228c2..886f6c3148f5 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -24,7 +24,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index be0550a2ad18..e8d3d33c2939 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Astronomical Calculation Library
 
 USE_GNOME=	gnometarget lthack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index edbda3f6c68e..3a63b9ba7500 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -17,7 +17,7 @@ COMMENT=	MPEG audio analysis toolkit
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index 9170670501e0..d9a0c69f976c 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	glib12 gnomehack gnometarget
 WANT_GNOME=	yes
 USE_GETOPT_LONG=yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 411e31d82436..6d652a892e90 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=		yes
 USE_GCC=		3.3
 USE_REINPLACE=		yes
 USE_GNOME=		gnomehack gnomeprefix intlhack libgnomecanvas
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index c72cf6c360cf..c9b67519bde5 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Multitrack audio processing software
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
 USE_AUTOCONF_VER=213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/ecawave/Makefile b/audio/ecawave/Makefile
index f304572f9745..25086ace0a09 100644
--- a/audio/ecawave/Makefile
+++ b/audio/ecawave/Makefile
@@ -20,6 +20,7 @@ GNU_CONFIGURE=	yes
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS:S/"//g}
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index f99c66f94c5f..b30e288e36fb 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -21,7 +21,7 @@ USE_GETOPT_LONG=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnometarget gnomehack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 CONFLICTS=	py*-ro-*
 
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 5a651be54d64..a27de02f161d 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 USE_SDL=	yes
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 45a11c03798f..2ecba1051d2d 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sse --enable-3dnow \
 		--with-libiconv-prefix="${LOCALBASE}" \
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index bb472591e42a..361c582855e8 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -18,7 +18,7 @@ INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 14f830e56a5f..f60434581b74 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -23,7 +23,7 @@ MAN1=		gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	libglade
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 6dfdfe1b162c..6d93e7274664 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Multimedia applications for the GNOME 2 desktop
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 6dfdfe1b162c..6d93e7274664 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Multimedia applications for the GNOME 2 desktop
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index cebece5ec931..287653541092 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -19,7 +19,7 @@ COMMENT=	GStreamer plugin for monkeysaudio files
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	lthack gnomehack gnomeprefix gstreamerplugins
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 5aba78de6932..7460cdc69336 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.macio.risp.pl/gtkgep/files/
 MAINTAINER=	linimon@lonesome.com
 COMMENT=	A guitar effects processor for GTK
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 89d443352b41..e2f7c1112772 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@oven.org
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index e3846a38cb96..e1b8439c9758 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Portable audio output library
 
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .if defined(NOPORTDOCS)
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index ccdbe0414013..760edbd7f49d 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for playing audio CDs
 
 USE_GNOME=	gnomehack gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 2bb240edc230..b4550a7b345f 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ahze@ahze.net
 COMMENT=	A library to access data on a CDDB server
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnometarget lthack gnomehack pkgconfig
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index e13ca74c04cb..10466d5e1a09 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	ID3 tags library (part of MAD project)
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 26272d778fc7..f2b8c0d265cf 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Libmad library (part of MAD project)
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-debugging \
 		--enable-sso \
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index aa2bb4ad3920..f67f0ffdf28e 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -17,7 +17,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ENV=	SHELL=/bin/sh
 INSTALLS_SHLIB=	yes
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index cc26ccacb309..f5114a818705 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -17,7 +17,7 @@ COMMENT=	ModPlug mod-like music shared libraries
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 013722ea447b..80cf298d657b 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index f7adcddeac23..9cfe6606cf55 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw.2:${PORTSDIR}/math/fftw
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gcc-pipe
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index ee94196df05d..b1d4b48d10dc 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFLICTS=	libshout-1.0.7
 USE_REINPLACE=	yes
 
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 04dedd920506..7bf436620eff 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
 
 USE_GCC=	3.3
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-justsrc --disable-gcc-pipe
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index b7ad1d35d476..0dcac5c2b924 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 CONFLICTS=	libvorbis-aotuv-[0-9]*
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index d714b4bf4051..e075ce1d685c 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 90d4d09aaf18..726a1b282b53 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack lthack gnomeprefix libgnomeui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 90d4d09aaf18..726a1b282b53 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack lthack gnomeprefix libgnomeui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 6d4a14f8022d..2a6786e2cb07 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 2047951f6627..38ead04e3ff9 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A SDL audio library and player for some popular sound file formats
 
 USE_SDL=	sdl
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index 894b40650b4d..a34655f0d48c 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 894b40650b4d..a34655f0d48c 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/swami/Makefile b/audio/swami/Makefile
index 0f8120bf22df..9d67b0295523 100644
--- a/audio/swami/Makefile
+++ b/audio/swami/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt \
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
 USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=		gnomelibs gnometarget
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 2e1dc8c0a8e9..d0442d9dc28e 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/WINGs"
 
 MAN1=		get-wsound-flags.1x getsoundset.1x setsoundset.1x \
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index a025374a45ed..381a374e6818 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -18,7 +18,7 @@ COMMENT=	X11-based MP3 player with nice graphical interface
 
 USE_XLIB=	yes
 USE_GNOME=	gtk12 esound
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure libx11amp/configure
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index a9a66df111cb..940503246747 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 677aa4d3e820..f3302abdf560 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	lib/xmms/Output/libarts.so \
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 3f7c50999cdf..b0bf7b04a7ad 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -17,7 +17,7 @@ COMMENT=	XMMS Output plugin for crossfading between songs
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index e47107efc916..a93ec4c5d83d 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_AUTOMAKE_VER=	15
 USE_AUTOCONF_VER=	253
 USE_AUTOHEADER_VER=	253
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk12
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 6271addc3dd1..87932e207043 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/xmms-jack
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 gnometarget
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 
 PLIST_FILES=	lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 5b89b58fa3e8..d350a47b03c0 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_KDELIBS_VER=3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/0.0/0/}
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 123bea57f57d..6cb8d2fdc207 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -20,6 +20,6 @@ USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 39957459802b..5b243ae76746 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index 6b879a35eaf4..4477d10ffdcc 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	lib/xmms/Input/libxmms_sndfile.so
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index f8ed434210f6..2a936c7e5cc6 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -21,6 +21,6 @@ PLIST_FILES=	lib/xmms/Input/libtfmx.so
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index 5727262df8e0..b6f3ffa28cf5 100644
--- a/biology/libgenome/Makefile
+++ b/biology/libgenome/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Toolkit for developing bioinformatic related software in C++
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 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/chinese/wenju/Makefile b/chinese/wenju/Makefile
index c4b37704589a..a046d4e9df6a 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wenju
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wenju
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 8d5861820ff9..16b821c983ad 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -19,7 +19,7 @@ USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 528bcf5fc895..39d2520d8a8b 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	esn@x123.info
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 
 USE_PERL5=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	pkgconfig gnomehack
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 696508b8c00a..ce207d244b7f 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Linux Infared Remote Control
 USE_XLIB=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-driver=any --disable-manage-devices
 
diff --git a/comms/vpb2/Makefile b/comms/vpb2/Makefile
index 14303e29af61..059484b657e8 100644
--- a/comms/vpb2/Makefile
+++ b/comms/vpb2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	dyfet@gnu.org
 COMMENT=	User mode API for Voicetronix 4 port analog DSP telephony cards
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_AUTOCONF_VER=	213
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index f233e322b80b..db730f987e17 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -17,7 +17,7 @@ USE_GNOME=	pkgconfig
 USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 28d1506c2107..73a0e57e3bdd 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Free Implementation of the Unicode Bidirectional Algorithm
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack pkgconfig
 INSTALLS_SHLIB=	yes
 
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index dd34b0097d2e..25e1e5607c4b 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	gnometarget
 LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static \
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index cfb65aee2959..d582bbb0b054 100644
--- a/converters/mimelib/Makefile
+++ b/converters/mimelib/Makefile
@@ -16,7 +16,7 @@ COMMENT=	C++ class library for manipulating messages in MIME format
 
 CONFLICTS=	kdenetwork-3.1.*
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index a09397ab7447..433b0a43a835 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-included-gettext
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 600fc09ef212..53635a8c1eb0 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -17,7 +17,7 @@ USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 WANT_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 600fc09ef212..53635a8c1eb0 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -17,7 +17,7 @@ USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 WANT_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index e6f2627e3f21..df8dce343f4a 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	The GNU database manager
 
 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/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 77b105d1a78e..385a1d093608 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 77b105d1a78e..385a1d093608 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 673091a855be..e9e5fc7a307d 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
 
 OPTIONS=	MYSQL "Build MySQL driver" on \
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index e44e7fca445a..37140b6fad32 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 post-install:
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index e60e39de8f66..2d79d522a229 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gconf bonobo
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index e2e426900ec9..638848e8bec4 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgda2
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 477af42f0691..31d669fd7905 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
 		intlhack 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/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 06eddcc6776f..7a809caf73cd 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An ODBC 3.x driver manager, for universal data source access
 
 CONFLICTS=	unixODBC-*
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 INIDIR=		${PREFIX}/etc/${PORTNAME}
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 2a0863f2d223..60813f8844ad 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C++ class library and toolset for ODBC access to data sources
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/libsdb/Makefile b/databases/libsdb/Makefile
index 92bec03bf480..58ad9d23f042 100644
--- a/databases/libsdb/Makefile
+++ b/databases/libsdb/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple database library
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 MAN3=		sdb.3 sdb_init.3 sdb_open.3 sdb_close.3 sdb_query.3
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 1b19ff61e446..4c3f3485a298 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk	# To build man-pages
 USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_GNOME=	glib20
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index e916abfc081c..c9b03504bb7c 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 CONFIGURE_SCRIPT=	../unix/configure
 LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 INSTALLS_SHLIB=	yes
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 506ae6fb1a4b..f3dd72dbc52d 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A new C++ interface for  PostgreSQL
 
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 506ae6fb1a4b..f3dd72dbc52d 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A new C++ interface for  PostgreSQL
 
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index 506ae6fb1a4b..f3dd72dbc52d 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A new C++ interface for  PostgreSQL
 
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 0bc625185753..69ce79967648 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Trivial Database
 
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
 
 MAN3=	tdb.3 tdb_chainlock.3 tdb_close.3 tdb_delete.3 tdb_error.3 \
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 32c8a4b8dcfb..30d9a529d5f2 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	libiodbc-*
 
 USE_GNOME=	gnomehack gnometarget lthack
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 INSTALLS_SHLIB=	yes
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index 817453fcfa97..875c9c966801 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .if defined(MAINTAINER_MODE)
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index d5c6af2e6955..d4eef2874089 100644
--- a/databases/xbsql/Makefile
+++ b/databases/xbsql/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An SQL wrapper for the XBase DBMS library
 LIB_DEPENDS=	xbase-2.0.0:${PORTSDIR}/databases/xbase
 
 USE_BISON=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index c33b7bfb66b4..7238dff88624 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A program to create labels and business cards
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui
 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/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index e0ccb9c44acc..95ac7ec5faef 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
 USE_X_PREFIX=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack gnometarget
 CONFIGURE_ARGS=	--enable-gtkspell
 INSTALLS_SHLIB=	yes
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 14c5d581b30f..b937daeebb1d 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk20
 WANT_GNOME=	yes
-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/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index 1dea9f6bddb9..e06c01336f71 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 # necesary to access the second master site by getting rid of the default switch -A
 FETCH_CMD ?=/usr/bin/fetch -Rr
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index 2d6ab029e09d..b07b6a1432d0 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index daaf0f735b3b..23251db1a9a4 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
index 70fa5d478766..49edb850bccf 100644
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ b/deskutils/xfce4-taskbar-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
index 19e0c0fe7924..9b184471da56 100644
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ b/deskutils/xfce4-windowlist-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
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}
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index ea92c07d85e6..d0ac81984902 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A library to handle internationalized domain names
 
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} \
 		--enable-runidn \
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 37a84c28c89d..f36f52eea7d6 100644
--- a/dns/libidn/Makefile
+++ b/dns/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/editors/Makefile b/editors/Makefile
index 381b9f1c72d9..5047419b1d64 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -137,7 +137,6 @@
     SUBDIR += openoffice-1.1-dk
     SUBDIR += openoffice-1.1-el
     SUBDIR += openoffice-1.1-es
-    SUBDIR += openoffice-1.1-et
     SUBDIR += openoffice-1.1-fi
     SUBDIR += openoffice-1.1-it
     SUBDIR += openoffice-1.1-nl
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 5a599925c6fe..680dd6c17839 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget lthack
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 5013c20f546a..0a1f5b7a0289 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier \
 		libgnomeprintui libgnomeui eel2 gtksourceview
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index a5671f606949..cde766b44f3e 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack lthack gail libgnomeprintui \
 		libgnomeui
-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/editors/mlview/Makefile b/editors/mlview/Makefile
index 23ce593c947e..aad7a9b541cc 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_AUTOCONF_VER=	253
 USE_GNOME=	gnomeprefix gnomehack eel2
 USE_GMAKE=	yes
-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/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index e3fe0e58f51e..898644c79acc 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_BISON=	yes
 USE_GNOME=	gnomehack libglade
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile
index 3434c56db7a7..3d81e5a9d3d8 100644
--- a/emulators/lib765/Makefile
+++ b/emulators/lib765/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.seasip.demon.co.uk/Unix/LibDsk/
 MAINTAINER=	kemm@in-line.ru
 COMMENT=	Emulation of uPD765a Floppy Disc Controller
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 DOCS=		ChangeLog doc/765.txt
diff --git a/emulators/vx68k/Makefile b/emulators/vx68k/Makefile
index 9435d5bb6b02..f2ca52112f98 100644
--- a/emulators/vx68k/Makefile
+++ b/emulators/vx68k/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	vm68k.4:${PORTSDIR}/emulators/libvm68k
 
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 LIBTOOLFILES=	configure vx68k-gtk/configure
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index cd98d0f4817d..8d2e2f1000bd 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -17,7 +17,7 @@ COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)
 LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot \
diff --git a/finance/opale/Makefile b/finance/opale/Makefile
index 65b2603f494c..cd1911fadadc 100644
--- a/finance/opale/Makefile
+++ b/finance/opale/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	kofficecore.2:${PORTSDIR}/editors/koffice-kde3
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB= yes
 
diff --git a/french/med/Makefile b/french/med/Makefile
index f1bd014ace7b..5e5be81d3b90 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -23,7 +23,7 @@ EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-shared
 CONFIGURE_ENV=	HDF5HOME=${LOCALBASE}
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 03912f58ac7f..9a3b613989e6 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS+=	--without-mysql
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index c79ce4b627b7..f31ef1c8612e 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -25,7 +25,7 @@ USE_SDL=	sdl
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 59c1530f4b3f..82bbc448fff5 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://vipe.technion.ac.il/~shlomif/freecell-solver/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program that automatically solves games of Freecell
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN6=	fc-solve-board_gen.6 fc-solve.6 \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 4c6e339ce0b2..f17dee8d1c2c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \
 		librsvg2
-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/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 4c6e339ce0b2..f17dee8d1c2c 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \
 		librsvg2
-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/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 50c5074094b3..51e39bc417e0 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Core library of MaitreTarot, a Tarot card game
 
 USE_BZIP2=		yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=		glib20 libxml2 lthack
 INSTALLS_SHLIB=		yes
 
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index a47dea34fdbb..27415f4bc863 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -17,7 +17,7 @@ COMMENT=		Client-side library of MaitreTarot, a Tarot card game
 LIB_DEPENDS=		maitretarot.0:${PORTSDIR}/games/libmaitretarot
 
 USE_BZIP2=		yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=		glib20 libxml2 lthack
 INSTALLS_SHLIB=		yes
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 44497789b9fd..4b0b61f91e2c 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -31,7 +31,7 @@ WADFILE=	quakesw-1.0.6.tar.gz
 PROGFILE=	qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
 SKINFILES=	skinbase.zip qw_skins.zip
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 0aa240e46be3..3f4a728aeec1 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index eef6897bfdfa..74c49be74a03 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	steak:${PORTSDIR}/german/steak
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 442a69013b5e..10ef1aa79268 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Fast pixel formats conversion library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 9a3463c20df0..a751497ba7e7 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	openexr
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A high dynamic-range (HDR) image file format
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	YES
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index e08954930928..3adb436fdab9 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An ascii art library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_X11)
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 3afa27929dc8..17fa91a10fb5 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
 USE_XLIB=	yes
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index c8e95f69c4c4..d9208a88d262 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index b8247332114e..9eaf410d690e 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A general drawing canvas from dia dialog editor
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 imlib gnomehack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index b969dc77365a..c704faacf25e 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_FREETYPE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index ff3199f686eb..0007a003da92 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fonts and font libraries necessary for Enlightenment
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index fdd096e0e2f8..5c5b2a185131 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
 USE_AUTOHEADER_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_XLIB=	yes
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 23e501d270e5..a0fd27c8183e 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tools and library routines for working with GIF images
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 
 .ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 80bdb1a93f28..442e451c7acf 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -41,7 +41,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index a5331385f06c..d15f593246c3 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	"LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}"
 
 MAN3=		gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle \
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 71c1dcb21f0f..2b865ddd9d3b 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -27,7 +27,7 @@ WRKSRC=			${WRKDIR}/Glide3
 USE_X_PREFIX=		yes
 XFREE86_VERSION=	4
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
 AUTOMAKE_ARGS=		-a
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index e826e7e97bec..7eba7d1bae48 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_FREETYPE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib"
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index b2f1d6e6a9be..ef6a0d9f6ce3 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Weird GNOME fractal generator
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui lthack
 USE_GMAKE=	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/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 17fe9c89869f..3539c9b640fb 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A very simple GUI framework for use with SDL
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 096bc0846c85..d11e5e3729ad 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_ZIP=	yes
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
index 1317a33833d1..ba927eade3c0 100644
--- a/graphics/kimagemapeditor/Makefile
+++ b/graphics/kimagemapeditor/Makefile
@@ -16,7 +16,7 @@ COMMENT=	KDE-based editor for HTML image maps
 USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 9593ad2b8877..96dac7284794 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_GNOME=	gnomehack gnometarget lthack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--without-jpeg --without-tiff
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 59d2a190b278..b5faa667b313 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Library for high-performance 2D graphics
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 CONFLICTS=	libart-*
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 59d2a190b278..b5faa667b313 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Library for high-performance 2D graphics
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 CONFLICTS=	libart-*
 
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 7eef2c7dd15f..27d2cf0a4267 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GTK+ widgets to display/edit EXIF tags
 LIB_DEPENDS=	exif.10:${PORTSDIR}/graphics/libexif
 
 USE_GNOME=	gnomehack lthack gtk20
-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/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 136454d254ec..4a3caada9d98 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Library to read digital camera file meta-data
 
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index ca1a95d6184e..4e0554d7481d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack libglade2 libartlgpl2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index e2031c8c2fd7..d1014241ad14 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomecanvas
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index 83ccc645e38f..d466adceca93 100644
--- a/graphics/libgrass5/Makefile
+++ b/graphics/libgrass5/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library of functions from the GRASS GIS application for use by non-GRASS programs
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index d1b3eb6d39ef..7492a33154e1 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A library for loading (and saving) 3d models (3d modeller object files)
 
 CONFLICTS=	xmorph*
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 693c164b1f90..a5d616acae0f 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs gdkpixbuf
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 5f3c0c22fd5a..78d92c7d1607 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack gtk20 libartlgpl2 libxml2 libgsf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 23e501d270e5..a0fd27c8183e 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tools and library routines for working with GIF images
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 
 .ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 278570630e28..5e36e5d2a126 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_BZIP2=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 012711749c2f..f59dceed33bc 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A plotting library and toolkit
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		MOTIFLIB="${MOTIFLIB}" \
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index b8caa3b515d0..c157004c13b3 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Cartographic Projections library
 
 NADFILES=	proj-nad27-1.1.tar.gz
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index cf7ed8765fbd..20cb5304b930 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	Magick++.6:${PORTSDIR}/graphics/ImageMagick \
 		EMF.1:${PORTSDIR}/graphics/libemf
 
 USE_GNOME=	gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-libemf-include=${LOCALBASE}/include/libEMF
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index abe10f701f86..4764c0771a9e 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Use OpenGL to play around with three dimensional scenes
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index d1debd6bb74a..b4933cbdbb59 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -17,7 +17,7 @@ COMMENT=	High level 3D graphics library compatible with Apple's QuickDraw(TM)
 USE_REINPLACE=	yes
 WANT_AUTOCONF_VER?=	253
 WANT_AUTOMAKE_VER?=	15
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GL=		yes
 USE_X_PREFIX=	yes
 .ifdef (WITH_QUESA_EXAMPLES)
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index fff3879a8c6c..ed80219c5baf 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -19,7 +19,7 @@ COMMENT=	SDL graphics drawing primitives and other support functions
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/SDL11 \
 		--disable-mmx
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 52613b34ab4a..fddd7df73f14 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 797307ac940d..20d4146d84ff 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -21,7 +21,7 @@ USE_SDL=	sdl
 USE_GL=		yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index b82a5e77b632..8231248ae90e 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_REINPLACE=	yes
 USE_XLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/" --with-ungif=${LOCALBASE} \
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index d2b7a3b0a11b..6939d953a12f 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	swfdec
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index 0b870bfad810..a97d544c035f 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GNOME=	gtk12
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index 12edf010b789..89c386b818e3 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -25,7 +25,7 @@ USE_BISON=	yes
 USE_GNOME=	gtk12 libxml2
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	XMMS_CONFIG="${XMMS_CONFIG}"
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 2374d1042041..c40c3e928de1 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	libmorph*
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 6dc4a338a657..af04f2a72b15 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another kana-kanji conversion system
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_GNOME=	lthack
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 97f97357fddf..e9d7f416680f 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 97f97357fddf..e9d7f416680f 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 0ec91229ce5b..4ab2eba51356 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -19,7 +19,7 @@ OPTIONS+=	WNN	"Use FreeWnn" on
 USE_PERL5_BUILD=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack gnomepanel
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 67b45276e97c..ff4f23b4a463 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -22,7 +22,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/japanese/uim/Makefile b/japanese/uim/Makefile
index dccc5375c264..b863d76e96b7 100644
--- a/japanese/uim/Makefile
+++ b/japanese/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/korean/eterm/Makefile b/korean/eterm/Makefile
index 22a68a6d8c3a..83e5f61058f3 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanya
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lxpg4" LOCALBASE="${LOCALBASE}"
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 1fa7c2d27a87..db9369ef630a 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Scheme-to-C compiler
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 04db60805417..568068cfbdf5 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/cim/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for the SIMULA programming language
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 MAN1=		cim.1
 
diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile
index 0c0fc31d339d..17ec79a9845f 100644
--- a/lang/libutils/Makefile
+++ b/lang/libutils/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support lib for Tensile/NSL
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 9c37328d3aea..0af06dc70d76 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -20,7 +20,7 @@ COMMENT=	NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
 CONFLICTS=	js-1.5.*
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 .if defined(NOPORTDOCS)
 USE_REINPLACE=	yes
 .endif
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 7648ffbc83ea..ec66e26748ea 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -61,7 +61,7 @@ OPTIONS+=	BROKEN_MTA "Enable if MTA pases ^M to dspam" off
 OPTIONS+=	CGI "Install CGI (pulls in apache)" off
 
 USE_GNOME=	pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 7648ffbc83ea..ec66e26748ea 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -61,7 +61,7 @@ OPTIONS+=	BROKEN_MTA "Enable if MTA pases ^M to dspam" off
 OPTIONS+=	CGI "Install CGI (pulls in apache)" off
 
 USE_GNOME=	pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 3d318e518770..6a8810db37da 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -19,7 +19,7 @@ USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget glib20 lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 			LIBS="-L${LOCALBASE}/lib"
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index fd407d862af7..d1dfe8d9bbc1 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A library for posting electronic mail
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 7cbecd2c6c3e..b044f3c44073 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A mail library
 
 USE_ICONV=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index df2e0e65b8bd..972926425434 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls \
 
 USE_LIBLTDL=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 72ce34333823..28d401c34012 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 INSTALLS_SHLIB=	yes
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 61680cdb35aa..2f70f3dbf76f 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index b0932029fea0..270748588fd5 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 COMMENT=	Fast C routines to compute the Discrete Fourier Transform
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-shared
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 6abbccc087f4..2740d725dc01 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	ahze@ahze.net
 COMMENT=	Fast C routines to compute the Discrete Fourier Transform
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack gnomeprefix gnometarget lthack pkgconfig
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 80b87cd6848a..f15a24799f80 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Advanced graphic calculator
 USE_KDELIBS_VER=	3
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 06713f61c160..dee6f21df5bc 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A free library for arbitrary precision arithmetic
 CONFLICTS=	libgmp-2*
 USE_REINPLACE=	yes
 USE_GNOME=	lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx --enable-mpfr
 INSTALLS_SHLIB=	yes
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 028ff365cff7..7065e7f02dd9 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	jon.drews@gmail.com
 COMMENT=	The GNU Scientific Library - mathematical libs
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	MAKEINFO='makeinfo --no-split'
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 53705dd0630e..9ee7e295e3c9 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -17,7 +17,7 @@ COMMENT=	KDEGUI for octave
 RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index 06713f61c160..dee6f21df5bc 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A free library for arbitrary precision arithmetic
 CONFLICTS=	libgmp-2*
 USE_REINPLACE=	yes
 USE_GNOME=	lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx --enable-mpfr
 INSTALLS_SHLIB=	yes
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index 420893a956a8..b7a986f03b01 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	C++ Library for Symbolic and Numeric Calculus Applications
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index 9c37368e32e5..13a688f9586b 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ieee.uow.edu.au/documents/contrib/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ implementation of the classic 3-layer perceptron in library form
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index ebcabbe843a6..b369c957dbb2 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index ebcabbe843a6..b369c957dbb2 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/spar/Makefile b/math/spar/Makefile
index e7fe94a63b61..84fd25edb93b 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A modular math parser
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	spar.1
diff --git a/misc/gaim-guifications/Makefile b/misc/gaim-guifications/Makefile
index 9663d752d6e0..d693b8465151 100644
--- a/misc/gaim-guifications/Makefile
+++ b/misc/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/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index d87b6a23468c..8ed3d9f26251 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
 USE_GNOME=	glib12 gnomehack gnomeprefix
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index d671a8dbf224..daf6a1a82b65 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	machiel_mastenbroek@hotmail.com
 COMMENT=	A library required by smssend (same author)
 
 USE_AUTOCONF_VER?=259
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 9e46daf5b220..edb8fb607b90 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Set of filters to convert English text to various stereotyped dialects
 
 CONFLICTS=	jive* chef*
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index a977e7e95876..cb5b440118d5 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index d58026bc641e..fd207a12952d 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
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"
 
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 9663d752d6e0..d693b8465151 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 e4c316166714..d117ae444866 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 b2dd8d12793f..4029603f486a 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 2a3b12c43d0a..bb1e727021cb 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 aab68ddff81c..5e3c7b48028d 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 6ff2653d1189..53a61f92fc33 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 074d794d145d..16cc24ea20ce 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 9663d752d6e0..d693b8465151 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>
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 03f01fcdba8a..d7d906f98e3e 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -21,7 +21,7 @@ COMMENT=	An extendable SNMP implementation
 USE_AUTOCONF_VER=213
 USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CFLAGS+=	-fPIC
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 2546d6002da4..e7a50e00f068 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/net-p2p/fcptools/Makefile b/net-p2p/fcptools/Makefile
index e86750f331b7..e95729dfe402 100644
--- a/net-p2p/fcptools/Makefile
+++ b/net-p2p/fcptools/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	FreeNet client library and command-line tools for shell scripting
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME:L}
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 97f52e64c5e4..a3857bb3f701 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -23,7 +23,7 @@ USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index 5ff227f05cca..e651ee5afd4d 100644
--- a/net-p2p/libfreenet/Makefile
+++ b/net-p2p/libfreenet/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Freenet library written in C
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/libfreenet
 INSTALLS_SHLIB=	yes
 
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index 5534901638dd..f67b8ecf3c04 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 USE_MYSQL=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index 2546d6002da4..e7a50e00f068 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/net/fcptools/Makefile b/net/fcptools/Makefile
index e86750f331b7..e95729dfe402 100644
--- a/net/fcptools/Makefile
+++ b/net/fcptools/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	FreeNet client library and command-line tools for shell scripting
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME:L}
diff --git a/net/gale/Makefile b/net/gale/Makefile
index e4c316166714..d117ae444866 100644
--- a/net/gale/Makefile
+++ b/net/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/gmdns/Makefile b/net/gmdns/Makefile
index 86380706ef27..3a1aff134b7a 100644
--- a/net/gmdns/Makefile
+++ b/net/gmdns/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A GNU implementation of multicast DNS, part of Zeroconf
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index 2a24f4c9bf60..843b6ed03ecd 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A simple network library built upon Glib-2
 
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack glib20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-glib2
 
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 97da2dcd7cbb..361665c41090 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A simple network library built upon Glib
 
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	gnet-config.1
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 960e4c4fcad7..e1da9dba7503 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib-2
 
 USE_GNOME=	gnomehack glib20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 97f52e64c5e4..a3857bb3f701 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -23,7 +23,7 @@ USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index b68b23b8b4b6..eff4e27e5b74 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A C library for writing servers
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_OPENSSL)
diff --git a/net/howl/Makefile b/net/howl/Makefile
index ecea56b878f4..642091549175 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_GMAKE=	yes
 USE_GNOME=	lthack gnometarget pkgconfig
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 USE_REINPLACE=	yes
 
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index b2dd8d12793f..4029603f486a 100644
--- a/net/icqlib/Makefile
+++ b/net/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/icqlib0/Makefile b/net/icqlib0/Makefile
index 2aba5e29f08e..0c3c73e4d719 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Old branch 0.x.x of library required by kicq (used by icqmail)
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SIZE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index 5ff227f05cca..e651ee5afd4d 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Freenet library written in C
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/libfreenet
 INSTALLS_SHLIB=	yes
 
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 1aca8e0a6b47..24f2d6de5f6d 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 2a3b12c43d0a..bb1e727021cb 100644
--- a/net/libicq/Makefile
+++ b/net/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/libnetdude/Makefile b/net/libnetdude/Makefile
index 9f2366446f9c..9ea3d76d0cef 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library for manipulating libpcap/tcpdump trace files
 
 LIB_DEPENDS=	pcapnav.0:${PORTSDIR}/net/libpcapnav
 
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	glib12
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index 4458ee6e8397..4355001d8f65 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A low layer of SIP implementation
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index 95824484cafb..9c3dabc215ce 100644
--- a/net/libosip2/Makefile
+++ b/net/libosip2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A low layer of SIP implementation
 
 USE_GNOME=	gnometarget lthack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS=	--disable-debug --disable-trace
 INSTALLS_SHLIB=	yes
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index 13e2b019e614..defb086dd1cb 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	yb@sainte-barbe.org
 COMMENT=	A libpcap wrapper library
 
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 030574eb1fe2..b4f2793fc29c 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOMAKE_VER=	15
 USE_AUTOCONF_VER=	253
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 
 INFO=	socket++
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index b8ae4f4eb80d..2b991eff29a6 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	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 \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/loudmouth/Makefile b/net/loudmouth/Makefile
index aab68ddff81c..5e3c7b48028d 100644
--- a/net/loudmouth/Makefile
+++ b/net/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/meanwhile-gaim/Makefile b/net/meanwhile-gaim/Makefile
index 6ff2653d1189..53a61f92fc33 100644
--- a/net/meanwhile-gaim/Makefile
+++ b/net/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/meanwhile/Makefile b/net/meanwhile/Makefile
index 074d794d145d..16cc24ea20ce 100644
--- a/net/meanwhile/Makefile
+++ b/net/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/netdude/Makefile b/net/netdude/Makefile
index eb92e51eb3ba..dd98f922fadd 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	netdude.0:${PORTSDIR}/net/libnetdude
 USE_LIBLTDL=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lltdl"
 USE_GMAKE=	yes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index b338297e233d..0691e9491fe1 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -26,7 +26,7 @@ USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	DBDIR=${DBDIR} \
 		SHLIB=${PORTVERSION:S/.p/pre/}
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 221bb6bd43c6..aa575c22c489 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A Real-time Transport Protocol (RTP) stack
 
 USE_GNOME=	glib20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 INSTALLS_SHLIB=	yes
 
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 3b665a1501c9..5a8f0c482dc8 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -20,7 +20,7 @@ COMMENT=	A C++-Library for PVM
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-pvm-incs=${LOCALBASE}/include \
 		--with-pvm-libs=${LOCALBASE}/lib
 INSTALLS_SHLIB=	yes
diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile
index 9f24cce7dcc8..1822a684c6e4 100644
--- a/net/radiusclient/Makefile
+++ b/net/radiusclient/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	maurice@castro.aus.net
 COMMENT=	Client library and basic utilities for Radius authenticated login
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 39255c3e8f02..666c571bd6c4 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	GUI.0:${PORTSDIR}/graphics/guilib
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 201a297c3acc..cbf71296e66b 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -25,7 +25,7 @@ GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index db12cebe74d4..c654b86ff452 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-os-dir=no
 INSTALLS_SHLIB=	yes
diff --git a/net/verlihub/Makefile b/net/verlihub/Makefile
index 5534901638dd..f67b8ecf3c04 100644
--- a/net/verlihub/Makefile
+++ b/net/verlihub/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 USE_MYSQL=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index eeebea92bfb1..ab13daa88d13 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index eeebea92bfb1..ab13daa88d13 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 88d1521d198e..c8b1201dcae7 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 500a2e075f98..67ff100be790 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 88d1521d198e..c8b1201dcae7 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 500a2e075f98..67ff100be790 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/rapip/Makefile b/palm/rapip/Makefile
index 0feffad9cf2c..56308f1567d4 100644
--- a/palm/rapip/Makefile
+++ b/palm/rapip/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+=	synce-serial-start:${PORTSDIR}/palm/synce-serial \
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index d554244fa717..7e674b17cf21 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE}
 
 INSTALLS_SHLIB=	yes
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index d554244fa717..7e674b17cf21 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE}
 
 INSTALLS_SHLIB=	yes
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index 0feffad9cf2c..56308f1567d4 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+=	synce-serial-start:${PORTSDIR}/palm/synce-serial \
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index a6d67074ed07..b780a2213635 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 0ccf09054aa4..ad6e117ff6c6 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gimp=no
 INSTALLS_SHLIB=	yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index d534c849f669..1102e84ed125 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
 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/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index d534c849f669..1102e84ed125 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
 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/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 0ccf09054aa4..ad6e117ff6c6 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gimp=no
 INSTALLS_SHLIB=	yes
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index 0ccf09054aa4..ad6e117ff6c6 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gimp=no
 INSTALLS_SHLIB=	yes
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 4c6084552c30..60af4b4759f1 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20
 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/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index cee2300553b0..c43318cc29f6 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libbonobo libartlgpl2 \
 		gtk20 lthack
 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/print/libijs/Makefile b/print/libijs/Makefile
index ff0267b7e2cf..4f3dff9a8bb2 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C library that supports plugin printer driver for Ghostscript
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=		ijs-config.1
diff --git a/print/panda/Makefile b/print/panda/Makefile
index a61353f17966..cd35d5a87251 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41 \
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-berkeley-db
 INSTALLS_SHLIB=	yes
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 8b77d934e8c8..522cd342c5e9 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index e3ed0f53326b..32c5d48a623f 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade2 libgnomeprint libgnomeui
 USE_GMAKE=	yes
-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/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 6bedcceb1b44..5e7cf69644ac 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -17,7 +17,7 @@ COMMENT=	BeeCrypt is an open source cryptography library
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index 602b89829e68..6636d4b66019 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A collection of plug-ins to cryptographic engines
 BUILD_DEPENDS=	gpgme-config:${PORTSDIR}/security/gpgme \
 		gpg-agent:${PORTSDIR}/security/gnupg-devel
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index e34a7d80070d..64512159ed79 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -50,7 +50,7 @@ USE_RC_SUBR=	YES
 
 USE_AUTOMAKE_VER=14
 USE_AUTOCONF_VER=213
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 AUTOMAKE_ARGS=	--add-missing --include-deps
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 3a1cb18a7474..6e9838166491 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	lthack gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index d2d171904dc9..b387e2e027ba 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack lthack gtk20
 USE_GMAKE=	yes
-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/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile
index d2d171904dc9..b387e2e027ba 100644
--- a/security/gnomekeyring/Makefile
+++ b/security/gnomekeyring/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack lthack gtk20
 USE_GMAKE=	yes
-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/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index d68de3886c69..fc47c8db4459 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	gnutls-[0-9]*
 
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 5f881b35b855..b56262f2114f 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -28,7 +28,7 @@ USE_GPG?=	yes
 SIG_SUFFIX=	.sig.asc
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index e4f0631964fc..1d06e7f2c43a 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library to make access to GnuPG easier
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index e4f0631964fc..1d06e7f2c43a 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library to make access to GnuPG easier
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 7ca4820b2989..d6b66a8d9f42 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gpg-error.1:${PORTSDIR}/security/libgpg-error
 
 USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 693c5702967c..10d0b32afca4 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components
 
 USE_GPG=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libident/Makefile b/security/libident/Makefile
index f8fc1ce5d091..05dcc1f1e3ce 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small library to interface the ident protocol server (rfc1413)
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN3=		ident.3
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index bc0090a73a6a..74e1e1ec8736 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
 		gpg-error.1:${PORTSDIR}/security/libgpg-error
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index cd75d34c5cb1..a49be5aed48b 100644
--- a/security/libntlm/Makefile
+++ b/security/libntlm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library that implement Microsoft's NTLM authentication
 
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 3c7a310c0cfe..b089dcd8120e 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls/libtasn1
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 56ee18f73404..390bcf2879f3 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Open Crypto Development Kit
 
 LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/opensc-esteid/Makefile b/security/opensc-esteid/Makefile
index 64a7ec5107b7..a218c86ba699 100644
--- a/security/opensc-esteid/Makefile
+++ b/security/opensc-esteid/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 USE_OPENLDAP=	yes
 INSTALLS_SHLIB=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcsclite=${LOCALBASE}    \
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 3a1cb18a7474..6e9838166491 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	lthack gtk20
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 0b581e0f18e5..3d210e0947a3 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix eel2
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 2581e9893aa8..e1f09b457a2c 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -20,7 +20,7 @@ PLIST_SUB=	SFS_VERSION=${PORTVERSION}
 INFO=		sfs
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sfsuser=sfs \
 		--with-sfsgroup=sfs \
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 208c51c2a1db..06f868d773a6 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_OPENSSL=	yes
 USE_GNOME=	gnomehack libxslt
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 50fdf21d836f..c2ed3ce018e8 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -22,7 +22,7 @@ COMMENT=	An Enhanced Printer Spooler
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	\
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 4d6800b58e16..a3302d3c74b7 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ebrandi@fugspbr.org
 COMMENT=	DAR is a full featured command-line backup tool, aimed for disks
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 MAN1=		dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 334e1e23caed..40bdfd4665da 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.astron.com/pub/file/ \
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	File - determine file type
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-fsect-man5
 MAN1=		file.1
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index b62966144f71..42f8ee3f91e6 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index b62966144f71..42f8ee3f91e6 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 135e73a23c95..3bd29eb18c46 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -18,7 +18,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index e69961a018fb..d797995a06d6 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 8f451c9f25a9..5c917564eed7 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 60f5e2813937..fc088c67f265 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=	i386
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 9530d49e2596..c4ae7d3dd74d 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GCC=	3.3
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 55af878073a3..e7d97ee98c3e 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 8d2be0502226..4bdfea286a6a 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 28904e85ac59..de3157efc93a 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index c2b6815c5362..12a940483b7d 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index b51ffc5296ac..1c7b00c2d982 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 45dedf01cc5a..fbee857a7e03 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 84d8425625c3..a3e2f1d7ffa4 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
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 \
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 10be4fbb06e2..1fa50b7601f7 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mt --program-prefix="" \
 		--with-libxml2-include="${LOCALBASE}/include/libxml2"
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 97519e43f3ba..7a0a8e5c71a0 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A C++ class library for writing CGI applications
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
 INSTALLS_SHLIB=	yes
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 4e4e2aecca06..f4100e528fdf 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	wwwzip.1:${PORTSDIR}/www/libwww
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs
-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/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index bf3ca17511fe..9a29a009205e 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-gconf=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 537f0a6b221c..ec0b2c9886cb 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	sources/libghttp/1.0
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME http client library
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 044cf61c9b10..5c409936855e 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack libxslt gnomevfs2 gail
 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/www/libwww/Makefile b/www/libwww/Makefile
index 0ad9196703ee..eab75b71930c 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The W3C Reference Library
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib
 USE_PERL5_BUILD=yes
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index f7edccb371cd..0475749ea683 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
 		gtksourceview lthack intlhack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .ifndef WITHOUT_OPENSSL
diff --git a/www/screem/Makefile b/www/screem/Makefile
index f7edccb371cd..0475749ea683 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
 		gtksourceview lthack intlhack
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .ifndef WITHOUT_OPENSSL
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index 0bd4f623ee9f..ff0b871e8972 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -24,7 +24,7 @@ KDEDIR?=${LOCALBASE}/bin
 CONFIGURE_TARGET=
 CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	krusader.1
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index 0bd4f623ee9f..ff0b871e8972 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -24,7 +24,7 @@ KDEDIR?=${LOCALBASE}/bin
 CONFIGURE_TARGET=
 CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	krusader.1
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index e8920c6946cb..eeeeb750547e 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 194349f19f89..c31957d694cf 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=		yes
 USE_X_PREFIX=		yes
 XFREE86_VERSION=	4
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
 AUTOMAKE_ARGS=		-a
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 79f3b8b38cd1..ae3d1defa187 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index ddafc2675689..de5fd1de41a1 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -19,7 +19,7 @@ COMMENT=	The Clean GTK theme engine
 WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 5d3c7b4cfa94..96a4cae58e90 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index fc631e4d548a..a465b945c4a0 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 9e451551c4e5..7c58f1c8157d 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A GTK theme engine designed to look nice with the GNOME desktop environ
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index f84aa5af174a..f4c2ce61f7a6 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-theme
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomehack lthack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 4c1d47e0c13a..bb6bf10a9796 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index c96cd686cb8c..c2bd8e5cfbf7 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Theme engine for gtk+ toolkits
 
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 THEMES=		metal notif pixmap raleigh redmond95
 
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index b4ead780a8e0..be26c48589d2 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index 8059e045a911..c51a8ac13dc0 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index cb8c6a312d8d..22193b08cb42 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/zenith-1.0
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 6e0210860ed5..955b1a241a14 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 695e666969c6..1b9a8d8adc75 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 6376f890002b..1aef51de22aa 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index dfb35dee4e47..bcdfa07476d3 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index f7ac0716eb39..504287bd6ff0 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 GTKVERSION=	1.2
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 3042c24d95c0..d31686792204 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A QNX Photon like window decoration and widget style for KDE
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index dc7f2bca1330..10b734e1af6f 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 .include <bsd.port.mk>
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 6e800bfc9c31..673cc2f0440d 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index cade41c469a7..400bb408a0bc 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intltool gnometarget
-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/x11-toolkits/bakery_gnomeui/Makefile b/x11-toolkits/bakery_gnomeui/Makefile
index fed55ae1430d..0bfb489cbc4c 100644
--- a/x11-toolkits/bakery_gnomeui/Makefile
+++ b/x11-toolkits/bakery_gnomeui/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget
-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/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index ae1baff2fc00..4492671abbf6 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 17804a0fbacf..1267082bcf08 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GNOME=	lthack
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 17804a0fbacf..1267082bcf08 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GNOME=	lthack
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
index fdd096e0e2f8..5c5b2a185131 100644
--- a/x11-toolkits/freeglut/Makefile
+++ b/x11-toolkits/freeglut/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
 USE_AUTOHEADER_VER=	213
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_XLIB=	yes
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 477b30095047..41b2be1d8f99 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Fox toolkit reimplementation of Scintilla editing widget
 
 LIB_DEPENDS=	FOX-1.0.0:${PORTSDIR}/x11-toolkits/fox
 
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 5814154d7e4e..c4fdf3f829cc 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier libglade gnomevfs
 USE_ICONV=	yes
 GNOME_HTML_DIR=	${PREFIX}/share/doc/gal
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-static --with-libiconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 9b35e2033222..4f9566ed128c 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libgnomeui libgnomeprintui
 GNOME_HTML_DIR=	${PREFIX}/share/doc/gal2
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-static --with-libiconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 598507ea2ae6..95f1872694a5 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Components intended to be shared between GNOME development tools
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gevas/Makefile b/x11-toolkits/gevas/Makefile
index 4af17e4fb56d..4206de73e3e1 100644
--- a/x11-toolkits/gevas/Makefile
+++ b/x11-toolkits/gevas/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GTK+ bindings for Evas canvas library
 LIB_DEPENDS=	evas.6:${PORTSDIR}/graphics/evas
 
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-install:
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 7258f8bcdf2c..b86faaba5b9f 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index bf1268a579fc..cc080f7dc34b 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 8efe623af661..ac319559cbb9 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12 --with-native-locale \
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 8c4d3821bd84..86bb98223610 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 8c4d3821bd84..86bb98223610 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 86cda5547663..62d4dba08723 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-lib-GL
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index f06bb4fe7c47..7b37e8f05105 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gtk20
 USE_BZIP2=	yes
 USE_GL=		yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index c22605588007..99fac4824c79 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GL=		yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 7258f8bcdf2c..b86faaba5b9f 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index bf1268a579fc..cc080f7dc34b 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 71002b7abf60..6a6fadfa494d 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.3
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index bf1268a579fc..cc080f7dc34b 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index a8faf425ddf5..b807956224ff 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack libgnome libgnomeprintui
 CONFIGURE_ARGS=	--enable-compile-warnings=no
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index cb2c5ce16e47..000661e93c8e 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Guile binding library for GNOME
 LIB_DEPENDS=	guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix bonobo gtkhtml libglade
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-bonobo --with-gtkhtml --without-gal \
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index d67c088e63e2..fe35a502203a 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12 gnometarget
 USE_REINPLACE=	yes
-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/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 754d53a9d6fb..514da4a238d8 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,7 +20,7 @@ WANT_AUTOMAKE_VER=	18
 USE_AUTOCONF_VER=	259
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 LIBTOOLFILES=	aclocal.m4 test/aclocal.m4
 CONFIGURE_ARGS+=	--enable-static --enable-shared --enable-production
 CONFIGURE_ARGS+=	--disable-build-Xlt --disable-build-Xbae
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index b564ed87cb26..69a1852d6f98 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -24,7 +24,7 @@ MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 0c592141f6d9..7e7f0dff66ac 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack \
 		libgnomecanvas libgnome
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index ce56eadb6899..13988cede31b 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gnomeprefix libbonoboui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 5ce92855134d..5f99c4ded8a7 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomepanel atspi
 CONFIGURE_ARGS=	--enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 726cd9c5ccf6..2b966383db59 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack \
 		intlhack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 1198d4fd97a4..cecbd610282b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -25,7 +25,7 @@ USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack gnomehier libbonoboui
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 59f2735ffad0..608183754305 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 95c2e4bec631..8b2255fbc801 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CFLAGS+=	-fPIC
 
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index cdd64ebdd6d0..603175bc7c47 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomepanel
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index b15bfb82a480..5dcc76e40ed6 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gtk20
 USE_BISON=	yes
 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/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 662f5d14b293..c036aed6e0de 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 00622ab4b32a..198be8ddcd65 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack gtk20 libartlgpl2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index c86e919b1723..fe410ddd177e 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 9441652d1502..08c077c41bde 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
index f7ac0716eb39..504287bd6ff0 100644
--- a/x11-toolkits/notif2/Makefile
+++ b/x11-toolkits/notif2/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 
 GTKVERSION=	1.2
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 60616e2adf18..be8caf3e868c 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 60616e2adf18..be8caf3e868c 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 766b74d69d5a..ddca3c0e3d5c 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gtkhtml gnometarget
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFILES=	configure pygtk/configure
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
 		--with-gnome-config=${X11BASE}/bin/gnome-config		\
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index e7c7051f5391..17249b05bea8 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel libzvt nautilus2
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index aa51d2c2ef25..c0b08a2b188d 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Graphical User Interface library for SDL
 
 USE_SDL=	sdl image ttf
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 403400dadebb..785ed4c31153 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 8bdbc9ad99eb..c859a578519e 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-opt=no
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index a815c53b0aba..ed90fb93a774 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack lthack gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index 61e35227a048..937da61cfdcd 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	stijn@win.tue.nl
 COMMENT=	Configurator for the Blackbox window manager
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index e7ee7843f163..d908c4619979 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	metacity*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack gnomehier gconf2 libglade2
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index aa4048d35df7..05ddf5437653 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	\
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 2c950952be3a..40a180ca35e5 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Standard library for Window Maker dock apps
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index 9e19691c5c12..5e42686a469e 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	EROOT="${X11BASE}/share/enlightenment" \
 		EBIN="${X11BASE}/bin" \
 		CPPFLAGS="${CPPFLAGS}" \
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 4b5c1bb04aa9..f67068aee2a9 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	expocity*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix intlhack gnomehack lthack gnomehier gconf2 libglade2
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d233d62ee0d4..62ba568764ac 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -30,7 +30,7 @@ USE_XPM=	yes
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	X11BASE=${X11BASE} \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 53cb5267ce15..635558ca5987 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index c3173cd6798a..b781605ab3e8 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 3fe0bf8e3337..eed7103a09ca 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 1863ae778dde..ee0bb6108589 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 2a0f662aea4d..e39b972236df 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 328ad7d7a7c3..9533a9c51264 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A core event abstraction library
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-install:
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 4c8abadd361a..53fb0397dd8d 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
 		ast.2:${PORTSDIR}/devel/libast
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS?=--enable-trans --enable-utmp \
 		--enable-xim --with-theme-update \
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 1aae16ce0bc8..7d0085385bd5 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -25,7 +25,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 12b1940143c1..bd8b66f0f67b 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -27,7 +27,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix esound gtk12 imlib libxml orbit
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--disable-test-gnome
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a11b623dad8b..02f21d20f65e 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
 		libwnck
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 1aae16ce0bc8..7d0085385bd5 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -25,7 +25,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 12b1940143c1..bd8b66f0f67b 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -27,7 +27,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix esound gtk12 imlib libxml orbit
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--disable-test-gnome
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index a11b623dad8b..02f21d20f65e 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
 		libwnck
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index d9d145fe2563..3b641ce3bc18 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -26,7 +26,7 @@ PREFIX?=	${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 0ac0127619ac..001047a60313 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -25,7 +25,7 @@ PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 4862d767bbca..f6c5a8e3b00e 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -26,7 +26,7 @@ MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 46084e84df5c..b0014447d5fe 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -29,7 +29,7 @@ MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 28c6abaf03df..be2ec956714b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack lthack gnomehier intlhack esound \
 		gnomevfs2 libxslt
 USE_BISON=	yes
 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/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 80ce5b1aa429..baddcd49e7d4 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnome
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 145cef1fb9e9..07eecb42f66c 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--disable-doxygen
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 22a82512c583..1d2c3eea4526 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -21,7 +21,7 @@ DISTNAME=	rxvt-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A low memory usage xterm replacement that supports color
 
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index f0358d787fee..1833a350ac41 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier lthack gnometarget pkgconfig
-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/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 15fb77ce128c..476b9d11647d 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 38ddb69fb06a..90ca05aceb6a 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2004-07-09 17:43:11 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2004-07-09 17:43:11 +0000
commit	9e5632dd661f75b5801706e55659a4da501e49b5 (patch)
tree	1a0770d8cc1771f94f7777b9a986bb87029c35d9
parent	90c653ebbfee158880bc5fc4eb15ad057288510a (diff)
download	ports-9e5632dd661f75b5801706e55659a4da501e49b5.tar.gz ports-9e5632dd661f75b5801706e55659a4da501e49b5.zip