Whoa there, boy, that's a mighty big commit y'all have there...

Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

	USE_LIBTOOL=YES		->	USE_LIBTOOL_VER=13
	USE_AUTOCONF=YES	->	USE_AUTOCONF_VER=213
	USE_AUTOMAKE=YES	->	USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.

80 files changed, 84 insertions, 84 deletions

diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 48b5f15124c6..fe18082327bd 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	simage.22:${PORTSDIR}/graphics/simage \
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_XLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/" --with-pthread=yes --enable-threadsafe \
 		--enable-3ds-import --enable-sound --enable-html
 INSTALLS_SHLIB=	yes
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 9aa08680d4ec..442a69013b5e 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=	yes
+USE_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/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5f06ed3fab0e..94b1bc5763df 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -34,7 +34,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 10c2cc74527b..6959395f848b 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.openexr.com/downloads/
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	OpenEXR, a high dynamic-range (HDR) image file format developed by ILM
 
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index bd3883cb31ad..e08954930928 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_X11)
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 918f58e744a2..3afa27929dc8 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=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
 USE_XLIB=	yes
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index f5b393e6064e..c0c484a76afa 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/blender
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_SDL=	sdl
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 18b637920a11..fe96f8d9e215 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=	yes
+USE_LIBTOOL_VER=13
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 8c6f027c1cfd..e3a9f31f5559 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 42d4a50fd32c..b8247332114e 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index ab82bd2c72fc..a3a82cdc1617 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A graphic view base imlib & gtk
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index d289e4d8d84b..05c36fa059a8 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--enable-all-plugins \
 		--enable-plugins-dir \
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index db9688b596fe..99d1fc1efe5a 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	ecore.0:${PORTSDIR}/x11/ecore \
 		evas.6:${PORTSDIR}/graphics/evas
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 3d9c477a1b86..a1e05f9db003 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index fdbc2d62ee79..b969dc77365a 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=	yes
+USE_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 67bc165e7cd0..ff3199f686eb 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index d4d5eb98189e..b7e1d9a4f1ba 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
 
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 USE_AUTOHEADER=	yes
 HAS_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include			\
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 177fd7dc68c0..e49244927392 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -19,7 +19,7 @@ USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 
-USE_AUTOCONF=   yes
+USE_AUTOCONF_VER=	213
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=${X11BASE}
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 09185b5fffb2..5858e32cb96a 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tools and library routines for working with GIF images
 
 INSTALLS_SHLIB=	yes
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 .ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index cd9a51cb6215..3c6983c0e88c 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -35,7 +35,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 83bcccd48357..0a7915a72e5e 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index b6ba49b5f73e..e4db551bef2f 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=	yes
+USE_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 262140780929..cec768a3328b 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=		yes
+USE_LIBTOOL_VER=	13
 USE_AUTOMAKE_VER=	14
 AUTOMAKE_ARGS=		-a
 USE_GMAKE=		yes
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index e532ad3530cf..e826e7e97bec 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=	yes
+USE_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 d2739bdfdaf4..412ecaed3666 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 libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 80e38dd00382..33f124307656 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo gnomeprint
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 3791e9b792f2..42bcf7c518cf 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 52918d24461e..afae31604561 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 AUTOMAKE_ARGS=	--add-missing
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh \
diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index a283366b851f..ca7a335a2187 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack libgnomeui libgnomeprintui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index c49fd1f4d487..533ca2b613d1 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 RUN_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
 		--with-dps-libraries=${X11BASE}/lib
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 26b5082703f7..b99cdbabc022 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=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index a0fc2dbbdca7..2157a51ea71e 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
 		edb.1:${PORTSDIR}/databases/edb
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 6895933842fe..e572851e4373 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack intlhack libglade2 libartlgpl2 libgnomeprintui
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-popt \
 		--with-gnome-print
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}" \
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 712de12f848b..b9eab96f039b 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=	lthack gnometarget
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFLAGS=  --disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index af98d0f09e9e..0798e25df3ad 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -20,7 +20,7 @@ COMMENT=	IJG's jpeg compression utilities
 
 WRKSRC=		${WRKDIR}/jpeg-6b
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index af98d0f09e9e..0798e25df3ad 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -20,7 +20,7 @@ COMMENT=	IJG's jpeg compression utilities
 
 WRKSRC=		${WRKDIR}/jpeg-6b
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 
diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
index 0aa9bc2addcb..a04b2c4e366f 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=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 6c3f4c7589ef..e2d95b7bce17 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -25,7 +25,7 @@ USE_GL=		yes
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 22e236c6c5c0..59d2a190b278 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=	yes
+USE_LIBTOOL_VER=13
 
 CONFLICTS=	libart-*
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 22e236c6c5c0..59d2a190b278 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=	yes
+USE_LIBTOOL_VER=13
 
 CONFLICTS=	libart-*
 
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index fc63a80da60b..65b55b7cd0e4 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 gtk20
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index eab7e4989300..136454d254ec 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=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index b96345ea8307..435e438ca654 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 8b77891ffeb2..0b251b03ac0d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack libglade2 libartlgpl2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 5099ab7c676a..38ed50587352 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 5099ab7c676a..38ed50587352 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomecanvas
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index d731ad2910e4..83ccc645e38f 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=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index df7f0ed8aec2..d1b3eb6d39ef 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index d90d020f848d..693c164b1f90 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=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 7626a1dd1ceb..0310715b0204 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=	yes
+USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack gtk20 libartlgpl2 libxml2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libtheora/Makefile b/graphics/libtheora/Makefile
index 5029ccdb7d7c..be23cde7a8d5 100644
--- a/graphics/libtheora/Makefile
+++ b/graphics/libtheora/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 09185b5fffb2..5858e32cb96a 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tools and library routines for working with GIF images
 
 INSTALLS_SHLIB=	yes
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 .ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index fdd27b2fa187..daf009313a78 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 CONFIGURE_ENV+=	GLVER="${GLVER}" LIBS="-lm"
 SUB_GL=		src si-glu src-glu
