CVS commit: pkgsrc/misc/libreoffice

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov  3 16:39:14 UTC 2020

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

Log Message:
libreoffice: Clean up options. Enable cups and gtk3 by default.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.13 -r1.14 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/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.242 pkgsrc/misc/libreoffice/Makefile:1.243
--- pkgsrc/misc/libreoffice/Makefile:1.242      Sun Nov  1 12:17:29 2020
+++ pkgsrc/misc/libreoffice/Makefile    Tue Nov  3 16:39:14 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.242 2020/11/01 12:17:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.243 2020/11/03 16:39:14 nia Exp $
 
 VERREL=                7.0.3
 VERRC=         1
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -332,9 +333,6 @@ BUILDLINK_API_DEPENDS.libetonyek+=  libet
 .include "../../converters/orcus/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../databases/mysql57-client/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
-.endif
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
@@ -382,18 +380,11 @@ BUILDLINK_API_DEPENDS.libnumbertext+=     li
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libcmis/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups-base/buildlink3.mk"
-.endif
 # Use PDFium instead of poppler for PDF import since 6.3.2.2nb1
 #.include "../../print/poppler-cpp/buildlink3.mk"
 #.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.endif
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"

Index: pkgsrc/misc/libreoffice/options.mk
diff -u pkgsrc/misc/libreoffice/options.mk:1.13 pkgsrc/misc/libreoffice/options.mk:1.14
--- pkgsrc/misc/libreoffice/options.mk:1.13     Mon Oct 26 12:44:21 2020
+++ pkgsrc/misc/libreoffice/options.mk  Tue Nov  3 16:39:14 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2020/10/26 12:44:21 abs Exp $
+# $NetBSD: options.mk,v 1.14 2020/11/03 16:39:14 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus
-PKG_SUGGESTED_OPTIONS= ldap dbus
+PKG_SUGGESTED_OPTIONS= cups ldap dbus gtk3
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -57,18 +57,22 @@ CONFIGURE_ARGS+=    --disable-gtk3
 .endif
 
 .if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/libcups/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
 .else
 CONFIGURE_ARGS+=       --disable-cups
 .endif
 
 .if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-dbus
 .else
 CONFIGURE_ARGS+=       --disable-dbus
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-ldap
 PLIST.ldap=            yes
 .else