[47560] trunk/dports/x11/SoXt/Portfile

[jeremyhu at macports.org]

Revision: 47560
          http://trac.macports.org/changeset/47560
Author:   jeremyhu at macports.org
Date:     2009-02-28 16:58:21 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
SoXt: Update AC_X_PATH workaround

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

Modified: trunk/dports/x11/SoXt/Portfile
===================================================================
--- trunk/dports/x11/SoXt/Portfile	2009-03-01 00:57:16 UTC (rev 47559)
+++ trunk/dports/x11/SoXt/Portfile	2009-03-01 00:58:21 UTC (rev 47560)
@@ -33,10 +33,27 @@
 configure.args		--enable-man --mandir=${prefix}/share/man \
 			--with-coin=${prefix}
 
-# This package doesn't ship some of of its m4 macros, so we can't autoreconf to do this...
-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 {
+        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}
+            }
+        }
+    }
+}
+
 platform darwin {
 	configure.args-append	--enable-darwin-x11
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/4bc1c5b8/attachment.html>