From alex@foxybanana.com  Tue Jul 11 22:35:02 2006
Return-Path: <alex@foxybanana.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 48EA216A4E6
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Jul 2006 22:35:02 +0000 (UTC)
	(envelope-from alex@foxybanana.com)
Received: from imf21aec.mail.bellsouth.net (imf21aec.mail.bellsouth.net [205.152.59.69])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3834F43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Jul 2006 22:35:01 +0000 (GMT)
	(envelope-from alex@foxybanana.com)
Received: from ibm63aec.bellsouth.net ([68.209.153.178])
          by imf21aec.mail.bellsouth.net with ESMTP
          id <20060711223500.QXXP22787.imf21aec.mail.bellsouth.net@ibm63aec.bellsouth.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 11 Jul 2006 18:35:00 -0400
Received: from Laptop.mine.box ([68.209.153.178]) by ibm63aec.bellsouth.net
          with ESMTP
          id <20060711223459.KWZX1324.ibm63aec.bellsouth.net@Laptop.mine.box>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 11 Jul 2006 18:34:59 -0400
Received: from Laptop.mine.box (localhost [127.0.0.1])
	by Laptop.mine.box (8.13.6/8.13.6) with ESMTP id k6BMY9VN027760
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Jul 2006 17:34:18 -0500 (CDT)
	(envelope-from alex@localhost.my.domain)
Received: (from alex@localhost)
	by Laptop.mine.box (8.13.6/8.13.6/Submit) id k6BMY4Du027759;
	Tue, 11 Jul 2006 17:34:04 -0500 (CDT)
	(envelope-from alex)
Message-Id: <200607112234.k6BMY4Du027759@Laptop.mine.box>
Date: Tue, 11 Jul 2006 17:34:04 -0500 (CDT)
From: Alexander Botero-Lowry <alex@foxybanana.com>
Reply-To: Alexander Botero-Lowry <alex@foxybanana.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER-UPDATE] Fix some small issues in bsd.scons.mk
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         100126
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] Fix some small issues in bsd.scons.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 11 22:40:15 GMT 2006
>Closed-Date:    Thu Jul 13 22:16:45 GMT 2006
>Last-Modified:  Thu Jul 13 22:16:45 GMT 2006
>Originator:     Alexander Botero-Lowry
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #1: Mon Jul 10 22:43:23 CDT 2006 root@Laptop.mine.box:/usr/src/sys/i386/compile/LAPTOP i386

>Description:
- Use LIBPATH and CPPPATH by default instead of appending to LINKFLAGS/CCFLAGS,
  this should fix some issues with portupgrading audio/xmms2.
>How-To-Repeat:
install xmms2 DrDoolittle, then portupgrade to DrEvil, notice linking errors
>Fix:
Lovely patch to fix it!
--- bsd.scons.mk.patch begins here ---
--- bsd.scons.mk.orig	Tue Jul 11 17:24:42 2006
+++ bsd.scons.mk	Tue Jul 11 17:30:24 2006
@@ -30,13 +30,15 @@
 # Some scons projects may honor PKGCONFIGDIR, which tells them where to
 # look for, and install, pkgconfig files.
 #
+# LIBPATH is the search path for libraries. Bring in some safe defaults.
+#
+# CPPPATH is the search path for includes, Again, bring in some safe defaults.
+#
 CCFLAGS?=	${CFLAGS}
 LINKFLAGS?=	${LDFLAGS}
 PKGCONFIGDIR?=	${LOCALBASE}/libdata/pkgconfig
-
-CCFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-I${LOCALBASE}/include
-LINKFLAGS+=	-L${LOCALBASE}/lib
+LIBPATH=	${LOCALBASE}/lib ${X11BASE}/lib
+CPPPATH=	${LOCALBASE}/include ${X11BASE}/include
 
 #
 # SCONS_ENV is where we pass all the stuff that should be the
@@ -53,8 +55,9 @@
 # argument to scons.
 #
 SCONS_ENV?=	CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \
-		PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}"
+		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}"  \
+		CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \
+		CC="${CC}" CXX="${CXX}"
 SCONS_ARGS?=
 SCONS_BUILDENV?=
 SCONS_TARGET?=
--- bsd.scons.mk.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Alexander Botero-Lowry <alex@foxybanana.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: itetcu@FreeBSD.org
Subject: Re: ports/100126: [MAINTAINER-UPDATE] Fix some small issues in
 bsd.scons.mk
