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@

22 files changed, 42 insertions, 57 deletions

diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile
index 07dc4ba5d36..0f2dad0f3a2 100644
--- a/print/cups-drivers-Magicolor5440DL/Makefile
+++ b/print/cups-drivers-Magicolor5440DL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/11/12 15:36:58 khorben Exp $
 #
 
 DISTNAME=	5440DL_lin64bit_1_2_1
@@ -33,5 +33,5 @@ post-extract:
 
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 419704cd79a..e373fcf1754 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.14 2017/11/12 15:37:00 khorben Exp $
 
 COMMENT=		PDF backend for CUPS
 
@@ -11,7 +11,7 @@ MASTER_SITES=		${HOMEPAGE}src/
 DISTFILES=		${DISTNAME:S/pdf-/pdf_/}.tar.gz
 LICENSE=		gnu-gpl-v2
 
-DEPENDS+=		cups-[0-9]*:../../print/cups
+DEPENDS+=		cups-base-[0-9]*:../../print/cups-base
 
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
deleted file mode 100644
index f81a80de350..00000000000
--- a/print/cups/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.40 2017/11/12 14:10:15 khorben Exp $
-
-BUILDLINK_TREE+=	cups
-
-.if !defined(CUPS_BUILDLINK3_MK)
-CUPS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cups+=		cups>=1.1.19nb3
-BUILDLINK_ABI_DEPENDS.cups+=		cups>=2.2.2nb2
-BUILDLINK_PKGSRCDIR.cups?=		../../print/cups-base
-
-.include "../../print/cups-base/buildlink3.mk"
-.endif # CUPS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-cups
diff --git a/print/epdfview/options.mk b/print/epdfview/options.mk
index 5d18bec444d..7a7d1fa416f 100644
--- a/print/epdfview/options.mk
+++ b/print/epdfview/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2017/05/19 13:18:18 prlw1 Exp $
+# $NetBSD: options.mk,v 1.4 2017/11/12 15:36:58 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.epdfview
 PKG_SUPPORTED_OPTIONS=	cups
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-cups
 .else
 CONFIGURE_ARGS+=	--without-cups
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index 44417a5f895..641f0f005df 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.16 2017/11/12 15:37:00 khorben Exp $
 
 META_PACKAGE=	yes
 
@@ -10,7 +10,7 @@ PKGREVISION=	3
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic support for CUPS
 
-DEPENDS+=	cups>=1.0:../../print/cups
+DEPENDS+=	cups-base>=1.0:../../print/cups-base
 DEPENDS+=	foomatic-filters-${FOOMATIC_FILTERS_VERSION}{,nb[0-9]*}:../../print/foomatic-filters
 
 WRKSRC=		${WRKDIR}
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 0f5230a5c49..3db992c1b7c 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.35 2017/11/12 15:37:00 khorben Exp $
 
 .include "Makefile.common"
 
@@ -42,7 +42,7 @@ INSTALL_TARGET=	install-bin install-man
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
+DEPENDS+=	{cups-base>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups-base
 .else
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 50fc9609fc2..f9332798dae 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.17 2017/11/12 15:37:00 khorben Exp $
 
 META_PACKAGE=	yes
 
@@ -10,7 +10,7 @@ PKGREVISION=	2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic PPD collection for CUPS servers
 
-DEPENDS+=	cups>=1.0:../../print/cups
+DEPENDS+=	cups-base>=1.0:../../print/cups-base
 DEPENDS+=	foomatic-ppds-${FOOMATIC_PPDS_VERSION}{,nb[0-9]*}:../../print/foomatic-ppds
 
 WRKSRC=		${WRKDIR}
diff --git a/print/foomatic4-filters/Makefile b/print/foomatic4-filters/Makefile
index 12fa624ff02..81a3cc25b6c 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/05/19 13:29:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.33 2017/11/12 15:37:00 khorben Exp $
 
 DISTNAME=	foomatic-filters-4.0.17
 PKGREVISION=	10
@@ -36,7 +36,7 @@ INSTALL_TARGET=	install-bin install-man
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+=	cups>=1.0:../../print/cups
+DEPENDS+=	cups-base>=1.0:../../print/cups-base
 CUPS_FILTERDIR=	${LOCALBASE}/libexec/cups/filter
 CONFIGURE_ENV+=	CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=	CUPS_FILTERDIR=${CUPS_FILTERDIR}
diff --git a/print/ghostscript-agpl/buildlink3.mk b/print/ghostscript-agpl/buildlink3.mk
index 32ba592776c..cb6a4c3aa88 100644
--- a/print/ghostscript-agpl/buildlink3.mk
+++ b/print/ghostscript-agpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2017/11/12 15:36:59 khorben Exp $
 
 BUILDLINK_TREE+=	ghostscript-agpl
 
@@ -16,7 +16,7 @@ pkgbase := ghostscript-agpl
 .include "../../mk/pkg-build-options.mk"
 
 #.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
-#.include "../../print/cups/buildlink3.mk"
+#.include "../../print/cups-base/buildlink3.mk"
 #.endif
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mfontconfig)
diff --git a/print/ghostscript-gpl/buildlink3.mk b/print/ghostscript-gpl/buildlink3.mk
index 6cfc07b772d..211d4276cc8 100644
--- a/print/ghostscript-gpl/buildlink3.mk
+++ b/print/ghostscript-gpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2017/11/12 15:36:59 khorben Exp $
 
 BUILDLINK_TREE+=	ghostscript-gpl
 
