Update to 1.0.58:

CHANGES IN V1.0.58

	- pdftoraster: Changed ICC profile get function to accept a
	  PPD fallback profile.
	- pdftoraster: Fixed handling of cupsColorSpaces 18,19,20.
	- rastertopdf: Added test feature to force color management if
	  "profile=" option is specified.
	- rastertopdf: Grayscale color conversion now properly inverts
          bits.
	- rastertopdf: Code cleanup for prepare_pdf_page().
	- rastertopdf: Implemented basic 8bit->8bit color space
	  conversions.
	- rastertopdf: Added black point compensation.
	- rastertopdf: Added handling of color rendering intent.
	- gstoraster, imagetoraster, pdftoraster, rastertopclx,
	  rastertopdf, foomatic-rip: Use color management functions in
	  libcupsfilters.
	- libcupsfilters: Modified code formatting and documentation in
	  the color management functions.
	- libcupsfilters: Fixed string handling and added debug log
          messages in the color management functions.
	- libcupsfilters: Fixed Adobe RGB matrix for proper rendering
          (transpose)
	- libcupsfilters: Moved color management functions from the
	  individual filters to the libcupsfilters library.

CHANGES IN V1.0.57

	- rastertopclx: Fixed implicit declaration of
          colord_get_inhibit_for_device_id.
	- Build system: Explicitly link to libm as -lm was dropped
          from cups-config --libs.
	- libcupsfilters, foomaticrip, gstoraster, imagetoraster,
          pdftoraster, rastertopclx, rastertopdf: Handle absence of
          colord or D-Bus gracefully (Ubuntu bug #1356405).

CHANGES IN V1.0.56

	- rastertopdf: Some code polishing and removal of now unneeded
	  functions
	- rastertopdf: Reduced color space handling to only
	  PWG-supported color spaces
	- rastertopdf: Added colorspace calibration function; included
	  optional "/Alternate" PDF key for ICC profile embedding
	- rastertopdf: Colorspace sRGB now embeds srgb icc profile;
	  implemented ICC Profile embedding (PDF 1.3 spec)
	- rastertopdf: Added basic color calibration
	- rastertopdf: Implemented ICC Profile creation code for IPP
	  Everywhere (from PWG raster)
	- pdftoraster: Added colord handling of ICC profiles
	- kmdevices.cpp/.h: Added interface for Kolor Manager
	- cups-browsed: Do not consider a remote CUPS queue as raw if
	  the TXT record is NULL as for queues broadcasted by the
	  legacy CUPS method the TXT record does not exist. Now
	  consider a queue with NULL TXT record only as raw if the
	  domain entry is not empty (which tells that the queue is
	  Bonjour-broadcasted (Bug #1223).
	- cups-browsed: Do also not mark a discovered printer as
	  already provided by another server when the other server's
	  queue has "unconfirmed" status. Mark the other queue with
	  "disappeared" or "unconfirmed" status as duplicate of the
	  discovered printer so that the new queue for the discovered
	  printer does not get removed when the entry for the other
	  queue times out.

CHANGES IN V1.0.55

	- pdftopdf: Fixed manual duplex by adding a blank page to evn
          pages if the total number of pages of the document is
          odd. Otherwise the last page of the document would stay in
          the input tray. This fixes also a side effect as the set of
          even pages reducing to a zero page job if the job consists
          of only one page, making Poppler's pdftops error out (Ubuntu
          bug #1340435).
	- cups-browsed: Do not mark a discovered printer as already
          provided by another server when the other server's queue has
          "disappeared" status. This queue can be from the same server
          before it changed its name.
	- cups-browsed: Do not create a local queue pointing to a
	  remote raw queue (Ubuntu bug #1335211).
	- foomatic-rip, imagetoraster, pdftoraster, rastertopclx,
	  rastertopdf: Added colord "device_inhibit" support for
	  color-managed filters.
	- foomatic-rip: Let it also build correctly on systems which
	  already provide the strlcat() and strlcpy() functions, like
	  Mac OS X. Thanks to Matt Broughton for reporting this
	  (bug #1215).
	- bannertopdf: Added support for PPD-less printing, especially
	  one gets a useful test page with PPD-less queues now.
	- bannertopdf: Fixed "Printer Location" and "Driver Version"
	  entries on the test page/the banners.
	- bannertopdf: Added new PDF template files which contain the
	  text strings appropriate to the banners, before the banners
	  were all equal, without text. Thanks to Johannes Meixner
	  from SUSE/Novell for this fix (Bug #1209).
	- bannertopdf: Fixed Makefile to mark it dependent on
	  libfontembed.la. Thanks to Tim Waugh from Red Hat for the
	  patch (Red Hat bug #1106101).
	- pstopdf: Use "grep -E" instead of "grep -P" as the latter
	  generates executable code and executes it, requiring
	  "execmem" privileges which could be not available in some
	  security policies. Thanks to Tim Waugh from Red Hat for the
	  patch (Red Hat bug #1079534).
	- foomatic-rip: NetBSD does not provide a mkstemps() function,
	  use appropriate workaround then (Bug #1211).
	- cups-browsed: Reorder inclusion of headers for compatibility
	  with NetBSD (Bug #1212).
	- pdftoraster: Fixed segfault caused by introduction of
	  "no-color-management" option (Bug #1214).
	- libcupsfilters: Let cupsRasterParseIPPOptions() also accept
	  "pwg-raster-document-type" settings with hyphen between
	  color space name and color depth.

5 files changed, 14 insertions, 52 deletions

diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index f8426baaa54..8cc4298e29b 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2014/08/22 21:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/09/07 20:43:49 wiz Exp $
 
-DISTNAME=	cups-filters-1.0.54
-PKGREVISION=	3
+DISTNAME=	cups-filters-1.0.58
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
diff --git a/print/cups-filters/PLIST b/print/cups-filters/PLIST
index a58925bf0ad..3a785ef6123 100644
--- a/print/cups-filters/PLIST
+++ b/print/cups-filters/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2014/08/22 21:58:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/09/07 20:43:49 wiz Exp $
 bin/ttfread
 include/cupsfilters/colord.h
+include/cupsfilters/colormanager.h
 include/cupsfilters/driver.h
 include/cupsfilters/image.h
 include/cupsfilters/raster.h
@@ -52,13 +53,19 @@ share/cups/banners/unclassified
 share/cups/charsets/pdf.utf-8
 share/cups/charsets/pdf.utf-8.heavy
 share/cups/charsets/pdf.utf-8.simple
+share/cups/data/classified.pdf
+share/cups/data/confidential.pdf
 share/cups/data/default-testpage.pdf
 share/cups/data/default.pdf
 share/cups/data/form_english.pdf
 share/cups/data/form_english_in.odt
 share/cups/data/form_russian.pdf
 share/cups/data/form_russian_in.odt
+share/cups/data/secret.pdf
+share/cups/data/standard.pdf
 share/cups/data/testprint
+share/cups/data/topsecret.pdf
+share/cups/data/unclassified.pdf
 share/cups/drv/cupsfilters.drv
 share/cups/mime/cupsfilters.convs
 share/cups/mime/cupsfilters.types
diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index ef543ee6d7d..8cf7da3905f 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/08/23 19:58:17 schnoebe Exp $
+$NetBSD: distinfo,v 1.6 2014/09/07 20:43:49 wiz Exp $
 
-SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c
-RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833
-Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes
-SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb
+SHA1 (cups-filters-1.0.58.tar.xz) = ec242d32123f654060c4d2a78f9e010bb2676c20
+RMD160 (cups-filters-1.0.58.tar.xz) = 4b17f25f7fd2d6fb272c912faf612f93bc41fa7b
+Size (cups-filters-1.0.58.tar.xz) = 1322988 bytes
 SHA1 (patch-mime_cupsfilters.conf) = cf2a7a0cd5df02b95d0c5d41c1091c51bcd6bc83
-SHA1 (patch-utils_cups-browsed.c) = e5257ca911b3ecd1def42dafbe3f649412555fb8
diff --git a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c
deleted file mode 100644
index 833345fd39f..00000000000
--- a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.2 2014/06/07 13:53:41 wiz Exp $
-
-mkstemps doesn't exist on NetBSD either.
-(Should be a configure test instead.)
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1211
-
---- filter/foomatic-rip/foomaticrip.c.orig	2014-06-06 08:49:59.000000000 +0000
-+++ filter/foomatic-rip/foomaticrip.c
-@@ -740,7 +740,7 @@ int main(int argc, char** argv)
-         debug = 1;
- 
-     if (debug) {
--#ifdef __UCLIBC__
-+#if defined(__UCLIBC__) || defined(__NetBSD__)
- 	sprintf(tmp, "%s-log-XXXXXX", LOG_FILE);
- 	int fd = mkstemp (tmp);
- #else
diff --git a/print/cups-filters/patches/patch-utils_cups-browsed.c b/print/cups-filters/patches/patch-utils_cups-browsed.c
deleted file mode 100644
index aa7f9ea35ff..00000000000
--- a/print/cups-filters/patches/patch-utils_cups-browsed.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-utils_cups-browsed.c,v 1.3 2014/08/23 19:58:17 schnoebe Exp $
-
-Move header below those providing u_int on NetBSD.
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1212
-
---- utils/cups-browsed.c.orig	2014-05-07 14:09:53.000000000 +0000
-+++ utils/cups-browsed.c
-@@ -23,15 +23,15 @@
- 
- #include <ctype.h>
- #include <errno.h>
--#include <ifaddrs.h>
-+#include <sys/types.h>
- #if defined(__OpenBSD__)
- #include <sys/socket.h>
- #endif /* __OpenBSD__ */
- #include <net/if.h>
- #include <netinet/in.h>
-+#include <ifaddrs.h>
- #include <resolv.h>
- #include <stdio.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
- #include <stdlib.h>