[pkgsrc/trunk]: pkgsrc/print/cups Add dbus and threads options.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b9a93c02832
branches:  trunk
changeset: 575731:2b9a93c02832
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Thu May 20 09:38:34 2010 +0000

description:
Add dbus and threads options.

Bump PKGREVISION

diffstat:

 print/cups/Makefile   |   4 ++--
 print/cups/options.mk |  18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 5940ce915857 -r 2b9a93c02832 print/cups/Makefile
--- a/print/cups/Makefile       Thu May 20 09:37:12 2010 +0000
+++ b/print/cups/Makefile       Thu May 20 09:38:34 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2010/05/20 09:37:12 sbd Exp $
+# $NetBSD: Makefile,v 1.153 2010/05/20 09:38:34 sbd Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -9,7 +9,7 @@
 BASE_VERS=     1.3.11
 DIST_VERS=     ${BASE_VERS}
 DIST_SUBDIR=   cups-${DIST_VERS}       # temp fix for updated distfile
-PKGREVISION=   3
+PKGREVISION=   4
 
 CATEGORIES=    print
 MASTER_SITES=  http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
diff -r 5940ce915857 -r 2b9a93c02832 print/cups/options.mk
--- a/print/cups/options.mk     Thu May 20 09:37:12 2010 +0000
+++ b/print/cups/options.mk     Thu May 20 09:38:34 2010 +0000
@@ -1,14 +1,21 @@
-# $NetBSD: options.mk,v 1.5 2010/05/20 09:35:58 sbd Exp $
+# $NetBSD: options.mk,v 1.6 2010/05/20 09:38:34 sbd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cups
 PKG_OPTIONS_REQUIRED_GROUPS=   pdftops
 PKG_OPTIONS_GROUP.pdftops=     ghostscript poppler
-PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp
+PKG_SUPPORTED_OPTIONS= dbus dnssd kerberos pam slp threads
 PKG_SUGGESTED_OPTIONS= dnssd kerberos poppler slp
 PKG_OPTIONS_LEGACY_OPTS+=      xpdf:poppler gs:ghostscript
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mdbus)
+.  include "../../sysutils/dbus/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-dbus
+.else
+CONFIGURE_ARGS+=       --disable-dbus
+.endif
+
 .if !empty(PKG_OPTIONS:Mdnssd)
 .include "../../net/mDNSResponder/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-dnssd
@@ -55,3 +62,10 @@
 .else
 CONFIGURE_ARGS+=       --disable-slp
 .endif
+
+.if !empty(PKG_OPTIONS:Mthreads)
+.  include "../../mk/pthread.buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-threads
+.else
+CONFIGURE_ARGS+=       --disable-threads
+.endif