Date: Tue, 11 Jul 2006 20:12:48 -0500

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__11_Jul_2006_20_12_48_-0500_iUscRnGDF0.qPAyr
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 I'm including a new patch, this one does it more cleanly than the last one did.
 
 
 On Tue, 11 Jul 2006 22:40:15 GMT
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 
 > Thank you very much for your problem report.
 > It has the internal identification `ports/100126'.
 > The individual assigned to look at your
 > report is: freebsd-ports-bugs. 
 > 
 > You can access the state of your problem report at any time
 > via this link:
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=100126
 > 
 > >Category:       ports
 > >Responsible:    freebsd-ports-bugs
 > >Synopsis:       [MAINTAINER-UPDATE] Fix some small issues in
 > >bsd.scons.mk Arrival-Date:   Tue Jul 11 22:40:15 GMT 2006
 > 
 > !DSPAM:4,44b428e347924163787476!
 > 
 > 
 
 --Multipart=_Tue__11_Jul_2006_20_12_48_-0500_iUscRnGDF0.qPAyr
 Content-Type: application/octet-stream;
  name="bsd.scons.mk.patch"
 Content-Disposition: attachment;
  filename="bsd.scons.mk.patch"
 Content-Transfer-Encoding: base64
 
 LS0tIGJzZC5zY29ucy5tay5vcmlnCVR1ZSBKdWwgMTEgMTc6MjQ6NDIgMjAwNgorKysgYnNkLnNj
 b25zLm1rCVR1ZSBKdWwgMTEgMjA6MTA6MzYgMjAwNgpAQCAtMzAsMTMgKzMwLDE2IEBACiAjIFNv
 bWUgc2NvbnMgcHJvamVjdHMgbWF5IGhvbm9yIFBLR0NPTkZJR0RJUiwgd2hpY2ggdGVsbHMgdGhl
 bSB3aGVyZSB0bwogIyBsb29rIGZvciwgYW5kIGluc3RhbGwsIHBrZ2NvbmZpZyBmaWxlcy4KICMK
 KyMgTElCUEFUSCBpcyB0aGUgbGlicmFyeSBzZWFyY2ggcGF0aC4gQnJpbmcgaW4gYSBzZW5zaWJs
 ZSBkZWZhdWx0LgorIworIyBDUFBQQVRIIGlzIHRoZSBpbmNsdWRlIHNlYXJjaCBwYXRoLiBBZ2Fp
 biBicmluZyBpbiBhIHNlbnNpYmxlIGRlZmF1bHQuCisjCiBDQ0ZMQUdTPz0JJHtDRkxBR1N9CiBM
 SU5LRkxBR1M/PQkke0xERkxBR1N9CiBQS0dDT05GSUdESVI/PQkke0xPQ0FMQkFTRX0vbGliZGF0
 YS9wa2djb25maWcKIAotQ0NGTEFHUys9CS1JJHtMT0NBTEJBU0V9L2luY2x1ZGUKLUNYWEZMQUdT
 Kz0JLUkke0xPQ0FMQkFTRX0vaW5jbHVkZQotTElOS0ZMQUdTKz0JLUwke0xPQ0FMQkFTRX0vbGli
 CitMSUJQQVRIPz0JJHtMT0NBTEJBU0V9L2xpYiAke1gxMUJBU0V9L2xpYgorQ1BQUEFUSD89CSR7
 TE9DQUxCQVNFfS9pbmNsdWRlICR7WDExQkFTRX0vaW5jbHVkZQogCiAjCiAjIFNDT05TX0VOViBp
 cyB3aGVyZSB3ZSBwYXNzIGFsbCB0aGUgc3R1ZmYgdGhhdCBzaG91bGQgYmUgdGhlCkBAIC01NCw2
 ICs1Nyw3IEBACiAjCiBTQ09OU19FTlY/PQlDQ0ZMQUdTPSIke0NDRkxBR1N9IiBDWFhGTEFHUz0i
 JHtDWFhGTEFHU30iIFwKIAkJTElOS0ZMQUdTPSIke0xJTktGTEFHU30iIFBLR0NPTkZJR0RJUj0i
 JHtQS0dDT05GSUdESVJ9IiBcCisJCUxJQlBBVEg9IiR7TElCUEFUSH0iIENQUFBBVEg9IiR7Q1BQ
 UEFUSH0iIFwKIAkJUFJFRklYPSIke1BSRUZJWH0iIENDPSIke0NDfSIgQ1hYPSIke0NYWH0iCiBT
 Q09OU19BUkdTPz0KIFNDT05TX0JVSUxERU5WPz0K
 
 --Multipart=_Tue__11_Jul_2006_20_12_48_-0500_iUscRnGDF0.qPAyr--
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Wed Jul 12 20:26:47 UTC 2006 
Responsible-Changed-Why:  
Over to the ones that can commited.  Note: I tested the last patch and 
it's OK. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100126 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Thu Jul 13 22:10:45 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100126 
>Unformatted:
