[45828] trunk/dports/x11/openmotif/Portfile

[jeremyhu at macports.org]

Revision: 45828
          http://trac.macports.org/changeset/45828
Author:   jeremyhu at macports.org
Date:     2009-01-22 15:16:55 -0800 (Thu, 22 Jan 2009)
Log Message:
-----------
openmotif: Force linking with X11libs in prefix when present

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

Modified: trunk/dports/x11/openmotif/Portfile
===================================================================
--- trunk/dports/x11/openmotif/Portfile	2009-01-22 23:14:10 UTC (rev 45827)
+++ trunk/dports/x11/openmotif/Portfile	2009-01-22 23:16:55 UTC (rev 45828)
@@ -4,7 +4,7 @@
 
 name            openmotif
 version         2.3.1-1
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set subdir      [lindex [split ${version} -] 0]
 worksrcdir      ${name}-${subdir}
@@ -48,6 +48,17 @@
     reinplace -E "/^LDFLAGS/s|\$| @LDFLAGS@|" ${worksrcpath}/lib/Xm/Makefile.in
 }
 
+# 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
+}
+
 configure.args  --mandir=${prefix}/share/man	\
                 --enable-xft	\
                 --enable-jpeg	\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090122/c948a5aa/attachment.html>