cups{,-base}: Update print/cups{,-base} to 2.2.6

pkgsrc changes:
- s/ghostscript/cups-filters/ in MESSAGE (most missing parts needed to use
  non-PS printers are provided by print/cups-filters)
- Define GITHUB_PROJECT to just `cups' (not `cups-base', as PKGBASE).
  This fixes fetching of the distfile from the MASTER_SITES.

Changes:
CUPS v2.2.6
-----------
- DBUS notifications could crash the scheduler (Issue #5143)
- Added USB quirks rules for Canon MP540 and Samsung ML-2160 (Issue #5148)
- Fixed TLS cipher suite selection with GNU TLS (Issue #5145, Issue #5150)
- Localization updates (Issue #5152)

5 files changed, 12 insertions, 13 deletions

diff --git a/print/cups-base/MESSAGE b/print/cups-base/MESSAGE
index 143d935fc93..41de5b26f31 100644
--- a/print/cups-base/MESSAGE
+++ b/print/cups-base/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: MESSAGE,v 1.2 2017/12/02 20:02:35 leot Exp $
 
-You will need to also install print/ghostscript if you wish to
+You will need to also install print/cups-filters if you wish to
 print to non-Postscript printers.
 
 You may install additional PPD files for other printer models into
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 8d77828e815..da726605ba3 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2017/11/23 17:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2017/12/02 20:02:35 leot Exp $
 
-PKGREVISION= 1
 .include "../../print/cups/Makefile.common"
 
 DISTNAME=	cups-${CUPS_VERS}-source
@@ -13,6 +12,7 @@ HOMEPAGE=	https://www.cups.org/
 COMMENT=	Common UNIX Printing System
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
+GITHUB_PROJECT=	cups
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 CONFLICTS+=	LPRng-[0-9]* LPRng-core-[0-9]*
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 94b2cb01cd0..a4e81ba7d90 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: distinfo,v 1.2 2017/12/02 20:02:35 leot Exp $
 
-SHA1 (cups-2.2.5-source.tar.gz) = b6b1967e0329768708f89b42adb4c6810a77a195
-RMD160 (cups-2.2.5-source.tar.gz) = fc69142955bfdf30668598ca2c8dcb553ea8eaee
-SHA512 (cups-2.2.5-source.tar.gz) = 5c824e74e2679de360ff1f95aa74013ca2d6a88d11d18041e7a5b51746c2a21bbc10da785791ea4e40d316167560982466789767018bd02676cf810ad0c3a5c9
-Size (cups-2.2.5-source.tar.gz) = 10314038 bytes
+SHA1 (cups-2.2.6-source.tar.gz) = b5e3389fb9450bfed377c95c0230c029c053acc4
+RMD160 (cups-2.2.6-source.tar.gz) = 7f4689e9102916d4190ffbb958e58d447c0fa146
+SHA512 (cups-2.2.6-source.tar.gz) = 52aa26acf5d38de5a4867c70f5b3006cb84fe5b362876c2f907872107bbac3d95fb249389546745249ad24d032963ac2d70f98a0884427a974c5bc4edc199c45
+Size (cups-2.2.6-source.tar.gz) = 10315433 bytes
 SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200
 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8ab01bf769d..e33e12514b2 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.253 2017/11/23 17:20:09 wiz Exp $
+# $NetBSD: Makefile,v 1.254 2017/12/02 20:02:34 leot Exp $
 
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=	cups-${CUPS_VERS}
-PKGREVISION=	2
 MASTER_SITES=	# empty
 
 MAINTAINER=	sbd@NetBSD.org
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 7b41544a5f3..4dee8fd8eda 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2017/11/12 14:10:15 khorben Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/12/02 20:02:34 leot Exp $
 #
 # used by print/cups/Makefile
 # used by print/cups-base/Makefile
 
-CUPS_VERS=	2.2.5
+CUPS_VERS=	2.2.6
 DISTNAME=	cups-${CUPS_VERS}-source
 CATEGORIES=	print