Page MenuHomeFreeBSD
Files F132068647

D4157.id10180.diff
No OneTemporary
Actions

D4157.id10180.diff
View Options

Index: Mk/Uses/autoreconf.mk
===================================================================
--- Mk/Uses/autoreconf.mk
+++ Mk/Uses/autoreconf.mk
@@ -64,6 +64,16 @@
BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool
.endif
+.if ${autoreconf_ARGS:Moutsource}
+CONFIGURE_CMD?= ${AUTORECONF_WRKSRC}/${CONFIGURE_SCRIPT}
+CONFIGURE_WRKSRC?= ${WRKDIR}/.build
+BUILD_WRKSRC?= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC}
+AUTORECONF_WRKSRC?= ${WRKSRC}
+.else
+AUTORECONF_WRKSRC?= ${CONFIGURE_WRKSRC}
+.endif
+
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
@@ -74,16 +84,19 @@
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} && ${LOCALBASE}/bin/autoreconf -f -i)
+ @(cd ${AUTORECONF_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
+.if ${autoreconf_ARGS:Moutsource}
+ @${MKDIR} ${CONFIGURE_WRKSRC}
+.endif
.endif
.endif
Index: devel/fb-adb/Makefile
===================================================================
--- devel/fb-adb/Makefile
+++ devel/fb-adb/Makefile
@@ -88,25 +88,6 @@
@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-androideabi/aux-&/' \
${WRKSRC}/stub-*/configure
-# XXX Similar to USES=qmake:outsource, merge into Mk/Uses/autoreconf.mk
-.if defined(USES) && ${USES:Mautoreconf\:outsource}
-USES:= autoreconf:build ${USES:Nautoreconf*}
-CONFIGURE_CMD= ${AUTORECONF_WRKSRC}/${CONFIGURE_SCRIPT}
-CONFIGURE_WRKSRC= ${WRKDIR}/.build
-BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
-AUTORECONF_WRKSRC?= ${WRKSRC}
-
-_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 ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
-.endfor
- @(cd ${AUTORECONF_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
- @${MKDIR} ${CONFIGURE_WRKSRC}
-.endif
-
.include <bsd.port.options.mk>
# Extract :p7zip files with 7z(1) if libarchive cannot handle x86_64 sfx
Index: devel/googlemock/Makefile
===================================================================
--- devel/googlemock/Makefile
+++ devel/googlemock/Makefile
@@ -20,7 +20,7 @@
USE_GITHUB= yes
GH_ACCOUNT= google
-USES= autoreconf libtool
+USES= autoreconf:outsource libtool
GNU_CONFIGURE= yes
# fused-src python tests are only useful for bundling. There's no point in
# running them before installing system-wide without source files.
@@ -36,7 +36,9 @@
${WRKSRC}/Makefile.am
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/scripts/gmock-config \
+ ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py \
+ ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: devel/googletest/Makefile
===================================================================
--- devel/googletest/Makefile
+++ devel/googletest/Makefile
@@ -15,7 +15,7 @@
USE_GITHUB= yes
GH_ACCOUNT= google
-USES= autoreconf libtool
+USES= autoreconf:outsource libtool
GNU_CONFIGURE= yes
# fused-src python tests are only useful for bundling. There's no point in
# running them before installing system-wide without source files.
@@ -30,6 +30,7 @@
${WRKSRC}/Makefile.am
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/scripts/gtest-config \
+ ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: sysutils/fusefs-simple-mtpfs/Makefile
===================================================================
--- sysutils/fusefs-simple-mtpfs/Makefile
+++ sysutils/fusefs-simple-mtpfs/Makefile
@@ -16,7 +16,7 @@
USE_GITHUB= yes
GH_ACCOUNT= phatina
-USES= autoreconf compiler:c++11-lib fuse localbase pkgconfig
+USES= autoreconf:outsource compiler:c++11-lib fuse localbase pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
MAKEFILE= makefile

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 14, 9:29 AM (8 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23717343
Default Alt Text
D4157.id10180.diff (4 KB)

Event Timeline