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

[jeremyhu at macports.org]

Revision: 43484
          http://trac.macports.org/changeset/43484
Author:   jeremyhu at macports.org
Date:     2008-12-10 22:23:29 -0800 (Wed, 10 Dec 2008)
Log Message:
-----------
glx isn't working right on Leopard either... the build is picking up a bad glcore.h from the system and using it instead of the one from mesa... disabling glx for now...

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

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2008-12-11 05:51:37 UTC (rev 43483)
+++ trunk/dports/x11/xorg-server/Portfile	2008-12-11 06:23:29 UTC (rev 43484)
@@ -83,9 +83,6 @@
 autoconf.cmd autoreconf
 autoconf.args -fvi
 
-# 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 
-
 # Can be removed once MacPorts 1.7.0 is released
 if {![info exists applications_dir]} {
     set applications_dir /Applications/MacPorts
@@ -93,18 +90,24 @@
 
 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 
+
 post-destroot {
 	ln -s Xquartz ${destroot}${prefix}/bin/X
 }
 
 platform macosx {
-	if {${os.major} < 9} {
+	if { ![file exists /usr/include/Xplugin.h] } {
 		# Xplugin.h is missing on Tiger
 		configure.cppflags-append -I${filespath}/include
+	}
 
-		# GLX doesn't work right on Tiger
-		configure.args-append --disable-glx
-
+	if {${os.major} < 9} {
 		post-install {
 			ui_msg "This server has not been thoroughly tested on Tiger.  Your feedback would be welcomed on x11-users at macosforge.org."
 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081210/f80dbad0/attachment.html>