Switch all cups packages to use cups15.

26 files changed, 52 insertions, 53 deletions

diff --git a/print/adobeps-win/Makefile b/print/adobeps-win/Makefile
index f48ea6c55b1..a8812b82eda 100644
--- a/print/adobeps-win/Makefile
+++ b/print/adobeps-win/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/04/06 12:04:01 rodent Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/18 09:26:10 wiz 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:../../print/cups
+DEPENDS+=	cups>=1.1.15:../../print/cups15
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile
index 2257fbb5b79..c172dc2e6a2 100644
--- a/print/cups-drivers-Magicolor5440DL/Makefile
+++ b/print/cups-drivers-Magicolor5440DL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/02/12 23:18:28 tron Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/18 09:26:10 wiz Exp $
 #
 
 DISTNAME=	5440DL_lin64bit_1_2_1
@@ -13,7 +13,6 @@ HOMEPAGE=	http://printer.konicaminolta.com/support/current_printers/mc5440dl_sup
 COMMENT=	CUPS drivers for printer Konica Minolta Magicolor 5440DL
 
 BUILD_DEPENDS+=	jbigkit>=1.6:../../graphics/jbigkit
-DEPENDS+=	cups>=1.1.14:../../print/cups
 
 GHOSTSCRIPT_REQD=	8.0
 USE_TOOLS+=		gs:run
@@ -33,5 +32,5 @@ post-extract:
 
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 828fb1e8e4e..73b1f326253 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/06/07 11:47:47 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/18 09:26:10 wiz Exp $
 
 DISTNAME=	cups-filters-1.0.54
 CATEGORIES=	print
@@ -42,7 +42,7 @@ post-install:
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
 BUILDLINK_ABI_DEPENDS.cups+=	cups>=1.6
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/ijs/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 80aef0d6348..fb8d0b05b48 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/05/29 23:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/18 09:26:10 wiz 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-[0-9]*:../../print/cups15
 
 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 60a8a1c2b00..614eb7845bd 100644
--- a/print/epdfview/options.mk
+++ b/print/epdfview/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/01/28 00:13:49 dillo Exp $
+# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz 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/cups15/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 77a67d89947..c71e7771751 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/18 09:26:11 wiz Exp $
 
 META_PACKAGE=	yes
 
@@ -10,7 +10,7 @@ PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic support for CUPS
 
-DEPENDS+=	cups>=1.0:../../print/cups
+DEPENDS+=	cups>=1.0:../../print/cups15
 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 c5a99653bc8..4d1c77de4ec 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/05/29 23:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/18 09:26:11 wiz Exp $
 
 .include "Makefile.common"
 
@@ -43,7 +43,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>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups15
 .else
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 2d8ec849c6f..0286f5a35dd 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/18 09:26:11 wiz Exp $
 
 META_PACKAGE=	yes
 
@@ -9,7 +9,7 @@ DISTNAME=	foomatic-ppds-cups-${FOOMATIC_PPDS_VERSION}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Foomatic PPD collection for CUPS servers
 
-DEPENDS+=	cups>=1.0:../../print/cups
+DEPENDS+=	cups>=1.0:../../print/cups15
 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 761981d507e..d451fa2a92e 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/05/29 23:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/18 09:26:11 wiz Exp $
 
 DISTNAME=	foomatic-filters-4.0.17
 PKGREVISION=	6
@@ -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>=1.0:../../print/cups15
 EVAL_PREFIX+=	CUPS_PREFIX=cups
 CUPS_FILTERDIR=	${CUPS_PREFIX:Q}/libexec/cups/filter
 CONFIGURE_ENV+=	CUPS_FILTERS=${CUPS_FILTERDIR}
