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

[jeremyhu at macports.org]

Revision: 43188
          http://trac.macports.org/changeset/43188
Author:   jeremyhu at macports.org
Date:     2008-12-06 17:22:55 -0800 (Sat, 06 Dec 2008)
Log Message:
-----------
xorg-server: Version bump, fix path to defaults, make X symlink, use fonts from x11prefix.

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

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2008-12-07 00:57:54 UTC (rev 43187)
+++ trunk/dports/x11/xorg-server/Portfile	2008-12-07 01:22:55 UTC (rev 43188)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		xorg-server
-version		1.4.2-apple26
+version		1.4.2-apple27
 categories	x11 devel
 maintainers	jeremyhu
 description	The X.org / Xquartz X server.
@@ -18,8 +18,15 @@
 distfiles	xorg-server-$version.tar.bz2:xq \
 		MesaLib-${mesavers}.tar.bz2:mesa
 
-checksums	xorg-server-$version.tar.bz2 sha1 30d2cb0a2cc35d14d7931788006dc3d283c10389 \
-		MesaLib-$mesavers.tar.bz2 sha1 7e2ecbe89d245510d2681d04e959aee6adc205c5
+checksums           xorg-server-1.4.2-apple27.tar.bz2 \
+                    md5     59b7968cdd2e1c62324a56f8b166ea6e \
+                    sha1    1922c4ac0bd8e349fa5232673cf5d7f0db9fbb7a \
+                    rmd160  cd54f041b6ac67354ea704cb0176f97085041a1f \
+                    MesaLib-7.0.4.tar.bz2 \
+                    md5     8d7bacbe0234742a5d08c8088c4619e9 \
+                    sha1    7e2ecbe89d245510d2681d04e959aee6adc205c5 \
+                    rmd160  0394bb9e00ea13f2399bc5895d4264221bbc03ac
+
 use_bzip2	yes
 use_parallel_build yes
 
@@ -35,14 +42,14 @@
                 port:xorg-xextproto \
                 port:xorg-xtrans
 
+# This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
 depends_run     port:xinit
+
+# I'd prefer to keep pixman a port: dependency here for building the server
 depends_lib     port:libpixman \
-                port:xorg-libAppleWM \
-                port:xorg-libXdmcp \
-                port:xorg-libXfixes
+                lib:libAppleWM.7:xorg-libAppleWM \
+                lib:libXfixes.3: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
 
@@ -51,11 +58,17 @@
     set applications_dir /Applications/MacPorts
 }
 
-configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers} --with-apple-applications-dir=${applications_dir}
+configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers} --with-apple-applications-dir=${applications_dir} --with-fontdir=${x11prefix}/lib/X11/fonts
 
 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
+	reinplace "s|org.x.X11|org.macports.X11|" ${worksrcpath}/hw/xquartz/bundle/Info.plist \
+	                                          ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c \
+	                                          ${worksrcpath}/hw/xquartz/mach-startup/stub.c
+
+	reinplace "s|/usr/X11|${prefix}|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c \
+	                                  ${worksrcpath}/hw/xquartz/X11Application.m
 }
+
+post-destroot {
+	system "ln -s Xquartz ${prefix}/bin/X"
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081206/b03df76e/attachment.html>