From owner-freebsd-ports@FreeBSD.ORG  Fri Jun 20 17:31:33 2003
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7183837B401
	for <freebsd-ports@freebsd.org>; Fri, 20 Jun 2003 17:31:33 -0700 (PDT)
Received: from mail.inka.de (quechua.inka.de [193.197.184.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8EA4743FA3
	for <freebsd-ports@freebsd.org>; Fri, 20 Jun 2003 17:31:32 -0700 (PDT)
	(envelope-from mailnull@mips.inka.de)
Received: from kemoauc.mips.inka.de (uucp@)
	by mail.inka.de with gbsmtp 
	id 19TWHz-000217-05; Sat, 21 Jun 2003 02:31:31 +0200
Received: from kemoauc.mips.inka.de (localhost [127.0.0.1])
	by kemoauc.mips.inka.de (8.12.9/8.12.6) with ESMTP id h5L00Hih059757
	for <freebsd-ports@freebsd.org>;
	Sat, 21 Jun 2003 02:00:17 +0200 (CEST)
	(envelope-from mailnull@localhost.mips.inka.de)
Received: (from mailnull@localhost)
	by kemoauc.mips.inka.de (8.12.9/8.12.9/Submit) id h5L00Go9059756
	for freebsd-ports@freebsd.org; Sat, 21 Jun 2003 02:00:16 +0200 (CEST)
From: naddy@mips.inka.de (Christian Weisgerber)
Date: Sat, 21 Jun 2003 00:00:16 +0000 (UTC)
Message-ID: <bd076g$1nul$1@kemoauc.mips.inka.de>
References: <200306190941.h5J9fIYL073911@repoman.freebsd.org>
	<20030619214555.GA34067@rot13.obsecurity.org>
	<bctg5s$etk$1@kemoauc.mips.inka.de>
	<20030620165635.GA53379@rot13.obsecurity.org>
Originator: naddy@mips.inka.de (Christian Weisgerber)
To: freebsd-ports@freebsd.org
Subject: Re: config.guess (was: Re: cvs commit: ports/audio/libmikmod/files
	patch-config.sub)
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jun 2003 00:31:33 -0000

Kris Kennaway <kris@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.

Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.453
diff -u -r1.453 bsd.port.mk
--- bsd.port.mk	10 Jun 2003 14:45:02 -0000	1.453
+++ bsd.port.mk	20 Jun 2003 23:50:27 -0000
@@ -620,6 +620,9 @@
 #				  ${HAS_CONFIGURE} is set.
 # CONFIGURE_LOG - The name of configure log file (default: config.log).
 #				  It will be printed to the screen if configure fails.
+# CONFIG_GUESS_DIRS - If GNU_CONFIGURE is set and a port uses config.guess
+#				  outside CONFIGURE_WRKSRC, the directories containing
+#				  the other copies must be set here.
 #
 # For build and install:
 #
@@ -2128,6 +2131,7 @@
 CONFIGURE_LOG?=		config.log
 
 .if defined(GNU_CONFIGURE)
+CONFIG_GUESS_DIRS?=	${CONFIGURE_WRKSRC}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} ${CONFIGURE_TARGET}
 HAS_CONFIGURE=		yes
 .endif
@@ -2737,6 +2741,12 @@
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		  ${SCRIPTDIR}/configure; \
 	fi
+.if defined(GNU_CONFIGURE)
+.	for _D in ${CONFIG_GUESS_DIRS}
+	@cp -f ${TEMPLATES}/config.guess ${_D}; chmod a+rx ${_D}/config.guess; \
+	    cp -f ${TEMPLATES}/config.sub ${_D}; chmod a+rx ${_D}/config.sub
+.	endfor
+.endif
 .if defined(HAS_CONFIGURE)
 	@(cd ${CONFIGURE_WRKSRC} && \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de