CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Pierre Pronchery" <khorben%netbsd.org@localhost>
Date: Sun, 12 Nov 2017 15:37:01 +0000

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sun Nov 12 15:37:00 UTC 2017

Modified Files:
        pkgsrc/emulators/wine: options.mk
        pkgsrc/emulators/wine-devel: options.mk
        pkgsrc/graphics/darktable: Makefile
        pkgsrc/lang/openjdk7: Makefile
        pkgsrc/lang/openjdk8: Makefile
        pkgsrc/misc/libreoffice: Makefile
        pkgsrc/net/freerdp: options.mk
        pkgsrc/net/netatalk22: options.mk
        pkgsrc/net/netatalk3: options.mk
        pkgsrc/net/netatalk30: options.mk
        pkgsrc/net/samba: options.mk
        pkgsrc/net/samba4: options.mk
        pkgsrc/print/cups-drivers-Magicolor5440DL: Makefile
        pkgsrc/print/cups-pdf: Makefile
        pkgsrc/print/epdfview: options.mk
        pkgsrc/print/foomatic-filters: Makefile
        pkgsrc/print/foomatic-filters-cups: Makefile
        pkgsrc/print/foomatic-ppds-cups: Makefile
        pkgsrc/print/foomatic4-filters: Makefile
        pkgsrc/print/ghostscript-agpl: buildlink3.mk
        pkgsrc/print/ghostscript-gpl: buildlink3.mk options.mk
        pkgsrc/print/gtklp: Makefile
        pkgsrc/print/gutenprint-lib: Makefile
        pkgsrc/print/hplip: Makefile
        pkgsrc/print/libgnomecups: Makefile buildlink3.mk
        pkgsrc/print/p5-Net-CUPS: Makefile
        pkgsrc/print/py-cups: Makefile buildlink3.mk
        pkgsrc/print/qpdfview: Makefile
        pkgsrc/print/scribus-qt4: Makefile
        pkgsrc/print/xpp: Makefile
        pkgsrc/x11/gtk2: options.mk
        pkgsrc/x11/gtk3: options.mk
        pkgsrc/x11/qt4-libs: options.mk
        pkgsrc/x11/qt5-qtbase: options.mk
Removed Files:
        pkgsrc/print/cups: buildlink3.mk

Log Message:
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@


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/wine/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/wine-devel/options.mk
cvs rdiff -u -r1.75 -r1.76 pkgsrc/graphics/darktable/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/lang/openjdk7/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/freerdp/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk22/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk3/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk30/options.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/samba/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/samba4/options.mk
cvs rdiff -u -r1.40 -r0 pkgsrc/print/cups/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/cups-pdf/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/epdfview/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/foomatic-filters-cups/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/foomatic-ppds-cups/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/foomatic4-filters/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/ghostscript-agpl/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/ghostscript-gpl/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/ghostscript-gpl/options.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/print/gtklp/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/print/gutenprint-lib/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/libgnomecups/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/libgnomecups/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/p5-Net-CUPS/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/py-cups/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/py-cups/buildlink3.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/print/qpdfview/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/print/scribus-qt4/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/print/xpp/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/gtk2/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/gtk3/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/qt4-libs/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt5-qtbase/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/wine/options.mk
diff -u pkgsrc/emulators/wine/options.mk:1.16 pkgsrc/emulators/wine/options.mk:1.17
--- pkgsrc/emulators/wine/options.mk:1.16       Fri May 19 13:18:17 2017
+++ pkgsrc/emulators/wine/options.mk    Sun Nov 12 15:36:57 2017
@@ -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

Index: pkgsrc/emulators/wine-devel/options.mk
diff -u pkgsrc/emulators/wine-devel/options.mk:1.10 pkgsrc/emulators/wine-devel/options.mk:1.11
--- pkgsrc/emulators/wine-devel/options.mk:1.10 Fri May 19 13:18:17 2017
+++ pkgsrc/emulators/wine-devel/options.mk      Sun Nov 12 15:36:57 2017
@@ -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

Index: pkgsrc/graphics/darktable/Makefile
diff -u pkgsrc/graphics/darktable/Makefile:1.75 pkgsrc/graphics/darktable/Makefile:1.76
--- pkgsrc/graphics/darktable/Makefile:1.75     Mon Sep 18 09:53:22 2017
+++ pkgsrc/graphics/darktable/Makefile  Sun Nov 12 15:36:57 2017
@@ -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>
 .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"

