pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Switch all cups15 packages to use cups.
details: https://anonhg.NetBSD.org/pkgsrc/rev/99a6910df5ed
branches: trunk
changeset: 362605:99a6910df5ed
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Fri May 19 13:18:17 2017 +0000
description:
Switch all cups15 packages to use cups.
diffstat:
emulators/wine-devel/options.mk | 4 ++--
emulators/wine/options.mk | 4 ++--
meta-pkgs/desktop-gnome/Makefile | 4 ++--
net/netatalk3/options.mk | 4 ++--
net/netatalk30/options.mk | 4 ++--
net/samba/options.mk | 4 ++--
print/adobeps-win/Makefile | 4 ++--
print/cups-drivers-Magicolor5440DL/Makefile | 4 ++--
print/cups-pdf/Makefile | 4 ++--
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/scribus/Makefile | 4 ++--
x11/gtk2/options.mk | 4 ++--
x11/gtk3/options.mk | 4 ++--
x11/kdelibs3/buildlink3.mk | 4 ++--
x11/kdelibs3/options.mk | 4 ++--
x11/qt3-libs/Makefile.common | 4 ++--
x11/qt4-libs/options.mk | 4 ++--
x11/qt5-qtbase/options.mk | 4 ++--
35 files changed, 70 insertions(+), 70 deletions(-)
diffs (truncated from 620 to 300 lines):
diff -r 8f7bd3eb934d -r 99a6910df5ed emulators/wine-devel/options.mk
--- a/emulators/wine-devel/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/emulators/wine-devel/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2016/09/18 17:53:41 maya Exp $
+# $NetBSD: options.mk,v 1.10 2017/05/19 13:18:17 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cups
.endif
diff -r 8f7bd3eb934d -r 99a6910df5ed emulators/wine/options.mk
--- a/emulators/wine/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/emulators/wine/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2017/05/19 13:18:17 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cups
.endif
diff -r 8f7bd3eb934d -r 99a6910df5ed meta-pkgs/desktop-gnome/Makefile
--- a/meta-pkgs/desktop-gnome/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/meta-pkgs/desktop-gnome/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/08/06 12:21:03 obache Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/19 13:18:17 prlw1 Exp $
#
DISTNAME= desktop-gnome-0.5
@@ -15,7 +15,7 @@
# implements http://wiki.netbsd.se/Desktop_Phase_1
#
DEPENDS+= pkgin-[0-9]*:../../pkgtools/pkgin
-DEPENDS+= cups-[0-9]*:../../print/cups15
+DEPENDS+= cups-[0-9]*:../../print/cups
DEPENDS+= firefox-[0-9]*:../../www/firefox
DEPENDS+= gnome-[0-9]*:../../meta-pkgs/gnome
DEPENDS+= gimp-[0-9]*:../../graphics/gimp
diff -r 8f7bd3eb934d -r 99a6910df5ed net/netatalk3/options.mk
--- a/net/netatalk3/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/net/netatalk3/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/11/07 00:45:30 christos Exp $
+# $NetBSD: options.mk,v 1.2 2017/05/19 13:18:17 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
.else
CONFIGURE_ARGS+= --disable-cups
diff -r 8f7bd3eb934d -r 99a6910df5ed net/netatalk30/options.mk
--- a/net/netatalk30/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/net/netatalk30/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/02/07 20:34:54 szptvlfn Exp $
+# $NetBSD: options.mk,v 1.4 2017/05/19 13:18:17 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
.else
CONFIGURE_ARGS+= --disable-cups
diff -r 8f7bd3eb934d -r 99a6910df5ed net/samba/options.mk
--- a/net/samba/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/net/samba/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.36 2016/03/18 12:28:21 jperkin Exp $
+# $NetBSD: options.mk,v 1.37 2017/05/19 13:18:18 prlw1 Exp $
# Recommended package options for various setups:
#
@@ -59,7 +59,7 @@
###
PLIST_VARS+= cups
.if !empty(PKG_OPTIONS:Mcups)
-. include "../../print/cups15/buildlink3.mk"
+. include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
PLIST.cups= yes
INSTALLATION_DIRS+= libexec/cups/backend
diff -r 8f7bd3eb934d -r 99a6910df5ed print/adobeps-win/Makefile
--- a/print/adobeps-win/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/adobeps-win/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/08/29 23:04:38 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
DISTNAME= winsteng
PKGNAME= adobeps-win-1.0.6
@@ -12,7 +12,7 @@
COMMENT= Adobe PostScript MS Windows drivers for CUPS/Samba
BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
-DEPENDS+= cups>=1.1.15<1.7:../../print/cups15
+DEPENDS+= cups>=1.1.15:../../print/cups
DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}
diff -r 8f7bd3eb934d -r 99a6910df5ed print/cups-drivers-Magicolor5440DL/Makefile
--- a/print/cups-drivers-Magicolor5440DL/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/cups-drivers-Magicolor5440DL/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/03/05 11:29:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/19 13:18:18 prlw1 Exp $
#
DISTNAME= 5440DL_lin64bit_1_2_1
@@ -33,5 +33,5 @@
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 8f7bd3eb934d -r 99a6910df5ed print/cups-pdf/Makefile
--- a/print/cups-pdf/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/cups-pdf/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/19 13:18:18 prlw1 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/cups15
+DEPENDS+= cups-[0-9]*:../../print/cups
USE_TOOLS+= perl:run
REPLACE_PERL+= contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch
diff -r 8f7bd3eb934d -r 99a6910df5ed print/epdfview/options.mk
--- a/print/epdfview/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/print/epdfview/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2017/05/19 13:18:18 prlw1 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/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --with-cups
.else
CONFIGURE_ARGS+= --without-cups
diff -r 8f7bd3eb934d -r 99a6910df5ed print/foomatic-filters-cups/Makefile
--- a/print/foomatic-filters-cups/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/foomatic-filters-cups/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2017/05/19 13:18:18 prlw1 Exp $
META_PACKAGE= yes
@@ -10,7 +10,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Foomatic support for CUPS
-DEPENDS+= cups>=1.0:../../print/cups15
+DEPENDS+= cups>=1.0:../../print/cups
DEPENDS+= foomatic-filters-${FOOMATIC_FILTERS_VERSION}{,nb[0-9]*}:../../print/foomatic-filters
WRKSRC= ${WRKDIR}
diff -r 8f7bd3eb934d -r 99a6910df5ed print/foomatic-filters/Makefile
--- a/print/foomatic-filters/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/foomatic-filters/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/09/03 14:21:25 mef Exp $
+# $NetBSD: Makefile,v 1.33 2017/05/19 13:18:18 prlw1 Exp $
.include "Makefile.common"
@@ -42,7 +42,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+= {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups15
+DEPENDS+= {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
.else
DEPENDS+= ${TEXTTOPS_DEPENDS}:../../print/mpage
.endif
diff -r 8f7bd3eb934d -r 99a6910df5ed print/foomatic-ppds-cups/Makefile
--- a/print/foomatic-ppds-cups/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/foomatic-ppds-cups/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
META_PACKAGE= yes
@@ -10,7 +10,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Foomatic PPD collection for CUPS servers
-DEPENDS+= cups>=1.0:../../print/cups15
+DEPENDS+= cups>=1.0:../../print/cups
DEPENDS+= foomatic-ppds-${FOOMATIC_PPDS_VERSION}{,nb[0-9]*}:../../print/foomatic-ppds
WRKSRC= ${WRKDIR}
diff -r 8f7bd3eb934d -r 99a6910df5ed print/foomatic4-filters/Makefile
--- a/print/foomatic4-filters/Makefile Fri May 19 12:35:13 2017 +0000
+++ b/print/foomatic4-filters/Makefile Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/05/19 13:18:18 prlw1 Exp $
DISTNAME= foomatic-filters-4.0.17
PKGREVISION= 9
@@ -36,7 +36,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+= cups>=1.0:../../print/cups15
+DEPENDS+= cups>=1.0:../../print/cups
CUPS_FILTERDIR= ${LOCALBASE}/libexec/cups/filter
CONFIGURE_ENV+= CUPS_FILTERS=${CUPS_FILTERDIR}
FILES_SUBST+= CUPS_FILTERDIR=${CUPS_FILTERDIR}
diff -r 8f7bd3eb934d -r 99a6910df5ed print/ghostscript-agpl/buildlink3.mk
--- a/print/ghostscript-agpl/buildlink3.mk Fri May 19 12:35:13 2017 +0000
+++ b/print/ghostscript-agpl/buildlink3.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/08/12 22:27:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
BUILDLINK_TREE+= ghostscript-agpl
@@ -16,7 +16,7 @@
.include "../../mk/pkg-build-options.mk"
#.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
-#.include "../../print/cups15/buildlink3.mk"
+#.include "../../print/cups/buildlink3.mk"
#.endif
.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mfontconfig)
diff -r 8f7bd3eb934d -r 99a6910df5ed print/ghostscript-gpl/buildlink3.mk
--- a/print/ghostscript-gpl/buildlink3.mk Fri May 19 12:35:13 2017 +0000
+++ b/print/ghostscript-gpl/buildlink3.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
BUILDLINK_TREE+= ghostscript-gpl
@@ -16,7 +16,7 @@
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mfontconfig)
diff -r 8f7bd3eb934d -r 99a6910df5ed print/ghostscript-gpl/options.mk
--- a/print/ghostscript-gpl/options.mk Fri May 19 12:35:13 2017 +0000
+++ b/print/ghostscript-gpl/options.mk Fri May 19 13:18:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2017/05/19 13:18:18 prlw1 Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8
@@ -42,7 +42,7 @@
SUBST_FILES.cupsetc= cups/cups.mak
SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
-.include "../../print/cups15/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index