From owner-svn-ports-all@freebsd.org  Thu Jul 30 17:28:36 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id F07133AB201;
 Thu, 30 Jul 2020 17:28:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BHcnw67pdz3RVR;
 Thu, 30 Jul 2020 17:28:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B653D14792;
 Thu, 30 Jul 2020 17:28:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06UHSa8U062167;
 Thu, 30 Jul 2020 17:28:36 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06UHSaHQ062166;
 Thu, 30 Jul 2020 17:28:36 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <202007301728.06UHSaHQ062166@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 30 Jul 2020 17:28:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r543812 - head/lang/bsh
X-SVN-Group: ports-head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/lang/bsh
X-SVN-Commit-Revision: 543812
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2020 17:28:37 -0000

Author: pfg
Date: Thu Jul 30 17:28:36 2020
New Revision: 543812
URL: https://svnweb.freebsd.org/changeset/ports/543812

Log:
  lang/bsh: Use JDK 8 to build.
  
  The build breaks with JDK 9+. Upstream has fixed this in their development
  version but they haven't released a new version, so for nw require Java 8
  to build.
  
  Pet portlint while here.
  
  Reported by:	Tom Jones
  Approved by:	thierry (mentor, implicit)

Modified:
  head/lang/bsh/Makefile

Modified: head/lang/bsh/Makefile
==============================================================================
--- head/lang/bsh/Makefile	Thu Jul 30 17:28:35 2020	(r543811)
+++ head/lang/bsh/Makefile	Thu Jul 30 17:28:36 2020	(r543812)
@@ -16,6 +16,7 @@ GH_ACCOUNT=	beanshell
 GH_PROJECT=	beanshell
 
 USE_JAVA=	yes
+JAVA_BUILD=	8
 
 USE_ANT=	yes
 ALL_TARGET=	jarall
@@ -23,7 +24,7 @@ ALL_TARGET=	jarall
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JARNAME=${PORTNAME}.jar
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
 		bin/${PORTNAME}
 
 do-install: