Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Apr 2015 15:14:58 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384229 - in head: mail/libspf mail/mu math/nlopt multimedia/kodi multimedia/kodi/files multimedia/libcec multimedia/libva-intel-driver net-im/tox net-p2p/twister net/afpfs-ng net/bmon ...
Message-ID:  <201504181514.t3IFEwwc064870@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Apr 18 15:14:57 2015
New Revision: 384229
URL: https://svnweb.freebsd.org/changeset/ports/384229

Log:
  Convert to USES=autoreconf

Modified:
  head/mail/libspf/Makefile
  head/mail/mu/Makefile
  head/math/nlopt/Makefile
  head/multimedia/kodi/Makefile
  head/multimedia/kodi/files/patch-freebsd
  head/multimedia/libcec/Makefile
  head/multimedia/libva-intel-driver/Makefile
  head/net-im/tox/Makefile
  head/net-p2p/twister/Makefile
  head/net/afpfs-ng/Makefile
  head/net/bmon/Makefile
  head/net/freeradius2/Makefile
  head/net/isc-dhcp41-server/Makefile
  head/net/libnfs/Makefile
  head/net/libsocket++/Makefile
  head/net/ntopng/Makefile
  head/net/openggsn/Makefile
  head/net/rabbitmq-c/Makefile
  head/net/tigervnc/Makefile
  head/net/torsocks/Makefile
  head/print/fontforge/Makefile
  head/print/panda/Makefile

Modified: head/mail/libspf/Makefile
==============================================================================
--- head/mail/libspf/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/mail/libspf/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -18,9 +18,7 @@ MAKE_JOBS_UNSAFE=yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool tar:bzip2
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-AUTOMAKE_ARGS=	-a -c -f
+USES=		autoreconf libtool tar:bzip2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*

Modified: head/mail/mu/Makefile
==============================================================================
--- head/mail/mu/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/mail/mu/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -20,10 +20,9 @@ GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	${PORTVERSION:S/^/v/}
 GH_COMMIT=	7888ba3
 
-USES=		gmake libtool makeinfo pkgconfig
+USES=		autoreconf gmake libtool makeinfo pkgconfig
 USE_GNOME=	glib20
-USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
-AUTOMAKE_ARGS=	--add-missing
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk
 INSTALL_TARGET=	install-strip
 

Modified: head/math/nlopt/Makefile
==============================================================================
--- head/math/nlopt/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/math/nlopt/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -20,12 +20,12 @@ BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 
 USES=		autoreconf compiler:features libtool pathfix \
 		pkgconfig python:2
-USE_AUTOTOOLS=	libtoolize
 USE_LDCONFIG=	yes
 
 PATHFIX_MAKEFILEIN=	Makefile.am

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/multimedia/kodi/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -61,8 +61,8 @@ GH_ACCOUNT=	xbmc
 GH_PROJECT=	ffmpeg
 GH_TAGNAME=	2.4.6-Helix
 
-USES=		gettext gmake iconv:wchar_t libtool:build pkgconfig python:2
-USE_AUTOTOOLS=	autoconf:env automake:env
+USES=		autoreconf:build gettext gmake iconv:wchar_t libtool \
+		pkgconfig python:2
 GNU_CONFIGURE=	yes
 USE_XORG=	xt xmu xtst xrandr
 USE_GL=		glu
@@ -172,9 +172,8 @@ post-patch:
 		${WRKSRC}/xbmc/Makefile.in \
 		${WRKSRC}/tools/TexturePacker/Makefile.in
 	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
-	${REINPLACE_CMD} '/^autopoint/d' ${WRKSRC}/lib/cpluff/autogen.sh
 
-run-autotools:
+pre-configure:
 	cd ${WRKSRC} && ${SH} ./bootstrap
 
 post-install:

Modified: head/multimedia/kodi/files/patch-freebsd
==============================================================================
--- head/multimedia/kodi/files/patch-freebsd	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/multimedia/kodi/files/patch-freebsd	Sat Apr 18 15:14:57 2015	(r384229)
@@ -1,16 +1,3 @@
-diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh
-index ee0a418..efd5291 100755
---- lib/cpluff/autogen.sh
-+++ lib/cpluff/autogen.sh
-@@ -15,7 +15,7 @@ fi
- 
- # Generate files in top level directory
- cd "$basedir"
--autopoint
-+#autopoint
- rm -f ABOUT-NLS
- test -d auxliary || mkdir auxliary
- libtoolize --automake -f
 diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile
 index 0e08dcf..e94d78f 100644
 --- tools/depends/target/ffmpeg/Makefile

Modified: head/multimedia/libcec/Makefile
==============================================================================
--- head/multimedia/libcec/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/multimedia/libcec/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -17,12 +17,10 @@ GH_ACCOUNT=	Pulse-Eight
 GH_COMMIT=	2a80b46
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}-repack
 
-USES=		alias pathfix pkgconfig libtool
+GNU_CONFIGURE=	yes
+USES=		alias autoreconf pathfix pkgconfig libtool
 PATHFIX_MAKEFILEIN=Makefile.am
 USE_XORG=	x11 xproto xrandr
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-ACLOCAL_ARGS=	-I.
-AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 

Modified: head/multimedia/libva-intel-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-driver/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/multimedia/libva-intel-driver/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -15,11 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 
-USES=		compiler:c11 gmake libtool pkgconfig tar:bzip2
+GNU_CONFIGURE=	yes
+USES=		autoreconf compiler:c11 gmake libtool pkgconfig tar:bzip2
 USE_GL=		gl
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-ACLOCAL_ARGS=	-I.
-AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-isystem${LOCALBASE}/include

Modified: head/net-im/tox/Makefile
==============================================================================
--- head/net-im/tox/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net-im/tox/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -21,10 +21,9 @@ GH_ACCOUNT=	irungentoo
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	a47fad1
 
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-AUTOMAKE_ARGS=	-a -c -f
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tests
-USES=		libtool openal:soft pathfix pkgconfig
+USES=		autoreconf libtool openal:soft pathfix pkgconfig
 USE_SDL=	yes
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
@@ -66,8 +65,8 @@ PID_DIR=	/var/run/tox-bootstrapd
 PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
+post-patch:
+	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}

Modified: head/net-p2p/twister/Makefile
==============================================================================
--- head/net-p2p/twister/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net-p2p/twister/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -27,9 +27,8 @@ GH_TAGNAME=	v${PORTVERSION}
 USE_BDB=	yes
 WANT_BDB_VER=	48
 USE_OPENSSL=	yes
-USES=		gmake iconv
+USES=		autoreconf gmake iconv libtool
 
-USE_AUTOTOOLS=	libtoolize:env aclocal:env autoconf:env autoheader:env automake:env
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=${WRKSRC}/libtorrent
 CONFIGURE_ARGS=	--with-libiconv			\
@@ -52,10 +51,9 @@ PORTDOCS=	README.md
 WITH_OPENSSL_PORT=	yes
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|'	\
+post-patch:
+	@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|'	\
 		${WRKSRC}/share/genbuild.sh
