Sun Oct 27 17:26:10 2019 UTC ()
libreoffice: Drop dead kde4 option remnants (it was commented out)


(kamil)
diff -r1.6 -r1.7 pkgsrc/misc/libreoffice/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/misc/libreoffice/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/options.mk 2019/08/10 11:41:29 1.6
+++ pkgsrc/misc/libreoffice/options.mk 2019/10/27 17:26:10 1.7
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: options.mk,v 1.6 2019/08/10 11:41:29 ryoon Exp $ 1# $NetBSD: options.mk,v 1.7 2019/10/27 17:26:10 kamil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice
4PKG_SUPPORTED_OPTIONS= java debug gtk3 cups # kde4  4PKG_SUPPORTED_OPTIONS= java debug gtk3 cups
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
8PKG_SUGGESTED_OPTIONS+= java 8PKG_SUGGESTED_OPTIONS+= java
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= java gtk3 cups # kde4  13PLIST_VARS+= java gtk3 cups
14 14
15.if !empty(PKG_OPTIONS:Mjava) 15.if !empty(PKG_OPTIONS:Mjava)
16.include "../../mk/java-env.mk" 16.include "../../mk/java-env.mk"
17.include "../../mk/java-vm.mk" 17.include "../../mk/java-vm.mk"
18USE_JAVA= yes 18USE_JAVA= yes
19USE_JAVA2= yes 19USE_JAVA2= yes
20BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 20BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
21CONFIGURE_ARGS+= --with-ant-home=${LOCALBASE} 21CONFIGURE_ARGS+= --with-ant-home=${LOCALBASE}
22 22
23DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 23DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
24CONFIGURE_ARGS+= --with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar 24CONFIGURE_ARGS+= --with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
25CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ 25CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
26 --with-java \ 26 --with-java \
@@ -41,25 +41,16 @@ CONFIGURE_ARGS+= --enable-selective-debu @@ -41,25 +41,16 @@ CONFIGURE_ARGS+= --enable-selective-debu
41PLIST_SRC= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.debug 41PLIST_SRC= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.debug
42.else 42.else
43CONFIGURE_ARGS+= --enable-release-build 43CONFIGURE_ARGS+= --enable-release-build
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mgtk3) 46.if !empty(PKG_OPTIONS:Mgtk3)
47CONFIGURE_ARGS+= --enable-gtk3 47CONFIGURE_ARGS+= --enable-gtk3
48PLIST.gtk3= yes 48PLIST.gtk3= yes
49.include "../../x11/gtk3/buildlink3.mk" 49.include "../../x11/gtk3/buildlink3.mk"
50.else 50.else
51CONFIGURE_ARGS+= --disable-gtk3 51CONFIGURE_ARGS+= --disable-gtk3
52.endif 52.endif
53 53
54#.if !empty(PKG_OPTIONS:Mkde4) 
55#CONFIGURE_ARGS+= --enable-kde4 
56#CONFIGURE_ENV+= KDE4DIR="${LOCALBASE}" 
57#PLIST.kde4= yes 
58#.include "../../x11/kdelibs4/buildlink3.mk" 
59#.else 
60#CONFIGURE_ARGS+= --disable-kde4 
61#.endif 
62 
63.if empty(PKG_OPTIONS:Mcups) 54.if empty(PKG_OPTIONS:Mcups)
64CONFIGURE_ARGS+= --disable-cups 55CONFIGURE_ARGS+= --disable-cups
65.endif 56.endif