CVS commit: pkgsrc/misc/libreoffice

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Oct 26 12:44:21 UTC 2020

Modified Files:
        pkgsrc/misc/libreoffice: options.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/libreoffice/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/options.mk
diff -u pkgsrc/misc/libreoffice/options.mk:1.12 pkgsrc/misc/libreoffice/options.mk:1.13
--- pkgsrc/misc/libreoffice/options.mk:1.12     Sat Oct 24 16:51:49 2020
+++ pkgsrc/misc/libreoffice/options.mk  Mon Oct 26 12:44:21 2020
@@ -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 @@ PKG_SUGGESTED_OPTIONS+=     java
 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}