From owner-svn-ports-all@freebsd.org  Thu Jul  4 02:40:50 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F48E15E6E07;
 Thu,  4 Jul 2019 02:40:50 +0000 (UTC)
 (envelope-from glewis@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)
 server-signature RSA-PSS (4096 bits)
 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 322A575066;
 Thu,  4 Jul 2019 02:40:50 +0000 (UTC)
 (envelope-from glewis@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 0D71D1CBCD;
 Thu,  4 Jul 2019 02:40:50 +0000 (UTC)
 (envelope-from glewis@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x642enHf091650;
 Thu, 4 Jul 2019 02:40:49 GMT (envelope-from glewis@FreeBSD.org)
Received: (from glewis@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x642enhk091649;
 Thu, 4 Jul 2019 02:40:49 GMT (envelope-from glewis@FreeBSD.org)
Message-Id: <201907040240.x642enhk091649@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glewis set sender to
 glewis@FreeBSD.org using -f
From: Greg Lewis <glewis@FreeBSD.org>
Date: Thu, 4 Jul 2019 02:40:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r505812 - head/java/icedtea-web
X-SVN-Group: ports-head
X-SVN-Commit-Author: glewis
X-SVN-Commit-Paths: head/java/icedtea-web
X-SVN-Commit-Revision: 505812
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 322A575066
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
 NEURAL_HAM_SHORT(-0.97)[-0.971,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
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, 04 Jul 2019 02:40:50 -0000

Author: glewis
Date: Thu Jul  4 02:40:49 2019
New Revision: 505812
URL: https://svnweb.freebsd.org/changeset/ports/505812

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/java/icedtea-web/Makefile

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Thu Jul  4 02:28:17 2019	(r505811)
+++ head/java/icedtea-web/Makefile	Thu Jul  4 02:40:49 2019	(r505812)
@@ -81,7 +81,7 @@ JUNIT_JAR=	${JAVALIBDIR}/junit.jar
 
 .include <bsd.port.pre.mk>
 
-.if ${JAVA_PORT_VERSION} == "1.6.0"
+.if ${JAVA_PORT_VERSION:M*6*}
 pre-extract:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"