[pkgsrc/trunk]: pkgsrc/lang/openjdk11 openjdk11: revert options.mk 1.5

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c78c8790e6d
branches:  trunk
changeset: 455039:4c78c8790e6d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jun 27 07:53:43 2021 +0000

description:
openjdk11: revert options.mk 1.5

https://mail-index.netbsd.org/pkgsrc-changes/2021/06/22/msg237065.html

diffstat:

 lang/openjdk11/options.mk |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r abe4809031da -r 4c78c8790e6d lang/openjdk11/options.mk
--- a/lang/openjdk11/options.mk Sun Jun 27 07:15:55 2021 +0000
+++ b/lang/openjdk11/options.mk Sun Jun 27 07:53:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2021/06/22 11:56:35 nia Exp $
+# $NetBSD: options.mk,v 1.6 2021/06/27 07:53:43 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk11
 PKG_OPTIONS_OPTIONAL_GROUPS=   variant
@@ -6,11 +6,7 @@
 PKG_SUPPORTED_OPTIONS=         debug dtrace jre-jce x11 static-libstdcpp
 PKG_SUGGESTED_OPTIONS=         jre-jce x11
 
-.if ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "x86_64" || \
-    (${MACHINE_ARCH} == "aarch64" && \
-      (empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) || \
-      !empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64)))
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_OPTIONS_GROUP.variant+=    jdk-hotspot-vm
 PKG_SUGGESTED_OPTIONS+=                jdk-hotspot-vm
 .else