CVS commit: pkgsrc/print/cups-filters

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Dec 17 21:16:08 UTC 2017

Modified Files:
        pkgsrc/print/cups-filters: Makefile
Added Files:
        pkgsrc/print/cups-filters: options.mk

Log Message:
cups-filters: Make `avahi' and `dbus' support available as PKG_OPTIONS

Make `avahi' and `dbus' available as PKG_OPTIONS, both enabled by default (as
per old cups-filters).

Please note that gdbus-codegen is invoked unconditionally and so still needed
also in the `-dbus' case.

Bump PKGREVISION (strictly speaking that's probably not needed but the dbus
dependency was previously picked up indirectly via net/avahi).


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/print/cups-filters/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/print/cups-filters/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/cups-filters/Makefile
diff -u pkgsrc/print/cups-filters/Makefile:1.85 pkgsrc/print/cups-filters/Makefile:1.86
--- pkgsrc/print/cups-filters/Makefile:1.85     Fri Dec  8 08:52:58 2017
+++ pkgsrc/print/cups-filters/Makefile  Sun Dec 17 21:16:07 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2017/12/08 08:52:58 maya Exp $
+# $NetBSD: Makefile,v 1.86 2017/12/17 21:16:07 leot Exp $
 
 DISTNAME=      cups-filters-1.17.9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=  .tar.xz
@@ -72,6 +72,8 @@ post-install:
        ${CHMOD} go-rwx ${DESTDIR}${PREFIX}/libexec/cups/backend/serial
        ${INSTALL_SCRIPT} ${WRKSRC}/cups-browsed-daemonize.sh ${DESTDIR}${PREFIX}/libexec/cups-browsed
 
+.include "options.mk"
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -79,7 +81,6 @@ post-install:
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../net/avahi/buildlink3.mk"
 BUILDLINK_ABI_DEPENDS.cups-base+=      cups-base>=1.7.4nb1
 .include "../../print/cups-base/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"

Added files:

Index: pkgsrc/print/cups-filters/options.mk
diff -u /dev/null pkgsrc/print/cups-filters/options.mk:1.1
--- /dev/null   Sun Dec 17 21:16:08 2017
+++ pkgsrc/print/cups-filters/options.mk        Sun Dec 17 21:16:07 2017
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2017/12/17 21:16:07 leot Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cups-filters
+PKG_SUPPORTED_OPTIONS= avahi dbus
+PKG_SUGGESTED_OPTIONS= avahi dbus
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Avahi support
+#
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-avahi
+.else
+CONFIGURE_ARGS+=       --disable-avahi
+.endif
+
+#
+# DBus support
+#
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-dbus
+.else
+CONFIGURE_ARGS+=       --disable-dbus
+.endif