Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 28 Nov 2019 16:38:27 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518589 - head/devel/sbt
Message-ID:  <201911281638.xASGcRmo026301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ale
Date: Thu Nov 28 16:38:26 2019
New Revision: 518589
URL: https://svnweb.freebsd.org/changeset/ports/518589

Log:
  Make it working with Java 11+ now that it's supported by bsd.java.mk.
  
  PR:		242277
  Submitted by:	Jens Grassel <freebsd-ports@jan0sch.de>

Modified:
  head/devel/sbt/Makefile

Modified: head/devel/sbt/Makefile
==============================================================================
--- head/devel/sbt/Makefile	Thu Nov 28 15:47:51 2019	(r518588)
+++ head/devel/sbt/Makefile	Thu Nov 28 16:38:26 2019	(r518589)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sbt
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/
 
@@ -15,7 +16,7 @@ USES=		tar:tgz
 
 OPTIONS_DEFINE=	ADVANCED PRELOADED
 OPTIONS_DEFAULT=ADVANCED
-ADVANCED_DESC=	Install advanced bash shell-script
+ADVANCED_DESC=	Install advanced bash shell-script (required for Java 11+)
 PRELOADED_DESC=	Install preloaded jars for offline usage
 
 NO_BUILD=	yes
@@ -41,6 +42,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MADVANCED}
+	${INSTALL_DATA} ${WRKSRC}/bin/java9-rt-export.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/conf
 	${INSTALL_DATA} ${FILESDIR}/sbtopts ${STAGEDIR}${DATADIR}/conf
@@ -49,7 +51,6 @@ do-install:
 .endif
 	${LN} -s ../${DATADIR_REL}/sbt ${STAGEDIR}${PREFIX}/bin/
 .else
-	${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt
 .endif

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911281638.xASGcRmo026301>