Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jul 2019 02:52:20 +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: r505813 - head/www/htmlcompressor
Message-ID:  <201907040252.x642qK3c001845@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Thu Jul  4 02:52:20 2019
New Revision: 505813
URL: https://svnweb.freebsd.org/changeset/ports/505813

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.

Modified:
  head/www/htmlcompressor/Makefile

Modified: head/www/htmlcompressor/Makefile
==============================================================================
--- head/www/htmlcompressor/Makefile	Thu Jul  4 02:40:49 2019	(r505812)
+++ head/www/htmlcompressor/Makefile	Thu Jul  4 02:52:20 2019	(r505813)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 
 PLIST_FILES=	bin/htmlcompressor %%JAVAJARDIR%%/htmlcompressor.jar
 SUB_FILES=	htmlcompressor
-SUB_LIST+=	JAVA_VERSION=${JAVA_PORT_VERSION:R}
+SUB_LIST+=	JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}



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