diff --git a/print/ghostscript-agpl/buildlink3.mk b/print/ghostscript-agpl/buildlink3.mk
index c50b7939470..424c532f177 100644
--- a/print/ghostscript-agpl/buildlink3.mk
+++ b/print/ghostscript-agpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/02/12 23:18:29 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/06/18 09:26:11 wiz 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/cups15/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 27e9f4dc5c0..9a704f00485 100644
--- a/print/ghostscript-gpl/buildlink3.mk
+++ b/print/ghostscript-gpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/04/26 13:51:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/06/18 09:26:11 wiz 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/cups15/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 a305992934a..60504c1f695 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/05/01 04:11:01 richard Exp $
+# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 00d4e962872..4394e35b62d 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2014/05/05 00:48:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index e0c00668144..7269c83dc6a 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2014/05/29 23:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2014/06/18 09:26:11 wiz Exp $
 
 VERSION=	5.2.9
 DISTNAME=	gutenprint-${VERSION}
@@ -106,6 +106,6 @@ TEST_TARGET=		check
 .include "../../x11/gtk2/buildlink3.mk"
 
 # gutenprint-cups: cups support
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index aa01a2d7d84..2b0703fb0ee 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2014/06/09 01:11:32 schnoebe Exp $
+# $NetBSD: Makefile,v 1.38 2014/06/18 09:26:11 wiz Exp $
 
 DISTNAME=		hplip-3.14.6
 CATEGORIES=		print
@@ -175,7 +175,7 @@ post-install:
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/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 ff6dba81a6c..1c48a172a0c 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/02/12 23:18:29 tron Exp $
+# $NetBSD: Makefile,v 1.36 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index 80c6570e138..b2371dacee2 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2014/02/12 23:18:29 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .endif # LIBGNOMECUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libgnomecups
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index a19995cc7a9..6bdd338c4f4 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/05/29 23:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/18 09:26:11 wiz 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
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/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 d29cbbc4171..f5e75732ed3 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 23:18:30 tron Exp $
+# $NetBSD: Makefile,v 1.23 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index cd4ff3be862..1f34c97f501 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2013/02/16 11:19:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2014/06/18 09:26:11 wiz 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/cups15/buildlink3.mk"
 .endif # PY_CUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-cups
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index ce274a2ab84..34bc351c929 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/04/29 07:57:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/06/18 09:26:11 wiz Exp $
 
 VER=		0.4
 DISTNAME=	qpdfview-${VER}
@@ -29,7 +29,7 @@ do-configure:
 		${QTDIR}/bin/qmake qpdfview.pro
 
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/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 a659732e426..4684c73972b 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2014/05/29 23:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/18 09:26:11 wiz Exp $
 
 DISTNAME=		scribus-1.4.3
 PKGREVISION=		3
@@ -34,7 +34,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/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 490bbabce20..4935eddc8ce 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2014/05/29 23:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2014/06/18 09:26:11 wiz Exp $
 
 DISTNAME=		scribus-1.3.3.14
 PKGREVISION=		21
@@ -38,7 +38,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 1c5276325a6..f4302023924 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2014/06/18 09:26:11 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-print
 
@@ -17,7 +17,7 @@ pkgbase := xfce4-print
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups15/buildlink3.mk"
 .endif
 .endif # XFCE4_PRINT_BUILDLINK3_MK
 
diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk
index 3dc1ac75817..159c9daebaa 100644
--- a/print/xfce4-print/options.mk
+++ b/print/xfce4-print/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2012/07/08 07:45:25 sbd Exp $
+# $NetBSD: options.mk,v 1.7 2014/06/18 09:26:11 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xfce4-print
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=        --disable-bsdlpr
 
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 PLIST.cups=		yes
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index c5b9c651637..821d6e5a4d3 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2014/02/12 23:18:30 tron Exp $
+# $NetBSD: Makefile,v 1.50 2014/06/18 09:26:12 wiz Exp $
 
 DISTNAME=	xpp-1.5
 PKGREVISION=	11
@@ -20,6 +20,6 @@ INSTALLATION_DIRS+=	${DOCDIR}
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README ${DESTDIR}${DOCDIR}
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"