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

[ryandesign at macports.org]

Revision: 61549
          http://trac.macports.org/changeset/61549
Author:   ryandesign at macports.org
Date:     2009-12-14 04:50:18 -0800 (Mon, 14 Dec 2009)
Log Message:
-----------
mesa: avoid repeating ${worksrcpath}/../AppleSGLX-${ASGLX_version} in several places

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

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-12-14 11:10:09 UTC (rev 61548)
+++ trunk/dports/x11/mesa/Portfile	2009-12-14 12:50:18 UTC (rev 61549)
@@ -21,6 +21,7 @@
 #                    MesaDemos-${version}.tar.bz2:mesa \
 
 worksrcdir          Mesa-${version}
+set ASGLX_path      ${workpath}/AppleSGLX-${ASGLX_version}
 platforms           macosx darwin
 use_bzip2           yes
 master_sites        ftp://ftp.freedesktop.org/pub/mesa/current/:mesa \
@@ -98,7 +99,7 @@
 
 	# Ensure test programs glxgears and glxinfo are built for the right architectures.
 	reinplace "s|(CC) tests|(CC) ${extra_cflags} ${extra_ldflags} tests|" \
-		${worksrcpath}/../AppleSGLX-${ASGLX_version}/Makefile
+		${ASGLX_path}/Makefile
 }
 
 post-extract {
@@ -114,17 +115,17 @@
 
 variant hw_render description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} {
 #	post-patch {
-#		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && cat ${filespath}/asglx-*.patch | patch -p0"
+#		system "cd ${ASGLX_path} && cat ${filespath}/asglx-*.patch | patch -p0"
 #	}
 
 	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}'"
-		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${build.cmd} programs ${build.args} LDFLAGS='${configure.ldflags}' CFLAGS='${configure.cppflags} ${configure.cflags}' INSTALL_DIR='${prefix}'"
+		system "cd ${ASGLX_path} && ${build.cmd} builds/libGL.1.2.dylib ${build.args} LDFLAGS='${configure.ldflags}' CFLAGS='${configure.cppflags} ${configure.cflags}' INSTALL_DIR='${prefix}'"
+		system "cd ${ASGLX_path} && ${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}'"
-		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${destroot.cmd} install_programs ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
+		system "cd ${ASGLX_path} && ${destroot.cmd} ${destroot.target} ${destroot.destdir} ${destroot.args} INSTALL_DIR='${prefix}'"
+		system "cd ${ASGLX_path} && ${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/20091214/2b92c3bf/attachment.html>