config.guess (was: Re: cvs commit: ports/audio/libmikmod/files patch-config.sub)

[Kris Kennaway]

On Sat, Jun 21, 2003 at 12:00:16AM +0000, Christian Weisgerber wrote:
> Kris Kennaway <kris at obsecurity.org> wrote:
> 
> > OK, I misunderstood the purpose of config.guess.  This sounds like the
> > right approach!
> 
> Fetch config.{guess,sub} from ftp://ftp.gnu.org/gnu/config/ and add
> them to /usr/ports/Templates/.  These still need editing for ia64
> and amd64.

This patch works, but based on the initial amd64 package build with
your patch in place there are quite a few ports out there that seem to
require CONFIG_GUESS_DIRS.  I wonder if it wouldn't be better to
automatically replace all occurrences of config.{guess,sub} in the
${WRKSRC} tree.  I haven't yet tested this on a full build:

Kris

Index: bsd.port.mk
===================================================================
RCS file: /rot13/mnt2/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.454
diff -u -r1.454 bsd.port.mk
--- bsd.port.mk	26 Jun 2003 22:58:21 -0000	1.454
+++ bsd.port.mk	6 Jul 2003 00:51:32 -0000
@@ -2794,6 +2794,16 @@
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		  ${SCRIPTDIR}/configure; \
 	fi
+.if defined(GNU_CONFIGURE)
+	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKSRC} -name config.guess -o -name config.sub \
+		| ${XARGS} -n 1 /usr/bin/dirname); \
+	for _D in $${CONFIG_GUESS_DIRS}; do \
+		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
+		${CHMOD} a+rx $${_D}/config.guess; \
+	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
+		${CHMOD} a+rx $${_D}/config.sub; \
+	done
+.endif
 .if defined(HAS_CONFIGURE)
 	@(cd ${CONFIGURE_WRKSRC} && \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030705/c735e01f/attachment.bin