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

[jeremyhu at macports.org]

Revision: 43940
          http://trac.macports.org/changeset/43940
Author:   jeremyhu at macports.org
Date:     2008-12-17 18:04:23 -0800 (Wed, 17 Dec 2008)
Log Message:
-----------
xorg-server: Version bump to 1.4.2-apple28... this should be more stable on Tiger now.

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

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2008-12-18 00:51:46 UTC (rev 43939)
+++ trunk/dports/x11/xorg-server/Portfile	2008-12-18 02:04:23 UTC (rev 43940)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		xorg-server
-version		1.4.2-apple27
-revision	2
+version		1.4.2-apple28
 categories	x11 devel
 maintainers	jeremyhu
 description	The X.org / Xquartz X server.
@@ -19,10 +18,10 @@
 distfiles	xorg-server-$version.tar.bz2:xq \
 		MesaLib-${mesavers}.tar.bz2:mesa
 
-checksums           xorg-server-1.4.2-apple27.tar.bz2 \
-                    md5     59b7968cdd2e1c62324a56f8b166ea6e \
-                    sha1    1922c4ac0bd8e349fa5232673cf5d7f0db9fbb7a \
-                    rmd160  cd54f041b6ac67354ea704cb0176f97085041a1f \
+checksums           xorg-server-1.4.2-apple28.tar.bz2 \
+                    md5     f4de44d0a2bddbd61652308264ddb3dc \
+                    sha1    a69a01f4f159358a406c56bd3863edbb2df95191 \
+                    rmd160  6670722dc44b4616ef549d1a365843a1ac602812 \
                     MesaLib-7.0.4.tar.bz2 \
                     md5     8d7bacbe0234742a5d08c8088c4619e9 \
                     sha1    7e2ecbe89d245510d2681d04e959aee6adc205c5 \
@@ -51,11 +50,7 @@
 	port:xorg-xproto \
 	port:xorg-xextproto \
 	port:xorg-xineramaproto \
-	port:xorg-xtrans \
-	port:autoconf \
-	port:automake \
-	port:libtool \
-	port:xorg-util-macros
+	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 \
@@ -70,8 +65,6 @@
 	port:xorg-libAppleWM \
 	port:xorg-libXfixes
 
-patchfiles	prefix.patch
-
 post-patch {
 	reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
 
@@ -79,23 +72,11 @@
 	system "cd ${worksrcpath}/.. && patch -p0 < ${filespath}/mesa-7.0-multisample.patch"
 }
 
-use_autoconf yes
-autoconf.cmd autoreconf
-autoconf.args -fvi
-
-# 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} --with-fontdir=${x11prefix}/lib/X11/fonts --with-apple-application-id=org.macports.X11
 
-# GLX doesn't work right ... see below...
-configure.args-append --disable-glx
-
-# Not working for some reason...
 # Otherwise glcore.h will be pulled in from glproto in /opt/local/include/GL/internal
-#configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include 
+configure.cppflags-delete -I${prefix}/include
+configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include -I${x11prefix}/include
 
 post-destroot {
 	ln -s Xquartz ${destroot}${prefix}/bin/X
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081217/33f67613/attachment.html>