pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update dependencies on print/cups to print/cups-base
details: https://anonhg.NetBSD.org/pkgsrc/rev/a95f7ec0d469
branches: trunk
changeset: 371441:a95f7ec0d469
user: khorben <khorben%pkgsrc.org@localhost>
date: Sun Nov 12 15:36:57 2017 +0000
description:
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@
diffstat:
emulators/wine-devel/options.mk | 4 ++--
emulators/wine/options.mk | 4 ++--
graphics/darktable/Makefile | 4 ++--
lang/openjdk7/Makefile | 4 ++--
lang/openjdk8/Makefile | 4 ++--
misc/libreoffice/Makefile | 4 ++--
net/freerdp/options.mk | 4 ++--
net/netatalk22/options.mk | 4 ++--
net/netatalk3/options.mk | 4 ++--
net/netatalk30/options.mk | 4 ++--
net/samba/options.mk | 4 ++--
net/samba4/options.mk | 4 ++--
print/cups-drivers-Magicolor5440DL/Makefile | 4 ++--
print/cups-pdf/Makefile | 4 ++--
print/cups/buildlink3.mk | 15 ---------------
print/epdfview/options.mk | 4 ++--
print/foomatic-filters-cups/Makefile | 4 ++--
print/foomatic-filters/Makefile | 4 ++--
print/foomatic-ppds-cups/Makefile | 4 ++--
print/foomatic4-filters/Makefile | 4 ++--
print/ghostscript-agpl/buildlink3.mk | 4 ++--
print/ghostscript-gpl/buildlink3.mk | 4 ++--
print/ghostscript-gpl/options.mk | 4 ++--
print/gtklp/Makefile | 4 ++--
print/gutenprint-lib/Makefile | 4 ++--
print/hplip/Makefile | 4 ++--
print/libgnomecups/Makefile | 4 ++--
print/libgnomecups/buildlink3.mk | 4 ++--
print/p5-Net-CUPS/Makefile | 4 ++--
print/py-cups/Makefile | 4 ++--
print/py-cups/buildlink3.mk | 4 ++--
print/qpdfview/Makefile | 4 ++--
print/scribus-qt4/Makefile | 4 ++--
print/xpp/Makefile | 4 ++--
x11/gtk2/options.mk | 4 ++--
x11/gtk3/options.mk | 4 ++--
x11/qt4-libs/options.mk | 4 ++--
x11/qt5-qtbase/options.mk | 4 ++--
38 files changed, 74 insertions(+), 89 deletions(-)
diffs (truncated from 672 to 300 lines):
diff -r 3a850f495c38 -r a95f7ec0d469 emulators/wine-devel/options.mk
--- a/emulators/wine-devel/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/emulators/wine-devel/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
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 -r 3a850f495c38 -r a95f7ec0d469 emulators/wine/options.mk
--- a/emulators/wine/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/emulators/wine/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
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 -r 3a850f495c38 -r a95f7ec0d469 graphics/darktable/Makefile
--- a/graphics/darktable/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/graphics/darktable/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/lang/openjdk7/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/lang/openjdk8/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/misc/libreoffice/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 net/freerdp/options.mk
--- a/net/freerdp/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/freerdp/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
### 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 -r 3a850f495c38 -r a95f7ec0d469 net/netatalk22/options.mk
--- a/net/netatalk22/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/netatalk22/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 net/netatalk3/options.mk
--- a/net/netatalk3/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/netatalk3/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 net/netatalk30/options.mk
--- a/net/netatalk30/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/netatalk30/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 net/samba/options.mk
--- a/net/samba/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/samba/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
###
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 -r 3a850f495c38 -r a95f7ec0d469 net/samba4/options.mk
--- a/net/samba4/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/net/samba4/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
###
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 -r 3a850f495c38 -r a95f7ec0d469 print/cups-drivers-Magicolor5440DL/Makefile
--- a/print/cups-drivers-Magicolor5440DL/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/print/cups-drivers-Magicolor5440DL/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 print/cups-pdf/Makefile
--- a/print/cups-pdf/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/print/cups-pdf/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
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 -r 3a850f495c38 -r a95f7ec0d469 print/cups/buildlink3.mk
--- a/print/cups/buildlink3.mk Sun Nov 12 14:12:18 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3a850f495c38 -r a95f7ec0d469 print/epdfview/options.mk
--- a/print/epdfview/options.mk Sun Nov 12 14:12:18 2017 +0000
+++ b/print/epdfview/options.mk Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
.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 -r 3a850f495c38 -r a95f7ec0d469 print/foomatic-filters-cups/Makefile
--- a/print/foomatic-filters-cups/Makefile Sun Nov 12 14:12:18 2017 +0000
+++ b/print/foomatic-filters-cups/Makefile Sun Nov 12 15:36:57 2017 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index