summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2010-05-20 09:38:34 +0000
committersbd <sbd@pkgsrc.org>2010-05-20 09:38:34 +0000
commit9671b1dde1179577efe79ab1b92d5c1ae42386fe (patch)
tree2f35103050bddf4b7e0ecc7c5c1fe2b38d306481 /print
parent0aaaff0ab94cdb969205c721397c01592edefd61 (diff)
downloadpkgsrc-9671b1dde1179577efe79ab1b92d5c1ae42386fe.tar.gz
Add dbus and threads options.
Bump PKGREVISION
Diffstat (limited to 'print')
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/cups/options.mk18
2 files changed, 18 insertions, 4 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ef6643936a0..cd1f2a3d8ee 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -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 @@ PKGNAME= cups-${DIST_VERS:S/-/./g}
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 --git a/print/cups/options.mk b/print/cups/options.mk
index 4ce4244b5cc..3c1438d8892 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -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 @@ CONFIGURE_ARGS+= --enable-slp
.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