Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/misc/libreoffice/Makefile,v retrieving revision 1.93 diff -p -u -u -r1.93 Makefile --- Makefile 4 Dec 2016 05:17:34 -0000 1.93 +++ Makefile 5 Dec 2016 18:27:28 -0000 @@ -297,7 +297,9 @@ BUILDLINK_API_DEPENDS.libetonyek+= libet .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" .include "../../net/libcmis/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" +.endif .include "../../print/poppler-cpp/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/misc/libreoffice/PLIST,v retrieving revision 1.13 diff -p -u -u -r1.13 PLIST --- PLIST 15 Aug 2016 19:15:25 -0000 1.13 +++ PLIST 5 Dec 2016 18:27:28 -0000 @@ -10969,7 +10969,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 -${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/cupspassworddialog.ui +${PLIST.cups}${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: options.mk =================================================================== RCS file: /cvsroot/pkgsrc/misc/libreoffice/options.mk,v retrieving revision 1.2 diff -p -u -u -r1.2 options.mk --- options.mk 25 Nov 2015 12:51:54 -0000 1.2 +++ options.mk 5 Dec 2016 18:27:28 -0000 @@ -1,16 +1,17 @@ # $NetBSD: options.mk,v 1.2 2015/11/25 12:51:54 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice -PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 +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 +PKG_SUGGESTED_OPTIONS+= java .endif .include "../../mk/bsd.options.mk" -PLIST_VARS+= java kde4 gtk3 +PLIST_VARS+= java kde4 gtk3 cups .if !empty(PKG_OPTIONS:Mjava) .include "../../mk/java-env.mk" @@ -64,3 +65,9 @@ PLIST.kde4= yes .else CONFIGURE_ARGS+= --disable-kde4 .endif + +.if !empty(PKG_OPTIONS:Mcups) +PLIST.cups= yes +.else +CONFIGURE_ARGS+= --disable-cups +.endif