kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Consistently prefer ${CONFIGURE_CMD} over ./${CONFIGURE_SCRIPT}

Browse source 
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
This commit is contained in:
Jan Beich 2016-04-13 10:36:15 +00:00
parent c57709330b
commit 88360e4c12
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=413184
22 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/perl5.mk
View file

@ -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

8
Mk/bsd.port.mk
View file

@ -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}" ; \

2
databases/p5-Class-DBI-Plugin-Senna/Makefile
View file

@ -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 <bsd.port.mk>

2
devel/fb-adb/Makefile
View file

@ -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

2
devel/qmake5/Makefile
View file

@ -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

2
games/eboard/Makefile
View file

@ -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

2
games/nimuh/Makefile
View file

@ -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}

2
games/volleyball/Makefile
View file

@ -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} && \

2
irc/inspircd/Makefile
View file

@ -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:

2
lang/ghc/Makefile
View file

@ -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

2
textproc/groff/Makefile
View file

@ -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}; \

2
textproc/p5-XML-DifferenceMarkup/Makefile
View file

@ -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>

2
www/interchange/Makefile
View file

@ -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

2
www/nginx-devel/Makefile
View file

@ -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}

2
www/nginx/Makefile
View file

@ -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}

2
www/p5-RT-Authen-ExternalAuth/Makefile
View file

@ -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:

2
www/p5-RT-Extension-LDAPImport/Makefile
View file

@ -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:

2
www/p5-RT-Extension-MandatoryOnTransition/Makefile
View file

@ -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:

2
www/p5-RT-Extension-SLA/Makefile
View file

@ -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:

2
www/p5-RTx-Calendar/Makefile
View file

@ -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:

2
www/tengine/Makefile
View file

@ -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

2
x11-toolkits/tix/Makefile
View file

@ -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