diff options
| author | ryoon <ryoon> | 2016-12-14 13:52:56 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2016-12-14 13:52:56 +0000 |
| commit | ed7c448a202d5984071d03abf5de815e3c5990bc (patch) | |
| tree | 2c071ad05d52993f896a8e5ed449e0f61e0e67fb /misc | |
| parent | 75345ddb3b8ae045d8a0b5bb6d981862f306510f (diff) | |
| download | pkgsrc-ed7c448a202d5984071d03abf5de815e3c5990bc.tar.gz | |
Bump PKGREVISION
* Disable print/cups dependency to fix a freeze during ods/xls/xlsx loading
* Fix cups PLIST
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libreoffice/Makefile | 3 | ||||
| -rw-r--r-- | misc/libreoffice/PLIST | 4 | ||||
| -rw-r--r-- | misc/libreoffice/options.mk | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index b9abbdc6bd4..4554cecf30b 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -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 --git a/misc/libreoffice/PLIST b/misc/libreoffice/PLIST index 86c825677ac..ffa515b0e86 100644 --- a/misc/libreoffice/PLIST +++ b/misc/libreoffice/PLIST @@ -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/setmasterpassworddlg. ${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 --git a/misc/libreoffice/options.mk b/misc/libreoffice/options.mk index 760ee6c84a8..3b3c056511b 100644 --- a/misc/libreoffice/options.mk +++ b/misc/libreoffice/options.mk @@ -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 |