Greetings,
Meanwhile scala-3.4.2 was released.
Here the updated diff.
Tested on -curent/amd64.
diff --git lang/scala/Makefile lang/scala/Makefile
index 740b16a0748..0e619d11c0b 100644
--- lang/scala/Makefile
+++ lang/scala/Makefile
@@ -1,17 +1,16 @@
COMMENT= general purpose multi-paradigm programming language
-VERSION = 2.12.9
-DISTNAME= scala-${VERSION}
+VERSION = 3.4.2
+DISTNAME= scala3-${VERSION}
+PKGNAME= ${DISTNAME:S/scala3-/scala-/}
CATEGORIES= lang
-REVISION= 0
HOMEPAGE= http://www.scala-lang.org/
-# BSD
+# Apache2
PERMIT_PACKAGE= Yes
-SITES= https://downloads.lightbend.com/scala/${VERSION}/
-EXTRACT_SUFX= .tgz
+SITES= https://github.com/scala/scala3/releases/download/${VERSION}/
MODULES= java
MODJAVA_VER= 1.8+
@@ -20,7 +19,7 @@ RUN_DEPENDS= java/javaPathHelper \
shells/bash
SCALA_HOME= ${PREFIX}/scala/
-SCALA_SCRIPTS= fsc scala scalac scalap scaladoc
+SCALA_SCRIPTS= scala scalac scaladoc
NO_BUILD= Yes
NO_TEST= Yes
@@ -31,9 +30,8 @@ post-extract:
do-install:
${INSTALL_DATA_DIR} ${SCALA_HOME}
- cd ${WRKSRC} && tar -cf - bin doc lib misc src | \
+ cd ${WRKSRC} && tar -cf - bin lib | \
tar -xf - -C ${SCALA_HOME}
- ${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 ${PREFIX}/man/man1/
# Install the wrapper scripts
.for s in ${SCALA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/$s ${PREFIX}/bin/
diff --git lang/scala/distinfo lang/scala/distinfo
index ca8fefd01c8..e04c9430757 100644
--- lang/scala/distinfo
+++ lang/scala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scala-2.12.9.tgz) = Xp8ET1ebYCFfFEuiGHjJq+87lUGzezTBdExDaGHu9nI=
-SIZE (scala-2.12.9.tgz) = 20649062
+SHA256 (scala3-3.4.2.tar.gz) = JEfwlRJsZTKk0DAIlsh+U1Dozm4UQXwVeLSkNIGHMEs=
+SIZE (scala3-3.4.2.tar.gz) = 39098935
diff --git lang/scala/files/fsc lang/scala/files/fsc
deleted file mode 100644
index 23700f9bd8b..00000000000
--- lang/scala/files/fsc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/ksh
-
-JAVA_CMD=$(javaPathHelper -c scala)
-
-JAVACMD=${JAVA_CMD} ${TRUEPREFIX}/scala/bin/fsc "$@"
diff --git lang/scala/files/scala lang/scala/files/scala
index 99584f8efbc..19d12699255 100644
--- lang/scala/files/scala
+++ lang/scala/files/scala
@@ -1,5 +1,5 @@
#!/bin/ksh
-JAVA_CMD=$(javaPathHelper -c scala)
+JAVA_HOME=${JAVA_HOME:-$(javaPathHelper -h scala)}
-JAVACMD=${JAVA_CMD} ${TRUEPREFIX}/scala/bin/scala "$@"
+JAVA_HOME=${JAVA_HOME} ${TRUEPREFIX}/scala/bin/scala "$@"
diff --git lang/scala/files/scalac lang/scala/files/scalac
index f11e367541f..bf3118ba834 100644
--- lang/scala/files/scalac
+++ lang/scala/files/scalac
@@ -1,5 +1,5 @@
#!/bin/ksh
-JAVA_CMD=$(javaPathHelper -c scala)
+JAVA_HOME=${JAVA_HOME:-$(javaPathHelper -h scala)}
-JAVACMD=${JAVA_CMD} ${TRUEPREFIX}/scala/bin/scalac "$@"
+JAVA_HOME=${JAVA_HOME} ${TRUEPREFIX}/scala/bin/scalac "$@"
diff --git lang/scala/files/scaladoc lang/scala/files/scaladoc
index 46976b9f872..c605c243b9e 100644
--- lang/scala/files/scaladoc
+++ lang/scala/files/scaladoc
@@ -1,5 +1,5 @@
#!/bin/ksh
-JAVA_CMD=$(javaPathHelper -c scala)
+JAVA_HOME=${JAVA_HOME:-$(javaPathHelper -h scala)}
-JAVACMD=${JAVA_CMD} ${TRUEPREFIX}/scala/bin/scaladoc "$@"
+JAVA_HOME=${JAVA_HOME} ${TRUEPREFIX}/scala/bin/scaladoc "$@"
diff --git lang/scala/files/scalap lang/scala/files/scalap
deleted file mode 100644
index b4fb77331c2..00000000000
--- lang/scala/files/scalap
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/ksh
-
-JAVA_CMD=$(javaPathHelper -c scala)
-
-JAVACMD=${JAVA_CMD} ${TRUEPREFIX}/scala/bin/scalap "$@"
diff --git lang/scala/pkg/PLIST lang/scala/pkg/PLIST
index fc8d54cf028..bc5e7474f37 100644
--- lang/scala/pkg/PLIST
+++ lang/scala/pkg/PLIST
@@ -1,48 +1,63 @@
-bin/fsc
bin/scala
bin/scalac
bin/scaladoc
-bin/scalap
-@man man/man1/fsc.1
-@man man/man1/scala.1
-@man man/man1/scalac.1
-@man man/man1/scaladoc.1
-@man man/man1/scalap.1
scala/
scala/bin/
-scala/bin/fsc
+scala/bin/common
scala/bin/scala
scala/bin/scalac
scala/bin/scaladoc
-scala/bin/scalap
-scala/doc/
-scala/doc/LICENSE.md
-scala/doc/License.rtf
-scala/doc/README
-scala/doc/licenses/
-scala/doc/licenses/apache_jansi.txt
-scala/doc/licenses/bsd_asm.txt
-scala/doc/licenses/bsd_jline.txt
-scala/doc/licenses/mit_jquery.txt
-scala/doc/licenses/mit_tools.tooltip.txt
-scala/doc/tools/
-scala/doc/tools/css/
-scala/doc/tools/css/style.css
-scala/doc/tools/fsc.html
-scala/doc/tools/images/
-scala/doc/tools/images/external.gif
-scala/doc/tools/images/scala_logo.png
-scala/doc/tools/index.html
-scala/doc/tools/scala.html
-scala/doc/tools/scalac.html
-scala/doc/tools/scaladoc.html
-scala/doc/tools/scalap.html
scala/lib/
-scala/lib/jline-2.14.6.jar
-scala/lib/scala-compiler.jar
-scala/lib/scala-library.jar
-scala/lib/scala-parser-combinators_2.12-1.0.7.jar
-scala/lib/scala-reflect.jar
-scala/lib/scala-swing_2.12-2.0.3.jar
-scala/lib/scala-xml_2.12-1.0.6.jar
-scala/lib/scalap-2.12.9.jar
+scala/lib/annotations-15.0.jar
+scala/lib/antlr4-runtime-4.7.2.jar
+scala/lib/autolink-0.6.0.jar
+scala/lib/compiler-interface-1.9.6.jar
+scala/lib/dist_3-3.4.2.jar
+scala/lib/flexmark-0.62.2.jar
+scala/lib/flexmark-ext-anchorlink-0.62.2.jar
+scala/lib/flexmark-ext-autolink-0.62.2.jar
+scala/lib/flexmark-ext-emoji-0.62.2.jar
+scala/lib/flexmark-ext-gfm-strikethrough-0.62.2.jar
+scala/lib/flexmark-ext-gfm-tasklist-0.62.2.jar
+scala/lib/flexmark-ext-ins-0.62.2.jar
+scala/lib/flexmark-ext-superscript-0.62.2.jar
+scala/lib/flexmark-ext-tables-0.62.2.jar
+scala/lib/flexmark-ext-wikilink-0.62.2.jar
+scala/lib/flexmark-ext-yaml-front-matter-0.62.2.jar
+scala/lib/flexmark-jira-converter-0.62.2.jar
+scala/lib/flexmark-util-0.62.2.jar
+scala/lib/flexmark-util-ast-0.62.2.jar
+scala/lib/flexmark-util-builder-0.62.2.jar
+scala/lib/flexmark-util-collection-0.62.2.jar
+scala/lib/flexmark-util-data-0.62.2.jar
+scala/lib/flexmark-util-dependency-0.62.2.jar
+scala/lib/flexmark-util-format-0.62.2.jar
+scala/lib/flexmark-util-html-0.62.2.jar
+scala/lib/flexmark-util-misc-0.62.2.jar
+scala/lib/flexmark-util-options-0.62.2.jar
+scala/lib/flexmark-util-sequence-0.62.2.jar
+scala/lib/flexmark-util-visitor-0.62.2.jar
+scala/lib/jackson-annotations-2.15.1.jar
+scala/lib/jackson-core-2.15.1.jar
+scala/lib/jackson-databind-2.15.1.jar
+scala/lib/jackson-dataformat-yaml-2.15.1.jar
+scala/lib/jackson-datatype-jsr310-2.12.1.jar
+scala/lib/jline-native-3.25.1.jar
+scala/lib/jline-reader-3.25.1.jar
+scala/lib/jline-terminal-3.25.1.jar
+scala/lib/jline-terminal-jna-3.25.1.jar
+scala/lib/jna-5.14.0.jar
+scala/lib/jsoup-1.17.2.jar
+scala/lib/liqp-0.8.2.jar
+scala/lib/scala-asm-9.6.0-scala-1.jar
+scala/lib/scala-library-2.13.12.jar
+scala/lib/scala3-compiler_3-3.4.2.jar
+scala/lib/scala3-interfaces-3.4.2.jar
+scala/lib/scala3-library_3-3.4.2.jar
+scala/lib/scala3-staging_3-3.4.2.jar
+scala/lib/scala3-tasty-inspector_3-3.4.2.jar
+scala/lib/scaladoc_3-3.4.2.jar
+scala/lib/snakeyaml-2.0.jar
+scala/lib/strftime4j-1.0.5.jar
+scala/lib/tasty-core_3-3.4.2.jar
+scala/lib/util-interface-1.9.8.jar
--
wbr, Kirill