-	(cd ${CONFIGURE_WRKSRC} && ./autotool.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/twisterd ${STAGEDIR}${PREFIX}/bin

Modified: head/net/afpfs-ng/Makefile
==============================================================================
--- head/net/afpfs-ng/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/afpfs-ng/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -12,10 +12,9 @@ COMMENT=	Apple Filing Protocol client li
 
 LICENSE=	GPLv2
 
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake iconv libtool tar:bzip2 readline
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-AUTOMAKE_ARGS=	--add-missing --copy --force
+USES=		autoreconf gmake iconv libtool readline tar:bzip2
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-return-type

Modified: head/net/bmon/Makefile
==============================================================================
--- head/net/bmon/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/bmon/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -20,10 +20,8 @@ GH_ACCOUNT=	tgraf
 GH_COMMIT=	ad62e66
 GH_TAGNAME=	v${PORTVERSION}
 
-USES=		ncurses pkgconfig:build
-USE_AUTOTOOLS=	libtoolize autoheader automake aclocal
-AUTOMAKE_ARGS+=	--add-missing
 GNU_CONFIGURE=	yes
+USES=		autoreconf ncurses pkgconfig:build
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/freeradius2/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -28,9 +28,9 @@ CONFLICTS_INSTALL=	gnu-radius-[0-9].* op
 
 USE_RC_SUBR=	radiusd
 
-USES=		gmake libtool shebangfix tar:bzip2 libtool autoreconf
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool shebangfix tar:bzip2
 SHEBANG_FILES=	scripts/radsqlrelay src/modules/rlm_counter/rad_counter
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader
 USE_OPENSSL=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
@@ -309,14 +309,14 @@ CONFIGURE_ARGS+=--with-openssl-libraries
 
 post-patch:
 # never try to find execinfo.h (needed until we can enable/disable backtrace
-	@${REINPLACE_CMD} -e '/execinfo.h/d' ${WRKSRC}/configure \
-		${WRKSRC}/configure.in
+	@${REINPLACE_CMD} '/execinfo.h/d' ${WRKSRC}/configure.in
 # Patch raddb/certs/Makefile for the full path to the openssl binary (using
 # ports OpenSSL if installed)
 	@${REINPLACE_CMD} -E \
 		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
 		${WRKSRC}/raddb/certs/Makefile
 # If we're using Heimdal from base, alter the LIBS variable
+# XXX Should patch configure.in instead of configure because it is regenerated
 .if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
 	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
 	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
@@ -331,17 +331,6 @@ post-patch:
 	@${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \
 		${WRKSRC}/scripts/Makefile
 
-pre-configure:
-# Force the rebuild of some configures from configure.in, as we're patching
-# the configure.in
-# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf is
-# added to USE_AUTOTOOLS
-	@cd ${WRKSRC}/src/modules/rlm_ldap && ${AUTOCONF} -I ${WRKSRC}
-	@cd ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql \
-		&& ${AUTOCONF} -I ${WRKSRC}
-	@cd ${WRKSRC}/src/modules/rlm_perl && ${AUTOCONF} -I ${WRKSRC}
-	@cd ${WRKSRC}/src/modules/rlm_python && ${AUTOCONF} -I ${WRKSRC}
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rlm_* \

Modified: head/net/isc-dhcp41-server/Makefile
==============================================================================
--- head/net/isc-dhcp41-server/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/isc-dhcp41-server/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -96,11 +96,9 @@ PLIST_SUB+=		SCHEMA_DIR="${SCHEMA_DIR:S,
 PORTDOCS+=		README.ldap LICENSE.ldap
 LDAP_SCRIPT=		${WRKDIR}/${LDAPPATCHDIST}/dhcpd-conf-to-ldap
 LDAP_SCHEMA=		${WRKDIR}/${LDAPPATCHDIST}/dhcp.schema
-USES+=			perl5
+USES+=			autoreconf perl5
 USE_PERL5=		run
 USE_OPENLDAP=		yes
-USE_AUTOTOOLS=		aclocal libtoolize autoconf autoheader automake
-AUTOMAKE_ARGS=		--foreign --add-missing --copy
 CPPFLAGS+=		-I${LOCALBASE}/include
 LIBS+=			-L${LOCALBASE}/lib
 LDFLAGS+=		-L${LOCALBASE}/lib

Modified: head/net/libnfs/Makefile
==============================================================================
--- head/net/libnfs/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/libnfs/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -14,10 +14,8 @@ LICENSE=	LGPL21 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig gmake libtool
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-ACLOCAL_ARGS=	-I.
-AUTOMAKE_ARGS=	--add-missing
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 post-patch:

Modified: head/net/libsocket++/Makefile
==============================================================================
--- head/net/libsocket++/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/libsocket++/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -18,9 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		libtool makeinfo
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
-AUTOMAKE_ARGS=	-a -c
+USES=		autoreconf libtool makeinfo
 
 INFO=	socket++
 

Modified: head/net/ntopng/Makefile
==============================================================================
--- head/net/ntopng/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/ntopng/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -20,11 +20,11 @@ LIB_DEPENDS=	librrd.so:${PORTSDIR}/datab
 		libndpi.so:${PORTSDIR}/net/ndpi \
 		libzmq.so:${PORTSDIR}/net/libzmq3
 
-USE_AUTOTOOLS=	autoheader aclocal libtoolize
+GNU_CONFIGURE=	yes
 USE_SQLITE=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
-USES=	 	cpe gmake libtool pathfix pkgconfig tar:tgz
+USES=	 	autoreconf cpe gmake libtool pathfix pkgconfig tar:tgz
 SUB_FILES=	ntopng-geoipupdate.sh
 
 CPE_VENDOR=	ntop

Modified: head/net/openggsn/Makefile
==============================================================================
--- head/net/openggsn/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/openggsn/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -12,10 +12,8 @@ COMMENT=	Implementation of the Gateway G
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake libtool
-
-USE_AUTOTOOLS=	aclocal autoconf automake libtoolize autoheader
-AUTOMAKE_ARGS=	--gnu --add-missing --copy
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool
 
 post-patch:
 	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \

Modified: head/net/rabbitmq-c/Makefile
==============================================================================
--- head/net/rabbitmq-c/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/rabbitmq-c/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -25,10 +25,8 @@ CONFLICTS=	rabbitmq-c-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool python tar:bzip2
+USES=		autoreconf gmake libtool python tar:bzip2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal autoconf automake autoheader libtoolize
-AUTOMAKE_ARGS=	-i --add-missing
 
 OPTIONS_DEFINE=	64BIT POPT
 64BIT_DESC=	Produce 64-bit library

Modified: head/net/tigervnc/Makefile
==============================================================================
--- head/net/tigervnc/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/tigervnc/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -24,9 +24,8 @@ CONFLICTS=	tridiavnc-[0-9]* \
 		tightvnc-[0-9]* \
 		vnc-[0-9]*
 
-USES=		cmake cpe gmake libtool pkgconfig python
+USES=		autoreconf:build cmake cpe gmake libtool pkgconfig python
 USE_GL=		gl
-USE_AUTOTOOLS=	autoconf:env automake:env libtoolize:env
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
@@ -132,7 +131,7 @@ post-patch:
 	@cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch
 
 post-configure:
-	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${AUTORECONF} -fiv
+	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoreconf -fiv
 	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 
 post-build:

Modified: head/net/torsocks/Makefile
==============================================================================
--- head/net/torsocks/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/net/torsocks/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -17,9 +17,7 @@ GH_ACCOUNT=	dgoulet
 GH_PROJECT=	torsocks
 GH_TAGNAME=	96f7a0d
 
-USE_AUTOTOOLS=	aclocal autoconf libtoolize
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-
+GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

Modified: head/print/fontforge/Makefile
==============================================================================
--- head/print/fontforge/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/print/fontforge/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -30,7 +30,6 @@ GH_COMMIT=	53e171b
 USES=		autoreconf:build desktop-file-utils execinfo gettext gmake iconv libtool pkgconfig python shared-mime-info
 USE_XORG=	x11 xi ice xkbui
 USE_GNOME=	glib20 gtk20 libxml2 pango
-USE_AUTOTOOLS=	libtoolize
 
 CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -67,12 +66,6 @@ CONFIGURE_ARGS+=	--enable-freetype-debug
 CONFIGURE_ARGS+=	--disable-freetype-debugger
 .endif
 
-# Although USE_AUTOTOOLS=libtoolize is set above, I do not want to have the ports
-# system run libtoolize, I run it in pre-configure. fontforge's bootstrap normally
-# runs it and if it run later on, it causes the build process to fail.
-run-autotools-libtoolize:
-	@${TRUE}
-
 # This is to get around calling fontforge's bootstrap script, as that script fails
 # if git isn't installed on a system DESPITE there being a --skip-git argument that
 # can be passed into it. autoreconf is called here because I want to run it without
@@ -80,7 +73,7 @@ run-autotools-libtoolize:
 pre-configure:
 	(cd ${WRKSRC} && \
 		${SH} -c '. ./bootstrap.conf ; \
-		${LIBTOOLIZE} -q ; \
+		${LOCALBASE}/bin/libtoolize -i -c -q ; \
 		gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
 		export LIBTOOLIZE=true ; ${LOCALBASE}/bin/autoreconf -s -i)
 

Modified: head/print/panda/Makefile
==============================================================================
--- head/print/panda/Makefile	Sat Apr 18 14:07:54 2015	(r384228)
+++ head/print/panda/Makefile	Sat Apr 18 15:14:57 2015	(r384229)
@@ -24,10 +24,8 @@ CONFIGURE_ARGS=	--enable-berkeley-db
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LIBS+=		-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		autoreconf gmake libtool pathfix pkgconfig tar:bzip2
 PATHFIX_MAKEFILEIN=	Makefile.am
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-AUTOMAKE_ARGS=	-a -c -f
 USE_BDB=	yes
 USE_LDCONFIG=	yes
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504181514.t3IFEwwc064870>