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

[jeremyhu at macports.org]

Revision: 47380
          http://trac.macports.org/changeset/47380
Author:   jeremyhu at macports.org
Date:     2009-02-27 12:55:52 -0800 (Fri, 27 Feb 2009)
Log Message:
-----------
mesa: bump to ASGLX 53, install glut, glxgears, and glxinfo

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

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-02-27 19:52:33 UTC (rev 47379)
+++ trunk/dports/x11/mesa/Portfile	2009-02-27 20:55:52 UTC (rev 47380)
@@ -4,8 +4,8 @@
 
 name                mesa
 version             7.2
-revision            5
-set ASGLX_version   52
+revision            6
+set ASGLX_version   53
 categories          x11 graphics
 maintainers         jeremyhu andrea.damore openmaintainer
 description         Mesa 3D Graphics Library
@@ -13,6 +13,8 @@
 
 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
 worksrcdir          Mesa-${version}
 platforms           macosx darwin
@@ -24,10 +26,18 @@
                     md5     04d379292e023df0b0266825cb0dbde5 \
                     sha1    a6dce814cc56a562890ab79cf4e205f62459a29c \
                     rmd160  1e7c2cc6aa27ebaf7e726ac2086c10a5155d0832 \
-                    AppleSGLX-52.tar.bz2 \
-                    md5     08e8387baaa4e87d6e160a07767667f6 \
-                    sha1    f55c05db96e5cde2848e61eabf597413b0db7715 \
-                    rmd160  0ef07b8c1be227c3cb03f810557a15fbf0367f87
+                    MesaGLUT-7.2.tar.bz2 \
+                    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 \
+                    rmd160  0c8d11f4e759e878ca3fcc591d49303df33ab277
 
 patch.pre_args -p1
 patchfiles \
@@ -36,15 +46,18 @@
 	mesa-7.2-drm_headers.patch \
 	mesa-7.2-x11dir.patch
 
+# glut port is here to "clean out" the glut port if it's installed to avoid conflict
 depends_build \
 	port:xorg-glproto \
 	bin:makedepend:makedepend \
+	port:glut \
 	bin:tclsh8.5:tcl
 
 depends_lib \
 	port:xorg-libXext
 
 use_configure  no
+use_parallel_build yes
 
 build.target default
 build.args-append INSTALL_DIR=${prefix}
@@ -73,10 +86,19 @@
 	}
 
 	# This next hunk supports building -system_x11 mesa on a system that is otherwise +system_x11
-	if {! [file exists ${prefix}/lib/libX11.dylib]} {
-		build.args-append X11_DIR=${x11prefix}
-		destroot.args-append X11_DIR=${x11prefix}	
+	pre-build {
+		if {! [file exists ${prefix}/lib/libX11.dylib]} {
+			build.args-append X11_DIR=${x11prefix}
+			destroot.args-append X11_DIR=${x11prefix}	
+		}
 	}
+
+	post-destroot {
+		xinstall -o root -m 755 -d "${destroot}${prefix}/bin"
+		xinstall -o root -m 755 "${worksrcpath}/progs/xdemos/glxgears" "${destroot}/${prefix}/bin"
+		xinstall -o root -m 755 "${worksrcpath}/progs/xdemos/glxinfo" "${destroot}/${prefix}/bin"
+	}
+
 }
 
 variant hw_render conflicts system_x11 description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} {
@@ -86,13 +108,14 @@
 
 	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}'"
 	}
 
 	post-destroot {
 		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${destroot.cmd} ${destroot.target} ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
-		delete ${destroot}${prefix}/include/GL/glxint.h
-		delete ${destroot}${prefix}/include/GL/glxmd.h
-		delete ${destroot}${prefix}/include/GL/glxproto.h
+#               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}'"
 	}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090227/aa84d6e9/attachment-0001.html>