[47402] trunk/dports/graphics/SimGear/Portfile

[jeremyhu at macports.org]

Revision: 47402
          http://trac.macports.org/changeset/47402
Author:   jeremyhu at macports.org
Date:     2009-02-27 17:19:56 -0800 (Fri, 27 Feb 2009)
Log Message:
-----------
SimGear: Update X11 dependency

Modified Paths:
--------------
    trunk/dports/graphics/SimGear/Portfile

Modified: trunk/dports/graphics/SimGear/Portfile
===================================================================
--- trunk/dports/graphics/SimGear/Portfile	2009-02-28 01:15:21 UTC (rev 47401)
+++ trunk/dports/graphics/SimGear/Portfile	2009-02-28 01:19:56 UTC (rev 47402)
@@ -24,7 +24,19 @@
 depends_lib		port:plib \
 				port:zlib \
 				port:openal \
-				port:xorg-libs
+				port:xorg-libX11
 
 configure.args	--with-x
-configure.cppflags-append	"-I${x11prefix}/include"
+
+# This block helps us link correctly and setup our pc files correctly when we are
+# +system_x11 and x11prefix is somewhere non-standard
+if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] && ![file exists ${x11prefix}/lib/pkgconfig/x11.pc] } {
+    # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+    # These next three lines should cause AC_X_PATH to let us setup our CPPFLAGS
+    # and LDFLAGS without interference
+    pre-configure {
+        configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
+        configure.cppflags-append -I${x11prefix}/include
+        configure.ldflags-append  -L${x11prefix}/lib
+    }
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090227/18c5628a/attachment.html>