Switch all cups15 packages to use cups.

22 files changed, 44 insertions, 44 deletions

diff --git a/print/adobeps-win/Makefile b/print/adobeps-win/Makefile
index 7092141196f..74964f3a521 100644
--- a/print/adobeps-win/Makefile
+++ b/print/adobeps-win/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/08/29 23:04:38 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
 
 DISTNAME=	winsteng
 PKGNAME=	adobeps-win-1.0.6
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.adobe.com/products/printerdrivers/windows.html
 COMMENT=	Adobe PostScript MS Windows drivers for CUPS/Samba
 
 BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
-DEPENDS+=	cups>=1.1.15<1.7:../../print/cups15
+DEPENDS+=	cups>=1.1.15:../../print/cups
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile
index 75414cfd16f..34a6c260c2d 100644
--- a/print/cups-drivers-Magicolor5440DL/Makefile
+++ b/print/cups-drivers-Magicolor5440DL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/03/05 11:29:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 9759b2b9c06..ea061cc03f7 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/19 13:18:18 prlw1 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/cups15
+DEPENDS+=		cups-[0-9]*:../../print/cups
 
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch
diff --git a/print/epdfview/options.mk b/print/epdfview/options.mk
index 614eb7845bd..5d18bec444d 100644
--- a/print/epdfview/options.mk
+++ b/print/epdfview/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/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 009412f1351..ad508ad9025 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2017/05/19 13:18:18 prlw1 Exp $
 
 META_PACKAGE=	yes
 
@@ -10,7 +10,7 @@ PKGREVISION=	2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic support for CUPS
 
-DEPENDS+=	cups>=1.0:../../print/cups15
+DEPENDS+=	cups>=1.0:../../print/cups
 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 4b813dc88e2..65ed56ba7c8 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/09/03 14:21:25 mef Exp $
+# $NetBSD: Makefile,v 1.33 2017/05/19 13:18:18 prlw1 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/cups15
+DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 .else
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 730fffab74d..8e08f7efa40 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
 
 META_PACKAGE=	yes
 
@@ -10,7 +10,7 @@ PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic PPD collection for CUPS servers
 
-DEPENDS+=	cups>=1.0:../../print/cups15
+DEPENDS+=	cups>=1.0:../../print/cups
 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 e7d0fc72c53..8cfc3bcd7c2 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/05/19 13:18:18 prlw1 Exp $
 
 DISTNAME=	foomatic-filters-4.0.17
 PKGREVISION=	9
@@ -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/cups15
+DEPENDS+=	cups>=1.0:../../print/cups
 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 cd917e17be9..32ba592776c 100644
--- a/print/ghostscript-agpl/buildlink3.mk
+++ b/print/ghostscript-agpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/08/12 22:27:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+#.include "../../print/cups/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 09bbd76083c..6cfc07b772d 100644
--- a/print/ghostscript-gpl/buildlink3.mk
+++ b/print/ghostscript-gpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/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 60504c1f695..03abe2eafbb 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index eb8326896fe..e941078c4f7 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/02/12 06:25:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 449a78ce823..d8017a46368 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2017/03/16 13:17:54 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2017/05/19 13:18:19 prlw1 Exp $
 
 VERSION=	5.2.12
 DISTNAME=	gutenprint-${VERSION}
@@ -96,6 +96,6 @@ TEST_TARGET=		check
 .include "../../x11/gtk2/buildlink3.mk"
 
 # gutenprint-cups: cups support
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 8109e95c1e3..514e903b32b 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2016/11/30 18:00:08 schnoebe Exp $
+# $NetBSD: Makefile,v 1.58 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=	hplip-3.16.11
 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/cups15/buildlink3.mk"
+.include "../../print/cups/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 bb19440285c..60b7207e482 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2017/05/19 13:18:19 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index d9d419674b1..17cd118dbb6 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2017/05/19 13:18:19 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .endif # LIBGNOMECUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libgnomecups
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 3a5ac2c4274..d2e1a01d724 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/06/08 19:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=	Net-CUPS-0.61
 PKGNAME=	p5-${DISTNAME}
@@ -17,6 +17,6 @@ PERL5_PACKLIST=	auto/Net/CUPS/.packlist
 
 .include "../../converters/libiconv/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cups+=	cups>=1.2.2<2.0
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/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 2093d666243..5a169880ab1 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/03/05 11:29:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2017/05/19 13:18:19 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index 1f34c97f501..a6b36df2e3b 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2017/05/19 13:18:19 prlw1 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/cups15/buildlink3.mk"
+#.include "../../print/cups/buildlink3.mk"
 .endif # PY_CUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-cups
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index b86dc6e8b14..369cbb2529f 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/05/02 13:37:32 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2017/05/19 13:18:19 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/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 afe9807affe..1588fb58651 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/01/01 14:43:54 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=		scribus-1.4.3
 PKGREVISION=		8
@@ -34,7 +34,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../print/podofo/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 0aba46443f2..71d877b8e78 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2017/02/21 16:01:36 joerg Exp $
+# $NetBSD: Makefile,v 1.109 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=		scribus-1.3.3.14
 PKGREVISION=		27
@@ -39,7 +39,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
 
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1