Update dependencies on print/cups to print/cups-base

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update dependencies on print/cups to print/cups-base
From: Pierre Pronchery <khorben%defora.org@localhost>
Date: Sun, 12 Nov 2017 17:15:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Sun Nov 12 18:15:30 2017 +0100
Changeset:	f39a80494a2ea0326a90b2035156235ed23cc099

Modified Files:
	chromium/Makefile
	cinnamon-settings-daemon/Makefile
	cinnamon-settings-daemon/buildlink3.mk
	colord/buildlink3.mk
	gnome-settings-daemon/Makefile
	hpoj/Makefile
	libreoffice-git/Makefile
	netatalk/options.mk
	qt5-qtbase-git/options.mk
	qt5-qtbase/options.mk
	splix/Makefile
	wine-devel/options.mk

Log Message:
Update dependencies on print/cups to print/cups-base

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f39a80494a2ea0326a90b2035156235ed23cc099

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

diffstat:
 chromium/Makefile                      | 2 +-
 cinnamon-settings-daemon/Makefile      | 2 +-
 cinnamon-settings-daemon/buildlink3.mk | 2 +-
 colord/buildlink3.mk                   | 2 +-
 gnome-settings-daemon/Makefile         | 2 +-
 hpoj/Makefile                          | 2 +-
 libreoffice-git/Makefile               | 2 +-
 netatalk/options.mk                    | 2 +-
 qt5-qtbase-git/options.mk              | 2 +-
 qt5-qtbase/options.mk                  | 2 +-
 splix/Makefile                         | 2 +-
 wine-devel/options.mk                  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/chromium/Makefile b/chromium/Makefile
index 446033fdd7..2fa0a20e15 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -314,7 +314,7 @@ do-install:
 .include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 # This introduces OpenSSL dependency and it conflicts with bundled BoringSSL.
-#.include "../../print/cups/buildlink3.mk"
+#.include "../../print/cups-base/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 7eba41b9c2..b1167d4299 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -21,7 +21,7 @@ pre-configure:
 
 BUILD_DEPENDS+=	gnome-common-[0-9]*:../../devel/gnome-common
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/cinnamon-settings-daemon/buildlink3.mk b/cinnamon-settings-daemon/buildlink3.mk
index c4bb26efe4..a8f31794c2 100644
--- a/cinnamon-settings-daemon/buildlink3.mk
+++ b/cinnamon-settings-daemon/buildlink3.mk
@@ -8,7 +8,7 @@ CINNAMON_SETTINGS_DAEMON_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.cinnamon-settings-daemon+=	cinnamon-settings-daemon>=3.0.1
 BUILDLINK_PKGSRCDIR.cinnamon-settings-daemon?=		../../wip/cinnamon-settings-daemon
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../wip/cinnamon-desktop/buildlink3.mk"
diff --git a/colord/buildlink3.mk b/colord/buildlink3.mk
index c3dd4b10b3..ef04ee4d05 100644
--- a/colord/buildlink3.mk
+++ b/colord/buildlink3.mk
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.colord?=	../../wip/colord
 # XXX provides a wrappered API or otherwise does not expose the APIs of the
 # XXX buildlink3 lines below to dependencies, remove them.
 # XXX
-#.include "../../print/cups/buildlink3.mk"
+#.include "../../print/cups-base/buildlink3.mk"
 #.include "../../wip/geocode-glib/buildlink3.mk"
 #.include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 9547cd5b81..17f1560782 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -60,7 +60,7 @@ BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.1
 .include "../../wip/geocode-glib/buildlink3.mk"
 .include "../../wip/libgweather/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/hpoj/Makefile b/hpoj/Makefile
index 39c2de75d0..f0ff4916c3 100644
--- a/hpoj/Makefile
+++ b/hpoj/Makefile
@@ -34,6 +34,6 @@ REPLACE.bash.old=	.*/bin/bash
 REPLACE.bash.new=	${PREFIX}/bin/bash
 REPLACE_FILES.bash=	scripts/ptal-cups.in
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../graphics/sane-backends/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libreoffice-git/Makefile b/libreoffice-git/Makefile
index c61a314a24..7e4b2afa2d 100644
--- a/libreoffice-git/Makefile
+++ b/libreoffice-git/Makefile
@@ -292,7 +292,7 @@ BUILDLINK_API_DEPENDS.libetonyek+=	libetonyek>=0.1.4
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libcmis/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/netatalk/options.mk b/netatalk/options.mk
index 32d6eed675..44a25c2c22 100644
--- a/netatalk/options.mk
+++ b/netatalk/options.mk
@@ -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/qt5-qtbase-git/options.mk b/qt5-qtbase-git/options.mk
index 875523ad6d..9d4f8799a9 100644
--- a/qt5-qtbase-git/options.mk
+++ b/qt5-qtbase-git/options.mk
@@ -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
diff --git a/qt5-qtbase/options.mk b/qt5-qtbase/options.mk
index 40aa94fb5a..9ffd289ec5 100644
--- a/qt5-qtbase/options.mk
+++ b/qt5-qtbase/options.mk
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	cups eglfs gtk3
 PLIST_VARS+=		cups gtk3
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups/buildlink3.mk"
+.  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=	-cups
 PLIST.cups=		yes
 .else
diff --git a/splix/Makefile b/splix/Makefile
index 8ca41ccc91..c6ce881d4e 100644
--- a/splix/Makefile
+++ b/splix/Makefile
@@ -17,5 +17,5 @@ MAKE_ENV+=	rastertoqpdl_CXXFLAGS=-pthread
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wine-devel/options.mk b/wine-devel/options.mk
index 8421f0bb93..9c300b6851 100755
--- a/wine-devel/options.mk
+++ b/wine-devel/options.mk
@@ -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
Prev by Date: Bump PKGREVISION on packages depending on CUPS
Next by Date: Rename "common.mk" to "Makefile.common"
Previous by Thread: Bump PKGREVISION on packages depending on CUPS
Next by Thread: Rename "common.mk" to "Makefile.common"
Indexes:
Home | Main Index | Thread Index | Old Index