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

[jeremyhu at macports.org]

Revision: 44744
          http://trac.macports.org/changeset/44744
Author:   jeremyhu at macports.org
Date:     2009-01-02 14:55:15 -0800 (Fri, 02 Jan 2009)
Log Message:
-----------
xorg-server: Bump to 1.4.2-apple31 and use Macports fonts instead of fonts in x11prefix

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

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2009-01-02 21:52:11 UTC (rev 44743)
+++ trunk/dports/x11/xorg-server/Portfile	2009-01-02 22:55:15 UTC (rev 44744)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		xorg-server
-version		1.4.2-apple30
+version		1.4.2-apple31
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -18,10 +18,10 @@
 distfiles	xorg-server-$version.tar.bz2:xq \
 		MesaLib-${mesavers}.tar.bz2:mesa
 
-checksums           xorg-server-1.4.2-apple30.tar.bz2 \
-                    md5     9ce0d24fc932527f361d06979c092a4b \
-                    sha1    e2841b3bd8b51463e76f0610bc6eb1f81d36dfb6 \
-                    rmd160  d079fb31648b2c1251c5164262a8e25faefb7113 \
+checksums           xorg-server-1.4.2-apple31.tar.bz2 \
+                    md5     7b4c16698836ac1904227f53b1eeee75 \
+                    sha1    7d65a928dd7fd655cafff4fdebe3458276016974 \
+                    rmd160  e19742eb64c3ce73d2bb2be11d47083149f97f91 \
                     MesaLib-7.0.4.tar.bz2 \
                     md5     8d7bacbe0234742a5d08c8088c4619e9 \
                     sha1    7e2ecbe89d245510d2681d04e959aee6adc205c5 \
@@ -30,8 +30,6 @@
 use_bzip2	yes
 use_parallel_build yes
 
-patchfiles vnc-workaround.patch
-
 depends_build \
 	port:pkgconfig \
 	port:xorg-applewmproto \
@@ -56,7 +54,8 @@
 
 # This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
 depends_run \
-	port:xinit
+	port:xinit \
+	port:xorg-fonts
 
 # I'd prefer to keep pixman a port: dependency here for building the server
 depends_lib \
@@ -74,7 +73,7 @@
 	system "cd ${worksrcpath}/.. && patch -p0 < ${filespath}/mesa-7.0-multisample.patch"
 }
 
-configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers} --with-apple-applications-dir=${applications_dir} --with-fontdir=${x11prefix}/lib/X11/fonts --with-apple-application-id=org.macports.X11
+configure.args	--with-mesa-source=${worksrcpath}/../Mesa-${mesavers} --with-apple-applications-dir=${applications_dir} --with-fontdir=${prefix}/share/fonts --with-apple-application-id=org.macports.X11
 
 # Otherwise glcore.h will be pulled in from glproto in /opt/local/include/GL/internal
 configure.cppflags-delete -I${prefix}/include
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090102/9b367136/attachment-0001.html>