[47547] trunk/dports/x11/mesa/Portfile

[jeremyhu at macports.org]

Revision: 47547
          http://trac.macports.org/changeset/47547
Author:   jeremyhu at macports.org
Date:     2009-02-28 16:35:36 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
Don't use mesa glxgears and glxinfo since it doesn't build on Tiger.  #18705

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-03-01 00:26:47 UTC (rev 47546)
+++ trunk/dports/x11/mesa/Portfile	2009-03-01 00:35:36 UTC (rev 47547)
@@ -14,8 +14,11 @@
 homepage            http://mesa3d.sourceforge.net/
 distfiles           MesaLib-${version}.tar.bz2:mesa \
                     MesaGLUT-${version}.tar.bz2:mesa \
-                    MesaDemos-${version}.tar.bz2:mesa \
                     AppleSGLX-${ASGLX_version}.tar.bz2:xq
+
+# The Mesa glut versions of glxgears and glxinfo aren't Tiger friendly
+#                    MesaDemos-${version}.tar.bz2:mesa \
+
 worksrcdir          Mesa-${version}
 platforms           macosx darwin
 use_bzip2           yes
@@ -30,10 +33,6 @@
                     md5     f67daf93e12c4a459703bbf3e4004e31 \
                     sha1    2d969fc8214622b93bcc594c36e56bb573678d05 \
                     rmd160  e60a98f3e8a16b219f7d68231ecbb84f9b3a9963 \
-                    MesaDemos-7.2.tar.bz2 \
-                    md5     22e03dc4038cd63f32c21eb60994892b \
-                    sha1    3d7b9b3ee84ed3637849f7598faf3d60c5a2a9fd \
-                    rmd160  123c9ebb2a61581415e9e3757e5bbc29128c3380 \
                     AppleSGLX-53.tar.bz2 \
                     md5     a5e72066c985888bfcd0d94f520d3ee4 \
                     sha1    ece3287ea4889c244a7d1e80ac9e7f22d508d378 \
@@ -61,6 +60,7 @@
 use_parallel_build yes
 
 build.target default
+# PROGS="glxgears glxinfo"
 build.args-append INSTALL_DIR=${prefix}
 destroot.args-append INSTALL_DIR=${prefix}
 
@@ -94,9 +94,10 @@
 		}
 	}
 
-	post-destroot {
-		xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin"
-	}
+# Do this if you want to install the mesa-provided glxinfo and glxgears... doesn't work on Tiger
+#	post-destroot {
+#		xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin"
+#	}
 
 }
 
@@ -107,14 +108,12 @@
 
 	post-build {
 		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${build.cmd} builds/libGL.1.2.dylib ${build.args} LDFLAGS='${configure.ldflags}' CFLAGS='${configure.cppflags} ${configure.cflags}' INSTALL_DIR='${prefix}'"
-#               Use this if we want to install our glxgears and glxinfo instead of the glut version
-#		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${build.cmd} programs ${build.args} LDFLAGS='${configure.ldflags}' CFLAGS='${configure.cppflags} ${configure.cflags}' INSTALL_DIR='${prefix}'"
+		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${build.cmd} programs ${build.args} LDFLAGS='${configure.ldflags}' CFLAGS='${configure.cppflags} ${configure.cflags}' INSTALL_DIR='${prefix}'"
 	}
 
 	post-destroot {
 		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${destroot.cmd} ${destroot.target} ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
-#               Use this if we want to install our glxgears and glxinfo instead of the glut version
-#		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${destroot.cmd} install_programs ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
+		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${destroot.cmd} install_programs ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
 	}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/b4cc047d/attachment-0001.html>