Index: pkgsrc/lang/openjdk7/Makefile
diff -u pkgsrc/lang/openjdk7/Makefile:1.116 pkgsrc/lang/openjdk7/Makefile:1.117
--- pkgsrc/lang/openjdk7/Makefile:1.116 Mon Aug 14 00:02:16 2017
+++ pkgsrc/lang/openjdk7/Makefile       Sun Nov 12 15:36:58 2017
@@ -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"

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.51 pkgsrc/lang/openjdk8/Makefile:1.52
--- pkgsrc/lang/openjdk8/Makefile:1.51  Sat Sep  2 04:13:41 2017
+++ pkgsrc/lang/openjdk8/Makefile       Sun Nov 12 15:36:58 2017
@@ -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"

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.127 pkgsrc/misc/libreoffice/Makefile:1.128
--- pkgsrc/misc/libreoffice/Makefile:1.127      Fri Nov 10 22:54:04 2017
+++ pkgsrc/misc/libreoffice/Makefile    Sun Nov 12 15:36:58 2017
@@ -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+=  libet
 .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"

Index: pkgsrc/net/freerdp/options.mk
diff -u pkgsrc/net/freerdp/options.mk:1.6 pkgsrc/net/freerdp/options.mk:1.7
--- pkgsrc/net/freerdp/options.mk:1.6   Fri Jun 24 11:33:59 2016
+++ pkgsrc/net/freerdp/options.mk       Sun Nov 12 15:36:58 2017
@@ -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

Index: pkgsrc/net/netatalk22/options.mk
diff -u pkgsrc/net/netatalk22/options.mk:1.4 pkgsrc/net/netatalk22/options.mk:1.5
--- pkgsrc/net/netatalk22/options.mk:1.4        Wed Jul 12 13:56:00 2017
+++ pkgsrc/net/netatalk22/options.mk    Sun Nov 12 15:36:58 2017
@@ -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 
 .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

Index: pkgsrc/net/netatalk3/options.mk
diff -u pkgsrc/net/netatalk3/options.mk:1.2 pkgsrc/net/netatalk3/options.mk:1.3
--- pkgsrc/net/netatalk3/options.mk:1.2 Fri May 19 13:18:17 2017
+++ pkgsrc/net/netatalk3/options.mk     Sun Nov 12 15:36:58 2017
@@ -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 
 .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

Index: pkgsrc/net/netatalk30/options.mk
diff -u pkgsrc/net/netatalk30/options.mk:1.4 pkgsrc/net/netatalk30/options.mk:1.5
--- pkgsrc/net/netatalk30/options.mk:1.4        Fri May 19 13:18:17 2017
+++ pkgsrc/net/netatalk30/options.mk    Sun Nov 12 15:36:58 2017
@@ -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 
 .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

Index: pkgsrc/net/samba/options.mk
diff -u pkgsrc/net/samba/options.mk:1.37 pkgsrc/net/samba/options.mk:1.38
--- pkgsrc/net/samba/options.mk:1.37    Fri May 19 13:18:18 2017
+++ pkgsrc/net/samba/options.mk Sun Nov 12 15:36:58 2017
@@ -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

Index: pkgsrc/net/samba4/options.mk
diff -u pkgsrc/net/samba4/options.mk:1.5 pkgsrc/net/samba4/options.mk:1.6
--- pkgsrc/net/samba4/options.mk:1.5    Sun Jun 11 05:26:45 2017
+++ pkgsrc/net/samba4/options.mk        Sun Nov 12 15:36:58 2017
@@ -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

Index: pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile
diff -u pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.20 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.21
--- pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.20     Wed Aug 16 20:45:43 2017
+++ pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile  Sun Nov 12 15:36:58 2017
@@ -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"

Index: pkgsrc/print/cups-pdf/Makefile
diff -u pkgsrc/print/cups-pdf/Makefile:1.13 pkgsrc/print/cups-pdf/Makefile:1.14
--- pkgsrc/print/cups-pdf/Makefile:1.13 Fri May 19 13:29:03 2017
+++ pkgsrc/print/cups-pdf/Makefile      Sun Nov 12 15:37:00 2017
@@ -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

Index: pkgsrc/print/epdfview/options.mk
diff -u pkgsrc/print/epdfview/options.mk:1.3 pkgsrc/print/epdfview/options.mk:1.4
--- pkgsrc/print/epdfview/options.mk:1.3        Fri May 19 13:18:18 2017
+++ pkgsrc/print/epdfview/options.mk    Sun Nov 12 15:36:58 2017
@@ -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

