add a "cups" options, default to on.

3 files changed, 31 insertions, 17 deletions

diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 412c9dd852e..1da9d8abce3 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/11/15 22:58:00 abs Exp $
+# $NetBSD: Makefile,v 1.16 2010/11/19 08:29:30 mrg Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 PKGREVISION=	1
@@ -15,6 +15,8 @@ CMAKE_ARGS+=	-DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
+.include "options.mk"
+
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../meta-pkgs/kde4/kde4.mk"
 
@@ -26,7 +28,6 @@ BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../graphics/qimageblitz/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../print/py-cups/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kdebase4/buildlink3.mk"
diff --git a/misc/kdeutils4/PLIST b/misc/kdeutils4/PLIST
index f1c0fc1870f..d87579f59ee 100644
--- a/misc/kdeutils4/PLIST
+++ b/misc/kdeutils4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/10/25 20:55:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/11/19 08:29:30 mrg Exp $
 bin/ark
 bin/kcalc
 bin/kcharselect
@@ -10,7 +10,7 @@ bin/ktimer
 bin/kwalletmanager
 bin/kwikdisk
 bin/okteta
-bin/printer-applet
+${PLIST.cups}bin/printer-applet
 bin/superkaramba
 bin/sweeper
 include/KDE/Kasten/AbstractConnectJob
@@ -517,9 +517,9 @@ share/doc/kde/HTML/en/kwallet/save-login-information.png
 share/doc/kde/HTML/en/okteta/common
 share/doc/kde/HTML/en/okteta/index.cache.bz2
 share/doc/kde/HTML/en/okteta/index.docbook
-share/doc/kde/HTML/en/printer-applet/common
-share/doc/kde/HTML/en/printer-applet/index.cache.bz2
-share/doc/kde/HTML/en/printer-applet/index.docbook
+${PLIST.cups}share/doc/kde/HTML/en/printer-applet/common
+${PLIST.cups}share/doc/kde/HTML/en/printer-applet/index.cache.bz2
+${PLIST.cups}share/doc/kde/HTML/en/printer-applet/index.docbook
 share/doc/kde/HTML/en/sweeper/common
 share/doc/kde/HTML/en/sweeper/index.cache.bz2
 share/doc/kde/HTML/en/sweeper/index.docbook
@@ -656,19 +656,19 @@ share/kde/apps/okteta/structures/png/png.osd
 share/kde/apps/oktetapart/oktetapartbrowserui.rc
 share/kde/apps/oktetapart/oktetapartreadonlyui.rc
 share/kde/apps/oktetapart/oktetapartreadwriteui.rc
-share/kde/apps/printer-applet/authconn.py
-share/kde/apps/printer-applet/debug.py
-share/kde/apps/printer-applet/monitor.py
-share/kde/apps/printer-applet/printer-applet-printers.ui
-share/kde/apps/printer-applet/printer-applet.notifyrc
-share/kde/apps/printer-applet/printer-applet.py
-share/kde/apps/printer-applet/printer-applet.ui
-share/kde/apps/printer-applet/printer-appletui.rc
-share/kde/apps/printer-applet/statereason.py
+${PLIST.cups}share/kde/apps/printer-applet/authconn.py
+${PLIST.cups}share/kde/apps/printer-applet/debug.py
+${PLIST.cups}share/kde/apps/printer-applet/monitor.py
+${PLIST.cups}share/kde/apps/printer-applet/printer-applet-printers.ui
+${PLIST.cups}share/kde/apps/printer-applet/printer-applet.notifyrc
+${PLIST.cups}share/kde/apps/printer-applet/printer-applet.py
+${PLIST.cups}share/kde/apps/printer-applet/printer-applet.ui
+${PLIST.cups}share/kde/apps/printer-applet/printer-appletui.rc
+${PLIST.cups}share/kde/apps/printer-applet/statereason.py
 share/kde/apps/superkaramba/superkarambaui.rc
 share/kde/apps/sweeper/sweeperui.rc
 share/kde/autostart/kgpg.desktop
-share/kde/autostart/printer-applet.desktop
+${PLIST.cups}share/kde/autostart/printer-applet.desktop
 share/kde/config.kcfg/ark.kcfg
 share/kde/config.kcfg/kcalc.kcfg
 share/kde/config.kcfg/kgpg.kcfg
diff --git a/misc/kdeutils4/options.mk b/misc/kdeutils4/options.mk
new file mode 100644
index 00000000000..0a209b3b61b
--- /dev/null
+++ b/misc/kdeutils4/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2010/11/19 08:29:30 mrg Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdeutils
+PKG_SUPPORTED_OPTIONS=	cups
+PKG_SUGGESTED_OPTIONS=	cups
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		cups
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/py-cups/buildlink3.mk"
+PLIST.cups=		yes
+.endif