On Thu, 13 Mar 2025 11:35:34 +0100,
Stuart Henderson <s...@spacehopper.org> wrote:
>
> On 2025/03/08 16:02, Kirill A. Korinsky wrote:
> > ports@,
> >
> > I'd like to update lang/scala to 3.6.4.
> >
> > As usual I had tested in on -current/amd64 against jdk17 and jdk21, no
> > regression discovered.
> >
> > Changes: https://github.com/scala/scala3/releases/tag/3.6.4
> >
> > I had also migrated everything into SUBST_VARS to reduce noise in PLIST.
>
> From experience with other ports, I don't recommend that, it's
> significantly more work for updates, there's not much benefit,
> and it becomes a mess if two of the bundled jars end up using
> the same version number ;)
>
Something like this?
Index: lang/scala/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/scala/Makefile,v
diff -u -p -r1.25 Makefile
--- lang/scala/Makefile 23 Jan 2025 14:37:06 -0000 1.25
+++ lang/scala/Makefile 14 Mar 2025 21:54:43 -0000
@@ -1,9 +1,6 @@
COMMENT= general purpose multi-paradigm programming language
-VERSION= 3.6.3
-JNA_VERSION= 5.15.0
-JLINE_VERSION= 3.27.1
-SCALA2_VERSION= 2.13.15
+VERSION= 3.6.4
DISTNAME= scala3-${VERSION}
PKGNAME= ${DISTNAME:S/scala3-/scala-/}
@@ -27,7 +24,7 @@ RUN_DEPENDS= java/javaPathHelper \
SCALA_HOME= ${PREFIX}/scala/
SCALA_SCRIPTS= scala scalac scaladoc
-SUBST_VARS+= VERSION JNA_VERSION JLINE_VERSION SCALA2_VERSION
+SUBST_VARS+= VERSION
NO_BUILD= Yes
NO_TEST= Yes
Index: lang/scala/distinfo
===================================================================
RCS file: /home/cvs/ports/lang/scala/distinfo,v
diff -u -p -r1.11 distinfo
--- lang/scala/distinfo 23 Jan 2025 14:37:06 -0000 1.11
+++ lang/scala/distinfo 7 Mar 2025 18:10:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (scala3-3.6.3.tar.gz) = I+PYPSRLS8Q0SJ/BEAoFwB7EcFERZpN5pGcD5cGwlNU=
-SIZE (scala3-3.6.3.tar.gz) = 138306232
+SHA256 (scala3-3.6.4.tar.gz) = I8Jpq/aelCJyAZzvNq5/QbfdD0Mk5mPuzTDxVdkIxKU=
+SIZE (scala3-3.6.4.tar.gz) = 138366552
Index: lang/scala/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/lang/scala/pkg/PLIST,v
diff -u -p -r1.12 PLIST
--- lang/scala/pkg/PLIST 23 Jan 2025 14:37:06 -0000 1.12
+++ lang/scala/pkg/PLIST 14 Mar 2025 21:55:27 -0000
@@ -196,24 +196,24 @@ scala/maven2/org/jetbrains/annotations/1
scala/maven2/org/jetbrains/annotations/15.0/annotations-15.0.pom
scala/maven2/org/jline/
scala/maven2/org/jline/jline-native/
-scala/maven2/org/jline/jline-native/${JLINE_VERSION}/
-scala/maven2/org/jline/jline-native/${JLINE_VERSION}/jline-native-${JLINE_VERSION}.jar
-scala/maven2/org/jline/jline-native/${JLINE_VERSION}/jline-native-${JLINE_VERSION}.pom
+scala/maven2/org/jline/jline-native/3.27.1/
+scala/maven2/org/jline/jline-native/3.27.1/jline-native-3.27.1.jar
+scala/maven2/org/jline/jline-native/3.27.1/jline-native-3.27.1.pom
scala/maven2/org/jline/jline-parent/
-scala/maven2/org/jline/jline-parent/${JLINE_VERSION}/
-scala/maven2/org/jline/jline-parent/${JLINE_VERSION}/jline-parent-${JLINE_VERSION}.pom
+scala/maven2/org/jline/jline-parent/3.27.1/
+scala/maven2/org/jline/jline-parent/3.27.1/jline-parent-3.27.1.pom
scala/maven2/org/jline/jline-reader/
-scala/maven2/org/jline/jline-reader/${JLINE_VERSION}/
-scala/maven2/org/jline/jline-reader/${JLINE_VERSION}/jline-reader-${JLINE_VERSION}.jar
-scala/maven2/org/jline/jline-reader/${JLINE_VERSION}/jline-reader-${JLINE_VERSION}.pom
+scala/maven2/org/jline/jline-reader/3.27.1/
+scala/maven2/org/jline/jline-reader/3.27.1/jline-reader-3.27.1.jar
+scala/maven2/org/jline/jline-reader/3.27.1/jline-reader-3.27.1.pom
scala/maven2/org/jline/jline-terminal/
scala/maven2/org/jline/jline-terminal-jni/
-scala/maven2/org/jline/jline-terminal-jni/${JLINE_VERSION}/
-scala/maven2/org/jline/jline-terminal-jni/${JLINE_VERSION}/jline-terminal-jni-${JLINE_VERSION}.jar
-scala/maven2/org/jline/jline-terminal-jni/${JLINE_VERSION}/jline-terminal-jni-${JLINE_VERSION}.pom
-scala/maven2/org/jline/jline-terminal/${JLINE_VERSION}/
-scala/maven2/org/jline/jline-terminal/${JLINE_VERSION}/jline-terminal-${JLINE_VERSION}.jar
-scala/maven2/org/jline/jline-terminal/${JLINE_VERSION}/jline-terminal-${JLINE_VERSION}.pom
+scala/maven2/org/jline/jline-terminal-jni/3.27.1/
+scala/maven2/org/jline/jline-terminal-jni/3.27.1/jline-terminal-jni-3.27.1.jar
+scala/maven2/org/jline/jline-terminal-jni/3.27.1/jline-terminal-jni-3.27.1.pom
+scala/maven2/org/jline/jline-terminal/3.27.1/
+scala/maven2/org/jline/jline-terminal/3.27.1/jline-terminal-3.27.1.jar
+scala/maven2/org/jline/jline-terminal/3.27.1/jline-terminal-3.27.1.pom
scala/maven2/org/jsoup/
scala/maven2/org/jsoup/jsoup/
scala/maven2/org/jsoup/jsoup/1.17.2/
@@ -232,13 +232,13 @@ scala/maven2/org/nibor/autolink/autolink
scala/maven2/org/scala-lang/
scala/maven2/org/scala-lang/modules/
scala/maven2/org/scala-lang/modules/scala-asm/
-scala/maven2/org/scala-lang/modules/scala-asm/9.7.0-scala-2/
-scala/maven2/org/scala-lang/modules/scala-asm/9.7.0-scala-2/scala-asm-9.7.0-scala-2.jar
-scala/maven2/org/scala-lang/modules/scala-asm/9.7.0-scala-2/scala-asm-9.7.0-scala-2.pom
+scala/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/
+scala/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/scala-asm-9.7.1-scala-1.jar
+scala/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/scala-asm-9.7.1-scala-1.pom
scala/maven2/org/scala-lang/scala-library/
-scala/maven2/org/scala-lang/scala-library/${SCALA2_VERSION}/
-scala/maven2/org/scala-lang/scala-library/${SCALA2_VERSION}/scala-library-${SCALA2_VERSION}.jar
-scala/maven2/org/scala-lang/scala-library/${SCALA2_VERSION}/scala-library-${SCALA2_VERSION}.pom
+scala/maven2/org/scala-lang/scala-library/2.13.15/
+scala/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.jar
+scala/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.pom
scala/maven2/org/scala-lang/scala3-compiler_3/
scala/maven2/org/scala-lang/scala3-compiler_3/${VERSION}/
scala/maven2/org/scala-lang/scala3-compiler_3/${VERSION}/scala3-compiler_3-${VERSION}.jar
@@ -273,13 +273,13 @@ scala/maven2/org/scala-lang/tasty-core_3
scala/maven2/org/scala-lang/tasty-core_3/${VERSION}/tasty-core_3-${VERSION}.pom
scala/maven2/org/scala-sbt/
scala/maven2/org/scala-sbt/compiler-interface/
-scala/maven2/org/scala-sbt/compiler-interface/1.9.6/
-scala/maven2/org/scala-sbt/compiler-interface/1.9.6/compiler-interface-1.9.6.jar
-scala/maven2/org/scala-sbt/compiler-interface/1.9.6/compiler-interface-1.9.6.pom
+scala/maven2/org/scala-sbt/compiler-interface/1.10.4/
+scala/maven2/org/scala-sbt/compiler-interface/1.10.4/compiler-interface-1.10.4.jar
+scala/maven2/org/scala-sbt/compiler-interface/1.10.4/compiler-interface-1.10.4.pom
scala/maven2/org/scala-sbt/util-interface/
-scala/maven2/org/scala-sbt/util-interface/1.9.8/
-scala/maven2/org/scala-sbt/util-interface/1.9.8/util-interface-1.9.8.jar
-scala/maven2/org/scala-sbt/util-interface/1.9.8/util-interface-1.9.8.pom
+scala/maven2/org/scala-sbt/util-interface/1.10.4/
+scala/maven2/org/scala-sbt/util-interface/1.10.4/util-interface-1.10.4.jar
+scala/maven2/org/scala-sbt/util-interface/1.10.4/util-interface-1.10.4.pom
scala/maven2/org/sonatype/
scala/maven2/org/sonatype/oss/
scala/maven2/org/sonatype/oss/oss-parent/
--
wbr, Kirill
