1 files changed, 18 insertions, 28 deletions

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'