From owner-svn-ports-head@freebsd.org Sun Nov 15 15:34:53 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B013A2F008; Sun, 15 Nov 2015 15:34:53 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32485153F; Sun, 15 Nov 2015 15:34:53 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFFYqDs095664; Sun, 15 Nov 2015 15:34:52 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFFYpBD095657; Sun, 15 Nov 2015 15:34:51 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201511151534.tAFFYpBD095657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 15 Nov 2015 15:34:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401710 - in head: Mk/Uses devel/ptlib games/qqwing net/tigervnc print/fontforge X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 15:34:53 -0000 Author: tijl Date: Sun Nov 15 15:34:51 2015 New Revision: 401710 URL: https://svnweb.freebsd.org/changeset/ports/401710 Log: Let USES=autoreconf define AUTORECONF and use it throughout the tree. PR: 204534 Approved by: portmgr (antoine) Modified: head/Mk/Uses/autoreconf.mk head/devel/ptlib/Makefile head/games/qqwing/Makefile head/net/tigervnc/Makefile head/print/fontforge/Makefile Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Sun Nov 15 15:25:12 2015 (r401709) +++ head/Mk/Uses/autoreconf.mk Sun Nov 15 15:34:51 2015 (r401710) @@ -48,7 +48,7 @@ # Usage: USES=autoreconf or USES=autoreconf:args # Valid args: build Don't run autoreconf, only add build dependencies # -# MAINTAINER: autotools@FreeBSD.org +# MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_AUTORECONF_MK) _INCLUDE_USES_AUTORECONF_MK= yes @@ -64,6 +64,8 @@ BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool .endif +AUTORECONF?= ${LOCALBASE}/bin/autoreconf + .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK) @@ -83,7 +85,7 @@ do-autoreconf: if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \ then ${LOCALBASE}/bin/intltoolize -f -c; fi) .endif - @(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i) + @(cd ${CONFIGURE_WRKSRC} && ${AUTORECONF} -f -i) .endif .endif Modified: head/devel/ptlib/Makefile ============================================================================== --- head/devel/ptlib/Makefile Sun Nov 15 15:25:12 2015 (r401709) +++ head/devel/ptlib/Makefile Sun Nov 15 15:34:51 2015 (r401710) @@ -16,8 +16,7 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex CONFLICTS= pwlib-1.* -USES= bison gmake pkgconfig tar:xz -USE_AUTOTOOLS= autoconf:env automake:env +USES= autoreconf:build bison gmake pkgconfig tar:xz GNU_CONFIGURE= yes USE_OPENSSL= yes USE_LDCONFIG= yes @@ -162,7 +161,7 @@ post-patch: @${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx pre-configure: - cd ${WRKSRC}/plugins/ && autoreconf -fi + (cd ${WRKSRC}/plugins/ && ${AUTORECONF} -fi) post-install: ${LN} -sf libpt.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt.so.${PVERSION_MAJOR} Modified: head/games/qqwing/Makefile ============================================================================== --- head/games/qqwing/Makefile Sun Nov 15 15:25:12 2015 (r401709) +++ head/games/qqwing/Makefile Sun Nov 15 15:34:51 2015 (r401710) @@ -30,7 +30,7 @@ pre-configure: target/automake @cd ${WRKSRC} && ${CP} doc/qqwing.man target/automake/qqwing.1 @cd ${WRKSRC}/target/automake && ${TOUCH} config.h.in - @cd ${WRKSRC}/target/automake && autoreconf --force --install + @cd ${WRKSRC}/target/automake && ${AUTORECONF} --force --install pre-build: @cd ${WRKSRC} && ${CP} src/cpp/*.cpp target/automake Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Sun Nov 15 15:25:12 2015 (r401709) +++ head/net/tigervnc/Makefile Sun Nov 15 15:34:51 2015 (r401710) @@ -134,7 +134,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} ${LOCALBASE}/bin/autoreconf -fiv + @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${AUTORECONF} -fiv @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} post-build: Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Sun Nov 15 15:25:12 2015 (r401709) +++ head/print/fontforge/Makefile Sun Nov 15 15:34:51 2015 (r401710) @@ -77,6 +77,6 @@ pre-configure: ${SH} -c '. ./bootstrap.conf ; \ ${LOCALBASE}/bin/libtoolize -i -c -q ; \ ${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \ - export LIBTOOLIZE=true ; ${LOCALBASE}/bin/autoreconf -s -i) + export LIBTOOLIZE=true ; ${AUTORECONF} -f -i) .include