Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_160355831085730"
MIME-Version: 1.0
Date: Sat, 24 Oct 2020 16:51:50 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/misc/libreoffice
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20201024165150.22143FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_160355831085730
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Oct 24 16:51:50 UTC 2020

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

Log Message:
libreoffice: PKG_OPTIONalize ldap and dbus, g/c unused cups PLIST_VAR


To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/misc/libreoffice/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/libreoffice/options.mk

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


--_----------=_160355831085730
Content-Disposition: inline
Content-Length: 4194
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.240 pkgsrc/misc/libreoffice/Makefile:1.241
--- pkgsrc/misc/libreoffice/Makefile:1.240	Fri Oct  9 15:54:33 2020
+++ pkgsrc/misc/libreoffice/Makefile	Sat Oct 24 16:51:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.240 2020/10/09 15:54:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.241 2020/10/24 16:51:49 tnn Exp $
 
 VERREL=		7.0.2
 VERRC=		2
@@ -40,7 +40,7 @@ GCC_REQD+=	7
 BUILD_TARGET=	build
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD*)
+.if ${OPSYS} == "NetBSD"
 pre-build:
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && ${TOOLS_PLATFORM.paxctl} +m instdir/program/gengal.bin
 .endif
@@ -181,7 +181,6 @@ CONFIGURE_ARGS+=	--with-parallelism=1
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${PKGNAME_NOREV}
 CONFIGURE_ARGS+=	--disable-ccache
-CONFIGURE_ARGS+=	--enable-dbus
 CONFIGURE_ARGS+=	--disable-epm
 CONFIGURE_ARGS+=	--disable-fetch-external
 CONFIGURE_ARGS+=	--disable-firebird-sdbc
@@ -333,7 +332,9 @@ 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"
@@ -389,8 +390,10 @@ BUILDLINK_API_DEPENDS.libnumbertext+=	li
 #.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/PLIST
diff -u pkgsrc/misc/libreoffice/PLIST:1.39 pkgsrc/misc/libreoffice/PLIST:1.40
--- pkgsrc/misc/libreoffice/PLIST:1.39	Tue Aug 11 16:07:38 2020
+++ pkgsrc/misc/libreoffice/PLIST	Sat Oct 24 16:51:49 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2020/08/11 16:07:38 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.40 2020/10/24 16:51:49 tnn Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -145,7 +145,7 @@ ${PKGNAME}/lib/libreoffice/program/libin
 ${PKGNAME}/lib/libreoffice/program/libinvocadaptlo.so
 ${PKGNAME}/lib/libreoffice/program/libinvocationlo.so
 ${PKGNAME}/lib/libreoffice/program/libiolo.so
-${PKGNAME}/lib/libreoffice/program/libldapbe2lo.so
+${PLIST.ldap}${PKGNAME}/lib/libreoffice/program/libldapbe2lo.so
 ${PKGNAME}/lib/libreoffice/program/liblnglo.so
 ${PKGNAME}/lib/libreoffice/program/liblnthlo.so
 ${PKGNAME}/lib/libreoffice/program/liblocalebe1lo.so

Index: pkgsrc/misc/libreoffice/options.mk
diff -u pkgsrc/misc/libreoffice/options.mk:1.11 pkgsrc/misc/libreoffice/options.mk:1.12
--- pkgsrc/misc/libreoffice/options.mk:1.11	Wed Sep  9 10:48:25 2020
+++ pkgsrc/misc/libreoffice/options.mk	Sat Oct 24 16:51:49 2020
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2020/09/09 10:48:25 nia Exp $
+# $NetBSD: options.mk,v 1.12 2020/10/24 16:51:49 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice
-PKG_SUPPORTED_OPTIONS=	java debug gtk3 cups
+PKG_SUPPORTED_OPTIONS=	java debug gtk3 cups ldap dbus
+PKG_SUGGESTED_OPTIONS=	ldap dbus
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -16,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+=	java
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	java gtk3 cups
+PLIST_VARS+=	java gtk3 ldap
 
 .if !empty(PKG_OPTIONS:Mjava)
 .include "../../mk/java-env.mk"
@@ -55,6 +56,21 @@ PLIST.gtk3=		yes
 CONFIGURE_ARGS+=	--disable-gtk3
 .endif
 
-.if empty(PKG_OPTIONS:Mcups)
+.if !empty(PKG_OPTIONS:Mcups)
+CONFIGURE_ARGS+=	--enable-cups
+.else
 CONFIGURE_ARGS+=	--disable-cups
 .endif
+
+.if !empty(PKG_OPTIONS:Mdbus)
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--enable-ldap
+PLIST.ldap=		yes
+.else
+CONFIGURE_ARGS+=	--disable-ldap
+.endif


--_----------=_160355831085730--