[pkgsrc/trunk]: pkgsrc/misc/libreoffice Bump PKGREVISION

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10164c2913f7
branches:  trunk
changeset: 355857:10164c2913f7
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Dec 14 13:52:56 2016 +0000

description:
Bump PKGREVISION

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

diffstat:

 misc/libreoffice/Makefile   |  3 ++-
 misc/libreoffice/PLIST      |  4 ++--
 misc/libreoffice/options.mk |  7 ++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 40fb3ba6f6fb -r 10164c2913f7 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Wed Dec 14 12:16:03 2016 +0000
+++ b/misc/libreoffice/Makefile Wed Dec 14 13:52:56 2016 +0000
@@ -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
diff -r 40fb3ba6f6fb -r 10164c2913f7 misc/libreoffice/PLIST
--- a/misc/libreoffice/PLIST    Wed Dec 14 12:16:03 2016 +0000
+++ b/misc/libreoffice/PLIST    Wed Dec 14 13:52:56 2016 +0000
@@ -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/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
diff -r 40fb3ba6f6fb -r 10164c2913f7 misc/libreoffice/options.mk
--- a/misc/libreoffice/options.mk       Wed Dec 14 12:16:03 2016 +0000
+++ b/misc/libreoffice/options.mk       Wed Dec 14 13:52:56 2016 +0000
@@ -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 @@
 CONFIGURE_ARGS+=       --disable-kde4
 .endif
 
-.if !empty(PKG_OPTIONS:Mcups)
-PLIST.cups=            yes
-.else
+.if empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=       --disable-cups
 .endif