svn commit: r401710 - in head: Mk/Uses devel/ptlib games/qqwing net/tigervnc print/fontforge
Tijl Coosemans
tijl at FreeBSD.org
Sun Nov 15 15:34:53 UTC 2015
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 at FreeBSD.org
+# MAINTAINER: portmgr at 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 <bsd.port.mk>
More information about the svn-ports-all
mailing list