Date: Thu, 18 Jul 2019 16:45:47 +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: r506861 - head/dns/dnsjava Message-ID: <201907181645.x6IGjlvN054593@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Thu Jul 18 16:45:46 2019 New Revision: 506861 URL: https://svnweb.freebsd.org/changeset/ports/506861 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: 238979 Approved by: maintainer timeout Modified: head/dns/dnsjava/Makefile Modified: head/dns/dnsjava/Makefile ============================================================================== --- head/dns/dnsjava/Makefile Thu Jul 18 16:44:15 2019 (r506860) +++ head/dns/dnsjava/Makefile Thu Jul 18 16:45:46 2019 (r506861) @@ -23,12 +23,12 @@ DOCS_ALL_TARGET= docs .include <bsd.port.pre.mk> -.if ${JAVA_PORT_VERSION} == "1.6.0" +.if ${JAVA_PORT_VERSION:M*6*} PLIST_SUB+= JDK6="" .else PLIST_SUB+= JDK6="@comment " .endif -.if ${JAVA_PORT_VERSION} == "1.8.0" +.if ${JAVA_PORT_VERSION:M*8*} PLIST_SUB+= JDK8="" .else PLIST_SUB+= JDK8="@comment "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907181645.x6IGjlvN054593>