Index: pkgsrc/print/foomatic-filters/Makefile
diff -u pkgsrc/print/foomatic-filters/Makefile:1.34 pkgsrc/print/foomatic-filters/Makefile:1.35
--- pkgsrc/print/foomatic-filters/Makefile:1.34 Fri May 19 13:29:03 2017
+++ pkgsrc/print/foomatic-filters/Makefile      Sun Nov 12 15:37:00 2017
@@ -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

Index: pkgsrc/print/foomatic-filters-cups/Makefile
diff -u pkgsrc/print/foomatic-filters-cups/Makefile:1.15 pkgsrc/print/foomatic-filters-cups/Makefile:1.16
--- pkgsrc/print/foomatic-filters-cups/Makefile:1.15    Fri May 19 13:29:03 2017
+++ pkgsrc/print/foomatic-filters-cups/Makefile Sun Nov 12 15:37:00 2017
@@ -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@localhost
 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}

Index: pkgsrc/print/foomatic-ppds-cups/Makefile
diff -u pkgsrc/print/foomatic-ppds-cups/Makefile:1.16 pkgsrc/print/foomatic-ppds-cups/Makefile:1.17
--- pkgsrc/print/foomatic-ppds-cups/Makefile:1.16       Fri May 19 13:29:03 2017
+++ pkgsrc/print/foomatic-ppds-cups/Makefile    Sun Nov 12 15:37:00 2017
@@ -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@localhost
 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}

Index: pkgsrc/print/foomatic4-filters/Makefile
diff -u pkgsrc/print/foomatic4-filters/Makefile:1.32 pkgsrc/print/foomatic4-filters/Makefile:1.33
--- pkgsrc/print/foomatic4-filters/Makefile:1.32        Fri May 19 13:29:04 2017
+++ pkgsrc/print/foomatic4-filters/Makefile     Sun Nov 12 15:37:00 2017
@@ -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}

Index: pkgsrc/print/ghostscript-agpl/buildlink3.mk
diff -u pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.8 pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.9
--- pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.8     Fri May 19 13:18:18 2017
+++ pkgsrc/print/ghostscript-agpl/buildlink3.mk Sun Nov 12 15:36:59 2017
@@ -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)

Index: pkgsrc/print/ghostscript-gpl/buildlink3.mk
diff -u pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.8 pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.9
--- pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.8      Fri May 19 13:18:18 2017
+++ pkgsrc/print/ghostscript-gpl/buildlink3.mk  Sun Nov 12 15:36:59 2017
@@ -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)

Index: pkgsrc/print/ghostscript-gpl/options.mk
diff -u pkgsrc/print/ghostscript-gpl/options.mk:1.7 pkgsrc/print/ghostscript-gpl/options.mk:1.8
--- pkgsrc/print/ghostscript-gpl/options.mk:1.7 Fri May 19 13:18:18 2017
+++ pkgsrc/print/ghostscript-gpl/options.mk     Sun Nov 12 15:36:59 2017
@@ -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 d
 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

Index: pkgsrc/print/gtklp/Makefile
diff -u pkgsrc/print/gtklp/Makefile:1.42 pkgsrc/print/gtklp/Makefile:1.43
--- pkgsrc/print/gtklp/Makefile:1.42    Fri May 19 13:29:04 2017
+++ pkgsrc/print/gtklp/Makefile Sun Nov 12 15:36:59 2017
@@ -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}/insta
 
 .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"

Index: pkgsrc/print/gutenprint-lib/Makefile
diff -u pkgsrc/print/gutenprint-lib/Makefile:1.71 pkgsrc/print/gutenprint-lib/Makefile:1.72
--- pkgsrc/print/gutenprint-lib/Makefile:1.71   Fri Sep  1 11:27:18 2017
+++ pkgsrc/print/gutenprint-lib/Makefile        Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/print/hplip/Makefile
diff -u pkgsrc/print/hplip/Makefile:1.63 pkgsrc/print/hplip/Makefile:1.64
--- pkgsrc/print/hplip/Makefile:1.63    Thu Nov  9 20:44:59 2017
+++ pkgsrc/print/hplip/Makefile Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/print/libgnomecups/Makefile
diff -u pkgsrc/print/libgnomecups/Makefile:1.41 pkgsrc/print/libgnomecups/Makefile:1.42
--- pkgsrc/print/libgnomecups/Makefile:1.41     Sun Jul 30 22:47:54 2017
+++ pkgsrc/print/libgnomecups/Makefile  Sun Nov 12 15:36:59 2017
@@ -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.
 
 .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"

