[46269] trunk/dports/audio/arts/Portfile

[jeremyhu at macports.org]

Revision: 46269
          http://trac.macports.org/changeset/46269
Author:   jeremyhu at macports.org
Date:     2009-02-01 14:35:16 -0800 (Sun, 01 Feb 2009)
Log Message:
-----------
arts: Fix building/linking with MacPorts provided X11 libs

Modified Paths:
--------------
    trunk/dports/audio/arts/Portfile

Modified: trunk/dports/audio/arts/Portfile
===================================================================
--- trunk/dports/audio/arts/Portfile	2009-02-01 22:05:27 UTC (rev 46268)
+++ trunk/dports/audio/arts/Portfile	2009-02-01 22:35:16 UTC (rev 46269)
@@ -46,7 +46,7 @@
                 kde-admindir-20030601${extract.suffix} md5 6135f81de4b1561942be8fd31ae21297 \
                 detect-autoconf${extract.suffix} md5 1f511627496be40174169dbab4d6d78a
 
-set env(PATH) "${x11prefix}/bin:$env(PATH):${prefix}/bin"
+set env(PATH) "$env(PATH):${prefix}/bin:${x11prefix}/bin"
 
 platform darwin 6 {
                 depends_lib-append      lib:libdl:dlcompat
@@ -114,15 +114,22 @@
                 system "cd ${worksrcpath} && make -f admin/Makefile.common cvs"
 }
 
-configure.cppflags      -I${x11prefix}/include \
-                        -I${prefix}/include \
+configure.cppflags      -I${prefix}/include \
                         -I${prefix}/include/qt3 \
                         -no-cpp-precomp \
                         -fno-common
-configure.ldflags       -L${x11prefix}/lib
-configure.env   LIBS=-L${prefix}/lib \
-                DYLD_LIBRARY_PATH=${x11prefix}/lib:${prefix}/lib \
-                LD_LIBRARY_PATH=${x11prefix}/lib:${prefix}/lib
+configure.env   LIBS=-L${prefix}/lib
+
+if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+	configure.cppflags-append -I${x11prefix}/include
+	configure.ldflags-append  -L${x11prefix}/lib
+	configure.env-append DYLD_LIBRARY_PATH=${x11prefix}/lib:${prefix}/lib \
+	                     LD_LIBRARY_PATH=${x11prefix}/lib:${prefix}/lib
+} else {
+	configure.env-append DYLD_LIBRARY_PATH=${prefix}/lib \
+	                     LD_LIBRARY_PATH=${prefix}/lib
+}
+
 configure.cflags        -Os
 configure.cxxflags      -Os
 configure.args  --includedir=${prefix}/include \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090201/cbc228b7/attachment-0001.html>