[91938] trunk/dports/lang

blair at macports.org blair at macports.org
Fri Apr 13 11:18:55 PDT 2012


Revision: 91938
          https://trac.macports.org/changeset/91938
Author:   blair at macports.org
Date:     2012-04-13 11:18:55 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
scala{27,28,29}: replace hardcoded branch number with ${branch}.

Modified Paths:
--------------
    trunk/dports/lang/scala27/Portfile
    trunk/dports/lang/scala28/Portfile
    trunk/dports/lang/scala29/Portfile

Modified: trunk/dports/lang/scala27/Portfile
===================================================================
--- trunk/dports/lang/scala27/Portfile	2012-04-13 18:01:49 UTC (rev 91937)
+++ trunk/dports/lang/scala27/Portfile	2012-04-13 18:18:55 UTC (rev 91938)
@@ -39,20 +39,20 @@
 destroot {
         set sharedir ${destroot}${prefix}/share
         set man1dir ${sharedir}/man/man1
-        set scaladir ${sharedir}/scala-2.7
-        set docscaladir ${sharedir}/doc/scala-2.7
+        set scaladir ${sharedir}/scala-${branch}
+        set docscaladir ${sharedir}/doc/scala-${branch}
 
         xinstall -d -m 755 ${sharedir}
         file copy ${worksrcpath} ${scaladir}
 
         foreach f {fsc sbaz sbaz-setup scala scalac scaladoc scalap} {
-                ln -s ../share/scala-2.7/bin/${f} ${destroot}${prefix}/bin/${f}-2.7
+                ln -s ../share/scala-${branch}/bin/${f} ${destroot}${prefix}/bin/${f}-${branch}
         }
 
         file delete ${man1dir}
         file rename ${scaladir}/man/man1 ${man1dir}
         foreach f {fsc sbaz scala scalac scaladoc} {
-                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-2.7.1
+                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-${branch}.1
         }
         file delete -force ${scaladir}/man
 
@@ -69,7 +69,7 @@
                    scala-dbc.jar
                    scala-library.jar
                    scala-swing.jar} {
-                set g [strsed ${f} {/.jar/-2.7.jar/}]
-                ln -s ../scala-2.7/lib/${f} ${sharedir}/java/${g}
+                set g [strsed ${f} "/.jar/-${branch}.jar/"]
+                ln -s ../scala-${branch}/lib/${f} ${sharedir}/java/${g}
         }
 }

Modified: trunk/dports/lang/scala28/Portfile
===================================================================
--- trunk/dports/lang/scala28/Portfile	2012-04-13 18:01:49 UTC (rev 91937)
+++ trunk/dports/lang/scala28/Portfile	2012-04-13 18:18:55 UTC (rev 91938)
@@ -39,20 +39,20 @@
 destroot {
         set sharedir ${destroot}${prefix}/share
         set man1dir ${sharedir}/man/man1
-        set scaladir ${sharedir}/scala-2.8
-        set docscaladir ${sharedir}/doc/scala-2.8
+        set scaladir ${sharedir}/scala-${branch}
+        set docscaladir ${sharedir}/doc/scala-${branch}
 
         xinstall -d -m 755 ${sharedir}
         file copy ${worksrcpath} ${scaladir}
 
         foreach f {fsc sbaz sbaz-setup scala scalac scaladoc scalap} {
-                ln -s ../share/scala-2.8/bin/${f} ${destroot}${prefix}/bin/${f}-2.8
+                ln -s ../share/scala-${branch}/bin/${f} ${destroot}${prefix}/bin/${f}-${branch}
         }
 
         file delete ${man1dir}
         file rename ${scaladir}/man/man1 ${man1dir}
         foreach f {fsc sbaz scala scalac scaladoc scalap} {
-                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-2.8.1
+                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-${branch}.1
         }
         file delete -force ${scaladir}/man
 
@@ -68,7 +68,7 @@
                    scala-library.jar
                    scala-swing.jar
                    scalap.jar} {
-                set g [strsed ${f} {/.jar/-2.8.jar/}]
-                ln -s ../scala-2.8/lib/${f} ${sharedir}/java/${g}
+                set g [strsed ${f} "/.jar/-${branch}.jar/"]
+                ln -s ../scala-${branch}/lib/${f} ${sharedir}/java/${g}
         }
 }

Modified: trunk/dports/lang/scala29/Portfile
===================================================================
--- trunk/dports/lang/scala29/Portfile	2012-04-13 18:01:49 UTC (rev 91937)
+++ trunk/dports/lang/scala29/Portfile	2012-04-13 18:18:55 UTC (rev 91938)
@@ -39,21 +39,21 @@
 destroot {
         set sharedir ${destroot}${prefix}/share
         set man1dir ${sharedir}/man/man1
-        set scaladir ${sharedir}/scala-2.9
+        set scaladir ${sharedir}/scala-${branch}
         set docdir ${sharedir}/doc
-        set docscaladir ${docdir}/scala-2.9
+        set docscaladir ${docdir}/scala-${branch}
 
         xinstall -d -m 755 ${sharedir}
         file copy ${worksrcpath} ${scaladir}
 
         foreach f {fsc scala scalac scaladoc scalap} {
-                ln -s ../share/scala-2.9/bin/${f} ${destroot}${prefix}/bin/${f}-2.9
+                ln -s ../share/scala-${branch}/bin/${f} ${destroot}${prefix}/bin/${f}-${branch}
         }
 
         file delete ${man1dir}
         file rename ${scaladir}/man/man1 ${man1dir}
         foreach f {fsc scala scalac scaladoc scalap} {
-                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-2.9.1
+                file rename ${man1dir}/${f}.1 ${man1dir}/${f}-${branch}.1
         }
         file delete -force ${scaladir}/man
 
@@ -71,7 +71,7 @@
                    scala-swing.jar
                    scalacheck.jar
                    scalap.jar} {
-                set g [strsed ${f} {/.jar/-2.9.jar/}]
-                ln -s ../scala-2.9/lib/${f} ${sharedir}/java/${g}
+                set g [strsed ${f} "/.jar/-${branch}.jar/"]
+                ln -s ../scala-${branch}/lib/${f} ${sharedir}/java/${g}
         }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120413/c913e55e/attachment.html>


More information about the macports-changes mailing list