Tue May 24 09:46:56 2022 UTC ()
libreoffice: Remove version check that will fail with future NetBSD versions


(nia)
diff -r1.20 -r1.21 pkgsrc/misc/libreoffice/options.mk
cvs diff -r1.20 -r1.21 pkgsrc/misc/libreoffice/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/options.mk 2022/03/04 13:47:01 1.20
+++ pkgsrc/misc/libreoffice/options.mk 2022/05/24 09:46:56 1.21
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: options.mk,v 1.20 2022/03/04 13:47:01 ryoon Exp $ 1# $NetBSD: options.mk,v 1.21 2022/05/24 09:46:56 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice
4 4
5PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus 5PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus
6PKG_SUGGESTED_OPTIONS= cups ldap dbus gtk3 6PKG_SUGGESTED_OPTIONS= cups ldap dbus gtk3
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10# "checking the installed JDK... configure: error: JDK is too old, you need at least 9" 10# "checking the installed JDK... configure: error: JDK is too old, you need at least 9"
11# 11#
12# Only enable Java on platforms where OpenJDK>=9 is the default, 12# Only enable Java on platforms where OpenJDK>=9 is the default,
13# see mk/java-vm.mk 13# see mk/java-vm.mk
14.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ 14.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
15 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) 15 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
16PKG_SUGGESTED_OPTIONS+= java 16PKG_SUGGESTED_OPTIONS+= java
17.endif 17.endif
18 18
19.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
20 20
21PLIST_VARS+= ldap gtk3 21PLIST_VARS+= ldap gtk3
22 22
23.if !empty(PKG_OPTIONS:Mjava) 23.if !empty(PKG_OPTIONS:Mjava)
24USE_JAVA= yes 24USE_JAVA= yes
25USE_JAVA2= 9 25USE_JAVA2= 9
26.include "../../mk/java-env.mk" 26.include "../../mk/java-env.mk"
27.include "../../mk/java-vm.mk" 27.include "../../mk/java-vm.mk"
28BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 28BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant