[71534] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Wed Sep 15 13:28:43 PDT 2010


Revision: 71534
          http://trac.macports.org/changeset/71534
Author:   ryandesign at macports.org
Date:     2010-09-15 13:28:41 -0700 (Wed, 15 Sep 2010)
Log Message:
-----------
In the interest that all portfiles exemplify correct portfile writing techniques, remove slash before ${applications_dir} which is not needed because ${applications_dir} already begins with a slash

Modified Paths:
--------------
    trunk/dports/aqua/ManOpen/Portfile
    trunk/dports/devel/GitX/Portfile
    trunk/dports/java/android/Portfile
    trunk/dports/java/derby-server/Portfile
    trunk/dports/java/glassfishv3/Portfile
    trunk/dports/lang/eiffelstudio65/Portfile
    trunk/dports/news/leafnode/Portfile

Modified: trunk/dports/aqua/ManOpen/Portfile
===================================================================
--- trunk/dports/aqua/ManOpen/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/aqua/ManOpen/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -30,7 +30,7 @@
 destroot     {
     xinstall -d -m 755 ${destroot}${applications_dir}
     file copy ${build.dir}/${name}.app                 \
-        ${destroot}/${applications_dir}/${name}.app
+        ${destroot}${applications_dir}/${name}.app
     file copy ${build.dir}/openman ${destroot}${prefix}/bin
     file copy ${build.dir}/openman.tproj/openman.1            \
         ${destroot}${prefix}/share/man/man1

Modified: trunk/dports/devel/GitX/Portfile
===================================================================
--- trunk/dports/devel/GitX/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/devel/GitX/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -46,7 +46,7 @@
 
 post-destroot {
     file mkdir  ${destroot}${prefix}/bin
-    file rename ${destroot}/${applications_dir}/gitx ${destroot}${prefix}/bin/gitx
+    file rename ${destroot}${applications_dir}/gitx ${destroot}${prefix}/bin/gitx
 }
 
 livecheck.url       http://gitx.frim.nl/release_history.html

Modified: trunk/dports/java/android/Portfile
===================================================================
--- trunk/dports/java/android/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/java/android/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -78,7 +78,7 @@
 
 platform macosx {
     post-destroot {
-	xinstall -m 755 -d ${destroot}/${applications_dir}/Developer
+	xinstall -m 755 -d ${destroot}${applications_dir}/Developer
 
 	system "touch ${destroot}${applications_dir}/Developer/.localized"
 

Modified: trunk/dports/java/derby-server/Portfile
===================================================================
--- trunk/dports/java/derby-server/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/java/derby-server/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -48,7 +48,7 @@
 
 destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/java
-    xinstall -m 755 -d ${destroot}/${applications_dir}/Utilities
+    xinstall -m 755 -d ${destroot}${applications_dir}/Utilities
 
     file copy ${worksrcpath} ${destroot}${prefix}/share/java/${packagename}
 
@@ -56,7 +56,7 @@
 	xinstall -m 755							\
 	   -W ${filespath}						\
 	    ${script}.command						\
-	    ${destroot}/${applications_dir}/Utilities/${script}.command
+	    ${destroot}${applications_dir}/Utilities/${script}.command
 	reinplace s|@PREFIX@|${prefix}|g				\
 	    ${destroot}${applications_dir}/Utilities/${script}.command
     }

Modified: trunk/dports/java/glassfishv3/Portfile
===================================================================
--- trunk/dports/java/glassfishv3/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/java/glassfishv3/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -34,7 +34,7 @@
 	}
 
 	xinstall -m 755 -d ${destroot}${prefix}/share/java
-	xinstall -m 755 -d ${destroot}/${applications_dir}/Utilities
+	xinstall -m 755 -d ${destroot}${applications_dir}/Utilities
 
     file copy ${worksrcpath} ${destroot}${prefix}/share/java/${name}
 
@@ -42,7 +42,7 @@
 		xinstall -m 755													\
 			-W ${filespath}												\
 			${script}.command											\
-			${destroot}/${applications_dir}/Utilities/${script}.command
+			${destroot}${applications_dir}/Utilities/${script}.command
 		reinplace s|@PREFIX@|${prefix}|g								\
 			${destroot}${applications_dir}/Utilities/${script}.command
 	}

Modified: trunk/dports/lang/eiffelstudio65/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio65/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/lang/eiffelstudio65/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -67,7 +67,7 @@
 
 destroot          {
                     xinstall -m 755 -d ${destroot}${applications_dir}
-                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}/${applications_dir}/
+                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}${applications_dir}/
 
                     # Run ranlib on the libraries
                     system "ranlib ${destroot}${applications_dir}/Eiffel${branch}/studio/spec/$env(ISE_PLATFORM)/lib/*.a"

Modified: trunk/dports/news/leafnode/Portfile
===================================================================
--- trunk/dports/news/leafnode/Portfile	2010-09-15 20:26:12 UTC (rev 71533)
+++ trunk/dports/news/leafnode/Portfile	2010-09-15 20:28:41 UTC (rev 71534)
@@ -52,7 +52,7 @@
 	xinstall					-m 755 -d ${destroot}${prefix}/var
 	xinstall					-m 755 -d ${destroot}${prefix}/var/spool
 	xinstall -o _news -g _news	-m 755 -d ${destroot}${prefix}/var/spool/news
-	xinstall					-m 755 -d ${destroot}/${applications_dir}/Utilities
+	xinstall					-m 755 -d ${destroot}${applications_dir}/Utilities
 
 	xinstall -o _news -g _news -m 640											\
 		-W ${filespath}															\
@@ -81,15 +81,15 @@
 	xinstall -m 755																\
 		-W ${filespath}															\
 		Restart_Fetchnews.command.in											\
-		${destroot}/${applications_dir}/Utilities/Restart_Fetchnews.command
+		${destroot}${applications_dir}/Utilities/Restart_Fetchnews.command
 	xinstall -m 755																\
 		-W ${filespath}															\
 		Restart_Leafnode.command.in												\
-		${destroot}/${applications_dir}/Utilities/Restart_Leafnode.command
+		${destroot}${applications_dir}/Utilities/Restart_Leafnode.command
 	xinstall -m 755																\
 		-W ${filespath}															\
 		Restart_Texpire.command.in												\
-		${destroot}/${applications_dir}/Utilities/Restart_Texpire.command
+		${destroot}${applications_dir}/Utilities/Restart_Texpire.command
 
 	reinplace																	\
 		s|@PREFIX@|${prefix}|g													\
@@ -98,9 +98,9 @@
 		${destroot}${prefix}${launch_dir}/org.macports.texpire.plist
 	reinplace																	\
 		s|@PREFIX@|${prefix}|g													\
-		${destroot}/${applications_dir}/Utilities/Restart_Fetchnews.command		\
-		${destroot}/${applications_dir}/Utilities/Restart_Leafnode.command		\
-		${destroot}/${applications_dir}/Utilities/Restart_Texpire.command
+		${destroot}${applications_dir}/Utilities/Restart_Fetchnews.command		\
+		${destroot}${applications_dir}/Utilities/Restart_Leafnode.command		\
+		${destroot}${applications_dir}/Utilities/Restart_Texpire.command
 }
 
 ############################################################ {{{1 ###########
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100915/422721c9/attachment.html>


More information about the macports-changes mailing list