[53922] trunk/dports/science/afni/Portfile

[jmr at macports.org]

Revision: 53922
          http://trac.macports.org/changeset/53922
Author:   jmr at macports.org
Date:     2009-07-16 11:03:17 -0700 (Thu, 16 Jul 2009)
Log Message:
-----------
afni: remove use of cd (#12914)

Modified Paths:
--------------
    trunk/dports/science/afni/Portfile

Modified: trunk/dports/science/afni/Portfile
===================================================================
--- trunk/dports/science/afni/Portfile	2009-07-16 17:54:47 UTC (rev 53921)
+++ trunk/dports/science/afni/Portfile	2009-07-16 18:03:17 UTC (rev 53922)
@@ -30,64 +30,59 @@
 
 platform powerpc {
 post-patch      {
-		cd ${workpath}/afni_src
                 file copy ${filespath}/Makefile.ppc \
-			Makefile
+			${workpath}/afni_src/Makefile
 		reinplace "s|openMotif-2.2.3|${workpath}/openMotif-2.2.3|g" ${workpath}/afni_src/Makefile
 }
 }
 
 platform i386 {
 post-patch      {
-		cd ${workpath}/afni_src
                 file copy ${filespath}/Makefile.i386 \
-			Makefile
+			${workpath}/afni_src/Makefile
 		reinplace "s|openMotif-2.2.3|${workpath}/openMotif-2.2.3|g" ${workpath}/afni_src/Makefile
 }
 }
 
 pre-build	{
-		cd ${workpath}/openMotif-2.2.3
-		system "./configure --disable-shared --enable-static --disable-demos"
-		system "make"
+		system "cd ${workpath}/openMotif-2.2.3 && ./configure --disable-shared --enable-static --disable-demos"
+		system "cd ${workpath}/openMotif-2.2.3 && make"
 		}
 
 destroot {
 # First, separate files that were all dumped into macosx_bin by the Makefile
-		cd ${workpath}/afni_src
-		file mkdir macosx_lib
-		eval file rename [glob macosx_bin/*.a] macosx_lib
-		eval file rename [glob macosx_bin/*.so] macosx_lib
-		file mkdir macosx_include
-		eval file rename [glob macosx_bin/*.h] macosx_include
-		file mkdir macosx_share
-		eval file rename [glob macosx_bin/*.jpg] macosx_share
-		eval file rename [glob macosx_bin/*.txt] macosx_share
+		file mkdir ${workpath}/afni_src/macosx_lib
+		eval file rename [glob -directory ${workpath}/afni_src macosx_bin/*.a] ${workpath}/afni_src/macosx_lib
+		eval file rename [glob -directory ${workpath}/afni_src macosx_bin/*.so] ${workpath}/afni_src/macosx_lib
+		file mkdir ${workpath}/afni_src/macosx_include
+		eval file rename [glob -directory ${workpath}/afni_src macosx_bin/*.h] ${workpath}/afni_src/macosx_include
+		file mkdir ${workpath}/afni_src/macosx_share
+		eval file rename [glob -directory ${workpath}/afni_src macosx_bin/*.jpg] ${workpath}/afni_src/macosx_share
+		eval file rename [glob -directory ${workpath}/afni_src macosx_bin/*.txt] ${workpath}/afni_src/macosx_share
 
 # Delete files that conflict with other ports
-		eval file delete macosx_bin/cjpeg macosx_bin/djpeg \
-			macosx_bin/whirlgif
+		eval file delete ${workpath}/afni_src/macosx_bin/cjpeg ${workpath}/afni_src/macosx_bin/djpeg \
+			${workpath}/afni_src/macosx_bin/whirlgif
 
 # Install binaries and scripts
 		xinstall -d -m 755 ${destroot}${prefix}/bin
-		eval xinstall -m 755 [glob macosx_bin/*] ${destroot}${prefix}/bin
+		eval xinstall -m 755 [glob -directory ${workpath}/afni_src macosx_bin/*] ${destroot}${prefix}/bin
 # Install libraries and plugins
 		xinstall -d -m 755 ${destroot}${prefix}/lib/afni
-		eval xinstall -m 644 [glob macosx_lib/*] ${destroot}${prefix}/lib/afni
+		eval xinstall -m 644 [glob -directory ${workpath}/afni_src macosx_lib/*] ${destroot}${prefix}/lib/afni
 # Install headers
 		xinstall -d -m 755 ${destroot}${prefix}/include/afni
-		eval xinstall -m 644 [glob macosx_include/*] ${destroot}${prefix}/include/afni
+		eval xinstall -m 644 [glob -directory ${workpath}/afni_src macosx_include/*] ${destroot}${prefix}/include/afni
 
 # Install miscellaneous files
 		xinstall -d -m 755 ${destroot}${prefix}/share/afni
-		eval xinstall -m 644 [glob macosx_share/*] ${destroot}${prefix}/share/afni
+		eval xinstall -m 644 [glob -directory ${workpath}/afni_src macosx_share/*] ${destroot}${prefix}/share/afni
 		eval xinstall -m 644 [glob ${distpath}/TTatlas*] ${destroot}${prefix}/share/afni
-		cd ${workpath}
-		eval xinstall -m 644 [glob CA_EZ_v1.3c-May0806/*] ${destroot}${prefix}/share/afni
+		eval xinstall -m 644 [glob -directory ${workpath} CA_EZ_v1.3c-May0806/*] ${destroot}${prefix}/share/afni
 
 # Install docs
 		xinstall -d -m 755 ${destroot}${prefix}/share/doc/afni
-		eval xinstall -m 644 [glob afni_src/README.*] ${destroot}${prefix}/share/doc/afni
+		eval xinstall -m 644 [glob -directory ${workpath} afni_src/README.*] ${destroot}${prefix}/share/doc/afni
 		xinstall -d -m 755 ${destroot}${prefix}/man/man1
 		eval xinstall -m 644 ${distpath}/afni.1 ${destroot}${prefix}/man/man1
 		reinplace "s|%%PREFIX%%|${prefix}|g" ${destroot}${prefix}/man/man1/afni.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090716/031606f9/attachment.html>