From 7c2082609bec9c31237767d08c61f113e950f828 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 13 Apr 2016 10:36:54 +0000 Subject: [PATCH] Change default directory used by USES=autoreconf to WRKSRC PR: 208294 Exp-run by: antoine Reviewed by: tijl Approved by: portmgr (mat via D4157) Differential Revision: https://reviews.freebsd.org/D4169 --- Mk/Uses/autoreconf.mk | 7 ++++--- graphics/p5-ming/Makefile | 1 + graphics/py-ming/Makefile | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index a4e8be18373a..4eedcfdb68fe 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -65,6 +65,7 @@ BUILD_DEPENDS+= libtoolize:devel/libtool .endif AUTORECONF?= ${LOCALBASE}/bin/autoreconf +AUTORECONF_WRKSRC?= ${WRKSRC} .endif @@ -76,16 +77,16 @@ _USES_configure+= 470:do-autoreconf do-autoreconf: .for f in AUTHORS ChangeLog INSTALL NEWS README # Don't modify time stamps if the files already exist - @test -e ${CONFIGURE_WRKSRC}/${f} || ${TOUCH} ${CONFIGURE_WRKSRC}/${f} + @test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f} .endfor .if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool} - @(cd ${CONFIGURE_WRKSRC} && \ + @(cd ${AUTORECONF_WRKSRC} && \ if test -f configure.ac; then configure=configure.ac; \ else configure=configure.in; fi && \ if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \ then ${LOCALBASE}/bin/intltoolize -f -c; fi) .endif - @(cd ${CONFIGURE_WRKSRC} && ${AUTORECONF} -f -i) + @(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i) .endif .endif diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile index fe9fc760ee79..7521616f4a94 100644 --- a/graphics/p5-ming/Makefile +++ b/graphics/p5-ming/Makefile @@ -31,6 +31,7 @@ SHEBANG_FILES= examples/*.cgi PORTEXAMPLES= * +AUTORECONF_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/perl_ext diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile index c014c34143b4..510b63e2f477 100644 --- a/graphics/py-ming/Makefile +++ b/graphics/py-ming/Makefile @@ -29,6 +29,7 @@ GNU_CONFIGURE= yes USE_PYTHON= autoplist concurrent distutils USES= autoreconf libtool localbase python +AUTORECONF_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/py_ext