Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jul 2019 16:48:11 +0000 (UTC)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r506862 - head/games/jin
Message-ID:  <201907181648.x6IGmBbf054836@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Thu Jul 18 16:48:11 2019
New Revision: 506862
URL: https://svnweb.freebsd.org/changeset/ports/506862

Log:
  Adjust to proposed changes in Java versioning
  
  * Bug #238758 proposes to change the Java versioning from versions such
    as "1.6.0" to versions such as "6" (for example).  Modify the Makefile
    checks on JAVA_PORT_VERSION to cope with either format.
  
  PR:		238980
  Approved by:	maintainer timeout

Modified:
  head/games/jin/Makefile

Modified: head/games/jin/Makefile
==============================================================================
--- head/games/jin/Makefile	Thu Jul 18 16:45:46 2019	(r506861)
+++ head/games/jin/Makefile	Thu Jul 18 16:48:11 2019	(r506862)
@@ -25,7 +25,8 @@ USE_ANT=	yes
 MAKE_ARGS+=	-lib ${JAVAJARDIR}/bsh.jar
 
 SUB_FILES=	${PORTNAME}
-SUB_LIST=	JINJAR=${JINJAR:Q} JAVA_VERSION=${JAVA_PORT_VERSION:R}
+SUB_LIST=	JINJAR=${JINJAR:Q} \
+		JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 



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