[43905] trunk/dports/x11/xrender/Portfile

[jeremyhu at macports.org]

Revision: 43905
          http://trac.macports.org/changeset/43905
Author:   jeremyhu at macports.org
Date:     2008-12-16 18:38:22 -0800 (Tue, 16 Dec 2008)
Log Message:
-----------
xrender: Make xrender.pc on Tiger using the Tiger X11 force linking against the Tiger libX11.  Fixes bug #17677 without triggering #17558 if xorg-libX11 is subsequently installed (at which point this port should really be reinstalled anyways)

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

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2008-12-17 01:51:53 UTC (rev 43904)
+++ trunk/dports/x11/xrender/Portfile	2008-12-17 02:38:22 UTC (rev 43905)
@@ -5,7 +5,7 @@
 name				xrender
 set my_name			libXrender
 version				0.9.4
-revision			3
+revision			4
 categories			x11
 platforms			darwin
 maintainers			jeremyhu openmaintainer
@@ -25,6 +25,7 @@
 
 depends_build \
 	port:pkgconfig \
+	port:xorg-xproto \
 	port:xorg-renderproto
 
 # Change this to port:xorg-libX11 when other ports depend on this using lib: instead of port:
@@ -49,18 +50,18 @@
         # We need to nuke this once ports start relying on lib:libXrender and we can pull in
         # all of the macports xorg-* stack with this port.
         configure.env-append \
-            X_CFLAGS="-I${x11prefix}/include -DXTHREADS" \
+            X_CFLAGS="-I${x11prefix}/include" \
             X_LIBS="-L${x11prefix}/lib -lX11"
 
         post-patch {
             reinplace "/Requires.private: x11/d" ${worksrcpath}/xrender.pc.in
             reinplace "s| *x11||g" ${worksrcpath}/xrender.pc.in
-            reinplace "s| *xproto||g" ${worksrcpath}/xrender.pc.in
 
-            # Leaving these commented out as a reminder NOT to do this.
+            # This is dangerous if the user switches from using Tiger's X11 to using macports.
+            # We should advise users doing that to uninstall and reinstall xrender in that case
             # See bug #17558
-            #reinplace "s|\\(Cflags:.*\\)|\\1 -I${x11prefix}/include -DXTHREADS|g" ${worksrcpath}/xrender.pc.in
-            #reinplace "s|\\(Libs:.*\\)|\\1 -L${x11prefix}/lib -lX11|g" ${worksrcpath}/xrender.pc.in
+            reinplace "s|\\(Cflags:.*\\)|\\1 -I${x11prefix}/include|g" ${worksrcpath}/xrender.pc.in
+            reinplace "s|\\(Libs:.*\\)|\\1 -Wl,${x11prefix}/lib/libX11.dylib|g" ${worksrcpath}/xrender.pc.in
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081216/19c6d7db/attachment.html>