print/gutenprint-lib: Update to 5.3.3

Upstream changes are voluminous, but essentially there are bugfixes
and improvements and new printers.

4 files changed, 104 insertions, 40 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 83e31da2f10..0f7e7e9e583 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.90 2019/08/11 13:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2019/10/11 23:47:42 gdt Exp $
 
-VERSION=	5.2.15
+INSTALLVERSION=	5.3
+VERSION=	${INSTALLVERSION}.3
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	gdt@NetBSD.org
 COMMENT=	Drivers for Canon, Epson, Lexmark, and PCL printers
@@ -16,7 +16,6 @@ LICENSE=	gnu-gpl-v2
 
 PREV_PKGPATH=	print/gutenprint51-lib
 
-INSTALLVERSION=	5.2
 PLIST_SUBST+=	INSTALLVERSION=${INSTALLVERSION}
 PRINT_PLIST_AWK+=	{ gsub("gutenprint/${INSTALLVERSION}", \
 				"gutenprint/$${INSTALLVERSION}") }
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index 78784be10a4..2dde159bc38 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/09/02 16:34:58 gdt Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/10/11 23:47:42 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -20,8 +20,10 @@ include/gutenprint/mxml.h
 include/gutenprint/paper.h
 include/gutenprint/path.h
 include/gutenprint/printers.h
+include/gutenprint/refcache.h
 include/gutenprint/sequence.h
 include/gutenprint/string-list.h
+include/gutenprint/types.h
 include/gutenprint/util.h
 include/gutenprint/vars.h
 include/gutenprint/weave.h
@@ -31,6 +33,7 @@ include/gutenprintui2/gammacurve.h
 include/gutenprintui2/gutenprintui.h
 include/gutenprintui2/typebuiltins.h
 lib/gimp/2.0/plug-ins/gutenprint
+lib/gutenprint/${INSTALLVERSION}/config.summary
 lib/libgutenprint.la
 lib/libgutenprintui2.la
 lib/pkgconfig/gutenprint.pc
@@ -46,9 +49,9 @@ man/man8/cups-genppdupdate.8
 sbin/cups-genppd.${INSTALLVERSION}
 sbin/cups-genppdupdate
 share/cups/calibrate.ppm
-share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-1x1.xml
-share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-2x1.xml
-share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-4x1.xml
+share/gutenprint/${INSTALLVERSION}/xml/dither/matrix-1x1.xml
+share/gutenprint/${INSTALLVERSION}/xml/dither/matrix-2x1.xml
+share/gutenprint/${INSTALLVERSION}/xml/dither/matrix-4x1.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c120.xml
@@ -56,6 +59,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c64.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c82.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/claria.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/claria_xp.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/cmy.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/cmykrb.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/cmykro.xml
@@ -124,6 +128,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c82.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/claria.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/claria1400.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/claria_xp.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cmy.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cmykrb.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cmykro.xml
@@ -161,6 +166,40 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/wf500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/x80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/mediasizes/standard.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/baseline_300.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/baseline_360.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/bx.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c1xx.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c2x.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c4x.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c7xx.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c8x.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/c8x_base.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/cpro.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/photo2.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/picmate.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3_base.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3_cutter.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10_base.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10a.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10b.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x000.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x500.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x600.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x700.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x800.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x880.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/r200.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/r240.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/r800.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/sc800.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/sp700.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/sp750.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/sp950.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/wf7xxx.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_1.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_10.xml
@@ -176,7 +215,6 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_108.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_109.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_11.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_110.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_111.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_112.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_113.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_114.xml
@@ -199,12 +237,15 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_129.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_130.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_131.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_132.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_133.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_134.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_135.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_16.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_17.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_18.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_19.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_2.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_20.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_21.xml
@@ -220,7 +261,6 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_30.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_31.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_32.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_33.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_34.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_35.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_36.xml
@@ -248,7 +288,6 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_55.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_56.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_57.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_58.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_59.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_6.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_60.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_61.xml
@@ -299,12 +338,30 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/prox900.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/v2880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/wf40.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/c8x.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/escp2-i.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/prox600.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sc480.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sc680.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sc740.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sc860.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sp700.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/sp720.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/wf6xx.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7600.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/standard.xml
-share/gutenprint/${INSTALLVERSION}/xml/papers.xml
-share/gutenprint/${INSTALLVERSION}/xml/printers.xml
+share/gutenprint/${INSTALLVERSION}/xml/papers/labels.xml
+share/gutenprint/${INSTALLVERSION}/xml/papers/standard.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/canon.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/dpl.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/dyesub.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/escp2.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/lexmark.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/pcl.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/ps.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers/raw.xml
 share/gutenprint/doc/AUTHORS
 share/gutenprint/doc/COPYING
 share/gutenprint/doc/ChangeLog
