From owner-svn-ports-head@freebsd.org Wed Jul 17 15:07:05 2019 Return-Path: Delivered-To: svn-ports-head@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 3D459AE9DA; Wed, 17 Jul 2019 15:07:05 +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 1B29285724; Wed, 17 Jul 2019 15:07:05 +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 098B3202A0; Wed, 17 Jul 2019 15:07:05 +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 x6HF74MH040429; Wed, 17 Jul 2019 15:07:04 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6HF7443040428; Wed, 17 Jul 2019 15:07:04 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201907171507.x6HF7443040428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Wed, 17 Jul 2019 15:07:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506804 - head/graphics/jogl X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: head/graphics/jogl X-SVN-Commit-Revision: 506804 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1B29285724 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.925,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2019 15:07:05 -0000 Author: glewis Date: Wed Jul 17 15:07:04 2019 New Revision: 506804 URL: https://svnweb.freebsd.org/changeset/ports/506804 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: 238981 Approved by: peterj (maintainer) Modified: head/graphics/jogl/Makefile Modified: head/graphics/jogl/Makefile ============================================================================== --- head/graphics/jogl/Makefile Wed Jul 17 15:02:51 2019 (r506803) +++ head/graphics/jogl/Makefile Wed Jul 17 15:07:04 2019 (r506804) @@ -51,20 +51,20 @@ ALL_TARGET+= javadoc .include -.if ${JAVA_PORT_VERSION:M1.6.*} +.if ${JAVA_PORT_VERSION:M*6*} PLIST_SUB+= JDK6="" PLIST_SUB+= JDK7="@comment " .endif -.if ${JAVA_PORT_VERSION:M1.7.*} +.if ${JAVA_PORT_VERSION:M*7*} PLIST_SUB+= JDK6="@comment " PLIST_SUB+= JDK7="" .endif -.if ${JAVA_PORT_VERSION:M1.8.*} +.if ${JAVA_PORT_VERSION:M*8*} PLIST_SUB+= JDK6="@comment " PLIST_SUB+= JDK7="@comment " .endif -.if ${JAVA_PORT_VERSION:M1.8.*} +.if ${JAVA_PORT_VERSION:M*8*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build.xml .endif