Import of pkgsrc-2016Q3

print/gutenprint-lib/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2015/09/13 18:34:54 gdt Exp $
+# $NetBSD: Makefile,v 1.63 2016/09/07 00:20:33 gdt Exp $
 
-VERSION=	5.2.10
+VERSION=	5.2.11
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=	.tar.bz2

print/gutenprint-lib/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2015/09/10 00:10:24 gdt Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/09/07 00:20:33 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -183,6 +183,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_119.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_12.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_120.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_121.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_122.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml

print/gutenprint-lib/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2015/09/13 18:34:54 gdt Exp $
+$NetBSD: distinfo,v 1.17 2016/09/07 00:20:33 gdt Exp $
 
-SHA1 (gutenprint-5.2.10.tar.bz2) = 9690f9bf0a4c4c6c5a35b43d889ca8a3216c766c
-RMD160 (gutenprint-5.2.10.tar.bz2) = 46d214b3371eaa8aa0fc746eba362068668211ab
-Size (gutenprint-5.2.10.tar.bz2) = 6241585 bytes
+SHA1 (gutenprint-5.2.11.tar.bz2) = 2a00c84ebb382c701d95e18b7decf1268bb2b9d2
+RMD160 (gutenprint-5.2.11.tar.bz2) = 30d9eb246ad1aacd34e9c8fec26fe721de79c044
+SHA512 (gutenprint-5.2.11.tar.bz2) = f4010e489dd6763b19113abf1d55e84cea8d36b920d03dbe204dba30ab0d3fb3e3391e739cd1a56e2f63581c8ce4a856a7f747deb6e7b18d7e1f7a3d87901c60
+Size (gutenprint-5.2.11.tar.bz2) = 6570118 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
-SHA1 (patch-src_cups_test-ppds) = 6c547013b0c9b11744f3730e78d2aacc88af9813
 SHA1 (patch-src_main_print-olympus.c) = 48b421344f35216fdd663da075e40ce4fac0382b

print/gutenprint-lib/patches/patch-src_cups_test-ppds

@@ -1,16 +0,0 @@
-$NetBSD: patch-src_cups_test-ppds,v 1.1 2015/09/13 18:34:54 gdt Exp $
-
-Resolves test failure when package is not installed.
-From upstream, and will be in 5.2.11.
-
---- src/cups/test-ppds.orig	2014-02-15 03:44:49.000000000 +0000
-+++ src/cups/test-ppds
-@@ -10,7 +10,7 @@ make EXTRA_GENPPD_OPTS='-b -Z' ppd-clean
- # Also, a number of our media sizes aren't named correctly, but we'll
- # accept those issues rather than cluttering the namespace further and/or
- # changing tag names.
--cupstestppdopts='-I profiles -W sizes'
-+cupstestppdopts='-I profiles -W sizes -I filters'
- 
- ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l`
-