@@ -314,25 +371,6 @@ share/gutenprint/doc/README
 share/gutenprint/doc/gutenprint-users-manual.odt
 share/gutenprint/doc/gutenprint-users-manual.pdf
 share/gutenprint/doc/gutenprint.pdf
-share/gutenprint/doc/reference-html/book1.html
-share/gutenprint/doc/reference-html/c1714.html
-share/gutenprint/doc/reference-html/c193.html
-share/gutenprint/doc/reference-html/c1965.html
-share/gutenprint/doc/reference-html/c199.html
-share/gutenprint/doc/reference-html/c38.html
-share/gutenprint/doc/reference-html/c463.html
-share/gutenprint/doc/reference-html/c47.html
-share/gutenprint/doc/reference-html/docbook.css
-share/gutenprint/doc/reference-html/f14.html
-share/gutenprint/doc/reference-html/gpl-terms.html
-share/gutenprint/doc/reference-html/gpl.html
-share/gutenprint/doc/reference-html/ln10.html
-share/gutenprint/doc/reference-html/x1666.html
-share/gutenprint/doc/reference-html/x1731.html
-share/gutenprint/doc/reference-html/x270.html
-share/gutenprint/doc/reference-html/x66.html
-share/gutenprint/doc/reference-html/x78.html
-share/gutenprint/doc/reference-html/x952.html
 share/gutenprint/samples/colorbars4.png
 share/gutenprint/samples/colorsweep.png
 share/gutenprint/samples/extended.sample
@@ -390,4 +428,4 @@ share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
 share/locale/zh_CN/gutenprint_zh_CN.po
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/gutenprint_zh_TW.po
-@pkgdir lib/gutenprint/${INSTALLVERSION}/modules
+@pkgdir share/gutenprint/doc/reference-html
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index b25723196d9..16d6a7f4785 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2019/06/17 17:04:58 gdt Exp $
+$NetBSD: distinfo,v 1.24 2019/10/11 23:47:42 gdt Exp $
 
-SHA1 (gutenprint-5.2.15.tar.bz2) = e858fe3c56bb6ed957250fd6cc978b799f0f73c8
-RMD160 (gutenprint-5.2.15.tar.bz2) = a25e843268ecad7f19f51fcd6778412562d2d14d
-SHA512 (gutenprint-5.2.15.tar.bz2) = 4ec0bde1bdfe57c2ba28ce25cc219b705e7be130393064483bf25d2407991ff2dc67138d2ea278b005dd2727ebd91eecec8d7d9b4eab45419943fa0e8aa6b4eb
-Size (gutenprint-5.2.15.tar.bz2) = 7151306 bytes
+SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59
+RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337
+SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
+Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
+SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8
diff --git a/print/gutenprint-lib/patches/patch-configure b/print/gutenprint-lib/patches/patch-configure
new file mode 100644
index 00000000000..4b664526cf8
--- /dev/null
+++ b/print/gutenprint-lib/patches/patch-configure
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure,v 1.1 2019/10/11 23:47:42 gdt Exp $
+
+Remediate bashism.
+
+Not yet filed upstream.
+
+--- configure.orig	2019-08-25 15:14:21.000000000 +0000
++++ configure
+@@ -12747,7 +12747,7 @@ if test "${with_cups+set}" = set; then :
+   withval=$with_cups; case "${withval}" in
+ 
+     yes)
+-         if test "$FOUND_CUPS_CONFIG" == "yes" ; then
++         if test "$FOUND_CUPS_CONFIG" = "yes" ; then
+ 	   BUILD_CUPS="yes"
+ 	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -12776,7 +12776,7 @@ else
+              fi
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_CUPS}" >&5
+ $as_echo "${BUILD_CUPS}" >&6; } ;
+-     if test "$FOUND_CUPS_CONFIG" == "yes" ; then
++     if test "$FOUND_CUPS_CONFIG" = "yes" ; then
+        cups_prefix="${prefix}"
+        BUILD_CUPS="yes"
+      else