Attachment 229652 Details for Bug 259933 – Updated patch

[patch] Updated patch

scala_3.1.0v2.diff (text/plain), 2.48 KB, created by Joseph Mingrone on 2021-11-22 04:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2021-11-22 04:56:22 UTC

Size: 2.48 KB

patch

obsolete

>diff --git a/lang/scala/Makefile b/lang/scala/Makefile
>index de2d69276275..0afc37b3c0ef 100644
>--- a/lang/scala/Makefile
>+++ b/lang/scala/Makefile
>@@ -1,47 +1,33 @@
> # Created by: Mitsuru YOSHIDA <mitsuru@riken.jp>
> 
> PORTNAME=	scala
>-PORTVERSION=	2.13.1
>+DISTVERSION=	3.1.0
> CATEGORIES=	lang java
>-MASTER_SITES=	http://www.scala-lang.org/files/archive/
>+MASTER_SITES=	https://github.com/lampepfl/dotty/releases/download/${DISTVERSION}/
>+DISTNAME=	scala3-${DISTVERSION}
> 
> MAINTAINER=	freebsd-ports@jan0sch.de
> COMMENT=	Scala Programming Language
> 
> LICENSE=	APACHE20
>-LICENSE_FILE=	${WRKSRC}/doc/LICENSE.md
> 
> RUN_DEPENDS=	bash:shells/bash
> 
>-USES=		cpe tar:tgz
>+USES=		cpe
> CPE_VENDOR=	${PORTNAME}-lang
>-
>-OPTIONS_DEFINE=	DOCS
>+USE_JAVA=	yes
>+JAVA_VERSION=	1.8+
> 
> NO_ARCH=	yes
> NO_BUILD=	yes
>-USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
> 
> SCALA_HOME=	${DATADIR}
> SCALA_SHRDIRS=	lib
>-SCALA_DOCDIRS=	tools
>-SCALA_BINS=	fsc \
>-		scala \
>-		scalac \
>-		scaladoc \
>-		scalap
>+SCALA_BINS=	common scala scalac scaladoc
> 
>-SCALA_MANS=	${SCALA_BINS:S,$,.1,}
>-PLIST_FILES=	${SCALA_BINS:S,^,bin/,} \
>-	man/man1/fsc.1.gz \
>-	man/man1/scala.1.gz \
>-	man/man1/scalac.1.gz \
>-	man/man1/scaladoc.1.gz \
>-	man/man1/scalap.1.gz
>+PLIST_FILES=	${SCALA_BINS:S,^,bin/,}
> 
> PORTDATA=	*
>-PORTDOCS=	*
> 
> pre-patch:
> 	@${ECHO_MSG} "Installation settings:"
>@@ -51,19 +37,10 @@ do-install:
> 	@${MKDIR} ${STAGEDIR}${SCALA_HOME}/bin
> .for f in ${SCALA_BINS}
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${SCALA_HOME}/bin/${f}
>-	${LN} -s ${SCALA_HOME}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
>+	${RLN} ${STAGEDIR}${SCALA_HOME}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
> .endfor
> .for d in ${SCALA_SHRDIRS}
> 	(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${SCALA_HOME}/${d})
> .endfor
>-.for m in ${SCALA_MANS}
>-	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${STAGEDIR}${MANPREFIX}/man/man1/${m}
>-.endfor
>-
>-do-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for d in ${SCALA_DOCDIRS}
>-	(cd ${WRKSRC}/doc/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${d})
>-.endfor
> 
> .include <bsd.port.mk>
>diff --git a/lang/scala/distinfo b/lang/scala/distinfo
>index 9d578e1d3ffe..3d8c7c1ef973 100644
>--- a/lang/scala/distinfo
>+++ b/lang/scala/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1568893979
>-SHA256 (scala-2.13.1.tgz) = 6918ccc494e34810a7254ad2c4e6f0e1183784c22e7b4801b7dbc8d1994a04db
>-SIZE (scala-2.13.1.tgz) = 19685743
>+TIMESTAMP = 1637310726
>+SHA256 (scala3-3.1.0.tar.gz) = f5bb19d85b486fa02f0375b7af656fd1d3cd89cb988cc073dd7e3ccf8e40beff
>+SIZE (scala3-3.1.0.tar.gz) = 34775737

Flags:

jrm: maintainer-approval?

Actions: View | Diff

Attachments on bug 259933: 229586 | 229652