@@ -16,7 +16,7 @@ pkgbase := ghostscript-gpl
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mfontconfig)
diff --git a/print/ghostscript-gpl/options.mk b/print/ghostscript-gpl/options.mk
index 03abe2eafbb..8f53d4c64ee 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2017/05/19 13:18:18 prlw1 Exp $
+# $NetBSD: options.mk,v 1.8 2017/11/12 15:36:59 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits utf8
@@ -42,7 +42,7 @@ SUBST_MESSAGE.cupsetc=	Fixing CUPS etc directory path to install as example
 SUBST_FILES.cupsetc=	cups/cups.mak
 SUBST_SED.cupsetc=	-e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index feaf4c1dbbd..e35791d9172 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/05/19 13:29:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.43 2017/11/12 15:36:59 khorben Exp $
 #
 
 DISTNAME=	gtklp-1.2.7
@@ -19,5 +19,5 @@ MAKE_FLAGS+=		install_sh=${WRKSRC}/install-sh
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 2e54a56af1f..09226383748 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2017/09/01 11:27:18 gdt Exp $
+# $NetBSD: Makefile,v 1.72 2017/11/12 15:36:59 khorben Exp $
 
 VERSION=	5.2.13
 DISTNAME=	gutenprint-${VERSION}
@@ -96,6 +96,6 @@ TEST_TARGET=		check
 .include "../../x11/gtk2/buildlink3.mk"
 
 # gutenprint-cups: cups support
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 6c1b0281598..2a4a7dfed0d 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2017/11/09 20:44:59 schnoebe Exp $
+# $NetBSD: Makefile,v 1.64 2017/11/12 15:36:59 khorben Exp $
 
 DISTNAME=	hplip-3.17.10
 CATEGORIES=	print
@@ -176,7 +176,7 @@ post-install:
 .include "../../lang/python/extension.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index a7cccd8bf42..1c9ff28f94c 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/07/30 22:47:54 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2017/11/12 15:36:59 khorben Exp $
 #
 
 DISTNAME=	libgnomecups-0.2.3
@@ -19,5 +19,5 @@ PKGCONFIG_OVERRIDE=	libgnomecups-1.0.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index 17cd118dbb6..6b90d4412ac 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2017/05/19 13:18:19 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2017/11/12 15:36:59 khorben Exp $
 
 BUILDLINK_TREE+=	libgnomecups
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libgnomecups?=	../../print/libgnomecups
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .endif # LIBGNOMECUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libgnomecups
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 2b33f47f871..0b205c36bd8 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/06/14 21:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/11/12 15:36:59 khorben Exp $
 
 DISTNAME=	Net-CUPS-0.64
 PKGNAME=	p5-${DISTNAME}
@@ -19,6 +19,6 @@ EXTRACT_USING= bsdtar
 BUILDLINK_DEPMETHOD.cups-filters= build # image.h
 .include "../../print/cups-filters/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 2e94c3307ef..7bdc93f63c9 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/05/19 13:29:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.29 2017/11/12 15:36:59 khorben Exp $
 
 DISTNAME=	pycups-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-cups-${VERSION}
@@ -22,5 +22,5 @@ SUBST_SED.paths=	-e 's:"/usr/share/cups":"${BUILDLINK_PREFIX.cups}/share/cups/",
 SUBST_STAGE.paths=	post-patch
 
 .include "../../lang/python/distutils.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index a6b36df2e3b..61f048cafb4 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2017/05/19 13:18:19 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2017/11/12 15:36:59 khorben Exp $
 
 BUILDLINK_TREE+=	py-cups
 
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.py-cups+=	${PYPKGPREFIX}-cups>=1.9.44
 BUILDLINK_ABI_DEPENDS.py-cups+=	${PYPKGPREFIX}-cups>=1.9.61nb3
 BUILDLINK_PKGSRCDIR.py-cups?=	../../print/py-cups
 
-#.include "../../print/cups/buildlink3.mk"
+#.include "../../print/cups-base/buildlink3.mk"
 .endif # PY_CUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-cups
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index 0e2635d499f..af2226288ad 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/09/04 20:20:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2017/11/12 15:36:59 khorben Exp $
 
 VER=		0.4.16
 DISTNAME=	qpdfview-${VER}
@@ -27,7 +27,7 @@ do-configure:
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile
index 0a5d77df08c..d0a04c1bc79 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2017/09/25 22:26:51 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2017/11/12 15:36:59 khorben Exp $
 
 DISTNAME=		scribus-1.4.3
 PKGREVISION=		10
@@ -29,7 +29,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../print/podofo/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index e9e80e0d77f..3c054bfa5a4 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2017/02/12 06:25:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2017/11/12 15:36:59 khorben Exp $
 
 DISTNAME=	xpp-1.5
 PKGREVISION=	17
@@ -22,6 +22,6 @@ INSTALLATION_DIRS+=	${DOCDIR}
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README ${DESTDIR}${DOCDIR}
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"