[48018] trunk/dports/x11/wine/Portfile

[jeremyhu at macports.org]

Revision: 48018
          http://trac.macports.org/changeset/48018
Author:   jeremyhu at macports.org
Date:     2009-03-12 19:20:27 -0700 (Thu, 12 Mar 2009)
Log Message:
-----------
wine: Link against MacPorts X11 libs instead of system libs

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

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2009-03-13 02:19:47 UTC (rev 48017)
+++ trunk/dports/x11/wine/Portfile	2009-03-13 02:20:27 UTC (rev 48018)
@@ -4,7 +4,7 @@
 
 name                    wine
 version                 1.0.1
-revision                2
+revision                3
 categories              x11
 maintainers             ryandesign jwa openmaintainer
 homepage                http://www.winehq.com/
@@ -77,5 +77,17 @@
     reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
 }
 
+# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+# This block helps us link 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
+pre-configure {
+    if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+        configure.cppflags-append -I${x11prefix}/include
+        configure.ldflags-append  -L${x11prefix}/lib
+    }
+}
+
 livecheck.check         sourceforge
 livecheck.regex         "<title>Source Packages (\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*) released.*</title>"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090312/b6bb9332/attachment.html>