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

[jeremyhu at macports.org]

Revision: 43377
          http://trac.macports.org/changeset/43377
Author:   jeremyhu at macports.org
Date:     2008-12-09 20:54:28 -0800 (Tue, 09 Dec 2008)
Log Message:
-----------
xrender: Don't force port:xorg-libX11 for Tiger.  This should provide a workaround fo bug #17558

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

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2008-12-10 04:51:41 UTC (rev 43376)
+++ trunk/dports/x11/xrender/Portfile	2008-12-10 04:54:28 UTC (rev 43377)
@@ -5,7 +5,7 @@
 name				xrender
 set my_name			libXrender
 version				0.9.4
-revision			1
+revision			2
 categories			x11
 platforms			darwin
 maintainers			jeremyhu openmaintainer
@@ -23,31 +23,14 @@
                     sha1    8e0726d495db177e3089be9e1d5c41395277b0db \
                     rmd160  0d9249ffe7f8347946f1c4d701bd06d52a4ab40b
 
-depends_build			port:pkgconfig
-depends_lib			lib:libX11:xorg-libX11 \
-				port:xorg-renderproto
+depends_build \
+	port:pkgconfig \
+	port:xorg-renderproto
 
-# Panther and Tiger actually require the newer libX11 to build, so
-# force them to pull it in.  We should revert this to ALWAYS force
-# this to pull in port:xorg-libX11 once we convert other ports to use
-# lib:libXrender:xrender instead of port:xrender
+# Change this to port:xorg-libX11 when other ports depend on this using lib: instead of port:
+depends_lib \
+	lib:libX11:xorg-libX11
 
-# http://trac.macports.org/ticket/17429
-
-platform darwin 7 {
-    depends_lib-delete		lib:libX11:xorg-libX11
-    depends_lib-append		port:xorg-libX11
-}
-
-platform darwin 8 {
-    depends_lib-delete		lib:libX11:xorg-libX11
-    depends_lib-append		port:xorg-libX11
-}
-
-configure.args \
-    --x-includes=${x11prefix}/include \
-    --x-libraries=${x11prefix}/lib \
-
 use_parallel_build  yes
 
 post-destroot {
@@ -58,11 +41,16 @@
 }
 
 platform macosx {
-    # Apple's versions of X11 prior to XQuartz provide neither x11.pc nor xproto.pc
+    # TODO: We should only do this if port:xorg-libX11 isn't installed
     if {${os.major} < 9} {
+        # Xregion.h isn't in the Tiger X11 SDK, so slight hack here...
+        configure.cppflags-append -I${prefix}/include -I${filespath}/include
+
+	# Apple's versions of X11 prior to XQuartz provide neither x11.pc nor xproto.pc
         configure.env-append \
             X_CFLAGS="-I${x11prefix}/include -DXTHREADS" \
             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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081209/7822d404/attachment.html>