Add dbus and threads options.

Bump PKGREVISION
This commit is contained in:
sbd 2010-05-20 09:38:34 +00:00
parent fc53418247
commit f68b22dfd1
2 changed files with 18 additions and 4 deletions

View file

@ -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}/ \

View file

@ -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