CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Dec 14 13:52:56 UTC 2016

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

Log Message:
Bump PKGREVISION

* Disable print/cups dependency to fix a freeze during ods/xls/xlsx loading
* Fix cups PLIST


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/libreoffice/PLIST
cvs rdiff -u -r1.3 -r1.4 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.94 pkgsrc/misc/libreoffice/Makefile:1.95
--- pkgsrc/misc/libreoffice/Makefile:1.94       Tue Dec  6 15:21:00 2016
+++ pkgsrc/misc/libreoffice/Makefile    Wed Dec 14 13:52:56 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.94 2016/12/06 15:21:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2016/12/14 13:52:56 ryoon Exp $
 
 VERREL=                5.2.3
 VERRC=         3
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/misc/libreoffice/PLIST
diff -u pkgsrc/misc/libreoffice/PLIST:1.14 pkgsrc/misc/libreoffice/PLIST:1.15
--- pkgsrc/misc/libreoffice/PLIST:1.14  Tue Dec  6 15:21:00 2016
+++ pkgsrc/misc/libreoffice/PLIST       Wed Dec 14 13:52:56 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/12/06 15:21:00 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/12/14 13:52:56 ryoon Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -11253,7 +11253,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/simplenameclash.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/sslwarndialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/unknownauthdialog.ui
-${PLIST.cups}${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/cupspassworddialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/cupspassworddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/errornocontentdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/errornoprinterdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/printdialog.ui

Index: pkgsrc/misc/libreoffice/options.mk
diff -u pkgsrc/misc/libreoffice/options.mk:1.3 pkgsrc/misc/libreoffice/options.mk:1.4
--- pkgsrc/misc/libreoffice/options.mk:1.3      Tue Dec  6 15:21:00 2016
+++ pkgsrc/misc/libreoffice/options.mk  Wed Dec 14 13:52:56 2016
@@ -1,10 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2016/12/06 15:21:00 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2016/12/14 13:52:56 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 cups
 
 .include "../../mk/bsd.prefs.mk"
-PKG_SUGGESTED_OPTIONS= cups
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=        java
 .endif
@@ -66,8 +65,6 @@ PLIST.kde4=           yes
 CONFIGURE_ARGS+=       --disable-kde4
 .endif
 
-.if !empty(PKG_OPTIONS:Mcups)
-PLIST.cups=            yes
-.else
+.if empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=       --disable-cups
 .endif