[32257] trunk/dports

23 Dec 2007

Revision: 32257
          http://trac.macosforge.org/projects/macports/changeset/32257
Author:   ryandesign@macports.org
Date:     2007-12-23 01:39:21 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
All openmaintainer ports: ${prefix} already begins with a slash,
so there's no reason to put a slash before the ${prefix} variable
when using it.

See r32256 for the equivalent change for nomaintainer ports.

Modified Paths:
--------------
    trunk/dports/archivers/bzip2/Portfile
    trunk/dports/cross/arm-apple-darwin-binutils/Portfile
    trunk/dports/cross/arm-apple-darwin-cc/Portfile
    trunk/dports/devel/nsis/Portfile
    trunk/dports/devel/stgit/Portfile
    trunk/dports/games/fortune/Portfile
    trunk/dports/lang/lua/Portfile
    trunk/dports/lang/perl5.9-devel/Portfile
    trunk/dports/lang/tcl/Portfile
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/net/nessus-core/Portfile
    trunk/dports/python/py-matplotlib/Portfile
    trunk/dports/python/py-sip/Portfile
    trunk/dports/python/py25-matplotlib/Portfile
    trunk/dports/science/triangle/Portfile
    trunk/dports/tex/bibutils/Portfile
    trunk/dports/www/cgit/Portfile

Modified: trunk/dports/archivers/bzip2/Portfile
===================================================================

--- trunk/dports/archivers/bzip2/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/archivers/bzip2/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -39,7 +39,7 @@
 
 use_configure       no
 build.args          PREFIX="${prefix}"
-destroot.destdir    PREFIX="${destroot}/${prefix}"
+destroot.destdir    PREFIX="${destroot}${prefix}"
 
 variant universal { 
 	build.args-append \

Modified: trunk/dports/cross/arm-apple-darwin-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-apple-darwin-binutils/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/cross/arm-apple-darwin-binutils/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -53,11 +53,11 @@
 	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-libtool arm-apple-darwin-ranlib"
 
 	# Make the binaries externally visible.
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ld ./"
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-as ./"
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ar ./"
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-libtool ./"
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ranlib ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ld ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-as ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ar ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-libtool ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ranlib ./"
 
 	# Set up non-prefixed binaries in the iphone bin directory
 	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-ld ld"

Modified: trunk/dports/cross/arm-apple-darwin-cc/Portfile
===================================================================
--- trunk/dports/cross/arm-apple-darwin-cc/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/cross/arm-apple-darwin-cc/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -44,7 +44,7 @@
 
 post-destroot {
 	# Make the binaries externally visible.
-	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-cc ./"
+	system "cd ${destroot}${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-cc ./"
 
 	# Set up non-prefixed binaries in the iphone bin directory
 	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-cc cc"

Modified: trunk/dports/devel/nsis/Portfile
===================================================================
--- trunk/dports/devel/nsis/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/devel/nsis/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -42,8 +42,8 @@
 destroot {
 	system "cd ${worksrcpath} && scons ${scons.args} install"
 	foreach dir {Bin Docs Include Plugins Contrib Examples Menu Stubs} {
-		file delete -force ${destpath}/${prefix}/share/nsis/${dir}
-		file copy -force ${workpath}/nsis-${version}/${dir} ${destpath}/${prefix}/share/nsis
+		file delete -force ${destpath}${prefix}/share/nsis/${dir}
+		file copy -force ${workpath}/nsis-${version}/${dir} ${destpath}${prefix}/share/nsis
 	}
-	system "chmod -R go-w '${destpath}/${prefix}/share/nsis'"
+	system "chmod -R go-w '${destpath}${prefix}/share/nsis'"
 }

Modified: trunk/dports/devel/stgit/Portfile
===================================================================
--- trunk/dports/devel/stgit/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/devel/stgit/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -35,12 +35,12 @@
 post-destroot {
     # Install what little documentation there is
     xinstall -m 644 -W ${worksrcpath} COPYING README \
-        ${destroot}/${prefix}/share/doc/${name}
+        ${destroot}${prefix}/share/doc/${name}
     eval xinstall -m 644 [eval glob ${stgdocs}] \
-        ${destroot}/${prefix}/share/doc/${name}
+        ${destroot}${prefix}/share/doc/${name}
     if {${stgman} != ""} {
         eval xinstall -m 644 [eval glob ${stgman}] \
-            ${destroot}/${prefix}/share/man/man1
+            ${destroot}${prefix}/share/man/man1
     }
 }
 

Modified: trunk/dports/games/fortune/Portfile
===================================================================
--- trunk/dports/games/fortune/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/games/fortune/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -53,7 +53,7 @@
 	
 	foreach datfile $datfiles {
 		file copy ${worksrcpath}/datfiles/${datfile} \
-			${destroot}/${prefix}/share/games/fortune
+			${destroot}${prefix}/share/games/fortune
 	}
 }
 

Modified: trunk/dports/lang/lua/Portfile
===================================================================
--- trunk/dports/lang/lua/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/lang/lua/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -45,7 +45,7 @@
 	}
 }
 
