[78054] trunk/dports/x11/xdiskusage

[jmr at macports.org]

Revision: 78054
          http://trac.macports.org/changeset/78054
Author:   jmr at macports.org
Date:     2011-04-21 01:43:53 -0700 (Thu, 21 Apr 2011)
Log Message:
-----------
xdiskusage: fix build_arch support (#23977)

Modified Paths:
--------------
    trunk/dports/x11/xdiskusage/Portfile
    trunk/dports/x11/xdiskusage/files/patch-makeinclude.in.diff

Added Paths:
-----------
    trunk/dports/x11/xdiskusage/files/patch-configure.diff

Modified: trunk/dports/x11/xdiskusage/Portfile
===================================================================
--- trunk/dports/x11/xdiskusage/Portfile	2011-04-21 07:52:42 UTC (rev 78053)
+++ trunk/dports/x11/xdiskusage/Portfile	2011-04-21 08:43:53 UTC (rev 78054)
@@ -21,7 +21,7 @@
 # fltk is 32-bit only
 supported_archs i386 ppc
 
-build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
+patchfiles      patch-configure.diff
 
 destroot.destdir	prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man
 

Added: trunk/dports/x11/xdiskusage/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/xdiskusage/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/x11/xdiskusage/files/patch-configure.diff	2011-04-21 08:43:53 UTC (rev 78054)
@@ -0,0 +1,24 @@
+--- configure.orig	1999-01-10 06:25:37.000000000 +1100
++++ configure	2011-04-21 18:35:22.000000000 +1000
+@@ -1804,9 +1804,9 @@
+ 
+ if test -n "$GXX"; then
+     # GNU C compiler
+-    CFLAGS="-Wall -O2"
++    CFLAGS+=" -Wall"
+     CFLAGS_D="-Wall -g -DDEBUG"
+-    CXXFLAGS="-Wall -O2"
++    CXXFLAGS+=" -Wall"
+     CXXFLAGS_D="-Wall -g -DDEBUG"
+ else
+ if test "`(uname) 2>/dev/null`" = IRIX; then
+@@ -1830,9 +1830,7 @@
+   fi
+ else
+     # generic C compiler:
+-    CFLAGS="-O"
+     CFLAGS_D="-g -DDEBUG"
+-    CXXFLAGS="-O"
+     CXXFLAGS_D="-g -DDEBUG"
+ fi
+ fi

Modified: trunk/dports/x11/xdiskusage/files/patch-makeinclude.in.diff
===================================================================
--- trunk/dports/x11/xdiskusage/files/patch-makeinclude.in.diff	2011-04-21 07:52:42 UTC (rev 78053)
+++ trunk/dports/x11/xdiskusage/files/patch-makeinclude.in.diff	2011-04-21 08:43:53 UTC (rev 78054)
@@ -1,10 +1,11 @@
 --- makeinclude.in.orig	2004-05-05 02:07:57.000000000 -0400
 +++ makeinclude.in	2007-04-11 19:41:21.000000000 -0400
-@@ -21,6 +21,6 @@
+@@ -21,6 +21,7 @@
  CXXFLAGS_D	=@CXXFLAGS_D@
  
  # libraries to link with:
 -LDLIBS	=@LIBS@ -lfltk -lXinerama -lGL -lGLU -lX11 -lXext @X_EXTRA_LIBS@ -lm
 +LDLIBS	=@LIBS@ -lfltk -framework ApplicationServices -framework Carbon
++LDFLAGS =@LDFLAGS@
  
  INSTALL	=@INSTALL@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110421/2d76966a/attachment.html>