diff --git a/graphics/nip/Makefile b/graphics/nip/Makefile
index d64f596406da..3b5788f9a5db 100644
--- a/graphics/nip/Makefile
+++ b/graphics/nip/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vips.0:${PORTSDIR}/graphics/vips \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index d64f596406da..3b5788f9a5db 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vips.0:${PORTSDIR}/graphics/vips \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index a681edf8a561..b49b22aec86c 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= 	ports@FreeBSD.org
 COMMENT=	A C++ library for representing curves or surfaces
 
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/"
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 3ef68eae0c3c..76a2b36a15e2 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CFALGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 1e43cb211193..6f6f60860d89 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,10 +22,10 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 USE_AUTOHEADER=	yes
-USE_AUTOMAKE=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=	14
+USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 8aab7ab717bd..13f71abeb9fc 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--program-prefix=''
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 6588ede849a0..012711749c2f 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=	yes
+USE_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 2782b56150d4..b8caa3b515d0 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=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 3f336a10d79d..cf7ed8765fbd 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=	yes
+USE_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 b0c14017380f..474b9ea2a154 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=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index d5a2429666f1..2c91be87f3be 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 USE_GNOME=	glib12
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 0ac2875e5d83..c8372ed2c75a 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb \
 USE_REINPLACE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 3367f29e18dd..7d74fa6fcb3e 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -20,7 +20,7 @@ COMMENT=	SDL graphics drawing primitives and other support functions
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_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 fe477c4349fe..415ec179b753 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=	yes
+USE_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 16ab7d6f3ead..aa17d6f45849 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=	yes
+USE_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 332348982a5f..b82a5e77b632 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=	yes
+USE_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/sodipodi/Makefile b/graphics/sodipodi/Makefile
index e9e434b3aec5..0ffe83228b33 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack lthack libglade2 libartlgpl2
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--without-gnome-print \
 		--with-popt
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 7b4d9f205f6a..19232e5a700d 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -28,7 +28,7 @@ USE_X_PREFIX=	yes
 USE_QT_VER=	3
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index ee0200755e51..cdb75c032716 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 901cdd608e3f..ef4e38a4524a 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An image viewer for X
 PLIST_FILES=	bin/vp
 USE_SDL=	image
 USE_GETOPT_LONG=yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 78f864dabcb3..4c7dda27de46 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	tdv94ped@cs.umu.se
 COMMENT=	A medical image conversion utility and library
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_SUBMAKE=	yes
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index a18c49c3a867..ba24cbf305b3 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=	yes
+USE_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 cdf66eaca921..12edf010b789 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=	yes
+USE_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 ef235f40e79d..0004d9acf537 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	libmorph*
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_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/graphics/xpcd/Makefile b/graphics/xpcd/Makefile
index c66414db5ccc..fb92be631cf9 100644
--- a/graphics/xpcd/Makefile
+++ b/graphics/xpcd/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 CFLAGS+=        -I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 USE_X_PREFIX=	yes
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index ccc8ed83b542..6511e2acef6f 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile
index ccc8ed83b542..6511e2acef6f 100644
--- a/graphics/yafray/Makefile
+++ b/graphics/yafray/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"