From 79ba6e5dcdfbb194b2b44650608da14a4a5ea4f5 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert
Date: Mon, 29 Nov 2021 19:44:18 +0100
Subject: cups: => 2.4.0

---
 printer/cups/DEPENDS |  46 ++++++++++++++++++----------------------------
 printer/cups/DETAILS |   2 +-
 printer/cups/HISTORY |   7 +++++++
 printer/cups/op.gpg  | Bin 2275 -> 3490 bytes
 4 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'printer')

diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index cda12135ba..eb77a5fd79 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -4,44 +4,34 @@ depends  pkgconfig                                &&
 
 depends shared-mime-info &&
 
-optional_depends avahi \
-                   '--enable-avahi' \
-                   '--disable-avahi' \
-                   'use Avahi Service Discovery' &&
-
-optional_depends mdnsresponder                    \
-                   '--enable-dnssd'   \
-                   '--disable-dnssd'              \
-                   'DNS Service Discovery'       &&
-
-optional_depends  libpaper                        \
-                  '--enable-libpaper'             \
-                  '--disable-libpaper'            \
+optional_depends  avahi --with{,out}-avahi \
+                  'Avahi Service Discovery' &&
+
+optional_depends  mdnsresponder --with{,out}-dnssd \
+                  'DNS Service Discovery'       &&
+
+optional_depends  libpaper --with{,out}-libpaper  \
                   'Enable libpaper support'       &&
 
-optional_depends  "libusb" \
-                  '--enable-libusb' \
-                  '--disable-libusb' \
+optional_depends  libusb   --with{,out}-libusb \
                   'usb printers' &&
-optional_depends  "dbus"                          \
-                  "--enable-dbus"                 \
-                  "--disable-dbus"                \
+
+optional_depends  dbus   --with{,out}-dbus \
                   "hardware notifications"        &&
 
-optional_depends  "linux-pam"                     \
-                  "--enable-pam"                  \
-                  "--disable-pam"                 \
+optional_depends  linux-pam --with{,out}-pam \
                   "for pluggable authentication"  &&
 
-optional_depends gnutls "--enable-gnutls" "--disable-gnutls --disable-ssl" 'security' &&
+optional_depends  gnutls --with{,out}-gnutls \
+                  'security' &&
 
-optional_depends  "acl"                                           \
-                  "--enable-acl"                                              \
-                  "--disable-acl"                                              \
+optional_depends  acl --with{,out}-acl \
                   "for file system access control lists support"  &&
 
-optional_depends krb5 '--enable-gssapi' '--disable-gssapi' 'GSSAPI support' &&
-optional_depends systemd '--enable-systemd' '--disable-systemd' 'SystemD support' &&
+optional_depends  krb5 --with{,out}-gssapi 'Kerberos support - deprecated' &&
+
+optional_depends  systemd --with{,out}-systemd \
+                  'SystemD support' &&
 
 suggest_depends ghostscript '' '' 'to print Postscript files'
 suggest_depends cups-filters '' '' 'extra backends and filters'
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 08313647be..3fb1b1b2fd 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cups
-         VERSION=2.3.3op2
+         VERSION=2.4.0
   SECURITY_PATCH=14
           SOURCE=$SPELL-$VERSION-source.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index fcdd830468..65ec607f1e 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,10 @@
+2021-11-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS version 2.4.0
+	* CONFIGURE DEPENDS: change all options
+	  {en,dis}able-xxx => with{,out}=xxx
+	  deprecate Kerberos support
+	* op.gpg: add Zdenek Dohnal 
+
 2021-03-15 Treeve Jelbert <treeve@sourcemage.org>
 	* TRIGGERS: deleted, redundant
 
diff --git a/printer/cups/op.gpg b/printer/cups/op.gpg
index cd3d8a93e9..cf500bb1fd 100644
Binary files a/printer/cups/op.gpg and b/printer/cups/op.gpg differ
-- 
cgit v1.2.3