Update dependencies on print/cups to print/cups-base

This is with the notable exception of meta-pkgs/desktop-gnome, which I
believe implies a fully functional cups.

This is still missing revision bumps - I'll be right there (first time I
am doing this on so many packages at a time).

As discussed on tech-pkg@

6 files changed, 12 insertions, 12 deletions

diff --git a/net/freerdp/options.mk b/net/freerdp/options.mk
index 5f636cec66c..b0bba3cc5e5 100644
--- a/net/freerdp/options.mk
+++ b/net/freerdp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2016/06/24 11:33:59 he Exp $
+# $NetBSD: options.mk,v 1.7 2017/11/12 15:36:58 khorben Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freerdp
 PKG_SUPPORTED_OPTIONS=	alsa cups ffmpeg pcsc pulseaudio debug
@@ -25,7 +25,7 @@ CMAKE_ARGS+=	-DWITH_ALSA=OFF
 ### CUPS support
 ###
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CMAKE_ARGS+=	-DWITH_CUPS=ON
 PLIST.cups=	yes
 .else
diff --git a/net/netatalk22/options.mk b/net/netatalk22/options.mk
index 58f28fd1bcf..77ed001a355 100644
--- a/net/netatalk22/options.mk
+++ b/net/netatalk22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2017/07/12 13:56:00 hauke Exp $
+# $NetBSD: options.mk,v 1.5 2017/11/12 15:36:58 khorben Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/net/netatalk3/options.mk b/net/netatalk3/options.mk
index 4f4afc6fdfd..f085e00ba85 100644
--- a/net/netatalk3/options.mk
+++ b/net/netatalk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/05/19 13:18:17 prlw1 Exp $
+# $NetBSD: options.mk,v 1.3 2017/11/12 15:36:58 khorben Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/net/netatalk30/options.mk b/net/netatalk30/options.mk
index 1745b39d922..785d27d8615 100644
--- a/net/netatalk30/options.mk
+++ b/net/netatalk30/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2017/05/19 13:18:17 prlw1 Exp $
+# $NetBSD: options.mk,v 1.5 2017/11/12 15:36:58 khorben Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 0d621b72aeb..04394500c41 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.37 2017/05/19 13:18:18 prlw1 Exp $
+# $NetBSD: options.mk,v 1.38 2017/11/12 15:36:58 khorben Exp $
 
 # Recommended package options for various setups:
 #
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--with-acl-support
 ###
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 PLIST.cups=		yes
 INSTALLATION_DIRS+=	libexec/cups/backend
diff --git a/net/samba4/options.mk b/net/samba4/options.mk
index 0b4057b0742..39e62aa8eb5 100644
--- a/net/samba4/options.mk
+++ b/net/samba4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/06/11 05:26:45 dogcow Exp $
+# $NetBSD: options.mk,v 1.6 2017/11/12 15:36:58 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba4
 PKG_SUPPORTED_OPTIONS=	ads fam ldap pam winbind # cups # cups option is broken for me.
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--without-ads
 ###
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 PLIST.cups=		yes
 INSTALLATION_DIRS+=	libexec/cups/backend