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

[jeremyhu at macports.org]

Revision: 43525
          http://trac.macports.org/changeset/43525
Author:   jeremyhu at macports.org
Date:     2008-12-11 00:37:25 -0800 (Thu, 11 Dec 2008)
Log Message:
-----------
Don't mangle xrender.pc libs and cflags with x11prefix stuff.  This is part of the problem in bug #17558

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

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2008-12-11 08:32:16 UTC (rev 43524)
+++ trunk/dports/x11/xrender/Portfile	2008-12-11 08:37:25 UTC (rev 43525)
@@ -5,7 +5,7 @@
 name				xrender
 set my_name			libXrender
 version				0.9.4
-revision			2
+revision			3
 categories			x11
 platforms			darwin
 maintainers			jeremyhu openmaintainer
@@ -46,6 +46,8 @@
         configure.cppflags-append -I${prefix}/include -I${filespath}/include
 
         # Apple's versions of X11 prior to XQuartz provide neither x11.pc nor xproto.pc
+        # 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_LIBS="-L${x11prefix}/lib -lX11"
@@ -54,8 +56,11 @@
             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
-            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
+
+            # Leaving these commented out as a reminder NOT to do this.
+            # 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
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081211/204d6c87/attachment.html>