diff options
| -rw-r--r-- | Mk/Uses/autoreconf.mk | 6 | ||||
| -rw-r--r-- | devel/ptlib/Makefile | 5 | ||||
| -rw-r--r-- | games/qqwing/Makefile | 2 | ||||
| -rw-r--r-- | net/tigervnc/Makefile | 2 | ||||
| -rw-r--r-- | print/fontforge/Makefile | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index de92a6788f61..7106203159a6 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -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}/devel/autoconf \ 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 diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 4453b8b5559c..758f9c21b1b4 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 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} diff --git a/games/qqwing/Makefile b/games/qqwing/Makefile index b9c6da9713ac..d1cf7407ae89 100644 --- a/games/qqwing/Makefile +++ b/games/qqwing/Makefile @@ -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 diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index ad8e4ae89330..f55b3033d4aa 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -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: diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index 4ffae065b31d..c32d2137bcd0 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -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> |