Convert to USES=autoreconf

6 files changed, 9 insertions, 36 deletions

diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index e00c8d2612b5..1a21fda2f9df 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -19,11 +19,11 @@ NO_PACKAGE=	yes
 
 SNAPDATE=	20140626144503
 
-USES=			cpe tar:xz iconv perl5 pathfix libtool python:2,build
+USES=		autoreconf:build cpe iconv libtool pathfix perl5 \
+		python:2,build tar:xz
 CPE_PRODUCT=	apr-util
 CPE_VENDOR=	apache
 CPE_VERSION=	${PORTVERSION:S|.${SNAPDATE}||}
-USE_AUTOTOOLS=		automake:env autoconf:env libtoolize:env
 USE_PERL5=		build
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
@@ -113,7 +113,7 @@ post-patch:
 		-e 's|python -c|${PYTHON_VERSION} -c|' \
 		${WRKSRC}/build/buildcheck.sh
 
-run-autotools:
+pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf)
 
 pre-install:
@@ -129,17 +129,4 @@ test:	build
 
 #regression-test:	test
 
-debug_autoconf:
-	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"
-	@${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
-	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
-	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
-	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
-	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
-	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
-	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
-	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
-	@${ECHO} "==================="
-	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}" | ${TR} -s ' ' '\n'
-
 .include <bsd.port.mk>
diff --git a/devel/fstrm/Makefile b/devel/fstrm/Makefile
index 9faa68430189..05f8f81789dc 100644
--- a/devel/fstrm/Makefile
+++ b/devel/fstrm/Makefile
@@ -18,9 +18,8 @@ USE_GITHUB=		yes
 GH_ACCOUNT=		farsightsec
 
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=		automake autoconf:env libtoolize
+USES=			autoreconf gmake libtool pkgconfig
 USE_LDCONFIG=		yes
-USES=			libtool gmake pkgconfig
 
 OPTIONS_DEFINE=		DOXYGEN
 DOXYGEN_DESC=		Use doxygen for docs
@@ -29,7 +28,4 @@ DOXYGEN_ALL_TARGET=	html-local
 
 PORTDOCS=		*
 
-run-autotools:
-	cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh
-
 .include <bsd.port.mk>
diff --git a/devel/libr3/Makefile b/devel/libr3/Makefile
index 821149ad8ea9..53ef990a293e 100644
--- a/devel/libr3/Makefile
+++ b/devel/libr3/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-graphviz
-USES=		libtool pkgconfig
+USES=		autoreconf libtool pkgconfig
 INSTALL_TARGET=	install-strip
-USE_AUTOTOOLS=  aclocal:env autoconf:env autoheader:env automake:env libtoolize:env
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	c9s
@@ -30,7 +29,4 @@ post-patch:
 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile.am
 
-pre-configure:
-	(cd ${WRKSRC} && ./autogen.sh)
-
 .include <bsd.port.mk>
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 4bc80a815146..f89b7f21f4a9 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -13,10 +13,8 @@ COMMENT=	Object Oriented Input System
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		pathfix gmake libtool
+USES=		autoreconf gmake libtool pathfix
 PATHFIX_MAKEFILEIN=	Makefile.am
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-AUTOMAKE_ARGS=	--add-missing --copy --foreign
 USE_XORG=	x11 xaw
 USE_LDCONFIG=	yes
 
diff --git a/devel/pinba_engine/Makefile b/devel/pinba_engine/Makefile
index ef3161c2037c..6dcea46bb004 100644
--- a/devel/pinba_engine/Makefile
+++ b/devel/pinba_engine/Makefile
@@ -30,11 +30,9 @@ MYSQL_WRKSRC=	$$(cd ${PORTSDIR}/${_MYSQL_SERVER} && ${MAKE} -V WRKSRC)
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
+USES=		autoreconf gmake libtool
 USE_LDCONFIG=	${PREFIX}/lib/mysql/plugin
 
-AUTOMAKE_ARGS=	--add-missing --copy --force-missing
 CONFIGURE_ARGS=	--disable-static \
 		--with-mysql=${MYSQL_WRKSRC} \
 		--libdir=${PREFIX}/lib/mysql/plugin
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 63a4ff4bedbe..3a1f8a5d7685 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -14,10 +14,8 @@ COMMENT=	C++ library for SDTS related development
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 DOS2UNIX_FILES=	sdts++/io/sio_Utils.cpp
-USES=		bison dos2unix gmake libtool makeinfo
-USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing --copy --foreign
+USES=		autoreconf bison dos2unix gmake libtool makeinfo
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes