[47529] trunk/dports/x11/gtk2/Portfile

[jeremyhu at macports.org]

Revision: 47529
          http://trac.macports.org/changeset/47529
Author:   jeremyhu at macports.org
Date:     2009-02-28 15:21:09 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
Updae AC_X_PATH handling block

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-02-28 23:20:14 UTC (rev 47528)
+++ trunk/dports/x11/gtk2/Portfile	2009-02-28 23:21:09 UTC (rev 47529)
@@ -136,22 +136,23 @@
 
     configure.args-append      --with-xinput --enable-xinerama
 
-    # 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.
+    # 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 {
-            # 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
         }
 
         # 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/397fdd24/attachment.html>