[pkgsrc/trunk]: pkgsrc/print/gutenprint-lib Update to 5.1.12

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccf6018d7e4d
branches:  trunk
changeset: 359692:ccf6018d7e4d
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Mar 16 13:17:54 2017 +0000

description:
Update to 5.1.12

Upstream change summary (see NEWS for details):

  *) The Ghostscript IJS driver and Foomatic data generator have been
     removed.  CUPS is ubiquitous on Linux/UNIX systems, and the
     Ghostscript IJS driver and Foomatic data are not needed with
     CUPS.

  *) New/improved support for many dyesub printers, including media
     status reporting.

  *) Added/improved support for many printers.

  *) Removed support for Brother HL-1430.

diffstat:

 print/gutenprint-lib/Makefile                               |  21 +------
 print/gutenprint-lib/PLIST                                  |  39 ++++++++----
 print/gutenprint-lib/distinfo                               |  11 +--
 print/gutenprint-lib/patches/patch-src_main_print-olympus.c |  19 ------
 4 files changed, 33 insertions(+), 57 deletions(-)

diffs (184 lines):

diff -r f965ada14cf9 -r ccf6018d7e4d print/gutenprint-lib/Makefile
--- a/print/gutenprint-lib/Makefile     Thu Mar 16 13:03:42 2017 +0000
+++ b/print/gutenprint-lib/Makefile     Thu Mar 16 13:17:54 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2017/02/12 06:25:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2017/03/16 13:17:54 gdt Exp $
 
-VERSION=       5.2.11
+VERSION=       5.2.12
 DISTNAME=      gutenprint-${VERSION}
 PKGNAME=       gutenprint-lib-${VERSION}
-PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=  .tar.bz2
@@ -27,9 +26,6 @@
 USE_PKGLOCALEDIR=      YES
 USE_LIBTOOL=           YES
 
-# gcc 3.3.3 either can't compile this, or needs huge amounts of RAM (0.5G+).
-# Observed on NetBSD/i386 3 and confirmed with upstream.  Apparently it's
-# just 3.3.3 - there are no known issues with 2.95 or 4.x.
 USE_LANGUAGES+=                c99
 
 GNU_CONFIGURE=         YES
@@ -73,21 +69,13 @@
 # the effort.
 CONFIGURE_ARGS+= --enable-escputil
 
-# test pattern generator.  Small, so let it be built
+# test pattern generator.  Small, so let it be built.
 #CONFIGURE_ARGS+=      --enable-test
 #CONFIGURE_ARGS+=      --enable-testpattern
 
 # CUPS support, on by default.  This should be in a split package.
 #CONFIGURE_ARGS+=      --with-cups
 
-# 201105: Reevaluate what this means and whether we want it.
-# Foomatic support.  This should be in a split package, if at all.
-CONFIGURE_ARGS+=       --without-foomatic
-CONFIGURE_ARGS+=       --without-foomatic3
-
-# Ghostscript support.  This should be in a split package, if at all.
-CONFIGURE_ARGS+=       --without-ghostscript
-
 # Something in gutenprint seems to use readline, but it's not clear
 # why, so just disable it to reduce dependencies.
 CONFIGURE_ARGS+=       --without-readline
@@ -98,9 +86,6 @@
 
 # XXX Make command.types be a CONF_FILE
 
-# Tests fail unless the package is installed because they use
-# /usr/pkg/libexec/cups/filter/rastertogutenprint.5.2 rather than
-# the pre-installed version.  Reported upstream 20150910.
 TEST_TARGET=           check
 
 # A libintl is optional in gutenprint.
diff -r f965ada14cf9 -r ccf6018d7e4d print/gutenprint-lib/PLIST
--- a/print/gutenprint-lib/PLIST        Thu Mar 16 13:03:42 2017 +0000
+++ b/print/gutenprint-lib/PLIST        Thu Mar 16 13:17:54 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/09/07 00:20:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2017/03/16 13:17:54 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -86,6 +86,8 @@
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k34.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10a.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10b.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v4.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml
@@ -94,6 +96,7 @@
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf40.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/x80.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/xp100.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd.xml
@@ -149,6 +152,8 @@
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10a.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10b.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/r800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml
@@ -184,6 +189,12 @@
 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_123.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_124.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_125.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_126.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_127.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_128.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
@@ -301,24 +312,24 @@
 share/gutenprint/doc/gutenprint-users-manual.pdf
 share/gutenprint/doc/gutenprint.pdf
 share/gutenprint/doc/reference-html/book1.html
-share/gutenprint/doc/reference-html/c1715.html
-share/gutenprint/doc/reference-html/c194.html
-share/gutenprint/doc/reference-html/c1966.html
-share/gutenprint/doc/reference-html/c200.html
-share/gutenprint/doc/reference-html/c39.html
-share/gutenprint/doc/reference-html/c464.html
-share/gutenprint/doc/reference-html/c48.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/x1667.html
-share/gutenprint/doc/reference-html/x1732.html
-share/gutenprint/doc/reference-html/x271.html
-share/gutenprint/doc/reference-html/x67.html
-share/gutenprint/doc/reference-html/x79.html
-share/gutenprint/doc/reference-html/x953.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
diff -r f965ada14cf9 -r ccf6018d7e4d print/gutenprint-lib/distinfo
--- a/print/gutenprint-lib/distinfo     Thu Mar 16 13:03:42 2017 +0000
+++ b/print/gutenprint-lib/distinfo     Thu Mar 16 13:17:54 2017 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2016/09/07 00:20:33 gdt Exp $
+$NetBSD: distinfo,v 1.18 2017/03/16 13:17:54 gdt Exp $
 
-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 (gutenprint-5.2.12.tar.bz2) = e3f85d2559e6f53b2e65124d657f33a21960ab9a
+RMD160 (gutenprint-5.2.12.tar.bz2) = 0ab975effa4edece344fec02d0db04afdea0cc25
+SHA512 (gutenprint-5.2.12.tar.bz2) = 38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e
+Size (gutenprint-5.2.12.tar.bz2) = 6898738 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
-SHA1 (patch-src_main_print-olympus.c) = 48b421344f35216fdd663da075e40ce4fac0382b
diff -r f965ada14cf9 -r ccf6018d7e4d print/gutenprint-lib/patches/patch-src_main_print-olympus.c
--- a/print/gutenprint-lib/patches/patch-src_main_print-olympus.c       Thu Mar 16 13:03:42 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_main_print-olympus.c,v 1.1 2015/09/11 12:50:34 gdt Exp $
-
-Fix endian detection to be like other uses in gutenprint.
-Reported upstream 20150909.
-
---- src/main/print-olympus.c.orig      2014-05-15 01:18:36.000000000 +0000
-+++ src/main/print-olympus.c
-@@ -4901,9 +4901,9 @@ dyesub_do_print(stp_vars_t *v, stp_image
-   }
- 
-   if (pv.bytes_per_ink_channel > 1) {
--#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-     pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
--#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-     pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
- #else
- #error "Unable to determine endianness, aborting compilation!"