Date: Wed, 13 Apr 2016 10:36:15 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413184 - in head: Mk Mk/Uses databases/p5-Class-DBI-Plugin-Senna devel/fb-adb devel/qmake5 games/eboard games/nimuh games/volleyball irc/inspircd lang/ghc textproc/groff textproc/p5-XM... Message-ID: <201604131036.u3DAaFDq097431@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 13 10:36:15 2016 New Revision: 413184 URL: https://svnweb.freebsd.org/changeset/ports/413184 Log: Consistently prefer ${CONFIGURE_CMD} over ./${CONFIGURE_SCRIPT} This also fixes SET_LATE_CONFIGURE_ARGS with custom CONFIGURE_CMD. PR: 208294 Exp-run by: antoine Approved by: portmgr (antoine), perl (mat) Differential Revision: https://reviews.freebsd.org/D4158 Modified: head/Mk/Uses/perl5.mk (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) head/databases/p5-Class-DBI-Plugin-Senna/Makefile (contents, props changed) head/devel/fb-adb/Makefile (contents, props changed) head/devel/qmake5/Makefile (contents, props changed) head/games/eboard/Makefile (contents, props changed) head/games/nimuh/Makefile (contents, props changed) head/games/volleyball/Makefile (contents, props changed) head/irc/inspircd/Makefile (contents, props changed) head/lang/ghc/Makefile (contents, props changed) head/textproc/groff/Makefile (contents, props changed) head/textproc/p5-XML-DifferenceMarkup/Makefile (contents, props changed) head/www/interchange/Makefile (contents, props changed) head/www/nginx-devel/Makefile (contents, props changed) head/www/nginx/Makefile (contents, props changed) head/www/p5-RT-Authen-ExternalAuth/Makefile (contents, props changed) head/www/p5-RT-Extension-LDAPImport/Makefile (contents, props changed) head/www/p5-RT-Extension-MandatoryOnTransition/Makefile (contents, props changed) head/www/p5-RT-Extension-SLA/Makefile (contents, props changed) head/www/p5-RTx-Calendar/Makefile (contents, props changed) head/www/tengine/Makefile (contents, props changed) head/x11-toolkits/tix/Makefile (contents, props changed) Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Wed Apr 13 10:14:32 2016 (r413183) +++ head/Mk/Uses/perl5.mk Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Apr 13 10:14:32 2016 (r413183) +++ head/Mk/bsd.port.mk Wed Apr 13 10:36:15 2016 (r413184) @@ -2603,16 +2603,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}" ; \ Modified: head/databases/p5-Class-DBI-Plugin-Senna/Makefile ============================================================================== --- head/databases/p5-Class-DBI-Plugin-Senna/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/databases/p5-Class-DBI-Plugin-Senna/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -22,6 +22,6 @@ BROKEN_ia64= fails to configure with cor do-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .include <bsd.port.mk> Modified: head/devel/fb-adb/Makefile ============================================================================== --- head/devel/fb-adb/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/devel/fb-adb/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -23,8 +23,6 @@ USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= 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 Modified: head/devel/qmake5/Makefile ============================================================================== --- head/devel/qmake5/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/devel/qmake5/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/games/eboard/Makefile ============================================================================== --- head/games/eboard/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/games/eboard/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/games/nimuh/Makefile ============================================================================== --- head/games/nimuh/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/games/nimuh/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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} Modified: head/games/volleyball/Makefile ============================================================================== --- head/games/volleyball/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/games/volleyball/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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} && \ Modified: head/irc/inspircd/Makefile ============================================================================== --- head/irc/inspircd/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/irc/inspircd/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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: Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/lang/ghc/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/textproc/groff/Makefile ============================================================================== --- head/textproc/groff/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/textproc/groff/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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}; \ Modified: head/textproc/p5-XML-DifferenceMarkup/Makefile ============================================================================== --- head/textproc/p5-XML-DifferenceMarkup/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/textproc/p5-XML-DifferenceMarkup/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -28,6 +28,6 @@ post-patch: do-configure: @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} \ - ${PERL5} ./${CONFIGURE_SCRIPT} + ${PERL5} ${CONFIGURE_CMD} .include <bsd.port.mk> Modified: head/www/interchange/Makefile ============================================================================== --- head/www/interchange/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/interchange/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/nginx-devel/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -1137,7 +1137,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} Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/nginx/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -1086,7 +1086,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} Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile ============================================================================== --- head/www/p5-RT-Authen-ExternalAuth/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/p5-RT-Authen-ExternalAuth/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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: Modified: head/www/p5-RT-Extension-LDAPImport/Makefile ============================================================================== --- head/www/p5-RT-Extension-LDAPImport/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/p5-RT-Extension-LDAPImport/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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: Modified: head/www/p5-RT-Extension-MandatoryOnTransition/Makefile ============================================================================== --- head/www/p5-RT-Extension-MandatoryOnTransition/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/p5-RT-Extension-MandatoryOnTransition/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -45,7 +45,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: Modified: head/www/p5-RT-Extension-SLA/Makefile ============================================================================== --- head/www/p5-RT-Extension-SLA/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/p5-RT-Extension-SLA/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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: Modified: head/www/p5-RTx-Calendar/Makefile ============================================================================== --- head/www/p5-RTx-Calendar/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/p5-RTx-Calendar/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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: Modified: head/www/tengine/Makefile ============================================================================== --- head/www/tengine/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/www/tengine/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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 Modified: head/x11-toolkits/tix/Makefile ============================================================================== --- head/x11-toolkits/tix/Makefile Wed Apr 13 10:14:32 2016 (r413183) +++ head/x11-toolkits/tix/Makefile Wed Apr 13 10:36:15 2016 (r413184) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604131036.u3DAaFDq097431>