From owner-freebsd-ports  Wed Oct  9  4:50: 5 2002
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 BF04537B401; Wed,  9 Oct 2002 04:50:02 -0700 (PDT)
Received: from mail.imp.ch (mail.imp.ch [157.161.1.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4DF0E43E75; Wed,  9 Oct 2002 04:50:01 -0700 (PDT)
	(envelope-from mb@imp.ch)
Received: from nbs.imp.ch (nbs.imp.ch [157.161.4.7])
	by mail.imp.ch (8.12.3/8.12.3) with ESMTP id g99Bn8eq064489;
	Wed, 9 Oct 2002 13:49:09 +0200 (CEST)
	(envelope-from Martin.Blapp@imp.ch)
Received: from levais.imp.ch (levais.imp.ch [157.161.4.66])
	by nbs.imp.ch (8.12.3/8.12.3) with ESMTP id g99Bn8751400346;
	Wed, 9 Oct 2002 13:49:08 +0200 (MES)
Date: Wed, 9 Oct 2002 13:50:10 +0200 (CEST)
From: Martin Blapp <mb@imp.ch>
To: <ports@freebsd.org>
Cc: <portsmgr@freebsd.org>, <kan@freebsd.org>
Subject: PATCH: gcc3.2 support for bsd.port.mk
Message-ID: <20021009134554.M15308-200000@levais.imp.ch>
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED; BOUNDARY="0-593094260-1034164210=:15308"
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--0-593094260-1034164210=:15308
Content-Type: TEXT/PLAIN; charset=US-ASCII


Hi all,

Since one month we have now gcc3.2 in our CURRENT tree and the port has been
fixed. We should reflect that in bsd.port.mk as we did previously. OpenOffice
now depends on USE_GCC=3.2 and fails because there is no support yet. (also in
STABLE)

Can I commit the following patch ?

--- ports/Mk/bsd.port.mk.orig	Wed Oct  9 13:43:50 2002
+++ ports/Mk/bsd.port.mk	Wed Oct  9 13:43:52 2002
@@ -922,10 +922,16 @@
 BUILD_DEPENDS+=	gcc295:${PORTSDIR}/lang/gcc295
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif
-.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ${OSVERSION} < 500035
+.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ( ${OSVERSION} < 500035 || ${OSVERSION} > 500038 )
 CC=				gcc31
 CXX=			g++31
 BUILD_DEPENDS+=	gcc31:${PORTSDIR}/lang/gcc31
+MAKE_ENV+=		CC=${CC} CXX=${CXX}
+.endif
+.if defined(USE_GCC) && ${USE_GCC} == 3.2 && ${OSVERSION} < 500039
+CC=				gcc32
+CXX=			g++32
+BUILD_DEPENDS+=	gcc31:${PORTSDIR}/lang/gcc32
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif

Martin

Martin Blapp, <mb@imp.ch> <mbr@FreeBSD.org>
------------------------------------------------------------------
ImproWare AG, UNIXSP & ISP, Zurlindenstrasse 29, 4133 Pratteln, CH
Phone: +41 061 826 93 00: +41 61 826 93 01
PGP: <finger -l mbr@freebsd.org>
PGP Fingerprint: B434 53FC C87C FE7B 0A18 B84C 8686 EF22 D300 551E
------------------------------------------------------------------

--0-593094260-1034164210=:15308
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="bsd.port.mk.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <20021009135010.T15308@levais.imp.ch>
Content-Description: 
Content-Disposition: attachment; filename="bsd.port.mk.diff"

LS0tIC91c3IvcG9ydHMvTWsvYnNkLnBvcnQubWsub3JpZwlXZWQgT2N0ICA5
IDEzOjQzOjUwIDIwMDINCisrKyAvdXNyL3BvcnRzL01rL2JzZC5wb3J0Lm1r
CVdlZCBPY3QgIDkgMTM6NDM6NTIgMjAwMg0KQEAgLTkyMiwxMCArOTIyLDE2
IEBADQogQlVJTERfREVQRU5EUys9CWdjYzI5NToke1BPUlRTRElSfS9sYW5n
L2djYzI5NQ0KIE1BS0VfRU5WKz0JCUNDPSR7Q0N9IENYWD0ke0NYWH0NCiAu
ZW5kaWYNCi0uaWYgZGVmaW5lZChVU0VfR0NDKSAmJiAke1VTRV9HQ0N9ID09
IDMuMSAmJiAke09TVkVSU0lPTn0gPCA1MDAwMzUNCisuaWYgZGVmaW5lZChV
U0VfR0NDKSAmJiAke1VTRV9HQ0N9ID09IDMuMSAmJiAoICR7T1NWRVJTSU9O
fSA8IDUwMDAzNSB8fCAke09TVkVSU0lPTn0gPiA1MDAwMzggKQ0KIENDPQkJ
CQlnY2MzMQ0KIENYWD0JCQlnKyszMQ0KIEJVSUxEX0RFUEVORFMrPQlnY2Mz
MToke1BPUlRTRElSfS9sYW5nL2djYzMxDQorTUFLRV9FTlYrPQkJQ0M9JHtD
Q30gQ1hYPSR7Q1hYfQ0KKy5lbmRpZg0KKy5pZiBkZWZpbmVkKFVTRV9HQ0Mp
ICYmICR7VVNFX0dDQ30gPT0gMy4yICYmICR7T1NWRVJTSU9OfSA8IDUwMDAz
OQ0KK0NDPQkJCQlnY2MzMg0KK0NYWD0JCQlnKyszMg0KK0JVSUxEX0RFUEVO
RFMrPQlnY2MzMToke1BPUlRTRElSfS9sYW5nL2djYzMyDQogTUFLRV9FTlYr
PQkJQ0M9JHtDQ30gQ1hYPSR7Q1hYfQ0KIC5lbmRpZg0KIA0K
--0-593094260-1034164210=:15308--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message