--- CHANGES +++ CHANGES @@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20160331: +AUTHOR: jbeich@FreeBSD.org + + Introducing CONFIGURE_OUTSOURCE. It changes HAS_CONFIGURE and GNU_CONFIGURE + by invoking configure, build and install stage outside of source tree e.g., + + $ mkdir ../.build + $ cd ../.build + $ ${OLDPWD}/configure + $ gmake + $ gmake install + 20160301: AUTHOR: mat@FreeBSD.org --- Mk/Uses/autoreconf.mk +++ Mk/Uses/autoreconf.mk @@ -65,6 +65,7 @@ BUILD_DEPENDS+= libtoolize:${PORTSDIR}/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 --- Mk/Uses/perl5.mk +++ Mk/Uses/perl5.mk @@ -255,7 +255,7 @@ do-configure: fi @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .if !${_USE_PERL5:Mmodbuild*} @cd ${CONFIGURE_WRKSRC} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -778,6 +778,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # configure stage will not do anything if this is not set. # GNU_CONFIGURE - If set, you are using GNU configure (optional). Implies # HAS_CONFIGURE. +# CONFIGURE_OUTSOURCE - If set, this port builds outside of WRKSRC. # CONFIGURE_WRKSRC # - Directory to run configure in. # Default: ${WRKSRC} @@ -1552,6 +1553,14 @@ EXTRACT_WRKDIR:= ${WRKDIR} WRKSRC:= ${WRKSRC}/${WRKSRC_SUBDIR} .endif +.if defined(CONFIGURE_OUTSOURCE) +CONFIGURE_CMD?= ${WRKSRC}/${CONFIGURE_SCRIPT} +CONFIGURE_WRKSRC?= ${WRKDIR}/.build +BUILD_WRKSRC?= ${CONFIGURE_WRKSRC} +INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC} +TEST_WRKSRC?= ${CONFIGURE_WRKSRC} +.endif + PATCH_WRKSRC?= ${WRKSRC} CONFIGURE_WRKSRC?= ${WRKSRC} BUILD_WRKSRC?= ${WRKSRC} @@ -2601,16 +2610,16 @@ HAS_CONFIGURE= yes SET_LATE_CONFIGURE_ARGS= \ _LATE_CONFIGURE_ARGS="" ; \ if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \ - ./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \ + ${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \ fi ; \ - if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ + if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \ fi ; \ - if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ + if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ fi ; \ - if [ -z "`./${CONFIGURE_SCRIPT} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \ + if [ -z "`${CONFIGURE_CMD} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --build=${CONFIGURE_TARGET}" ; \ else \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \ @@ -3332,6 +3341,7 @@ do-configure: done .endif .if defined(HAS_CONFIGURE) + @${MKDIR} ${CONFIGURE_WRKSRC} @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ --- audio/oss/Makefile +++ audio/oss/Makefile @@ -15,11 +15,12 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk USES= tar:bzip2 kmod pkgconfig +HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes +CONFIGURE_ENV= HOSTCC="${CC}" ALL_TARGET= all install USE_GNOME= gtk20 USE_RC_SUBR= oss -WRKSRC= ${WRKDIR}/build -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= pkg-install pkg-deinstall ONLY_FOR_ARCHS= amd64 i386 @@ -31,15 +32,13 @@ OSS_CONF_FILES= oss_audigyls oss_audioloop oss_cs461x oss_emu10k1x \ oss_sbpci oss_sbxfi oss_trident oss_usb oss_userdev \ oss_ymf7xx osscore -PROTO_DIR= ${WRKSRC}/prototype +PROTO_DIR= ${INSTALL_WRKSRC}/prototype PROTO_ETCDIR= ${PROTO_DIR}/etc PROTO_BINDIR= ${PROTO_DIR}/usr/bin PROTO_SBINDIR= ${PROTO_DIR}/usr/sbin PROTO_MANDIR= ${PROTO_DIR}/usr/share/man PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss -CONFIGURE_ENV= CC="${CC}" HOSTCC="${CC}" - OPTIONS_DEFINE= VORBIS OPTIONS_DEFAULT=VORBIS @@ -59,11 +58,6 @@ post-patch: -name make.local -or -name soundoff -or -name soundon | \ ${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -do-configure: - ${MKDIR} ${WRKSRC} - (cd ${WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${PATCH_WRKSRC}/configure) - do-install: ${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/ # @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf --- databases/p5-Class-DBI-Plugin-Senna/Makefile +++ databases/p5-Class-DBI-Plugin-Senna/Makefile @@ -22,6 +22,6 @@ BROKEN_ia64= fails to configure with coredump do-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .include --- devel/arm-none-eabi-gcc492/Makefile +++ devel/arm-none-eabi-gcc492/Makefile @@ -25,13 +25,11 @@ PLIST_SUB= TARGETARCH=${PKGNAMEPREFIX:C/-//g} \ OPSYS=${OPSYS:tl} \ GCC_TARGET=${GCC_TARGET} -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build-gcc - GCC_TARGET= arm-none-eabi BU_PREFIX?= ${GCC_TARGET} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes # libstdcxx won't build, but we don't need it or multiple float-abi libs. CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --without-headers \ @@ -43,8 +41,6 @@ CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --disable-libstdcxx \ --disable-multilib -CONFIGURE_SCRIPT= ../${PORTNAME}-${PORTVERSION}/configure - PLIST= ${.CURDIR}/pkg-plist # U-Boot requires libgcc, crossbuild and install it along with the compiler. @@ -55,9 +51,6 @@ INSTALL_TARGET= install-gcc install-target-libgcc CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} -post-extract: - @${MKDIR} ${WRKSRC} - post-stage: @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ ${MV} ${STAGEDIR}${PREFIX}/bin/cpp \ --- devel/djgpp-binutils/Makefile +++ devel/djgpp-binutils/Makefile @@ -14,13 +14,9 @@ LICENSE= GPLv2 TARGET= i586-pc-msdosdjgpp -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure - USES= gmake makeinfo tar:bzip2 GNU_CONFIGURE= yes -SRCDIR= ${WRKDIR}/binutils-${PORTVERSION} -WRKSRC= ${WRKDIR}/build +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS= --target=${TARGET} \ --with-gcc --with-gnu-ld --with-gnu-as \ --disable-nls --disable-shared --disable-werror @@ -31,9 +27,6 @@ INFO_PATH= ${TARGET}/info BINARIES= addr2line ar as c++filt ld nm objcopy objdump ranlib \ readelf size strings strip -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - post-install: .for F in ${BINARIES} @${LN} -f ${STAGEDIR}${PREFIX}/bin/${TARGET}-$F ${STAGEDIR}${PREFIX}/${TARGET}/bin/$F --- devel/fb-adb/Makefile +++ devel/fb-adb/Makefile @@ -18,13 +18,12 @@ RUN_DEPENDS= adb:devel/android-tools-adb USE_GITHUB= yes GH_ACCOUNT= facebook -USES= autoreconf:outsource gmake ncurses perl5 python:3,build +USES= autoreconf gmake ncurses perl5 python:3,build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes CONFIGURE_ENV= PYTHON3="${PYTHON_CMD}" -# XXX D4158: --mandir as SET_LATE_CONFIGURE_ARGS doesn't respect CONFIGURE_CMD -CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz @@ -92,25 +91,6 @@ post-patch-NDK-off: @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \ ${WRKSRC}/stub-*/configure -# XXX D4157: 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 # XXX Bug 204615: Teach USE_LINUX about build-only deps --- devel/powerpc64-gcc/Makefile +++ devel/powerpc64-gcc/Makefile @@ -24,9 +24,6 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ BUILD_DEPENDS= ${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils RUN_DEPENDS= ${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build-gcc - .if empty(GCC_TARGET) # We are building for a FreeBSD target GCC_TARGET?= ${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL} @@ -42,6 +39,7 @@ EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions CONFIGURE_ENV= LC_ALL=C MAKE_ENV= LC_ALL=C GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --without-headers \ --with-gmp=${LOCALBASE} \ @@ -50,8 +48,6 @@ CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \ --with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld -CONFIGURE_SCRIPT= ../${PORTNAME}-${PORTVERSION}/configure - ALL_TARGET?= all-gcc INSTALL_TARGET?= install-gcc BROKEN_FreeBSD9= plist is different on 9.x that on other arches @@ -64,9 +60,6 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} .endif -post-extract: - @${MKDIR} ${WRKSRC} - post-install: @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ mv ${STAGEDIR}${PREFIX}/bin/cpp \ --- devel/psptoolchain-gcc-stage1/Makefile +++ devel/psptoolchain-gcc-stage1/Makefile @@ -35,14 +35,10 @@ BUILD_DEPENDS+= psp-addr2line:${PORTSDIR}/devel/psptoolchain-binutils \ psp-strip:${PORTSDIR}/devel/psptoolchain-binutils USES= gmake libtool tar:bzip2 -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - -SRCDIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build MAKE_ENV+= PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PREFIX}/bin:${PATH} HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_GCC_STAGE_PREFIX} \ --target="psp" \ --enable-languages="c" \ @@ -64,15 +60,15 @@ pre-configure: # Disable installation of .info files and libiberty for both stages. post-patch: @${REINPLACE_CMD} -E "s/^(install-data-am:)(.*)install-info-am(.*)/\1 \2 \3/" \ - ${SRCDIR}/libquadmath/Makefile.in - @${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${SRCDIR}/libiberty/Makefile.in + ${WRKSRC}/libquadmath/Makefile.in + @${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${WRKSRC}/libiberty/Makefile.in @${REINPLACE_CMD} -E \ -e "/^ \\$$\(mkinstalldirs\) \\$$\(DESTDIR\)\\$$\((infodir|man7dir)\)/d" \ -e "s/^(install-info:)(.*)/\1#\2/" \ -e "/^ \\$$\(DESTDIR\)\\$$\(man7dir\)\/(fsf-funding|gfdl|gpl)\\$$\(man7ext\)/d" \ - ${SRCDIR}/gcc/Makefile.in + ${WRKSRC}/gcc/Makefile.in .if ${PKGNAMESUFFIX} == "-stage1" - @${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${SRCDIR}/gcc/Makefile.in + @${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${WRKSRC}/gcc/Makefile.in .endif PLIST_SUB+= PSP_GCC_STAGE_PREFIX=${PSP_GCC_STAGE_PREFIX} --- devel/qmake5/Makefile +++ devel/qmake5/Makefile @@ -56,7 +56,7 @@ post-build: @cd ${WRKSRC} && \ ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} # Cleanup qmodule.pri to make it module agnostic. @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ ${WRKSRC}/mkspecs/qmodule.pri --- games/eboard/Makefile +++ games/eboard/Makefile @@ -76,7 +76,7 @@ post-install: .endfor .endif .for extra in ${EXTRAS} - @cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} EBOARDCONFIG=${STAGEDIR}${PREFIX}/bin/eboard-config ./${CONFIGURE_SCRIPT} --prefix=${PREFIX} + @cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} EBOARDCONFIG=${STAGEDIR}${PREFIX}/bin/eboard-config ${CONFIGURE_CMD} --prefix=${PREFIX} @cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} ${MAKE_ENV} ${MAKE} install DATADIR=${STAGEDIR}${DATADIR} .endfor @${INSTALL_DATA} ${WRKSRC}/icon-eboard.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/eboard.xpm --- games/nimuh/Makefile +++ games/nimuh/Makefile @@ -30,7 +30,7 @@ post-patch: @${REINPLACE_CMD} -e '/LIBS/ s|-lSDL_[a-z]*|& $${SDL_LIBS}|' ${WRKSRC}/configure post-configure: - @cd ${DATA_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + @cd ${DATA_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} post-install: @cd ${DATA_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} --- games/volleyball/Makefile +++ games/volleyball/Makefile @@ -41,7 +41,7 @@ post-patch: post-configure: cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \ - ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} post-install: cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \ --- graphics/p5-ming/Makefile +++ 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 --- graphics/py-ming/Makefile +++ 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 --- irc/inspircd/Makefile +++ irc/inspircd/Makefile @@ -139,7 +139,7 @@ PLIST_SUB+= POSIX="@comment " pre-configure: @if [ ${EXTRAS} ]; then \ - cd ${WRKSRC} && ./${CONFIGURE_SCRIPT} --enable-extras=${EXTRAS} ; \ + cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \ fi post-patch: --- lang/gcc/Makefile +++ lang/gcc/Makefile @@ -37,9 +37,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -82,11 +79,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -146,14 +142,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc46/Makefile +++ lang/gcc46/Makefile @@ -38,9 +38,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -58,11 +55,10 @@ CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -118,14 +114,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc47/Makefile +++ lang/gcc47/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -63,11 +60,10 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -127,14 +123,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc48/Makefile +++ lang/gcc48/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -73,11 +70,10 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -137,14 +133,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc49/Makefile +++ lang/gcc49/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -87,11 +84,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -153,14 +149,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc5-devel/Makefile +++ lang/gcc5-devel/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -86,11 +83,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -154,14 +150,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc5/Makefile +++ lang/gcc5/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -84,11 +81,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -153,14 +149,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/gcc6-devel/Makefile +++ lang/gcc6-devel/Makefile @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -87,11 +84,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -155,14 +151,14 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + ; ${WRKSRC}/contrib/test_summary .endif post-stage: --- lang/ghc/Makefile +++ lang/ghc/Makefile @@ -272,7 +272,7 @@ post-patch: pre-configure: @${MKDIR} ${TMPDIR} .if empty(PORT_OPTIONS:MBOOT) - @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT}) + @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS_BOOT}) @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif --- textproc/groff/Makefile +++ textproc/groff/Makefile @@ -80,7 +80,7 @@ post-configure: INSTALL_LIB="${INSTALL_LIB}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ + ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \ ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ ${FALSE}; \ --- textproc/p5-XML-DifferenceMarkup/Makefile +++ textproc/p5-XML-DifferenceMarkup/Makefile @@ -28,6 +28,6 @@ post-patch: do-configure: @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} \ - ${PERL5} ./${CONFIGURE_SCRIPT} + ${PERL5} ${CONFIGURE_CMD} .include --- www/interchange/Makefile +++ www/interchange/Makefile @@ -59,7 +59,7 @@ do-configure: # INTERCH_CONFIGURE_ARGS instead of CONFIGURE_ARGS. @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${INTERCH_CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${INTERCH_CONFIGURE_ARGS} post-install: # This directory has to be created here for check-plist to pass, otherwise it --- www/nginx-devel/Makefile +++ www/nginx-devel/Makefile @@ -1105,7 +1105,7 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} --- www/nginx/Makefile +++ www/nginx/Makefile @@ -1055,7 +1055,7 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} --- www/p5-RT-Authen-ExternalAuth/Makefile +++ www/p5-RT-Authen-ExternalAuth/Makefile @@ -54,7 +54,7 @@ PLIST_SUB+= RTHOME=share/rt${RT_VER} do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ + ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//;' Makefile post-configure: --- www/p5-RT-Extension-LDAPImport/Makefile +++ www/p5-RT-Extension-LDAPImport/Makefile @@ -53,7 +53,7 @@ PLIST_SUB+= RTHOME=share/rt${RT_VER} do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ + ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile post-configure: --- www/p5-RT-Extension-MandatoryOnTransition/Makefile +++ www/p5-RT-Extension-MandatoryOnTransition/Makefile @@ -46,7 +46,7 @@ PLIST_SUB+= RT_VER=${RT_VER} do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ + ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile post-configure: --- www/p5-RT-Extension-SLA/Makefile +++ www/p5-RT-Extension-SLA/Makefile @@ -55,7 +55,7 @@ SUB_FILES+= pkg-message do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ + ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile post-configure: --- www/p5-RTx-Calendar/Makefile +++ www/p5-RTx-Calendar/Makefile @@ -56,7 +56,7 @@ post-patch: do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ + ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile post-configure: --- www/tengine/Makefile +++ www/tengine/Makefile @@ -824,7 +824,7 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ ${MAKE} ) .endif --- x11-toolkits/tix/Makefile +++ x11-toolkits/tix/Makefile @@ -34,7 +34,7 @@ pre-configure: INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) + ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}) post-configure: @${REINPLACE_CMD} -e "s|package require Tcl 8\.4|package require Tcl ${TCL_VER}|g" ${WRKSRC}/Makefile