[47466] trunk/dports/science/triangle/Portfile

[jeremyhu at macports.org]

Revision: 47466
          http://trac.macports.org/changeset/47466
Author:   jeremyhu at macports.org
Date:     2009-02-28 02:09:21 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
triangle: Updated X11 dependencies and fixed linking against MacPorts libs

Modified Paths:
--------------
    trunk/dports/science/triangle/Portfile

Modified: trunk/dports/science/triangle/Portfile
===================================================================
--- trunk/dports/science/triangle/Portfile	2009-02-28 10:06:18 UTC (rev 47465)
+++ trunk/dports/science/triangle/Portfile	2009-02-28 10:09:21 UTC (rev 47466)
@@ -4,7 +4,7 @@
 
 name			triangle
 version			1.6
-revision                1
+revision                2
 categories		science
 maintainers		jwa openmaintainer
 description		A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator
@@ -32,14 +32,18 @@
     file mkdir ${worksrcpath}
     eval file rename [glob -directory ${workpath} \[A-s\]* t*.?] ${worksrcpath}
     reinplace "s/-DLINUX//" ${worksrcpath}/makefile
-    reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/makefile
+    if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+        reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
+    } else {
+        reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/makefile
+    }
 }
 
 post-configure	{
     reinplace "s|CC = cc|CC = ${configure.cc}|g" ${worksrcpath}/makefile
 }
 
-depends_lib		port:xorg-libs
+depends_lib		port:xorg-libX11
 
 use_configure		no
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/1c06be35/attachment.html>