aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2019-07-04 02:52:20 +0000
committerGreg Lewis <glewis@FreeBSD.org>2019-07-04 02:52:20 +0000
commit6e90646a9a415860309397288bca884d30c4928f (patch)
tree3d444ea6765b1108bb37ab7143fe6fcc3955ff52 /www
parent6468b14015cce30bed4a12bb264b47610ebe18bb (diff)
downloadports-6e90646a9a415860309397288bca884d30c4928f.tar.gz
ports-6e90646a9a415860309397288bca884d30c4928f.zip
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.
Notes
Notes: svn path=/head/; revision=505813
Diffstat (limited to 'www')
-rw-r--r--www/htmlcompressor/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile
index 127c3fd3cbe8..b5b8bc4f845d 100644
--- a/www/htmlcompressor/Makefile
+++ b/www/htmlcompressor/Makefile
@@ -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}