10 files changed, 18 insertions, 22 deletions

diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index c5c9d993f710..d7830ac9a18f 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		netpbm.1:${PORTSDIR}/graphics/netpbm
 
-USE_AUTOCONF=	213
+USE_AUTOCONF_VER=213
 USE_BZIP2=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include"
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index 90ee6787559f..18cf15ec1e98 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index c5b0e587b4a2..14cadaa02b79 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -15,9 +15,8 @@ MASTER_SITES=	http://axljab.homelinux.org/software/divxcalc/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DivX Calculator
 
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
-		autoheader:${PORTSDIR}/devel/autoconf
-
+WANT_AUTOMAKE_VER=15
+WANT_AUTOCONF_VER=253
 USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index b7e1d9a4f1ba..fdd096e0e2f8 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -15,19 +15,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
 
 USE_AUTOMAKE_VER=	14
-USE_AUTOHEADER=	yes
+USE_AUTOCONF_VER=	213
+USE_AUTOHEADER_VER=	213
+USE_LIBTOOL_VER=	13
 HAS_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include			\
 		--x-libraries=${X11BASE}/lib			\
 		--enable-replace-glut
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"			\
-		ACLOCAL="${ACLOCAL}"				\
-		AUTOCONF="${AUTOCONF}"				\
-		AUTOMAKE="${AUTOMAKE}"				\
-		AUTOHEADER="${AUTOHEADER}"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
 
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 2774eb642a35..71c1dcb21f0f 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -29,6 +29,7 @@ XFREE86_VERSION=	4
 INSTALLS_SHLIB=		yes
 USE_LIBTOOL_VER=	13
 USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
 AUTOMAKE_ARGS=		-a
 USE_GMAKE=		yes
 MAKEFILE=		makefile.autoconf
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index dcffd679040b..a3376c145ea5 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -14,13 +14,13 @@ MASTER_SITE_SUBDIR=	enlightenment
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
 
-LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
+USE_LIBLTDL=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_REINPLACE=	yes
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 4eec110dcda9..aba9b23d9e25 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -15,16 +15,14 @@ MAINTAINER?=	jylitalo@iki.fi
 COMMENT?=	An image management tool for the X Window System
 
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		gtk12-config:${PORTSDIR}/x11-toolkits/gtk12
+BUILD_DEPENDS=	gtk12-config:${PORTSDIR}/x11-toolkits/gtk12
 LIB_DEPENDS=	glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 MAN1=		lodju-create.1 lodju-gallery.1 lodju.1
 MANCOMPRESSED=	yes
 
-AUTOCONF=       autoconf
-GNU_AUTOCONF=   yes
+WANT_AUTOCONF_VER=253
 HAS_CONFIGURE=  yes
 USE_GETTEXT=	yes
 
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 46d65676a47a..386448f8e1f9 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF_VER=	213
-USE_AUTOHEADER=	yes
 USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
+USE_AUTOHEADER_VER=	213
 USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index f77ea7f04680..34f706360e4c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -24,6 +24,7 @@ USE_GL=		yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
 AUTOMAKE_ARGS=	--add-missing --include-deps
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 4bd8dc5c1e06..1c1400ff4e54 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -19,9 +19,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	3d@FreeBSD.org
 COMMENT=	A hardware OpenGL support for XFree86 X-Servers
 
-BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83 \
-		autoconf:${PORTSDIR}/devel/autoconf
+BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
 
+WANT_AUTOCONF_VER=253
 USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes