[49645] trunk/dports

blb at macports.org blb at macports.org
Tue Apr 14 00:58:38 PDT 2009


Revision: 49645
          http://trac.macports.org/changeset/49645
Author:   blb at macports.org
Date:     2009-04-14 00:58:36 -0700 (Tue, 14 Apr 2009)
Log Message:
-----------
Multiple ports - remove use of cd (ticket #12914) in some ports where it is
simple; not waiting for maintainers as cd doesn't work with current MacPorts

Modified Paths:
--------------
    trunk/dports/aqua/GPGAppKit/Portfile
    trunk/dports/devel/gpgme-objc/Portfile
    trunk/dports/devel/lua-lunit/Portfile
    trunk/dports/devel/spin/Portfile
    trunk/dports/devel/xmlwrapp/Portfile
    trunk/dports/java/javancss/Portfile
    trunk/dports/java/objectweb-asm/Portfile
    trunk/dports/lang/jikespg/Portfile
    trunk/dports/lang/jlint/Portfile
    trunk/dports/math/DoCon/Portfile
    trunk/dports/net/binkd/Portfile
    trunk/dports/net/http-replicator/Portfile
    trunk/dports/net/sclj/Portfile

Modified: trunk/dports/aqua/GPGAppKit/Portfile
===================================================================
--- trunk/dports/aqua/GPGAppKit/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/aqua/GPGAppKit/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -27,8 +27,7 @@
 build.args	build FRAMEWORK_SEARCH_PATHS=${prefix}/Library/Frameworks
 
 destroot 	{
-	cd ${worksrcpath}
-	system "${build.cmd} install ${build.target}			\
+	system "cd ${worksrcpath} && ${build.cmd} install ${build.target}			\
 		INSTALL_PATH=${prefix}/Library/Frameworks 		\
 		FRAMEWORK_SEARCH_PATHS=${prefix}/Library/Frameworks	\
 		INSTALL_MODE_FLAG=go-w,a+rX DSTROOT=${destroot}"

Modified: trunk/dports/devel/gpgme-objc/Portfile
===================================================================
--- trunk/dports/devel/gpgme-objc/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/devel/gpgme-objc/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -25,10 +25,9 @@
 		sha1 ff02efeac01253c9df797ec314ef0e4fc537964e
 depends_lib	port:gpgme
 patch	{
-	cd ${worksrcpath}
 	reinplace "s|/usr/local|${prefix}|g" 	\
-		${rname}.xcode/project.pbxproj	\
-		${rname}.pbproj/project.pbxproj
+		${worksrcpath}/${rname}.xcode/project.pbxproj	\
+		${worksrcpath}/${rname}.pbproj/project.pbxproj
 }
 use_configure	no
 build.type 	pbx
@@ -36,8 +35,7 @@
 build.args	build -project ${rname}.xcode -buildstyle EmbDevelopment
 
 destroot 	{
-	cd ${worksrcpath}
-	system "${build.cmd} install INSTALL_MODE_FLAG=go-w,a+rX 	\
+	system "cd ${worksrcpath} && ${build.cmd} install INSTALL_MODE_FLAG=go-w,a+rX 	\
 		INSTALL_PATH=${prefix}/Library/Frameworks 		\
 		DSTROOT=${destroot} ${build.target} 			\
 		-project ${rname}.xcode"

Modified: trunk/dports/devel/lua-lunit/Portfile
===================================================================
--- trunk/dports/devel/lua-lunit/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/devel/lua-lunit/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -26,16 +26,15 @@
 use_configure       no
 build               {}
 destroot            {
-    cd ${workpath}/${worksrcdir}
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-    file copy ANNOUNCE DOCUMENTATION README README.alpha CHANGES LICENSE TODO ${destroot}${prefix}/share/doc/${name}
+    xinstall -W ${worksrcpath} ANNOUNCE DOCUMENTATION README README.alpha CHANGES LICENSE TODO ${destroot}${prefix}/share/doc/${name}
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples
-    foreach luaexamp [glob examples/*] {
+    foreach luaexamp [glob ${worksrcpath}/examples/*] {
         xinstall -m 0644 ${luaexamp} ${destroot}${prefix}/share/doc/${name}/examples
     }
 
     xinstall -m 755 -d ${destroot}${prefix}/share/lua/5.1
-    foreach luadat [glob *.lua] {
+    foreach luadat [glob ${worksrcpath}/*.lua] {
         xinstall -m 0644 ${luadat} ${destroot}${prefix}/share/lua/5.1
     }
 }

Modified: trunk/dports/devel/spin/Portfile
===================================================================
--- trunk/dports/devel/spin/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/devel/spin/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -37,8 +37,7 @@
 }
 
 build       {
-    cd ${worksrcpath}/Src${version}
-    exec make
+    system "cd ${worksrcpath}/Src${version} && make"
 }
 
 destroot    {

Modified: trunk/dports/devel/xmlwrapp/Portfile
===================================================================
--- trunk/dports/devel/xmlwrapp/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/devel/xmlwrapp/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -29,8 +29,6 @@
 configure.cppflags-append	"-I${prefix}/include/libxml2"
 
 configure {
-	cd ${worksrcpath}
-
 	system "cd ${worksrcpath} && perl configure.pl --xml2-config=${prefix}/bin/xml2-config --xslt-config=${prefix}/bin/xslt-config --prefix=${prefix}"
 
 	reinplace "s#POST_LDFLAGS=#POST_LDFLAGS=-L${prefix}/lib -lxml2 -lz -lpthread -liconv -lm -lxslt#" ${worksrcpath}/src/libxml/Makefile

Modified: trunk/dports/java/javancss/Portfile
===================================================================
--- trunk/dports/java/javancss/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/java/javancss/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -32,8 +32,7 @@
 patchfiles		patch-build.xml
 
 post-patch {
-	   cd ${worksrcpath}
-	   reinplace s|/usr/local/java/javacc|${prefix}/bin/javacc| build.xml
+	   reinplace s|/usr/local/java/javacc|${prefix}/bin/javacc| ${worksrcpath}/build.xml
 }
 
 build.cmd		ant

Modified: trunk/dports/java/objectweb-asm/Portfile
===================================================================
--- trunk/dports/java/objectweb-asm/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/java/objectweb-asm/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -30,8 +30,7 @@
 use_configure		no
 
 pre-build {
-	  cd ${worksrcpath}
-	  reinplace s|^.*objectweb.ant.tasks.path.*ow_util_ant_tasks.jar|objectweb.ant.tasks.path\ ${prefix}/share/java/objectweb-anttasks.jar| build.properties
+	  reinplace s|^.*objectweb.ant.tasks.path.*ow_util_ant_tasks.jar|objectweb.ant.tasks.path\ ${prefix}/share/java/objectweb-anttasks.jar| ${worksrcpath}/build.properties
 }
 
 build.cmd		ant

Modified: trunk/dports/lang/jikespg/Portfile
===================================================================
--- trunk/dports/lang/jikespg/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/lang/jikespg/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -20,8 +20,7 @@
 worksrcdir      ${name}/src
 
 configure       {
-	cd ${worksrcpath}
-        reinplace "s|-s -o|-o|g" Makefile
+        reinplace "s|-s -o|-o|g" ${worksrcpath}/Makefile
 }
 
 destroot        {

Modified: trunk/dports/lang/jlint/Portfile
===================================================================
--- trunk/dports/lang/jlint/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/lang/jlint/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -21,7 +21,5 @@
 use_configure	no
 
 destroot	{
-	cd ${worksrcpath}
-	xinstall -m 755 antic ${destroot}${prefix}/bin
-	xinstall -m 755 jlint ${destroot}${prefix}/bin
+	xinstall -m 755 -W ${worksrcpath} antic jlint ${destroot}${prefix}/bin
 }

Modified: trunk/dports/math/DoCon/Portfile
===================================================================
--- trunk/dports/math/DoCon/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/math/DoCon/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -36,13 +36,10 @@
 		  depends_build bin:latex:texlive port:ghostscript
 
 		  post-destroot {
-		  	cd ${workpath}/${shortname}
-			system "latex manual.lat"
-			system "latex manual.lat"
-			system "latex manual.lat"
-			system "dvipdf manual"
-			file mkdir ${destroot}${prefix}/share/${shortname}-${version}
-			file copy manual.pdf ${destroot}${prefix}/share/${shortname}-${version}/
+			system "cd ${workpath}/${shortname} && latex manual.lat"
+			system "cd ${workpath}/${shortname} && dvipdf manual"
+			file mkdir ${destroot}${prefix}/share/doc/${shortname}-${version}
+			file copy ${workpath}/${shortname}/manual.pdf ${destroot}${prefix}/share/doc/${shortname}-${version}/
 		  }
 		}
 

Modified: trunk/dports/net/binkd/Portfile
===================================================================
--- trunk/dports/net/binkd/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/net/binkd/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -20,8 +20,7 @@
 		}
 			
 destroot 	{
-		cd ${worksrcpath}
-		system "install -o root -m 755 binkd ${destroot}/${prefix}/sbin/"
-		system "install -o root -m 644 binkd.8 ${destroot}/${prefix}/share/man/man8"
-		system "install -o root -m 644 binkd.cfg ${destroot}/${prefix}/etc/binkd.cfg.sample"
+		xinstall -m 755 ${worksrcpath}/binkd ${destroot}${prefix}/sbin/
+		xinstall -m 644 ${worksrcpath}/binkd.8 ${destroot}${prefix}/share/man/man8
+		xinstall -m 644 ${worksrcpath}/binkd.cfg ${destroot}${prefix}/etc/binkd.cfg.sample
 		}

Modified: trunk/dports/net/http-replicator/Portfile
===================================================================
--- trunk/dports/net/http-replicator/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/net/http-replicator/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -18,14 +18,14 @@
 homepage		http://gertjan.freezope.org/replicator/
 master_sites	${homepage}
 distname		${name}_${version}
+worksrcdir		${name}-${version}
 checksums		md5 7d8d69175a5dc3d470273b1e508a27f3
 
 depends_run		bin:python:python24
 
 configure	{
-	cd ${worksrcpath}
-	reinplace "s| /usr/bin/python|/usr/bin/env pyhton|g" http-replicator \
-		http-replicator_maintenance
+	reinplace "s| /usr/bin/python|/usr/bin/env python|g" ${worksrcpath}/http-replicator \
+		${worksrcpath}/http-replicator_maintenance
 }
 
 build			{}

Modified: trunk/dports/net/sclj/Portfile
===================================================================
--- trunk/dports/net/sclj/Portfile	2009-04-14 06:02:38 UTC (rev 49644)
+++ trunk/dports/net/sclj/Portfile	2009-04-14 07:58:36 UTC (rev 49645)
@@ -20,9 +20,8 @@
                   patch-man-man1-Makefile
 
 configure {
-	cd ${worksrcpath}/src
 	reinplace "s|\/usr\/bin\/perl|${prefix}\/bin\/perl|" \
-		sclj scljconv scljed
+		${worksrcpath}/src/sclj ${worksrcpath}/src/scljconv ${worksrcpath}/src/scljed
 }
 
 build {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090414/88a6b552/attachment-0001.html>


More information about the macports-changes mailing list