diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk
index 88619172c6ca..789d36d11b09 100644
--- a/emulators/wine-devel/options.mk
+++ b/emulators/wine-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2017/05/19 13:18:17 prlw1 Exp $
+# $NetBSD: options.mk,v 1.11 2017/11/12 15:36:57 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups dbus esound hal ldap opengl sane ssl x11 pulseaudio
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	opengl ssl x11
 PLIST_VARS+=		esd opengl x11 pulseaudio
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 4e0bbf666532..bd681e08f716 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2017/05/19 13:18:17 prlw1 Exp $
+# $NetBSD: options.mk,v 1.17 2017/11/12 15:36:57 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups dbus esound hal ldap opengl sane ssl x11
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	opengl ssl x11
 PLIST_VARS+=		esd opengl x11
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 3e356e942b9d..f9d10467b49d 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2017/09/18 09:53:22 maya Exp $
+# $NetBSD: Makefile,v 1.76 2017/11/12 15:36:57 khorben Exp $
 
 DISTNAME=	darktable-2.2.5
 #PKGREVISION=	1
@@ -79,7 +79,7 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/flickcurl/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 #.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/pugixml/buildlink3.mk"
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index a238954f4826..1edb245a45f6 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2017/08/14 00:02:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.117 2017/11/12 15:36:58 khorben Exp $
 
 JDK_MICRO=	141
 DISTNAME=	openjdk-1.7.${JDK_MICRO}-20170813
@@ -295,6 +295,6 @@ MAKE_ENV+=	STRIP=${PREFIX}/bin/gstrip
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cups?=	build
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index fc9de702405a..2cfd3c112028 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/09/02 04:13:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2017/11/12 15:36:58 khorben Exp $
 
 DISTNAME=	openjdk-1.8.144-20170830
 PKGNAME=	openjdk8-1.8.144
@@ -259,6 +259,6 @@ MAKE_ENV+=	STRIP=${PREFIX}/bin/gstrip
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cups?=	build
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index 8bae0cd9d01b..bc776583d4d1 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2017/11/10 22:54:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2017/11/12 15:36:58 khorben Exp $
 
 VERREL=		5.4.3
 VERRC=		2
@@ -328,7 +328,7 @@ BUILDLINK_API_DEPENDS.libetonyek+=	libetonyek>=0.1.2
 .include "../../net/libcmis/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .endif
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
diff --git a/net/freerdp/options.mk b/net/freerdp/options.mk
index 5f636cec66cd..b0bba3cc5e58 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 58f28fd1bcf8..77ed001a3557 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 4f4afc6fdfd6..f085e00ba853 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 1745b39d922c..785d27d86153 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 0d621b72aebc..04394500c41f 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 0b4057b07429..39e62aa8eb58 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
diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile
index 07dc4ba5d369..0f2dad0f3a2c 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 419704cd79a9..e373fcf17548 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 f81a80de350d..000000000000
--- 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 5d18bec444d9..7a7d1fa416f6 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 44417a5f8954..641f0f005df9 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 0f5230a5c49c..3db992c1b7cf 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 50fc9609fc2d..f9332798dae9 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 12fa624ff02e..81a3cc25b6c7 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 32ba592776ca..cb6a4c3aa880 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 6cfc07b772d8..211d4276cc82 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 03abe2eafbb7..8f53d4c64ee1 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 feaf4c1dbbdd..e35791d9172f 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 2e54a56af1fb..092263837489 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 6c1b02815984..2a4a7dfed0dc 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 a7cccd8bf421..1c9ff28f94cd 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 17cd118dbb6d..6b90d4412ac8 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 2b33f47f8713..0b205c36bd81 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 2e94c3307efd..7bdc93f63c9f 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 a6b36df2e3bc..61f048cafb49 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 0e2635d499fb..af2226288adc 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 0a5d77df08c5..d0a04c1bc797 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 e9e80e0d77fd..3c054bfa5a41 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"
diff --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk
index e1681564b268..3a4164f526eb 100644
--- a/x11/gtk2/options.mk
+++ b/x11/gtk2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2017/05/19 13:18:19 prlw1 Exp $
+# $NetBSD: options.mk,v 1.16 2017/11/12 15:36:59 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk2
 PKG_SUPPORTED_OPTIONS=	cups debug
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=		x11
 
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 PLIST.cups=		yes
 .else
 CONFIGURE_ENV+=		ac_cv_path_CUPS_CONFIG=no
diff --git a/x11/gtk3/options.mk b/x11/gtk3/options.mk
index 241aef7dead3..401d8952ce7e 100644
--- a/x11/gtk3/options.mk
+++ b/x11/gtk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2017/05/19 13:18:19 prlw1 Exp $
+# $NetBSD: options.mk,v 1.10 2017/11/12 15:37:00 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS=	gtk3-atk-bridge cups debug
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=		gtk3-atk-bridge x11
 
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 PLIST.cups=		yes
 .else
 CONFIGURE_ENV+=		ac_cv_path_CUPS_CONFIG=no
diff --git a/x11/qt4-libs/options.mk b/x11/qt4-libs/options.mk
index 8446f5a19079..f3a31427677e 100644
--- a/x11/qt4-libs/options.mk
+++ b/x11/qt4-libs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2017/05/19 13:18:20 prlw1 Exp $
+# $NetBSD: options.mk,v 1.10 2017/11/12 15:37:00 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qt4
 PKG_SUPPORTED_OPTIONS=	cups debug gtk2
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug gtk2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	-cups
 .else
 CONFIGURE_ARGS+=	-no-cups
diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk
index 32b5cd95b63b..645dc0c62fb5 100644
--- a/x11/qt5-qtbase/options.mk
+++ b/x11/qt5-qtbase/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2017/05/19 13:18:20 prlw1 Exp $
+# $NetBSD: options.mk,v 1.9 2017/11/12 15:37:00 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qt5
 PKG_SUPPORTED_OPTIONS=	cups debug gtk2
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug gtk2
 PLIST_VARS+=		cups gtk2
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	-cups
 PLIST.cups=		yes
 .else