Index: pkgsrc/print/libgnomecups/buildlink3.mk
diff -u pkgsrc/print/libgnomecups/buildlink3.mk:1.29 pkgsrc/print/libgnomecups/buildlink3.mk:1.30
--- pkgsrc/print/libgnomecups/buildlink3.mk:1.29        Fri May 19 13:18:19 2017
+++ pkgsrc/print/libgnomecups/buildlink3.mk     Sun Nov 12 15:36:59 2017
@@ -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?=    ../..
 
 .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

Index: pkgsrc/print/p5-Net-CUPS/Makefile
diff -u pkgsrc/print/p5-Net-CUPS/Makefile:1.25 pkgsrc/print/p5-Net-CUPS/Makefile:1.26
--- pkgsrc/print/p5-Net-CUPS/Makefile:1.25      Wed Jun 14 21:26:13 2017
+++ pkgsrc/print/p5-Net-CUPS/Makefile   Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/print/py-cups/Makefile
diff -u pkgsrc/print/py-cups/Makefile:1.28 pkgsrc/print/py-cups/Makefile:1.29
--- pkgsrc/print/py-cups/Makefile:1.28  Fri May 19 13:29:04 2017
+++ pkgsrc/print/py-cups/Makefile       Sun Nov 12 15:36:59 2017
@@ -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"
 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"

Index: pkgsrc/print/py-cups/buildlink3.mk
diff -u pkgsrc/print/py-cups/buildlink3.mk:1.16 pkgsrc/print/py-cups/buildlink3.mk:1.17
--- pkgsrc/print/py-cups/buildlink3.mk:1.16     Fri May 19 13:18:19 2017
+++ pkgsrc/print/py-cups/buildlink3.mk  Sun Nov 12 15:36:59 2017
@@ -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+=       ${PYPKGP
 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

Index: pkgsrc/print/qpdfview/Makefile
diff -u pkgsrc/print/qpdfview/Makefile:1.46 pkgsrc/print/qpdfview/Makefile:1.47
--- pkgsrc/print/qpdfview/Makefile:1.46 Mon Sep  4 20:20:56 2017
+++ pkgsrc/print/qpdfview/Makefile      Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/print/scribus-qt4/Makefile
diff -u pkgsrc/print/scribus-qt4/Makefile:1.48 pkgsrc/print/scribus-qt4/Makefile:1.49
--- pkgsrc/print/scribus-qt4/Makefile:1.48      Mon Sep 25 22:26:51 2017
+++ pkgsrc/print/scribus-qt4/Makefile   Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/print/xpp/Makefile
diff -u pkgsrc/print/xpp/Makefile:1.56 pkgsrc/print/xpp/Makefile:1.57
--- pkgsrc/print/xpp/Makefile:1.56      Sun Feb 12 06:25:56 2017
+++ pkgsrc/print/xpp/Makefile   Sun Nov 12 15:36:59 2017
@@ -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"

Index: pkgsrc/x11/gtk2/options.mk
diff -u pkgsrc/x11/gtk2/options.mk:1.15 pkgsrc/x11/gtk2/options.mk:1.16
--- pkgsrc/x11/gtk2/options.mk:1.15     Fri May 19 13:18:19 2017
+++ pkgsrc/x11/gtk2/options.mk  Sun Nov 12 15:36:59 2017
@@ -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

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.9 pkgsrc/x11/gtk3/options.mk:1.10
--- pkgsrc/x11/gtk3/options.mk:1.9      Fri May 19 13:18:19 2017
+++ pkgsrc/x11/gtk3/options.mk  Sun Nov 12 15:37:00 2017
@@ -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 
 
 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

Index: pkgsrc/x11/qt4-libs/options.mk
diff -u pkgsrc/x11/qt4-libs/options.mk:1.9 pkgsrc/x11/qt4-libs/options.mk:1.10
--- pkgsrc/x11/qt4-libs/options.mk:1.9  Fri May 19 13:18:20 2017
+++ pkgsrc/x11/qt4-libs/options.mk      Sun Nov 12 15:37:00 2017
@@ -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

Index: pkgsrc/x11/qt5-qtbase/options.mk
diff -u pkgsrc/x11/qt5-qtbase/options.mk:1.8 pkgsrc/x11/qt5-qtbase/options.mk:1.9
--- pkgsrc/x11/qt5-qtbase/options.mk:1.8        Fri May 19 13:18:20 2017
+++ pkgsrc/x11/qt5-qtbase/options.mk    Sun Nov 12 15:37:00 2017
@@ -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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index