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

[mcalhoun at macports.org]

Revision: 42732
          http://trac.macports.org/changeset/42732
Author:   mcalhoun at macports.org
Date:     2008-11-29 20:32:49 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
xrender: workaround for lack of x11.pc and xproto.pc on Apple's X11 prior to XQuartz.
Attempt to fix #17429.
There is no revision increase because xrender either builds correctly or not at all.

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

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2008-11-30 04:11:59 UTC (rev 42731)
+++ trunk/dports/x11/xrender/Portfile	2008-11-30 04:32:49 UTC (rev 42732)
@@ -13,8 +13,9 @@
 
 long_description	${description}
 
-homepage			http://www.x.org
-master_sites			${homepage}/pub/individual/lib/
+homepage			http://www.x.org/
+master_sites		http://www.x.org/archive/individual/lib/ \
+			http://xorg.freedesktop.org/archive/individual/lib/
 distname			${my_name}-${version}
 use_bzip2			yes
 
@@ -25,35 +26,33 @@
 depends_lib			lib:libX11:XFree86 \
 				port:xorg-renderproto
 
-configure.args \
-    --x-includes=${x11prefix}/include \
-    --x-libraries=${x11prefix}/lib \
+depends_build			port:pkgconfig
 
-configure.env \
-    CPPFLAGS=-I${prefix}/include -I${x11prefix}/include \
-    LDFLAGS=-L${prefix}/lib -L${x11prefix}/lib \
-    PKG_CONFIG_PATH=${x11prefix}/lib/pkgconfig
-
-# This doesn't seem to be necessary; commenting for now in case I'm wrong
-#post-patch {
-#    # Brute-force things into building with the universal LDFLAGS
-#    if {[variant_isset universal]} {
-#        reinplace "s|-dynamiclib|-dynamiclib ${configure.universal_ldflags}|g" \
-#            ${worksrcpath}/configure \
-#            ${worksrcpath}/ltmain.sh
-#    }
-#}
-#configure.universal_ldflags-append  -isysroot ${sysroot}
-
 use_parallel_build  yes
 
 post-destroot {
-    set docdir ${prefix}/share/doc/${name}-${version}
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
         ${destroot}${docdir}
 }
 
+platform macosx {
+    # Apple's versions of X11 prior to XQuartz provide neither x11.pc nor xproto.pc
+    if {${os.major} < 9} {
+        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
+            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
+        }
+    }
+}
+
 livecheck.check regex
-livecheck.url   ${master_sites}?C=M&O=D
+livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/7070b005/attachment.html>