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

44 files changed, 44 insertions, 44 deletions

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