Index: Mk/Uses/perl5.mk =================================================================== --- Mk/Uses/perl5.mk +++ Mk/Uses/perl5.mk @@ -255,7 +255,7 @@ 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 Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -2601,16 +2601,16 @@ 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}" ; \ Index: databases/p5-Class-DBI-Plugin-Senna/Makefile =================================================================== --- databases/p5-Class-DBI-Plugin-Senna/Makefile +++ databases/p5-Class-DBI-Plugin-Senna/Makefile @@ -22,6 +22,6 @@ do-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .include Index: devel/fb-adb/Makefile =================================================================== --- devel/fb-adb/Makefile +++ devel/fb-adb/Makefile @@ -23,8 +23,6 @@ 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 Index: devel/qmake5/Makefile =================================================================== --- devel/qmake5/Makefile +++ devel/qmake5/Makefile @@ -56,7 +56,7 @@ @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 Index: games/eboard/Makefile =================================================================== --- games/eboard/Makefile +++ games/eboard/Makefile @@ -76,7 +76,7 @@ .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 Index: games/nimuh/Makefile =================================================================== --- games/nimuh/Makefile +++ games/nimuh/Makefile @@ -30,7 +30,7 @@ @${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} Index: games/volleyball/Makefile =================================================================== --- games/volleyball/Makefile +++ games/volleyball/Makefile @@ -41,7 +41,7 @@ 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} && \ Index: irc/inspircd/Makefile =================================================================== --- irc/inspircd/Makefile +++ irc/inspircd/Makefile @@ -139,7 +139,7 @@ pre-configure: @if [ ${EXTRAS} ]; then \ - cd ${WRKSRC} && ./${CONFIGURE_SCRIPT} --enable-extras=${EXTRAS} ; \ + cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \ fi post-patch: Index: lang/ghc/Makefile =================================================================== --- lang/ghc/Makefile +++ lang/ghc/Makefile @@ -272,7 +272,7 @@ 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 Index: textproc/groff/Makefile =================================================================== --- textproc/groff/Makefile +++ textproc/groff/Makefile @@ -80,7 +80,7 @@ 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}; \ Index: textproc/p5-XML-DifferenceMarkup/Makefile =================================================================== --- textproc/p5-XML-DifferenceMarkup/Makefile +++ textproc/p5-XML-DifferenceMarkup/Makefile @@ -28,6 +28,6 @@ do-configure: @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} \ - ${PERL5} ./${CONFIGURE_SCRIPT} + ${PERL5} ${CONFIGURE_CMD} .include Index: www/interchange/Makefile =================================================================== --- www/interchange/Makefile +++ www/interchange/Makefile @@ -59,7 +59,7 @@ # 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 Index: www/nginx-devel/Makefile =================================================================== --- www/nginx-devel/Makefile +++ www/nginx-devel/Makefile @@ -1105,7 +1105,7 @@ 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} Index: www/nginx/Makefile =================================================================== --- www/nginx/Makefile +++ www/nginx/Makefile @@ -1055,7 +1055,7 @@ 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} Index: www/p5-RT-Authen-ExternalAuth/Makefile =================================================================== --- www/p5-RT-Authen-ExternalAuth/Makefile +++ www/p5-RT-Authen-ExternalAuth/Makefile @@ -54,7 +54,7 @@ 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: Index: www/p5-RT-Extension-LDAPImport/Makefile =================================================================== --- www/p5-RT-Extension-LDAPImport/Makefile +++ www/p5-RT-Extension-LDAPImport/Makefile @@ -53,7 +53,7 @@ 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: Index: www/p5-RT-Extension-MandatoryOnTransition/Makefile =================================================================== --- www/p5-RT-Extension-MandatoryOnTransition/Makefile +++ www/p5-RT-Extension-MandatoryOnTransition/Makefile @@ -46,7 +46,7 @@ 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: Index: www/p5-RT-Extension-SLA/Makefile =================================================================== --- www/p5-RT-Extension-SLA/Makefile +++ www/p5-RT-Extension-SLA/Makefile @@ -55,7 +55,7 @@ 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: Index: www/p5-RTx-Calendar/Makefile =================================================================== --- www/p5-RTx-Calendar/Makefile +++ www/p5-RTx-Calendar/Makefile @@ -56,7 +56,7 @@ 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: Index: www/tengine/Makefile =================================================================== --- www/tengine/Makefile +++ www/tengine/Makefile @@ -824,7 +824,7 @@ 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 Index: x11-toolkits/tix/Makefile =================================================================== --- x11-toolkits/tix/Makefile +++ x11-toolkits/tix/Makefile @@ -34,7 +34,7 @@ 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