-destroot.target	install INSTALL_TOP=${destroot}/${prefix}
+destroot.target	install INSTALL_TOP=${destroot}${prefix}
 post-destroot {
 	xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 0644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/lang/perl5.9-devel/Portfile
===================================================================
--- trunk/dports/lang/perl5.9-devel/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/lang/perl5.9-devel/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -45,11 +45,11 @@
     file delete ${destroot}${prefix}/bin/perl
     set branch [join [lrange [split ${version} .] 0 1] .]
 
-    foreach man1File [glob ${destroot}/${prefix}/share/man/man1/*] {
+    foreach man1File [glob ${destroot}${prefix}/share/man/man1/*] {
         regexp (.*)(\.1.*) ${man1File} -> program suffix
         file rename ${man1File} ${program}${version}${suffix}
     }
-    foreach man3File [glob ${destroot}/${prefix}/share/man/man3/*] {
+    foreach man3File [glob ${destroot}${prefix}/share/man/man3/*] {
         file rename ${man3File} ${man3File}pm${branch}
     }
 }

Modified: trunk/dports/lang/tcl/Portfile
===================================================================
--- trunk/dports/lang/tcl/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/lang/tcl/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -23,8 +23,8 @@
 
 destroot.destdir  INSTALL_ROOT=${destroot}
 post-destroot {
-    ln -s ${prefix}/bin/tclsh8.5 ${destroot}/${prefix}/bin/tclsh
-    ln -s ${prefix}/lib/libtcl8.5.dylib ${destroot}/${prefix}/lib/libtcl.dylib
+    ln -s ${prefix}/bin/tclsh8.5 ${destroot}${prefix}/bin/tclsh
+    ln -s ${prefix}/lib/libtcl8.5.dylib ${destroot}${prefix}/lib/libtcl.dylib
 }
 
 # Files with failing tests: socket.test

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -47,10 +47,10 @@
 		--enable-shared --enable-pthreads
 
 post-destroot {
-	file mkdir ${destroot}/${prefix}/share/doc/${name}
-	file copy ${worksrcpath}/doc/TODO ${destroot}/${prefix}/share/doc/${name}
+	file mkdir ${destroot}${prefix}/share/doc/${name}
+	file copy ${worksrcpath}/doc/TODO ${destroot}${prefix}/share/doc/${name}
 	foreach f [glob ${worksrcpath}/doc/*.txt ${worksrcpath}/doc/*.html] {
-		file copy $f ${destroot}/${prefix}/share/doc/${name}
+		file copy $f ${destroot}${prefix}/share/doc/${name}
 	}
 }
 

Modified: trunk/dports/net/nessus-core/Portfile
===================================================================
--- trunk/dports/net/nessus-core/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/net/nessus-core/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -29,11 +29,11 @@
 patchfiles	patch-nessus-preferences.c \
 		patch-nessusd-preferences.c
 
-destroot.keepdirs	${destroot}/${prefix}/etc/nessus \
-			${destroot}/${prefix}/var/nessus/jobs \
-			${destroot}/${prefix}/var/nessus/logs \
-			${destroot}/${prefix}/var/nessus/tmp \
-			${destroot}/${prefix}/var/nessus/users
+destroot.keepdirs	${destroot}${prefix}/etc/nessus \
+			${destroot}${prefix}/var/nessus/jobs \
+			${destroot}${prefix}/var/nessus/logs \
+			${destroot}${prefix}/var/nessus/tmp \
+			${destroot}${prefix}/var/nessus/users
 
 post-patch       {
 	reinplace "s/INCLUDES_H/NESSUS_CORE_INCLUDES_H/g" ${worksrcpath}/include/includes.h

Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/python/py-matplotlib/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -74,15 +74,15 @@
 }
 
 post-destroot {
-        xinstall -m 755 -d ${destroot}/${prefix}/share/doc/${name} \
-                ${destroot}/${prefix}/share/${name}
+        xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} \
+                ${destroot}${prefix}/share/${name}
         xinstall -m 644 -W ${worksrcpath} API_CHANGES CHANGELOG INSTALL \
                 INTERACTIVE KNOWN_BUGS README TODO \
-                ${destroot}/${prefix}/share/doc/${name}
+                ${destroot}${prefix}/share/doc/${name}
         file copy ${worksrcpath}/license \
-                ${destroot}/${prefix}/share/doc/${name}
+                ${destroot}${prefix}/share/doc/${name}
         file copy ${worksrcpath}/examples \
-                ${destroot}/${prefix}/share/${name}
+                ${destroot}${prefix}/share/${name}
 }
 
 variant gtk2 conflicts tkinter wxpython description "Use gtkAgg for interactive plotting" {

Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/python/py-sip/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -41,8 +41,8 @@
 test.cmd	cd siplib && ${prefix}/bin/python2.4 -c 'import sip'
 
 post-destroot {
-	xinstall -m 755 -d ${destroot}/${prefix}/share/doc
-	file copy ${worksrcpath}/doc ${destroot}/${prefix}/share/doc/${name}
+	xinstall -m 755 -d ${destroot}${prefix}/share/doc
+	file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} LICENSE NEWS README THANKS TODO \
 		${destroot}${prefix}/share/doc/${name}
 	system "${prefix}/bin/python2.4 ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/compileall.py ${destroot}${prefix}"

Modified: trunk/dports/python/py25-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/python/py25-matplotlib/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -75,15 +75,15 @@
 }
 
 post-destroot {
-        xinstall -m 755 -d ${destroot}/${prefix}/share/doc/${name} \
-                ${destroot}/${prefix}/share/${name}
+        xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} \
+                ${destroot}${prefix}/share/${name}
         xinstall -m 644 -W ${worksrcpath} API_CHANGES CHANGELOG INSTALL \
                 INTERACTIVE KNOWN_BUGS README TODO \
-                ${destroot}/${prefix}/share/doc/${name}
+                ${destroot}${prefix}/share/doc/${name}
         file copy ${worksrcpath}/license \
-                ${destroot}/${prefix}/share/doc/${name}
+                ${destroot}${prefix}/share/doc/${name}
         file copy ${worksrcpath}/examples \
-                ${destroot}/${prefix}/share/${name}
+                ${destroot}${prefix}/share/${name}
 }
 
 variant gtk2 conflicts tkinter wxpython description "Use gtkAgg for interactive plotting" {

Modified: trunk/dports/science/triangle/Portfile
===================================================================
--- trunk/dports/science/triangle/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/science/triangle/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -41,13 +41,13 @@
 destroot	{
 }
 
-destroot.destdir	BINDIR=${destroot}/${prefix}/bin
+destroot.destdir	BINDIR=${destroot}${prefix}/bin
 
 post-destroot {
-    xinstall -m 755 -d ${destroot}/${prefix}/share/doc/${name} \
-	${destroot}/${prefix}/bin
-    eval xinstall -m 644 -W ${worksrcpath} A.poly README ${destroot}/${prefix}/share/doc/${name}
-    xinstall -m 755 -W ${worksrcpath} triangle showme ${destroot}/${prefix}/bin
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} \
+	${destroot}${prefix}/bin
+    eval xinstall -m 644 -W ${worksrcpath} A.poly README ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 755 -W ${worksrcpath} triangle showme ${destroot}${prefix}/bin
 }
 
 livecheck.check	regex

Modified: trunk/dports/tex/bibutils/Portfile
===================================================================
--- trunk/dports/tex/bibutils/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/tex/bibutils/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -23,4 +23,4 @@
 checksums           md5 b7513e83a4e0c3126462af127437e16e \
                     sha1 504655a7f42e66dfd731dbb3bd31b8c64de3c049
 
-configure.pre_args  --install-dir ${destroot}/${prefix}/bin
+configure.pre_args  --install-dir ${destroot}${prefix}/bin

Modified: trunk/dports/www/cgit/Portfile
===================================================================
--- trunk/dports/www/cgit/Portfile	2007-12-23 09:18:47 UTC (rev 32256)
+++ trunk/dports/www/cgit/Portfile	2007-12-23 09:39:21 UTC (rev 32257)
@@ -49,7 +49,7 @@
 
 post-destroot {
     xinstall -m 444 ${worksrcpath}/cgitrc ${destroot}${prefix}/etc/cgitrc.sample
-    xinstall -m 700 -o www -g www -d ${destroot}/${prefix}/var/cache/cgit
+    xinstall -m 700 -o www -g www -d ${destroot}${prefix}/var/cache/cgit
     destroot.keepdirs ${destroot}${prefix}/var/cache/cgit
 }

    

ryandesign＠macports.org

tags

participants (1)