Sync with new bsd.autotools.mk

8 files changed, 18 insertions, 16 deletions

diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index f1144869fa0a..c72cf6c360cf 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Multitrack audio processing software
 
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
 USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index f698932aa40d..d1790bfc7618 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -18,7 +18,7 @@ NO_PACKAGE=	Distribution in binary form is prohibited
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_AUTOMAKE_VER=15
-USE_AUTOHEADER=	yes
+USE_AUTOHEADER_VER=213
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index e06e45c673c6..5a651be54d64 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_AUTOMAKE_VER=15
-USE_AUTOHEADER=	yes
+USE_AUTOMAKE_VER=	15
+USE_AUTOHEADER_VER=	253
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 9c878e4522c4..512a4222a36c 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
+USE_LIBLTDL=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libglade lthack
 USE_GMAKE=	yes
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index c27643e8eb0c..e47107efc916 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -24,14 +24,14 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_AUTOMAKE_VER=	15
-USE_AUTOHEADER=	yes
-AUTOMAKE_ARGS=	--add-missing
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-USE_REINPLACE=	yes
+USE_AUTOCONF_VER=	253
+USE_AUTOHEADER_VER=	253
+USE_LIBTOOL_VER=	13
+AUTOMAKE_ARGS=		--add-missing
+USE_X_PREFIX=		yes
+USE_GNOME=		gtk12
+USE_GMAKE=		yes
+USE_REINPLACE=		yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-xmms --with-mp4v2
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 4e9c305ee383..71a22ef8a651 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOHEADER=	yes
-USE_AUTOCONF_VER= 257
+USE_AUTOCONF_VER=	257
+USE_AUTOHEADER_VER=	257
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 11d010732304..6271addc3dd1 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=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 
 PLIST_FILES=	lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 75c5b87c59f1..123bea57f57d 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
 USE_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>