Index: CHANGES =================================================================== --- CHANGES +++ CHANGES @@ -10,6 +10,18 @@ All ports committers are allowed to commit to this file. +20160416: +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 + 20160402: AUTHOR: bapt@FreeBSD.org Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -778,6 +778,8 @@ # 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 in an empty ${CONFIGURE_WRKSRC} +# not being under ${WRKSRC}. # CONFIGURE_WRKSRC # - Directory to run configure in. # Default: ${WRKSRC} @@ -1552,6 +1554,14 @@ 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} @@ -3332,6 +3342,7 @@ done .endif .if defined(HAS_CONFIGURE) + @${MKDIR} ${CONFIGURE_WRKSRC} @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ Index: audio/oss/Makefile =================================================================== --- audio/oss/Makefile +++ audio/oss/Makefile @@ -15,11 +15,12 @@ BUILD_DEPENDS= gawk: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_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 @@ -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 Index: devel/arm-none-eabi-gcc492/Makefile =================================================================== --- devel/arm-none-eabi-gcc492/Makefile +++ devel/arm-none-eabi-gcc492/Makefile @@ -25,13 +25,11 @@ 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 @@ --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 @@ 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 \ Index: devel/djgpp-binutils/Makefile =================================================================== --- devel/djgpp-binutils/Makefile +++ devel/djgpp-binutils/Makefile @@ -14,13 +14,9 @@ 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 @@ 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 Index: devel/fb-adb/Makefile =================================================================== --- devel/fb-adb/Makefile +++ devel/fb-adb/Makefile @@ -18,10 +18,11 @@ 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}" INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ @@ -90,25 +91,6 @@ @${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 Index: devel/omniNotify/Makefile =================================================================== --- devel/omniNotify/Makefile +++ devel/omniNotify/Makefile @@ -20,35 +20,29 @@ BUILD_DEPENDS= ${NONEXISTENT}:devel/omniORB-4.1:patch WRKSRC= ${WRKDIR}/${PORTNAME} -CONFIGURE_WRKSRC= ${WRKSRC}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} OMNIORB_WRKSRC= `cd ${PORTSDIR}/devel/omniORB-4.1 && ${MAKE} -V WRKSRC` USES= gmake python GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes -CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-omniorb=${LOCALBASE} OPTIONS_DEFINE= EXAMPLES -.include - pre-configure: ${REINPLACE_CMD} -Ee 's|-O2|${CFLAGS}|' \ ${WRKSRC}/mk/beforeauto.mk.in - ${MKDIR} ${CONFIGURE_WRKSRC} cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notifd \ ${STAGEDIR}${PREFIX}/lib/lib*.so -.if ${PORT_OPTIONS:MEXAMPLES} + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )" -.endif .include Index: devel/powerpc64-gcc/Makefile =================================================================== --- devel/powerpc64-gcc/Makefile +++ devel/powerpc64-gcc/Makefile @@ -24,9 +24,6 @@ BUILD_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils RUN_DEPENDS= ${BU_PREFIX}-as: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 @@ 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 @@ --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= ${ARCH}-portbld-${OPSYS:tl}${OSREL} .endif -post-extract: - @${MKDIR} ${WRKSRC} - post-install: @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ mv ${STAGEDIR}${PREFIX}/bin/cpp \ Index: devel/psptoolchain-gcc-stage1/Makefile =================================================================== --- devel/psptoolchain-gcc-stage1/Makefile +++ devel/psptoolchain-gcc-stage1/Makefile @@ -35,14 +35,10 @@ psp-strip: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" \ @@ -57,22 +53,19 @@ --with-as=${LOCALBASE}/bin/psp-as \ --mandir=${PREFIX}/man -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - # Don't install any documentation for psptoolchain's gcc stage 1 - makes no sense. # 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 + ${PATCH_WRKSRC}/libquadmath/Makefile.in + @${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${PATCH_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 + ${PATCH_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/" ${PATCH_WRKSRC}/gcc/Makefile.in .endif PLIST_SUB+= PSP_GCC_STAGE_PREFIX=${PSP_GCC_STAGE_PREFIX} Index: devel/py-omniorb-3/Makefile =================================================================== --- devel/py-omniorb-3/Makefile +++ devel/py-omniorb-3/Makefile @@ -27,25 +27,19 @@ PLIST_SUB= SONUM=${PORTVERSION:C/.*\.//} -CONFIGURE_WRKSRC= ${WRKSRC}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} OMNIORB_WRKSRC!= cd ${.CURDIR}/../omniORB-4.1 && ${MAKE} -V WRKSRC USE_OPENSSL= yes GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes USES= gmake python tar:bzip2 -CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE} -.include - pre-configure: - ${MKDIR} ${CONFIGURE_WRKSRC} cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} post-install: @@ -54,17 +48,17 @@ cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming/__init__.py',None,'CosNaming/__init__.pyc',True)" cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming__POA/__init__.py',None,'CosNaming__POA/__init__.pyc',True)" cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('omniidl_be/python.py',None,'omniidl_be/python.pyc',True)" -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html @${MKDIR} ${STAGEDIR}${DOCSDIR}/tex ${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${STAGEDIR}${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${STAGEDIR}${DOCSDIR}/tex -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${FIND} . \ | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: devel/py-omniorb/Makefile =================================================================== --- devel/py-omniorb/Makefile +++ devel/py-omniorb/Makefile @@ -26,23 +26,19 @@ PLIST_SUB= SONUM=2 WRKSRC= ${WRKDIR}/${DISTNAME:S/-2//} -CONFIGURE_WRKSRC= ${WRKSRC}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} OMNIORB_WRKSRC!= cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC USE_OPENSSL= yes GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes USES= gmake python tar:bzip2 -CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE} pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} @cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} post-install: Index: lang/gcc/Makefile =================================================================== --- lang/gcc/Makefile +++ lang/gcc/Makefile @@ -37,9 +37,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc46/Makefile =================================================================== --- lang/gcc46/Makefile +++ lang/gcc46/Makefile @@ -38,9 +38,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc47/Makefile =================================================================== --- lang/gcc47/Makefile +++ lang/gcc47/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc48/Makefile =================================================================== --- lang/gcc48/Makefile +++ lang/gcc48/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc49/Makefile =================================================================== --- lang/gcc49/Makefile +++ lang/gcc49/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc5-devel/Makefile =================================================================== --- lang/gcc5-devel/Makefile +++ lang/gcc5-devel/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc5/Makefile =================================================================== --- lang/gcc5/Makefile +++ lang/gcc5/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/gcc6-devel/Makefile =================================================================== --- lang/gcc6-devel/Makefile +++ lang/gcc6-devel/Makefile @@ -39,9 +39,6 @@ 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 @@ .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,13 @@ @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Index: lang/squeak/Makefile =================================================================== --- lang/squeak/Makefile +++ lang/squeak/Makefile @@ -35,6 +35,7 @@ USE_GNOME= cairo pango USE_GL= gl HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes USE_GSTREAMER= yes VM_VERSION= ${PORTVERSION}.${SVN_VERSION} @@ -46,12 +47,9 @@ SQUEAK_LIB_DIR= ${PORTVERSION}-${SVN_VERSION} WRKSRC= ${WRKDIR}/Squeak-${VM_VERSION}-src -CONFIGURE_WRKSRC= ${WRKSRC}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -CONFIGURE_SCRIPT= ../unix/cmake/configure +CONFIGURE_SCRIPT= unix/cmake/configure CONFIGURE_ARGS= --prefix=${PREFIX} -CMAKE_SOURCE_PATH= ../unix +CMAKE_SOURCE_PATH= unix SUB_FILES= pkg-message SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \ @@ -72,9 +70,6 @@ @${REINPLACE_CMD} -e 's,return;,return 1;,' \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/so.* \ ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/squeakvm \