[42965] trunk/dports/x11/xorg-server/Portfile

[jeremyhu at macports.org]

Revision: 42965
          http://trac.macports.org/changeset/42965
Author:   jeremyhu at macports.org
Date:     2008-12-02 15:01:09 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
xorg-server: Update xorg-server to 1.4.2-apple26 (same as the latest xquartz release: 2.3.2_rc2)

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2008-12-02 22:52:11 UTC (rev 42964)
+++ trunk/dports/x11/xorg-server/Portfile	2008-12-02 23:01:09 UTC (rev 42965)
@@ -3,9 +3,9 @@
 PortSystem 1.0
 
 name		xorg-server
-version		1.4.0-apple4
+version		1.4.2-apple26
 categories	x11 devel
-maintainers	bbyer at macports.org
+maintainers	jeremyhu
 description	The X.org / Xquartz X server.
 homepage	http://www.x.org
 platforms	darwin macosx
@@ -13,19 +13,50 @@
 master_sites	http://xquartz.macosforge.org/downloads/src/:xq \
 		http://downloads.sourceforge.net/mesa3d/:mesa
 
-set mesavers	"7.0.3"
+set mesavers	"7.0.4"
 
 distfiles	xorg-server-$version.tar.bz2:xq \
 		MesaLib-${mesavers}.tar.bz2:mesa
 
-checksums	xorg-server-$version.tar.bz2 sha1 3fa1d2720b0df365b33a2a0099af2dfa6af9e0b7 \
-		MesaLib-$mesavers.tar.bz2 sha1 49b92094a25f189b411f393174ee666e73dddf36
+checksums	xorg-server-$version.tar.bz2 sha1 30d2cb0a2cc35d14d7931788006dc3d283c10389 \
+		MesaLib-$mesavers.tar.bz2 sha1 7e2ecbe89d245510d2681d04e959aee6adc205c5
 use_bzip2	yes
+use_parallel_build yes
 
-depends_lib	port:pkgconfig port:xorg-xproto port:xorg-xextproto port:xorg-xtrans \
-		port:xorg-libpthread-stubs port:xorg-libXau port:xorg-xcb-proto \
-		port:xorg-libxcb port:xorg-xcmiscproto port:xorg-inputproto \
-		port:xorg-kbproto port:xorg-libX11 port:xinit
+#                port:xorg-glproto \
 
-configure.env	PKG_CONFIG_PATH=/usr/X11/lib/pkgconfig
-configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers}
\ No newline at end of file
+depends_build   port:pkgconfig \
+                port:xorg-applewmproto \
+                port:xorg-fixesproto \
+                port:xorg-inputproto \
+                port:xorg-randrproto \
+                port:xorg-renderproto \
+                port:xorg-xcmiscproto \
+                port:xorg-xproto \
+                port:xorg-xextproto \
+                port:xorg-xtrans
+
+depends_run     port:xinit
+depends_lib	port:libpixman \
+                port:xorg-libAppleWM \
+                port:xorg-libXdmcp \
+                port:xorg-libXfixes
+
+configure.env	PKG_CONFIG_PATH=${x11prefix}/lib/pkgconfig
+
+# Otherwise glcore.h will be pulled in from glproto in /opt/local/include/GL/internal
+configure.cppflags -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include
+
+# Can be removed once MacPorts 1.7.0 is released
+if {![info exists applications_dir]} {
+    set applications_dir /Applications/MacPorts
+}
+
+configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers} --with-apple-applications-dir=${applications_dir}
+
+post-patch {
+	reinplace "s|org.x.X11|org.macports.X11|" ${worksrcpath}/hw/xquartz/bundle/Info.plist 
+	reinplace "s|org.x.X11|org.macports.X11|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
+	reinplace "s|org.x.X11|org.macports.X11|" ${worksrcpath}/hw/xquartz/mach-startup/stub.c
+	reinplace "s|/usr/X11|${prefix}|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081202/47de17ed/attachment.html>