[47541] trunk/dports/graphics/cairo/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Sat Feb 28 16:20:36 PST 2009


Revision: 47541
          http://trac.macports.org/changeset/47541
Author:   jeremyhu at macports.org
Date:     2009-02-28 16:20:35 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
cairo: Update our AC_X_PATH workaround

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

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2009-03-01 00:19:59 UTC (rev 47540)
+++ trunk/dports/graphics/cairo/Portfile	2009-03-01 00:20:35 UTC (rev 47541)
@@ -77,20 +77,23 @@
     --enable-xlib-xrender \
     --with-x
 
-# 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
-    configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-    configure.cppflags-append -I${x11prefix}/include
-    configure.ldflags-append  -L${x11prefix}/lib
- 
+# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+# This block helps us link correctly and setup our pc files correctly when we   
+# are +system_x11 and x11prefix is somewhere non-standard and should cause
+# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
+configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
+if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+    pre-configure {
+        configure.cppflags-append -I${x11prefix}/include
+        configure.ldflags-append  -L${x11prefix}/lib
+    }
+
     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
     post-destroot {
-        foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
-            reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
+        if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
+            foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
+                reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
+            }
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/42b883fa/attachment-0001.html>


More information about the macports-changes mailing list