[pkgsrc/trunk]: pkgsrc/misc/libreoffice Ensure USE_JAVA2 is set _before_ java...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10db83f2d6b9
branches:  trunk
changeset: 441117:10db83f2d6b9
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Oct 26 12:44:21 2020 +0000

description:
Ensure USE_JAVA2 is set _before_ java-vm.mk is included

Fixes build failure when both openjdk8 and openjdk11 were installed,
openjdk8 would be picked

diffstat:

 misc/libreoffice/options.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r c183c9ee99aa -r 10db83f2d6b9 misc/libreoffice/options.mk
--- a/misc/libreoffice/options.mk       Mon Oct 26 10:57:15 2020 +0000
+++ b/misc/libreoffice/options.mk       Mon Oct 26 12:44:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2020/10/24 16:51:49 tnn Exp $
+# $NetBSD: options.mk,v 1.13 2020/10/26 12:44:21 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus
@@ -20,10 +20,10 @@
 PLIST_VARS+=   java gtk3 ldap
 
 .if !empty(PKG_OPTIONS:Mjava)
+USE_JAVA=              yes
+USE_JAVA2=             9
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
-USE_JAVA=              yes
-USE_JAVA2=             yes
 BUILD_DEPENDS+=        apache-ant-[0-9]*:../../devel/apache-ant
 CONFIGURE_ARGS+=       --with-ant-home=${PREFIX}