[Midnightbsd-cvs] mports [19261] trunk/Mk/bsd.mport.mk: explicitly remove config.sub/ guess and replace with ours.

[laffer1 at midnightbsd.org]

Revision: 19261
          http://svnweb.midnightbsd.org/mports/?rev=19261
Author:   laffer1
Date:     2015-05-30 16:40:23 -0400 (Sat, 30 May 2015)
Log Message:
-----------
explicitly remove config.sub/guess and replace with ours.

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-05-30 20:32:35 UTC (rev 19260)
+++ trunk/Mk/bsd.mport.mk	2015-05-30 20:40:23 UTC (rev 19261)
@@ -2245,10 +2245,7 @@
 # Configure
 
 .if !target(do-configure)
-do-configure: run-configure
-.endif
-
-run-configure:
+do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		  ${SCRIPTDIR}/configure; \
@@ -2257,9 +2254,11 @@
 	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
 		| ${XARGS} -n 1 ${DIRNAME}); \
 	for _D in $${CONFIG_GUESS_DIRS}; do \
+		${RM} $${_D}/config.guess; \
 		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
 		${CHMOD} a+rx $${_D}/config.guess; \
-	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
+		${RM} $${_D}/config.sub; \
+		${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
 		${CHMOD} a+rx $${_D}/config.sub; \
 	done
 .endif
@@ -2280,9 +2279,11 @@
 			 ${FALSE}; \
 		fi)
 .endif
+# XXX is this needed?
 .if defined(USE_IMAKE)
 	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
 .endif
+.endif
 
 # Build
 # XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake