cups-filters: updated to 1.20.4

CHANGES IN V1.20.4
- README: Added link to Issue Tracker on GitHub.
- gstoraster: Removed unneeded "if"s.
- cups-browsed: When checking whether there is already a local
  print queue with the same URI as the one of the discovered
  printer, consider also as equal URI if the URIs only differ
  by use of IPP or IPPS and/or use of HTTPS port 443 instead
  of IPP port 631.
- cups-browsed: Also upgrade from ipp: to ipps: when the ipps:
  URI is on HTTPS port 443 instead of IPP port 631. This is
  common on IPP network printers.
- pdftopdf: Removed support for hardware-implemented reversing
  of page order in PostScript printers. It was once not
  correctly implemented in cups-filters and second, such
  printers are extremely rare, and on Gutenprint PPDs with
  pseudo OutputOrder option hardware reversing was even
  wrongly assumed.
- pdftopdf: Accept option "output-order=normal/reverse" for
  reversing page order and also "page-delivery=
  same-order/reverse-order".
- libcupsfilters: Let the PPD generator add "*PageStackOrder
  ..."  lines to the choices of the "OutputBin" option, to
  mark which output bins need the pages printed in reverse
  order.
- libcupsfilters: Let the PPD generator correctly create a
  "*DefaultOutputOrder: ..."  entry, depending on whether the
  paper is put out face-up or face-down in the default output
  bin.
- libcupsfilters: Fixed human-readable name of the OutputBin
  option in the PPD generator.
- pdftoopvp: Silence compiler warning.
- cups-browsed: If the user modifies/overwrites a print queue
  created by cups-browsed, it will now not only be
  automatically released from the control of cups-browsed, but
  we also create a replacement for our generated local queue
  under a new name.
- cups-browsed: Make URIS for using the implicitclass backend
  correctly working also with queue names containing an '@'
  character.
- braille: Strengthen error checking.
- braille: Index: Replace bogus characters with space.
- braille: Add print and braille page number options.
- braille: Index: Use standard duplex cups option.
- cups-browsed: Moved auto-generation of PPD file for IPP
  network printers from create_remote_printer_entry()
  function to update_cups_queues(). This allows re-creating
  accidentally removed or overwritten local queues without
  losing the PPD file.
- braille: Add option to pick hyphenation rule according to
  current locale and make it the default for second
  translation table.
- braille: Remove generated defs on "make clean".
- braille: Turn non-breakable spaces to spaces.
- braille: Fix character encoding when extracting text. When
  extracing text from a zip file or a pdf, the resulting text
  is always utf-8 independently of the original locale, so we
  need to force that.
- braille: Warn when no text translation was selected in case
  the user didn't notice.
- braille: Fix spurious spacing after last Form-Feed

3 files changed, 25 insertions, 44 deletions

diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 5ad604fa274..fc0063d0233 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2018/07/15 23:39:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.101 2018/07/25 12:38:37 adam Exp $
 
-DISTNAME=	cups-filters-1.20.3
-PKGREVISION=	3
+DISTNAME=	cups-filters-1.20.4
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
@@ -11,14 +10,25 @@ HOMEPAGE=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cup
 COMMENT=	Backends, filters, and other software for cups
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND mit
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	bash:run pkg-config gmake
-USE_LANGUAGES=	c c++11
-
 TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 
+USE_LANGUAGES=		c c++11
+USE_LIBTOOL=		yes
+USE_TOOLS+=		bash:run pkg-config gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-braille
+CONFIGURE_ARGS+=	--disable-ldap
+CONFIGURE_ARGS+=	--disable-mutool
+CONFIGURE_ARGS+=	--enable-ijs
+CONFIGURE_ARGS+=	--enable-opvp
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-apple-raster-filter=rastertopdf
+CONFIGURE_ARGS+=	--with-gs-path=${PREFIX}/bin/gs
+CONFIGURE_ARGS+=	--with-pdftops-path=${PREFIX}/bin/pdftops
+CONFIGURE_ARGS+=	--with-shell=${TOOLS_PATH.bash}
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/cups-filters
 PKGCONFIG_OVERRIDE+=	libcupsfilters.pc.in
 PKGCONFIG_OVERRIDE+=	libfontembed.pc.in
 
@@ -40,22 +50,8 @@ CFLAGS+=	-framework IOKit
 CPPFLAGS.SunOS+=	-D_POSIX_PTHREAD_SEMANTICS
 
 BUILD_DEFS+=		VARBASE
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
 RCD_SCRIPTS=		cups-browsed
-
-CONFIGURE_ARGS+=	--disable-braille
-CONFIGURE_ARGS+=	--disable-ldap
-CONFIGURE_ARGS+=	--disable-mutool
-CONFIGURE_ARGS+=	--with-apple-raster-filter=rastertopdf
-CONFIGURE_ARGS+=	--with-shell=${TOOLS_PATH.bash}
-CONFIGURE_ARGS+=	--with-pdftops-path=${PREFIX}/bin/pdftops
-CONFIGURE_ARGS+=	--with-gs-path=${PREFIX}/bin/gs
-CONFIGURE_ARGS+=	--enable-ijs
-CONFIGURE_ARGS+=	--enable-opvp
-
-INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/cups-filters
-
 CONF_FILES=		${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fontconfig/conf.d/99pdftoopvp.conf
 CONF_FILES+=		${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf
 
@@ -70,7 +66,8 @@ SUBST_SED.daemonize=		-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.daemonize+=		-e 's|@VARBASE@|${VARBASE}|g'
 
 post-install:
-	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/cups/cups-browsed.conf ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/cups/cups-browsed.conf \
+		${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf
 	# backends that need root access should not have world read and execute permissions
 	${CHMOD} go-rwx ${DESTDIR}${PREFIX}/libexec/cups/backend/parallel
 	${CHMOD} go-rwx ${DESTDIR}${PREFIX}/libexec/cups/backend/serial
diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index c4b3b12dc4a..85e83b4d618 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.55 2018/05/07 07:59:38 leot Exp $
+$NetBSD: distinfo,v 1.56 2018/07/25 12:38:37 adam Exp $
 
-SHA1 (cups-filters-1.20.3.tar.xz) = 7f67a72bfc11231ab82eb6a77d2e29980d1ab001
-RMD160 (cups-filters-1.20.3.tar.xz) = afd48d1b3a68901fcb50922995cc082fa28e27f2
-SHA512 (cups-filters-1.20.3.tar.xz) = 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31
-Size (cups-filters-1.20.3.tar.xz) = 1469468 bytes
+SHA1 (cups-filters-1.20.4.tar.xz) = af5cfa4fe55ddd3fe9c5fec199503cd3f028d3b2
+RMD160 (cups-filters-1.20.4.tar.xz) = d44ea5561b902a441d8ea73c48cea66a37179d87
+SHA512 (cups-filters-1.20.4.tar.xz) = 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
+Size (cups-filters-1.20.4.tar.xz) = 1474700 bytes
 SHA1 (patch-Makefile.in) = 2d5b05c9dca8ef7cc51931d77dddb1b2c4d422d8
 SHA1 (patch-configure) = b55dc7dc22008351c396374aceb88d2be293d179
 SHA1 (patch-filter_gstoraster.c) = 4eef8d91d8ca26a5a874e29885b836e9670d9e5d
 SHA1 (patch-filter_mupdftoraster.c) = 4c4f7d292163657f9541c8ce454ba57d248f7ef0
-SHA1 (patch-filter_pdftoopvp_OPVPOutputDev.cxx) = 3ecddd4cff43e63e8e62c25198b5fae482cfd8a1
diff --git a/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx b/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx
deleted file mode 100644
index 7eaececc090..00000000000
--- a/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-filter_pdftoopvp_OPVPOutputDev.cxx,v 1.3 2018/05/07 07:59:38 leot Exp $
-
-Fix an invalid conversion error.
-
---- filter/pdftoopvp/OPVPOutputDev.cxx.orig	2018-02-07 22:08:43.000000000 +0000
-+++ filter/pdftoopvp/OPVPOutputDev.cxx
-@@ -66,7 +66,7 @@ struct SplashOutFontSubst {
- class SplashOutFontFileID: public SplashFontFileID {
- public:
- 
--  SplashOutFontFileID(Ref *rA) { r = *rA; substIdx = -1; }
-+  SplashOutFontFileID(const Ref *rA) { r = *rA; substIdx = -1; }
- 
-   ~SplashOutFontFileID() {}
-