Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.644 2015/06/14 14:21:01 joerg Exp $
+# $NetBSD: Makefile,v 1.650 2015/09/12 16:50:00 joerg Exp $
 #

 COMMENT=	Desktop publishing
@@ -119,11 +119,11 @@ SUBDIR+=	poppler-cpp
 SUBDIR+=	poppler-data
 SUBDIR+=	poppler-glib
 SUBDIR+=	poppler-includes
-SUBDIR+=	poppler-qt
 SUBDIR+=	poppler-qt4
 SUBDIR+=	poppler-qt5
 SUBDIR+=	poppler-utils
 SUBDIR+=	poppler016
+SUBDIR+=	poppler016-qt3
 SUBDIR+=	poster
 SUBDIR+=	pscal
 SUBDIR+=	psify
@@ -138,6 +138,7 @@ SUBDIR+=	py-pisa
 SUBDIR+=	py-poppler
 SUBDIR+=	py-pslib
 SUBDIR+=	py-reportlab
+SUBDIR+=	py-weasyprint
 SUBDIR+=	qpdf
 SUBDIR+=	qpdfview
 SUBDIR+=	rlpr
@@ -364,6 +365,8 @@ SUBDIR+=	tex-cite
 SUBDIR+=	tex-cite-doc
 SUBDIR+=	tex-cjk
 SUBDIR+=	tex-cjk-doc
+SUBDIR+=	tex-cjk-gs-integrate
+SUBDIR+=	tex-cjk-gs-integrate-doc
 SUBDIR+=	tex-cjk-ko
 SUBDIR+=	tex-cjk-ko-doc
 SUBDIR+=	tex-cjkpunct
@@ -402,6 +405,8 @@ SUBDIR+=	tex-csquotes-doc
 SUBDIR+=	tex-ctable
 SUBDIR+=	tex-ctib
 SUBDIR+=	tex-ctib-doc
+SUBDIR+=	tex-cuisine
+SUBDIR+=	tex-cuisine-doc
 SUBDIR+=	tex-curves
 SUBDIR+=	tex-curves-doc
 SUBDIR+=	tex-custom-bib
@@ -440,6 +445,8 @@ SUBDIR+=	tex-dvipdfmx-def
 SUBDIR+=	tex-dvipdfmx-doc
 SUBDIR+=	tex-dvips
 SUBDIR+=	tex-dvips-doc
+SUBDIR+=	tex-easy-todo
+SUBDIR+=	tex-easy-todo-doc
 SUBDIR+=	tex-edmac
 SUBDIR+=	tex-edmac-doc
 SUBDIR+=	tex-einfuehrung-doc
@@ -455,6 +462,8 @@ SUBDIR+=	tex-enumitem
 SUBDIR+=	tex-enumitem-doc
 SUBDIR+=	tex-environ
 SUBDIR+=	tex-environ-doc
+SUBDIR+=	tex-envlab
+SUBDIR+=	tex-envlab-doc
 SUBDIR+=	tex-eplain
 SUBDIR+=	tex-eplain-doc
 SUBDIR+=	tex-epsf
@@ -473,6 +482,8 @@ SUBDIR+=	tex-ethiop-doc
 SUBDIR+=	tex-etoolbox-de-doc
 SUBDIR+=	tex-euler
 SUBDIR+=	tex-euler-doc
+SUBDIR+=	tex-europasscv
+SUBDIR+=	tex-europasscv-doc
 SUBDIR+=	tex-europecv
 SUBDIR+=	tex-europecv-doc
 SUBDIR+=	tex-everypage
@@ -502,11 +513,15 @@ SUBDIR+=	tex-fix2col
 SUBDIR+=	tex-fix2col-doc
 SUBDIR+=	tex-fixme
 SUBDIR+=	tex-fixme-doc
+SUBDIR+=	tex-fixmetodonotes
+SUBDIR+=	tex-fixmetodonotes-doc
 SUBDIR+=	tex-fixpdfmag
 SUBDIR+=	tex-float
 SUBDIR+=	tex-float-doc
 SUBDIR+=	tex-floatflt
 SUBDIR+=	tex-floatflt-doc
+SUBDIR+=	tex-flowfram
+SUBDIR+=	tex-flowfram-doc
 SUBDIR+=	tex-fmtcount
 SUBDIR+=	tex-fmtcount-doc
 SUBDIR+=	tex-fncylab
@@ -547,6 +562,8 @@ SUBDIR+=	tex-germkorr
 SUBDIR+=	tex-germkorr-doc
 SUBDIR+=	tex-getoptk
 SUBDIR+=	tex-getoptk-doc
+SUBDIR+=	tex-gfnotation
+SUBDIR+=	tex-gfnotation-doc
 SUBDIR+=	tex-glossaries
 SUBDIR+=	tex-glossaries-doc
 SUBDIR+=	tex-go
@@ -796,6 +813,8 @@ SUBDIR+=	tex-natbib
 SUBDIR+=	tex-natbib-doc
 SUBDIR+=	tex-needspace
 SUBDIR+=	tex-needspace-doc
+SUBDIR+=	tex-newlfm
+SUBDIR+=	tex-newlfm-doc
 SUBDIR+=	tex-newsletr
 SUBDIR+=	tex-newsletr-doc
 SUBDIR+=	tex-nextpage
@@ -877,6 +896,8 @@ SUBDIR+=	tex-plstmary
 SUBDIR+=	tex-plstmary-doc
 SUBDIR+=	tex-poltawski
 SUBDIR+=	tex-poltawski-doc
+SUBDIR+=	tex-polyglossia
+SUBDIR+=	tex-polyglossia-doc
 SUBDIR+=	tex-polytable
 SUBDIR+=	tex-polytable-doc
 SUBDIR+=	tex-powerdot
@@ -890,6 +911,8 @@ SUBDIR+=	tex-preview
 SUBDIR+=	tex-preview-doc
 SUBDIR+=	tex-printlen
 SUBDIR+=	tex-printlen-doc
+SUBDIR+=	tex-probsoln
+SUBDIR+=	tex-probsoln-doc
 SUBDIR+=	tex-program
 SUBDIR+=	tex-program-doc
 SUBDIR+=	tex-prosper
@@ -965,6 +988,8 @@ SUBDIR+=	tex-showtags-doc
 SUBDIR+=	tex-sidecap
 SUBDIR+=	tex-sidecap-doc
 SUBDIR+=	tex-simplified-latex-doc
+SUBDIR+=	tex-siunitx
+SUBDIR+=	tex-siunitx-doc
 SUBDIR+=	tex-skak
 SUBDIR+=	tex-skak-doc
 SUBDIR+=	tex-skaknew
@@ -978,12 +1003,16 @@ SUBDIR+=	tex-sphack-doc
 SUBDIR+=	tex-splitbib
 SUBDIR+=	tex-srcltx
 SUBDIR+=	tex-srcltx-doc
+SUBDIR+=	tex-standalone
+SUBDIR+=	tex-standalone-doc
 SUBDIR+=	tex-startex
 SUBDIR+=	tex-startex-doc
 SUBDIR+=	tex-statex
 SUBDIR+=	tex-statex-doc
 SUBDIR+=	tex-stdclsdv
 SUBDIR+=	tex-stdclsdv-doc
+SUBDIR+=	tex-stringstrings
+SUBDIR+=	tex-stringstrings-doc
 SUBDIR+=	tex-sttools
 SUBDIR+=	tex-sttools-doc
 SUBDIR+=	tex-subfig
@@ -992,6 +1021,8 @@ SUBDIR+=	tex-subfigmat
 SUBDIR+=	tex-subfigmat-doc
 SUBDIR+=	tex-subfigure
 SUBDIR+=	tex-subfigure-doc
+SUBDIR+=	tex-subfiles
+SUBDIR+=	tex-subfiles-doc
 SUBDIR+=	tex-substr
 SUBDIR+=	tex-substr-doc
 SUBDIR+=	tex-supertabular
@@ -1060,8 +1091,14 @@ SUBDIR+=	tex-tocbibind
 SUBDIR+=	tex-tocbibind-doc
 SUBDIR+=	tex-tocloft
 SUBDIR+=	tex-tocloft-doc
+SUBDIR+=	tex-todo
+SUBDIR+=	tex-todo-doc
+SUBDIR+=	tex-todonotes
+SUBDIR+=	tex-todonotes-doc
 SUBDIR+=	tex-tools
 SUBDIR+=	tex-tools-doc
+SUBDIR+=	tex-toptesi
+SUBDIR+=	tex-toptesi-doc
 SUBDIR+=	tex-totpages
 SUBDIR+=	tex-totpages-doc
 SUBDIR+=	tex-tpslifonts
@@ -1157,6 +1194,8 @@ SUBDIR+=	tex-xltxtra
 SUBDIR+=	tex-xltxtra-doc
 SUBDIR+=	tex-xskak
 SUBDIR+=	tex-xskak-doc
+SUBDIR+=	tex-xstring
+SUBDIR+=	tex-xstring-doc
 SUBDIR+=	tex-xtab
 SUBDIR+=	tex-xtab-doc
 SUBDIR+=	tex-xunicode
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2015/09/07 12:05:17 jperkin Exp $

 DISTNAME=		a2ps-4.14
 PKGREVISION=		8
@@ -19,9 +19,6 @@ USE_LIBTOOL=		yes
 .include "../../mk/bsd.prefs.mk"

 CFLAGS.Darwin+=		-flat_namespace
-.if ${OPSYS} == "Darwin"
-_STRIPFLAG_INSTALL=	# none
-.endif

 USE_TOOLS+=		file:run gmake lex mktemp:run perl:run
 CONFIGURE_ENV+=		file_prog=${FILE_CMD:Q}
--- a/print/adobeps-win/Makefile
+++ b/print/adobeps-win/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/06/18 09:28:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/08/29 23:04:38 joerg Exp $

 DISTNAME=	winsteng
 PKGNAME=	adobeps-win-1.0.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/1.x/
 EXTRACT_SUFX=	.exe
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.adobe.com/products/printerdrivers/windows.html
 COMMENT=	Adobe PostScript MS Windows drivers for CUPS/Samba

 BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
-DEPENDS+=	cups>=1.1.15:../../print/cups15
+DEPENDS+=	cups>=1.1.15<1.7:../../print/cups15

 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.88 2015/08/07 11:20:35 jaapb Exp $

 DISTNAME=		advi-1.10.2
-PKGREVISION=		3
+PKGREVISION=		5
 CATEGORIES=		print
 MASTER_SITES=		http://gallium.inria.fr/advi/

--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/06/14 16:08:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/13 11:35:35 wiz Exp $

-DISTNAME=	cups-filters-1.0.69
+DISTNAME=	cups-filters-1.0.76
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
@@ -13,19 +13,21 @@ 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
-USE_TOOLS+=	autoconf
 USE_LANGUAGES=	c c++

-CONFLICTS+=	cups<1.6
+BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils

 PKGCONFIG_OVERRIDE+=	libcupsfilters.pc.in
 PKGCONFIG_OVERRIDE+=	libfontembed.pc.in

+CONFLICTS+=	cups<1.6
+
 REPLACE_BASH+=	filter/textonly

 CONFIGURE_ARGS+=	--with-rcdir=${PREFIX}/share/examples/rc.d
 CONFIGURE_ARGS+=	--with-rclevels=""
+CONFIGURE_ARGS+=	--disable-ldap
 CONFIGURE_ARGS+=	--with-shell=${TOOLS_PATH.bash}

 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/cups-filters
@@ -33,9 +35,6 @@ INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/cups-filters
 CONF_FILES=		${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fonts/conf.d/99pdftoopvp.conf
 CONF_FILES=		${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf

-pre-configure:
-	cd ${WRKSRC} && autoconf
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/etc/cups/cups-browsed.conf ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf

--- a/print/cups-filters/PLIST
+++ b/print/cups-filters/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/06/14 16:08:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/08/26 08:36:48 wiz Exp $
 bin/foomatic-rip
 bin/ttfread
 include/cupsfilters/colord.h
@@ -15,6 +15,7 @@ lib/libcupsfilters.la
 lib/libfontembed.la
 lib/pkgconfig/libcupsfilters.pc
 lib/pkgconfig/libfontembed.pc
+libexec/cups/backend/implicitclass
 libexec/cups/backend/parallel
 libexec/cups/backend/serial
 libexec/cups/filter/bannertopdf
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.17 2015/06/14 16:08:04 wiz Exp $
+$NetBSD: distinfo,v 1.24 2015/09/13 11:35:35 wiz Exp $

-SHA1 (cups-filters-1.0.69.tar.xz) = c3d5cdbc0c7805c6a415ea05cdd7fd8b50f808b6
-RMD160 (cups-filters-1.0.69.tar.xz) = dea1d54539957a060456a6cfe98e52a23a80b575
-Size (cups-filters-1.0.69.tar.xz) = 1338548 bytes
-SHA1 (patch-configure.ac) = 4b5243c4c31541e7d44ff2d049cd5a42bc7a2267
-SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = cd916bf6c211b14305c311b6ad63bd0881030b09
+SHA1 (cups-filters-1.0.76.tar.xz) = 8e3515b8bb0ab7ca1f7d6583e9b22a4d974062cc
+RMD160 (cups-filters-1.0.76.tar.xz) = e3bee508b51e1b422d77c1ce3d6b42fca95b030b
+Size (cups-filters-1.0.76.tar.xz) = 1353016 bytes
--- a/print/cups-filters/patches/patch-configure.ac
+++ b/print/cups-filters/patches/patch-configure.ac
@@ -1,35 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/06/14 16:08:04 wiz Exp $
-
-Add a --with-shell option in order to avoid hardcoding "/bin/bash" inside
-filter/foomaticrip.c.
-
-Fixed upstream as [Bug 1288]:
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1288
-
--- configure.ac.orig	2015-04-13 14:47:41.000000000 +0000
-+++ configure.ac
-@@ -622,6 +622,16 @@ fi
- AC_SUBST(SED_EXTENDED_REGEX_OPT)
- AC_SUBST(CUPS_GHOSTSCRIPT)
- 
-+# =========================================================
-+# Select a different shell instead of the default /bin/bash
-+# =========================================================
-+AC_ARG_WITH([shell],
-+	[AS_HELP_STRING([--with-shell=path], [Specify path for a modern shell.])],
-+	[with_shell="$withval"],
-+	[with_shell="/bin/bash"]
-+)
-+AC_DEFINE_UNQUOTED([SHELL], "$with_shell", [Path for a modern shell])]
-+
- # =====================
- # Prepare all .in files
- # =====================
-@@ -659,6 +669,7 @@ Build configuration:
- 	png:             ${with_png}
- 	php:             ${with_php}
- 	php-config:      ${with_php_config}
-+	shell:           ${with_shell}
- 	test-font:       ${with_test_font_path}
- 	tiff:            ${with_tiff}
- 	avahi:           ${enable_avahi}
--- a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c
+++ b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c
@@ -1,18 +0,0 @@
-$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.5 2015/06/14 16:08:04 wiz Exp $
-
-Adjust according the --with-shell option.
-
-Fixed upstream as [Bug 1288]:
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1288
-
--- filter/foomatic-rip/foomaticrip.c.orig	2015-02-13 22:36:44.000000000 +0000
-+++ filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo
-                                 "/opt/cups/filter:"
-                                 "/usr/lib/cups/filter";
- 
-char modern_shell[64] = "/bin/bash";
-+char modern_shell[64] = SHELL;
- 
- void config_set_option(const char *key, const char *value)
- {
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2015/06/19 08:20:43 wiz Exp $
+# $NetBSD: Makefile,v 1.223 2015/09/03 21:15:41 wiz Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,8 +6,7 @@

 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-PKGREVISION=	1
-BASE_VERS=	2.0.3
+BASE_VERS=	2.1.0
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2015/06/12 11:02:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.50 2015/09/03 21:15:41 wiz Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -90,6 +90,7 @@ man/man5/classes.conf.5
 man/man5/client.conf.5
 man/man5/cups-files.conf.5
 man/man5/cups-snmp.conf.5
+man/man5/cupsd-logs.5
 man/man5/cupsd.conf.5
 man/man5/ipptoolfile.5
 man/man5/mailto.conf.5
@@ -111,7 +112,6 @@ man/man8/cupsaccept.8
 man/man8/cupsaddsmb.8
 man/man8/cupsctl.8
 man/man8/cupsd-helper.8
-man/man8/cupsd-logs.8
 man/man8/cupsd.8
 man/man8/cupsdisable.8
 man/man8/cupsenable.8
@@ -228,6 +228,7 @@ share/cups/templates/de/error.tmpl
 share/cups/templates/de/header.tmpl
 share/cups/templates/de/help-header.tmpl
 share/cups/templates/de/help-printable.tmpl
+share/cups/templates/de/help-trailer.tmpl
 share/cups/templates/de/job-cancel.tmpl
 share/cups/templates/de/job-hold.tmpl
 share/cups/templates/de/job-move.tmpl
@@ -479,6 +480,7 @@ share/cups/templates/ru/error.tmpl
 share/cups/templates/ru/header.tmpl
 share/cups/templates/ru/help-header.tmpl
 share/cups/templates/ru/help-printable.tmpl
+share/cups/templates/ru/help-trailer.tmpl
 share/cups/templates/ru/job-cancel.tmpl
 share/cups/templates/ru/job-hold.tmpl
 share/cups/templates/ru/job-move.tmpl
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.110 2015/06/12 11:02:35 wiz Exp $
+$NetBSD: distinfo,v 1.112 2015/09/03 21:15:41 wiz Exp $

-SHA1 (cups-2.0.3-source.tar.bz2) = 3de556237dcb7c9f3df0eb853a53cb93e1879a8f
-RMD160 (cups-2.0.3-source.tar.bz2) = 0885debd2440e96aa5b5d7a6433dc85ffb45fe2f
-Size (cups-2.0.3-source.tar.bz2) = 8797220 bytes
+SHA1 (cups-2.1.0-source.tar.bz2) = 92332b6785471b388929913be780d557ac00b7d0
+RMD160 (cups-2.1.0-source.tar.bz2) = 862a977ffa4e3cfb94ec011ff03d5ef1c55dde74
+Size (cups-2.1.0-source.tar.bz2) = 8829764 bytes
 SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
 SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
 SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
-SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
+SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
 SHA1 (patch-config-scripts_cups-compiler.m4) = 00dac129c55ad8428923f051766d6b2d26d6958d
 SHA1 (patch-config-scripts_cups-directories.m4) = 58c7b5d452c1dd67b754c7dcf0a3b5bb5a8e2768
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338
@@ -15,7 +15,7 @@ SHA1 (patch-config-scripts_cups-manpages.m4) = fc82b6da8f678359cedf80afff1615669
 SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 2754c4fb4e10ce148785a1c3423fcd981c67b416
 SHA1 (patch-configure.ac) = 7bb171c959aa72e92efd04394751460727b0ca7d
 SHA1 (patch-cups-tls.c) = 055d24956b7ddcd04799642c2893e8e16b70391a
-SHA1 (patch-data_Makefile) = a35b07ed6b6e6103513efe5e6f5f3a13e449bda1
+SHA1 (patch-data_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
 SHA1 (patch-scheduler_auth.c) = 1e2b837647e2d943585cc5f9dae86fc2c0c5d98a
 SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69
--- a/print/cups/patches/patch-conf_Makefile
+++ b/print/cups/patches/patch-conf_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-conf_Makefile,v 1.3 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-conf_Makefile,v 1.4 2015/09/03 21:15:41 wiz Exp $

 Don't install the config files (leave it up to pkgsrc).

--- conf/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
+--- conf/Makefile.orig	2015-02-27 12:30:26.000000000 +0000
 +++ conf/Makefile
@@ -70,22 +70,8 @@ install:	all install-data install-header
 #
@@ -14,8 +14,8 @@ Don't install the config files (leave it up to pkgsrc).
 -		else \
 -			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 -		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
 -	done
-	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
 -		if test -r $(DATADIR)/mime/$$file ; then \
--- a/print/cups/patches/patch-data_Makefile
+++ b/print/cups/patches/patch-data_Makefile
@@ -1,28 +0,0 @@
-$NetBSD: patch-data_Makefile,v 1.2 2015/01/18 17:15:20 wiz Exp $
-
-Do not install banner files and testprint to avoid conflict with
-cups-filters, which installs them too.
-
-https://cups.org/str.php?L4518+P-1+S-2+C0+I0+E0+Q
-
--- data/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
-+++ data/Makefile
-@@ -19,16 +19,9 @@ include ../Makedefs
- # Data files...
- #
- 
-BANNERS	=	\
-		classified \
-		confidential \
-		secret \
-		standard \
-		topsecret \
-		unclassified
-+BANNERS	=
- 
-DATAFILES =	\
-		testprint
-+DATAFILES =
- 
- PPDCFILES =	\
- 		epson.h \
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/18 16:33:26 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2015/09/05 13:03:22 jperkin Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -56,6 +56,7 @@ CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--enable-bannertops
 CONFIGURE_ARGS+=	--enable-texttops
 CONFIGURE_ARGS+=	--with-manext=bsd
+CONFIGURE_ARGS+=	--without-bundledir
 CONFIGURE_ARGS+=	--without-icondir
 CONFIGURE_ARGS+=	--without-menudir
 CONFIGURE_ARGS+=	--without-perl
@@ -79,8 +80,10 @@ CONFIGURE_ENV+=		ac_cv_func_epoll_create=no
 .endif
 LIBS+=			${BUILDLINK_LDADD.iconv}

-PLIST_VARS+=		notmac
-.if ${OPSYS} != "Darwin"
+PLIST_VARS+=		mac notmac
+.if ${OPSYS} == "Darwin"
+PLIST.mac=		yes
+.else
 PLIST.notmac=		yes
 .endif

@@ -184,7 +187,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
 .endif
 .if !empty(PKG_OPTIONS:Mdnssd)
-	${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
+	${LN} -fs ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
 .endif

 .include "../../converters/libiconv/buildlink3.mk"
--- a/print/cups15/PLIST
+++ b/print/cups15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/17 13:17:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/09/05 13:03:22 jperkin Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -42,6 +42,10 @@ lib/libcupsdriver.la
 lib/libcupsimage.la
 lib/libcupsmime.la
 lib/libcupsppdc.la
+${PLIST.mac}libexec/cups/apple/http
+${PLIST.mac}libexec/cups/apple/https
+${PLIST.mac}libexec/cups/apple/ipp
+${PLIST.mac}libexec/cups/apple/ipps
 ${PLIST.dnssd}libexec/cups/backend/dnssd
 libexec/cups/backend/http
 libexec/cups/backend/https
--- a/print/cups15/distinfo
+++ b/print/cups15/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/06/18 16:33:26 gdt Exp $
+$NetBSD: distinfo,v 1.3 2015/09/05 13:03:22 jperkin Exp $

 SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
 RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
@@ -6,22 +6,23 @@ Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes
 SHA1 (str4609-1.5.patch) = 07b06a1f097303e511bfe7bdddc0a6e8737185e9
 RMD160 (str4609-1.5.patch) = f83ccd525661d7a24294fb2f79233da455f37572
 Size (str4609-1.5.patch) = 10825 bytes
-SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
+SHA1 (patch-ac) = 1175653cb826094e5acce322ed0fcfca13abc322
 SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
 SHA1 (patch-ae) = 67e846ac428b4c44d8da9b49d959fa4f14fbb494
-SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
-SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
-SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
-SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e
-SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
-SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
-SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e
-SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60
+SHA1 (patch-af) = c1554d4481b071236a8071a8498192d439e0b225
+SHA1 (patch-ag) = def48ccd676e63f61472cb0b7f7a656a71152df3
+SHA1 (patch-ah) = f60952e0f52c25e308fbea4c4dfcf2e9e26b3d0a
+SHA1 (patch-ai) = 6f01606c59dce5b18e17c227d406b31c5c638b61
+SHA1 (patch-an) = fa83935d328d10ba60d05884a44c7f29ace75cf3
+SHA1 (patch-ao) = ace7c7a6e5a1c9d90aaa3d8a608978573fd5a9ce
+SHA1 (patch-at) = 6c6167d0394c164bdf1f6ff17976d9a40f9a87af
+SHA1 (patch-au) = c929e9fd49cfc54d5f69a1982632b455f67b08fd
 SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395
-SHA1 (patch-config-scripts_cups-gssapi.m4) = 6f558ee1d2d56ceba3a9705d3278c7969495be5d
+SHA1 (patch-config-scripts_cups-common.m4) = 5b6a21afef0b16df67af901b8bbf1317eaaad53e
+SHA1 (patch-config-scripts_cups-gssapi.m4) = c81240b2ce05133a1ce4981ef6286ac03bcabcf5
 SHA1 (patch-config.h.in) = 0f072063d24810dcbdd2d095b9f2fa6bab44ff20
 SHA1 (patch-filter_raster.c) = fc48e9cc7f7f32355816355dfc199157a00246c7
-SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60
+SHA1 (patch-ppdc_Makefile) = 50ba637ab159c19225690d8cf1c28dc7811f7275
 SHA1 (patch-scheduler_auth.c) = 29cd4378eb4ceeb1e618534fc5a9975022dbcf2c
 SHA1 (patch-scheduler_client.c) = d4b6667199c0ff9617847ba119b82a50457cfd98
-SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47
+SHA1 (patch-scheduler_dirsvc.c) = b544ec183f8ffb0c0f86541a6ed2c154192a1376
--- a/print/cups15/patches/patch-ac
+++ b/print/cups15/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 libtoolize.

--- configure.in.orig	2008-11-14 19:32:22.000000000 +0000
+--- configure.in.orig	2011-08-31 01:36:33.000000000 +0000
 +++ configure.in
@@ -22,7 +22,6 @@ sinclude(config-scripts/cups-manpages.m4
 
--- a/print/cups15/patches/patch-af
+++ b/print/cups15/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-af,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).

--- backend/Makefile.orig	2011-05-04 04:28:00.000000000 +0000
+--- backend/Makefile.orig	2012-04-23 17:42:12.000000000 +0000
 +++ backend/Makefile
@@ -89,7 +89,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
@@ -13,3 +13,12 @@ $NetBSD: patch-af,v 1.1 2014/06/17 13:17:13 wiz Exp $
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+@@ -112,7 +112,7 @@ install-exec:	$(INSTALLXPC)
+ install-xpc:	ipp
+ 	echo Installing XPC backends in $(SERVERBIN)/apple
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
+-	$(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
+	$(INSTALL_BIN) ipp $(SERVERBIN)/apple
+ 	for file in $(IPPALIASES); do \
+ 		$(RM) $(SERVERBIN)/apple/$$file; \
+ 		$(LN) ipp $(SERVERBIN)/apple/$$file; \
--- a/print/cups15/patches/patch-ag
+++ b/print/cups15/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 cups installs stuff in /usr/pkg/lib64 on Linux. Don't do this.

--- config-scripts/cups-3264.m4.orig	2009-04-19 21:18:45.000000000 +0000
+--- config-scripts/cups-3264.m4.orig	2011-05-12 05:21:56.000000000 +0000
 +++ config-scripts/cups-3264.m4
@@ -95,7 +95,7 @@ case "$uname" in
 			LIB32CUPS="32bit/libcups.so.2"
--- a/print/cups15/patches/patch-ah
+++ b/print/cups15/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'

--- config-scripts/cups-compiler.m4.orig	2009-05-17 00:13:47.000000000 +0000
+--- config-scripts/cups-compiler.m4.orig	2011-09-09 17:28:58.000000000 +0000
 +++ config-scripts/cups-compiler.m4
-@@ -140,8 +140,9 @@ if test -n "$GCC"; then
+@@ -125,8 +125,9 @@ if test -n "$GCC"; then
 	AC_MSG_CHECKING(if GCC supports -fstack-protector)
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
--- a/print/cups15/patches/patch-ai
+++ b/print/cups15/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS

--- notifier/Makefile.orig	2009-04-12 23:04:51.000000000 +0000
+--- notifier/Makefile.orig	2011-05-12 05:21:56.000000000 +0000
 +++ notifier/Makefile
@@ -62,6 +62,8 @@ install:	all install-data install-header
 #
--- a/print/cups15/patches/patch-an
+++ b/print/cups15/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-an,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 The '$' while loops expand the variables as long as possible so that no
 references to other variables occur. This is necessary because fontpath
@@ -9,7 +9,7 @@ loop.
 I'm also sure that this is not the Right Way to fix it, but at least it
 works.

--- config-scripts/cups-directories.m4.orig	2009-04-12 23:04:51.000000000 +0000
+--- config-scripts/cups-directories.m4.orig	2011-05-12 05:21:56.000000000 +0000
 +++ config-scripts/cups-directories.m4
@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib
 			libdir="$exec_prefix/lib32"
@@ -20,7 +20,7 @@ works.
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
-@@ -297,7 +297,15 @@ AC_SUBST(CUPS_CACHEDIR)
+@@ -308,7 +308,15 @@ AC_SUBST(CUPS_CACHEDIR)
 
 # Data files
 CUPS_DATADIR="$datadir/cups"
@@ -37,7 +37,7 @@ works.
 AC_SUBST(CUPS_DATADIR)
 
 # Icon directory
-@@ -306,7 +314,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
+@@ -317,7 +325,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
 if test "x$icondir" = x -a -d /usr/share/icons; then
 	ICONDIR="/usr/share/icons"
 else
@@ -50,7 +50,7 @@ works.
 fi
 
 AC_SUBST(ICONDIR)
-@@ -317,7 +329,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
+@@ -328,7 +340,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
 if test "x$menudir" = x -a -d /usr/share/applications; then
 	MENUDIR="/usr/share/applications"
 else
@@ -63,7 +63,7 @@ works.
 fi
 
 AC_SUBST(MENUDIR)
-@@ -332,7 +348,15 @@ else
+@@ -343,7 +359,15 @@ else
 	CUPS_DOCROOT="$docdir"
 fi
 
@@ -80,7 +80,7 @@ works.
 AC_SUBST(CUPS_DOCROOT)
 
 # Fonts
-@@ -344,8 +368,16 @@ else
+@@ -355,8 +379,16 @@ else
 	CUPS_FONTPATH="$fontpath"
 fi
 
@@ -98,7 +98,7 @@ works.
 
 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
-@@ -367,6 +399,14 @@ else
+@@ -378,6 +410,14 @@ else
 	CUPS_LOCALEDIR="$localedir"
 fi
 
@@ -113,7 +113,7 @@ works.
 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
 AC_SUBST(CUPS_LOCALEDIR)
 
-@@ -375,7 +415,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
+@@ -386,7 +426,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
 
 if test x$logdir = x; then
 	CUPS_LOGDIR="$localstatedir/log/cups"
@@ -121,7 +121,7 @@ works.
 else
 	CUPS_LOGDIR="$logdir"
 fi
-@@ -384,10 +423,13 @@ AC_SUBST(CUPS_LOGDIR)
+@@ -395,10 +434,13 @@ AC_SUBST(CUPS_LOGDIR)
 
 # Longer-term spool data
 CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -136,7 +136,7 @@ works.
 case "$uname" in
 	*BSD* | Darwin*)
 		# *BSD and Darwin (MacOS X)
-@@ -400,6 +442,10 @@ case "$uname" in
+@@ -411,6 +453,10 @@ case "$uname" in
 		CUPS_SERVERBIN="$exec_prefix/lib/cups"
 		;;
 esac
@@ -147,7 +147,7 @@ works.
 
 AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
 AC_SUBST(CUPS_SERVERBIN)
-@@ -407,7 +453,7 @@ AC_SUBST(INSTALL_SYSV)
+@@ -418,7 +464,7 @@ AC_SUBST(INSTALL_SYSV)
 
 # Configuration files
 CUPS_SERVERROOT="$sysconfdir/cups"
--- a/print/cups15/patches/patch-ao
+++ b/print/cups15/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 Add '--with-manext' configure option.

--- config-scripts/cups-manpages.m4.orig	2009-01-12 19:17:09.000000000 +0000
+--- config-scripts/cups-manpages.m4.orig	2011-05-12 05:21:56.000000000 +0000
 +++ config-scripts/cups-manpages.m4
@@ -13,6 +13,8 @@ dnl   which should have been included wi
 dnl   file is missing or damaged, see the license at "http://www.cups.org/".
--- a/print/cups15/patches/patch-at
+++ b/print/cups15/patches/patch-at
@@ -1,10 +1,10 @@
-$NetBSD: patch-at,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-at,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS

--- scheduler/Makefile.orig	2009-05-26 23:27:06.000000000 +0000
+--- scheduler/Makefile.orig	2011-05-11 22:17:34.000000000 +0000
 +++ scheduler/Makefile
-@@ -135,6 +135,8 @@ install:	all install-data install-header
+@@ -140,6 +140,8 @@ install:	all install-data install-header
 #
 
 install-data:
--- a/print/cups15/patches/patch-au
+++ b/print/cups15/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-au,v 1.2 2015/09/05 13:03:22 jperkin Exp $

--- scheduler/printers.c.orig	2011-06-15 00:46:13.000000000 +0000
+--- scheduler/printers.c.orig	2012-02-15 23:21:06.000000000 +0000
 +++ scheduler/printers.c
@@ -80,6 +80,9 @@
 #  include <asl.h>
--- a/print/cups15/patches/patch-config-scripts_cups-common.m4
+++ b/print/cups15/patches/patch-config-scripts_cups-common.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-config-scripts_cups-common.m4,v 1.1 2015/09/05 13:03:22 jperkin Exp $
+
+Get rid of bogus OSX test.
+
+--- config-scripts/cups-common.m4.orig	2012-07-25 20:43:57.000000000 +0000
+++ config-scripts/cups-common.m4
+@@ -385,7 +385,7 @@ case $uname in
+ 		if test $uversion -ge 100; then
+ 			AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
+ 		fi
+-		if test $uversion -ge 110; then
+		if test $uversion -ge 999110; then
+ 			# Broken public headers in 10.7...
+ 			AC_MSG_CHECKING(for sandbox/private.h presence)
+ 			if test -f /usr/local/include/sandbox/private.h; then
--- a/print/cups15/patches/patch-config-scripts_cups-gssapi.m4
+++ b/print/cups15/patches/patch-config-scripts_cups-gssapi.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2015/09/05 13:03:22 jperkin Exp $

 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
@@ -34,3 +34,12 @@ the gssapi option, and need an explicit -lgss
 				;;
 		esac
 		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
+@@ -105,7 +104,7 @@ if test x$enable_gssapi != xno; then
+ 				fi
+ 			else
+ 				AC_MSG_RESULT(no)
+-				if test $uversion -ge 110; then
+				if test $uversion -ge 999110; then
+ 					# Broken public headers in 10.7...
+ 					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
+ 				fi
--- a/print/cups15/patches/patch-ppdc_Makefile
+++ b/print/cups15/patches/patch-ppdc_Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-ppdc_Makefile,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-ppdc_Makefile,v 1.2 2015/09/05 13:03:22 jperkin Exp $

--- ppdc/Makefile.orig	2011-01-06 23:21:05.000000000 +0100
-+++ ppdc/Makefile	2011-11-13 15:51:42.867152712 +0100
+--- ppdc/Makefile.orig	2011-01-06 22:20:15.000000000 +0000
+++ ppdc/Makefile
@@ -378,7 +378,7 @@ libcupsppdc_s.a:	$(LIBOBJS) ../cups/$(LI
 libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
 	echo Linking $@...
--- a/print/cups15/patches/patch-scheduler_dirsvc.c
+++ b/print/cups15/patches/patch-scheduler_dirsvc.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2014/06/17 13:17:13 wiz Exp $
+$NetBSD: patch-scheduler_dirsvc.c,v 1.2 2015/09/05 13:03:22 jperkin Exp $

--- scheduler/dirsvc.c.orig	2011-01-22 01:07:22.000000000 +0100
-+++ scheduler/dirsvc.c	2011-09-20 19:08:50.512786064 +0200
-@@ -1332,7 +1332,7 @@ ldap_connect(void)
+--- scheduler/dirsvc.c.orig	2012-02-11 02:05:21.000000000 +0000
+++ scheduler/dirsvc.c
+@@ -1339,7 +1339,7 @@ ldap_connect(void)
     cupsdLogMessage(CUPSD_LOG_ERROR, "LDAP bind failed with error %d: %s",
                     rc, ldap_err2string(rc));
 
--- a/print/deforaos-pdfviewer/Makefile
+++ b/print/deforaos-pdfviewer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2015/08/09 15:54:06 khorben Exp $
 #

 DISTNAME=	PDFViewer-0.0.1
 PKGNAME=	deforaos-pdfviewer-0.0.1
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	print
 MASTER_SITES=	http://www.defora.org/os/download/download/3686/

@@ -17,6 +17,7 @@ USE_TOOLS+=	pkg-config

 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}

 .include "options.mk"

--- a/print/diffpdf/Makefile
+++ b/print/diffpdf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.48 2015/07/15 15:09:38 wiz Exp $

 DISTNAME=	diffpdf-2.1.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	http://www.qtrac.eu/

--- a/print/electrix/Makefile
+++ b/print/electrix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2015/07/15 15:09:39 wiz Exp $
 #

 DISTNAME=	electrix-0.2.0
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=electrix/}
 EXTRACT_SUFX=	.tar.bz2
--- a/print/epdfview/Makefile
+++ b/print/epdfview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.55 2015/07/15 15:09:39 wiz Exp $
 #

 DISTNAME=	epdfview-0.1.8
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	print
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/
 EXTRACT_SUFX=	.tar.bz2
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.71 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.72 2015/07/15 15:09:39 wiz Exp $
 #

 .include "../../print/evince/Makefile.common"

 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		32
+PKGREVISION=		33
 COMMENT=		File properties plugin for evince files

 .include "options.mk"
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2015/04/25 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.112 2015/07/15 15:09:39 wiz Exp $
 #

 .include "../../print/evince/Makefile.common"
-PKGREVISION=	41
+PKGREVISION=	42

 COMMENT=		Document viewer

--- a/print/evince3/Makefile
+++ b/print/evince3/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2015/06/15 00:06:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.42 2015/07/15 15:09:39 wiz Exp $

+PKGREVISION= 1
 .include "../../print/evince3/Makefile.common"

 COMMENT=		Document viewer
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $
 #

 DISTNAME=	foo2zjs
 PKGNAME=	${DISTNAME}-20120516
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://foo2zjs.rkkda.com/

@@ -11,7 +12,7 @@ HOMEPAGE=	http://foo2zjs.rkkda.com/
 COMMENT=	Printer driver for Zenographics ZjStream wire protocol
 LICENSE=	gnu-gpl-v2

-USE_TOOLS+=	gmake groff
+USE_TOOLS+=	gmake groff gsed:run

 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/foo2zjs share/foomatic/ppd/foo2zjs
@@ -23,13 +24,14 @@ SUBST_MESSAGE.paths=	Fix PREFIX.
 SUBST_FILES.paths=	Makefile icc2ps/Makefile
 SUBST_SED.paths=	-e "s,@PREFIX@,${DESTDIR}${PREFIX},"
 SUBST_SED.paths+=	-e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR},"
+SUBST_SED.paths+=	-e "s,@RUNPREFIX@,${PREFIX},"
 SUBST_STAGE.paths=	post-patch

 do-build:
 	cd ${WRKSRC} && ${GMAKE} ${PROGS}

 do-install:
-	cd ${WRKSRC} && ${GMAKE} install-prog install-man
+	cd ${WRKSRC} && ${GMAKE} install-prog install-man install-crd
 	# cheaper than upstream's "portable" Makefile
 	${INSTALL_DATA} ${WRKSRC}/PPD/*.ppd	\
 		${DESTDIR}${PREFIX}/share/foomatic/ppd/foo2zjs
--- a/print/foo2zjs/PLIST
+++ b/print/foo2zjs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/25 17:15:45 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/07/28 16:42:03 rumko Exp $
 bin/arm2hpdl
 bin/foo2hiperc
 bin/foo2hiperc-wrapper
@@ -59,6 +59,24 @@ man/man1/slxdecode.1
 man/man1/usb_printerid.1
 man/man1/xqxdecode.1
 man/man1/zjsdecode.1
+share/foo2qpdl/crd/CLP-300-1200x1200cms2
+share/foo2qpdl/crd/CLP-300-1200x600cms2
+share/foo2qpdl/crd/CLP-300-600x600cms2
+share/foo2qpdl/crd/CLP-300cms
+share/foo2qpdl/crd/CLP-600-1200x1200cms2
+share/foo2qpdl/crd/CLP-600-1200x600cms2
+share/foo2qpdl/crd/CLP-600-600x600cms2
+share/foo2qpdl/crd/CLP-600cms
+share/foo2qpdl/crd/black-text.ps
+share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
+share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
+share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd
+share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd
+share/foo2zjs/crd/kh.crd
+share/foo2zjs/crd/kx.crd
+share/foo2zjs/crd/prolog.ps
+share/foo2zjs/crd/screen1200.ps
+share/foo2zjs/crd/screen2400.ps
 share/foo2zjs/gamma-lookup.ps
 share/foo2zjs/gamma.ps
 share/foomatic/ppd/foo2zjs/Generic-OAKT_Printer.ppd
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2015/07/28 16:42:03 rumko Exp $

 SHA1 (foo2zjs.tar.gz) = c1a3aeb88cca8b284685c3457a7cc33d78319147
 RMD160 (foo2zjs.tar.gz) = f24945860e41fda61342a9b867123202ecf82179
 Size (foo2zjs.tar.gz) = 1644122 bytes
-SHA1 (patch-Makefile) = ee1542db6f954d77e5e1dcdeb146f57cf9b8cb95
+SHA1 (patch-Makefile) = 439dcce6060d679232b66d38991e86e97a6085eb
+SHA1 (patch-foo2zjs-pstops.sh) = c872f1df99d780705773bf9bda51495975f859e2
 SHA1 (patch-icc2ps_Makefile) = dae8f19cc2fab130d1c4962a3bcbd7d37d8d2a09
--- a/print/foo2zjs/patches/patch-Makefile
+++ b/print/foo2zjs/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $

 Fix PREFIX path
 Remove extra dc check. The DragonFly version has dc that supports the -e
@@ -7,7 +7,7 @@ actually test for -e support.  Just remove it completely.

 --- Makefile.orig	2012-06-01 23:10:31.000000000 +0000
 +++ Makefile
-@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
+@@ -17,9 +17,8 @@ SYSNAME := $(shell uname -n)
 VERSION=0.0
 
 # Installation prefix...
@@ -15,10 +15,11 @@ actually test for -e support.  Just remove it completely.
 -PREFIX=/usr
 -PREFIX=$(DESTDIR)/usr
 +PREFIX=@PREFIX@
+RUNPREFIX=@RUNPREFIX@
 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
-@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -31,7 +30,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
 SHAREQPDL=$(PREFIX)/share/foo2qpdl
 SHARESLX=$(PREFIX)/share/foo2slx
 SHAREHC=$(PREFIX)/share/foo2hiperc
@@ -27,7 +28,7 @@ actually test for -e support.  Just remove it completely.
 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
 INSTALL=install
 ROOT=root
-@@ -58,7 +56,7 @@ endif
+@@ -58,7 +57,7 @@ endif
 ifeq ($(UNAME),SunOS)
     LPuid=-oroot
     LPgid=-glp
@@ -36,7 +37,7 @@ actually test for -e support.  Just remove it completely.
 endif
 # If we aren't root, don't try to set ownership
 ifneq ($(EUID),0)
-@@ -409,12 +407,6 @@ all-test:
+@@ -409,12 +408,6 @@ all-test:
 	    echo "      ***"; \
 	    exit 1; \
 	fi
@@ -49,3 +50,68 @@ actually test for -e support.  Just remove it completely.
 ifeq ($(UNAME),Darwin)
 	@if ! type gsed >/dev/null 2>&1; then \
 	    echo "      ***"; \
+@@ -469,55 +462,55 @@ foo2hiperc: foo2hiperc.o $(LIBJBG)
+ foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2hp2600-wrapper: foo2hp2600-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2xqx-wrapper: foo2xqx-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2lava-wrapper: foo2lava-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2qpdl-wrapper: foo2qpdl-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2oak-wrapper: foo2oak-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2slx-wrapper: foo2slx-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2hiperc-wrapper: foo2hiperc-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2zjs-wrapper9: foo2zjs-wrapper9.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
+	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ 
--- a/print/foo2zjs/patches/patch-foo2zjs-pstops.sh
+++ b/print/foo2zjs/patches/patch-foo2zjs-pstops.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-foo2zjs-pstops.sh,v 1.1 2015/07/28 16:42:03 rumko Exp $
+
+Use gsed on all systems instead of just Darwin.
+
+--- foo2zjs-pstops.sh.orig	2012-02-23 21:19:46.000000000 +0000
+++ foo2zjs-pstops.sh
+@@ -48,7 +48,7 @@ debug() {
+ #
+ case `uname -s` in
+ Darwin)	sed=gsed;;
+-*)	sed=sed;;
+*)	sed=gsed;;
+ esac
+ 
+ #
--- a/print/foomatic4-db-engine/Makefile
+++ b/print/foomatic4-db-engine/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/08/15 22:54:50 leot Exp $
 #

-DISTNAME=	foomatic-db-engine-4.0.8
-PKGREVISION=	8
+DISTNAME=	foomatic-db-engine-4.0.12
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
 COMMENT=	Foomatic's database engine
+LICENSE=	gnu-gpl-v2

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
--- a/print/foomatic4-db-engine/distinfo
+++ b/print/foomatic4-db-engine/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2012/05/22 15:46:54 marino Exp $
+$NetBSD: distinfo,v 1.6 2015/08/15 22:54:50 leot Exp $

-SHA1 (foomatic-db-engine-4.0.8.tar.gz) = e47f5ee9b9256077f70b5ecf2481dfbce416d97a
-RMD160 (foomatic-db-engine-4.0.8.tar.gz) = 56523835ba5de0e5bdb37b78529775334e96ad76
-Size (foomatic-db-engine-4.0.8.tar.gz) = 354578 bytes
-SHA1 (patch-aa) = 12954938f5678c74c2a5663ca8faf7e58329796e
+SHA1 (foomatic-db-engine-4.0.12.tar.gz) = c3b747113b6a64b998000774e7c2d03ce48654c1
+RMD160 (foomatic-db-engine-4.0.12.tar.gz) = 163ad52e616928aa723cb3d263f1686e6a187500
+Size (foomatic-db-engine-4.0.12.tar.gz) = 360499 bytes
+SHA1 (patch-aa) = 3f81a888afc0f0ee6c913f09f2ea896058f015dd
 SHA1 (patch-makeMan.in) = 1beb5dbd5e288660a374e035e52b51fb80b9cc61
--- a/print/foomatic4-db-engine/patches/patch-aa
+++ b/print/foomatic4-db-engine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2012/01/26 11:53:50 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2015/08/15 22:54:50 leot Exp $

--- configure.orig	2011-07-25 09:51:22.000000000 +0000
+--- configure.orig	2015-02-14 12:21:56.000000000 +0000
 +++ configure
-@@ -4041,8 +4041,8 @@ LIBS="$save_LIBS"
+@@ -3720,8 +3720,8 @@ LIBS="$save_LIBS"
 SPOOLSEARCHPATH=/var/spool:/usr/spool/:/usr/local/spool:/usr/local/var/spool:/var/local/spool:/var/local
 LOGSEARCHPATH=/var/log:/usr/log:/usr/local/log:/usr/local/var/log:/var/local/log:/var/local
 SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/08/12 22:27:22 wiz Exp $

 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 		http://downloads.ghostscript.com/public/
--- a/print/ghostscript-agpl/buildlink3.mk
+++ b/print/ghostscript-agpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2015/08/12 22:27:10 wiz Exp $

 BUILDLINK_TREE+=	ghostscript-agpl

@@ -15,9 +15,9 @@ BUILDLINK_PKGSRCDIR.ghostscript-agpl?=		../../print/ghostscript-agpl
 pkgbase := ghostscript-agpl
 .include "../../mk/pkg-build-options.mk"

-.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
-.include "../../print/cups15/buildlink3.mk"
-.endif
+#.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
+#.include "../../print/cups15/buildlink3.mk"
+#.endif

 .if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mfontconfig)
 .include "../../fonts/fontconfig/buildlink3.mk"
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/04/06 11:24:55 adam Exp $
+$NetBSD: distinfo,v 1.7 2015/08/12 22:27:22 wiz Exp $

 SHA1 (ghostscript-9.16.tar.bz2) = 529e2b0be754cb353880a4ac97e3efa47ef82f5c
 RMD160 (ghostscript-9.16.tar.bz2) = b90c62480377b71b791da9c8cedf7673fca00c98
 Size (ghostscript-9.16.tar.bz2) = 29163348 bytes
 SHA1 (patch-af) = 3dd65dbd9611c00d45997c86d16eada37511dca5
 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
-SHA1 (patch-ai) = e83a732559094ea8b683a171219388d5087c816f
+SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
 SHA1 (patch-al) = b4d06da288a608d65cdb014b0f2384406089afe3
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-devices_devs.mak) = 526348d59ccb4d373ace11e46c37899b43a35c29
--- a/print/ghostscript-agpl/patches/patch-ai
+++ b/print/ghostscript-agpl/patches/patch-ai
@@ -1,11 +1,25 @@
-$NetBSD: patch-ai,v 1.2 2013/08/22 21:07:08 adam Exp $
+$NetBSD: patch-ai,v 1.3 2015/08/12 22:27:23 wiz Exp $

+chunk 1:
+fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes
+overlap.
+
+chunk 2:
 Replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664

--- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100
+--- base/mkromfs.c.orig	2015-03-30 08:21:24.000000000 +0000
 +++ base/mkromfs.c
-@@ -2302,7 +2302,7 @@
+@@ -1987,7 +1987,7 @@ ws(const byte *str, int len)
+     if (len >= LINE_SIZE)
+         exit(1);
+ 
+-    memcpy(linebuf, str, len);
+    memmove(linebuf, str, len);
+     flush_line_buf(len);
+ }
+ 
+@@ -2329,7 +2329,7 @@ main(int argc, char *argv[])
 #endif
     fprintf(out,"\n#include \"stdint_.h\"\n");
     fprintf(out,"\n#include \"time_.h\"\n\n");
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/09/23 08:25:09 he Exp $

 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/03/11 20:58:26 spz Exp $
+$NetBSD: distinfo,v 1.12 2015/09/23 08:25:09 he Exp $

 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@@ -11,11 +11,13 @@ SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531
 SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
 SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
 SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
-SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
+SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
 SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
 SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
 SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
 SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
+SHA1 (patch-base_gsmalloc.c) = 891bdcef49e0f2c435744eaf7bbcd31f5dbcbaba
+SHA1 (patch-base_memento.c) = d30cfb9285a0268e743c90cdf831674eaa24789b
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
--- a/print/ghostscript-gpl/patches/patch-ai
+++ b/print/ghostscript-gpl/patches/patch-ai
@@ -1,12 +1,26 @@
-$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2015/08/12 22:20:00 wiz Exp $

+chunk 1:
+fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes
+overlap.
+
+chunk 2:
 replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen
 per PR pkg/40664

--- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100
+--- base/mkromfs.c.orig	2012-08-08 08:01:36.000000000 +0000
 +++ base/mkromfs.c
-@@ -1033,7 +1033,7 @@
+@@ -1836,7 +1836,7 @@ ws(const byte *str, int len)
+     if (len >= LINE_SIZE)
+         exit(1);
+ 
+-    memcpy(linebuf, str, len);
+    memmove(linebuf, str, len);
+     flush_line_buf(len);
+ }
+ 
+@@ -2178,7 +2178,7 @@ main(int argc, char *argv[])
 #endif
     fprintf(out,"\n#include \"stdint_.h\"\n");
     fprintf(out,"\n#include \"time_.h\"\n\n");
--- a/print/ghostscript-gpl/patches/patch-base_gsmalloc.c
+++ b/print/ghostscript-gpl/patches/patch-base_gsmalloc.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-base_gsmalloc.c,v 1.1 2015/09/23 08:25:09 he Exp $
+
+In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the
+variable holding the actual number of bytes we allocate.
+
+Fixes CVE-2015-3228.
+
+--- base/gsmalloc.c.orig	2012-08-08 08:01:36.000000000 +0000
+++ base/gsmalloc.c
+@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u
+     } else {
+         uint added = size + sizeof(gs_malloc_block_t);
+ 
+-        if (mmem->limit - added < mmem->used)
+        if (added <= size || mmem->limit - added < mmem->used)
+             set_msg("exceeded limit");
+         else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0)
+             set_msg("failed");
--- a/print/ghostscript-gpl/patches/patch-base_memento.c
+++ b/print/ghostscript-gpl/patches/patch-base_memento.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-base_memento.c,v 1.1 2015/08/11 18:16:50 wiz Exp $
+
+Rely on header to get memset prototype.
+
+--- base/memento.c.orig	2012-08-08 08:01:36.000000000 +0000
+++ base/memento.c
+@@ -40,11 +40,7 @@
+ #ifdef MEMENTO_GS_HACKS
+ /* For GS we include malloc_.h. Anyone else would just include memento.h */
+ #include "malloc_.h"
+-#ifdef __MACH__
+ #include <string.h>
+-#else
+-void *memset(void *,int,size_t);
+-#endif
+ int atexit(void (*)(void));
+ #else
+ #include "memento.h"
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2015/09/13 18:34:54 gdt Exp $

-VERSION=	5.2.9
+VERSION=	5.2.10
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	22
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,8 @@ MAINTAINER=	gdt@NetBSD.org
 COMMENT=	Drivers for Canon, Epson, Lexmark, and PCL printers
 HOMEPAGE=	http://gutenprint.sourceforge.net/

+LICENSE=	gnu-gpl-v2
+
 PREV_PKGPATH=	print/gutenprint51-lib

 INSTALLVERSION=	5.2
@@ -96,6 +98,9 @@ CONFIGURE_ARGS+=	--without-readline

 # 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.
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/06/13 23:19:19 gdt Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/09/10 00:10:24 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -85,9 +85,11 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3.xml
 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_k3v4.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/sx445.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf40.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf500.xml
@@ -98,6 +100,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cutter_roll_feed.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default-duplex.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro3880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro_cutter_roll_feed.xml
@@ -109,6 +112,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/rx680.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/rx700.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/spro5000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/standard_roll_feed.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/wf7000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c120.xml
@@ -144,6 +148,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_pigment.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome.xml
 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/r800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml
@@ -173,7 +178,11 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_114.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_115.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_116.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_117.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_118.xml
+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_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml
@@ -291,9 +300,9 @@ 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/c1717.html
+share/gutenprint/doc/reference-html/c1715.html
 share/gutenprint/doc/reference-html/c194.html
-share/gutenprint/doc/reference-html/c1968.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
@@ -303,17 +312,19 @@ 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/x1669.html
-share/gutenprint/doc/reference-html/x1734.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/x955.html
+share/gutenprint/doc/reference-html/x953.html
 share/gutenprint/samples/colorbars4.png
 share/gutenprint/samples/colorsweep.png
 share/gutenprint/samples/extended.sample
 share/gutenprint/samples/profile.jpg
 share/gutenprint/samples/testpattern.sample
+share/locale/ca/LC_MESSAGES/gutenprint.mo
+share/locale/ca/gutenprint_ca.po
 share/locale/cs/LC_MESSAGES/gutenprint.mo
 share/locale/cs/gutenprint_cs.po
 share/locale/da/LC_MESSAGES/gutenprint.mo
@@ -354,8 +365,12 @@ share/locale/sl/LC_MESSAGES/gutenprint.mo
 share/locale/sl/gutenprint_sl.po
 share/locale/sv/LC_MESSAGES/gutenprint.mo
 share/locale/sv/gutenprint_sv.po
+share/locale/tr/LC_MESSAGES/gutenprint.mo
+share/locale/tr/gutenprint_tr.po
 share/locale/uk/LC_MESSAGES/gutenprint.mo
 share/locale/uk/gutenprint_uk.po
+share/locale/vi/LC_MESSAGES/gutenprint.mo
+share/locale/vi/gutenprint_vi.po
 share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
 share/locale/zh_CN/gutenprint_zh_CN.po
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.13 2012/07/08 11:34:14 gdt Exp $
+$NetBSD: distinfo,v 1.15 2015/09/13 18:34:54 gdt Exp $

-SHA1 (gutenprint-5.2.9.tar.bz2) = ecfd3757c5f8ddc994e4e60f713f5b9561b8cf28
-RMD160 (gutenprint-5.2.9.tar.bz2) = 4239535bfde87937c678d3942cdd3e37d8905765
-Size (gutenprint-5.2.9.tar.bz2) = 5720450 bytes
-SHA1 (patch-aa) = 42ed47e6f577b6bf562d05f9685f8ff77dc45f88
+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 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
+SHA1 (patch-src_cups_test-ppds) = 6c547013b0c9b11744f3730e78d2aacc88af9813
+SHA1 (patch-src_main_print-olympus.c) = 48b421344f35216fdd663da075e40ce4fac0382b
--- a/print/gutenprint-lib/patches/patch-aa
+++ b/print/gutenprint-lib/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2010/08/12 12:22:44 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2015/09/10 00:10:24 gdt Exp $

 Force, somewhat hackishly, the use of cups lpstat.  Probably upstream
 should find these paths at configure time.

--- src/gutenprintui2/plist.c.orig	2008-02-02 11:06:55.000000000 -0500
+--- src/gutenprintui2/plist.c.orig	2014-01-04 00:38:09.000000000 +0000
 +++ src/gutenprintui2/plist.c
@@ -96,7 +96,7 @@ static const print_system_t default_prin
 static print_system_t known_printing_systems[] =
--- a/print/gutenprint-lib/patches/patch-src_cups_test-ppds
+++ b/print/gutenprint-lib/patches/patch-src_cups_test-ppds
@@ -0,0 +1,16 @@
+$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`
+ 
--- a/print/gutenprint-lib/patches/patch-src_main_print-olympus.c
+++ b/print/gutenprint-lib/patches/patch-src_main_print-olympus.c
@@ -0,0 +1,19 @@
+$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!"
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2015/06/17 10:21:02 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/08/27 23:53:24 khorben Exp $

-DISTNAME=		hplip-3.15.6
-PKGREVISION=		1
+DISTNAME=		hplip-3.15.7
+PKGREVISION=		2
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}

@@ -18,8 +18,6 @@ FILES_SUBST+=           CUPS_GROUP=${CUPS_GROUP}
 PKG_GROUPS_VARS+=       CUPS_GROUP
 PKG_USERS_VARS+=        CUPS_USER

-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-xml
-
 BUILD_DEFS+=            CUPS_USER CUPS_GROUP VARBASE

 GNU_CONFIGURE=		yes
@@ -92,31 +90,33 @@ SUBST_SED.fix-paths-0=	-e 's,run=/var/run,run=${VARBASE}/run,g'

 SUBST_CLASSES+=			fix-paths-1
 SUBST_STAGE.fix-paths-1=	post-configure
-SUBST_MESSAGE.fix-paths-1=	Fixing /etc and /var paths in Python and C++ files.
-SUBST_FILES.fix-paths-1=	check.py base/codes.py base/g.py base/utils.py
-SUBST_FILES.fix-paths-1+=	installer/core_install.py
-SUBST_FILES.fix-paths-1+=	fax/backend/hpfax.py prnt/cups.py
-SUBST_FILES.fix-paths-1+=	ui/devmgr4.py ui4/devmgr5.py
-SUBST_FILES.fix-paths-1+=	prnt/filters/hpps
-SUBST_FILES.fix-paths-1+=	prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp
-SUBST_FILES.fix-paths-1+=	prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp
-SUBST_FILES.fix-paths-1+=	prnt/hpijs/hpijs.cpp
-SUBST_SED.fix-paths-1=	-e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g'
-SUBST_SED.fix-paths-1+=	-e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g'
-SUBST_SED.fix-paths-1+=	-e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g'
-SUBST_SED.fix-paths-1+=	-e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g'
-SUBST_SED.fix-paths-1+=	-e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g'
-SUBST_SED.fix-paths-1+=	-e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g'
+SUBST_MESSAGE.fix-paths-1=	Fixing paths in Python installer files.
+SUBST_FILES.fix-paths-1=	installer/core_install.py
+SUBST_FILES.fix-paths-1+=	installer/dcheck.py
+SUBST_SED.fix-paths-1=	-e 's,\([ '\''"=]\)/usr,\1${PREFIX},g'
+SUBST_SED.fix-paths-1+=	-e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g'
+SUBST_SED.fix-paths-1+=	-e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g'
+SUBST_SED.fix-paths-1+=	-e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g'
+SUBST_SED.fix-paths-1+=	-e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g'

 SUBST_CLASSES+=			fix-paths-2
 SUBST_STAGE.fix-paths-2=	post-configure
-SUBST_MESSAGE.fix-paths-2=	Fixing additional paths in installer/core_install.py.
-SUBST_FILES.fix-paths-2=	installer/core_install.py
-SUBST_SED.fix-paths-2=	-e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g'
-SUBST_SED.fix-paths-2+=	-e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g'
-SUBST_SED.fix-paths-2+=	-e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g'
-SUBST_SED.fix-paths-2+=	-e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g'
-SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/usr,\1${PREFIX},g'
+SUBST_MESSAGE.fix-paths-2=	Fixing /etc and /var paths in Python and C++ files.
+SUBST_FILES.fix-paths-2=	check.py base/codes.py base/g.py base/utils.py
+SUBST_FILES.fix-paths-2+=	base/codes.py base/g.py base/queues.py base/utils.py
+SUBST_FILES.fix-paths-2+=	installer/core_install.py
+SUBST_FILES.fix-paths-2+=	fax/backend/hpfax.py prnt/cups.py
+SUBST_FILES.fix-paths-2+=	ui/devmgr4.py ui4/devmgr5.py
+SUBST_FILES.fix-paths-2+=	prnt/filters/hpps
+SUBST_FILES.fix-paths-2+=	prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp
+SUBST_FILES.fix-paths-2+=	prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp
+SUBST_FILES.fix-paths-2+=	prnt/hpijs/hpijs.cpp
+SUBST_SED.fix-paths-2=	-e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g'
+SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g'
+SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g'
+SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g'
+SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g'
+SUBST_SED.fix-paths-2+=	-e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g'

 SUBST_CLASSES+=			fix-paths-3
 SUBST_STAGE.fix-paths-3=	post-configure
@@ -181,6 +181,5 @@ post-install:
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.16 2015/06/14 21:50:53 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.17 2015/08/14 19:45:29 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -550,6 +550,8 @@ share/hplip/ppd/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1100.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1110_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1110_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1120-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1120.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1125-hpijs.ppd.gz
@@ -630,6 +632,8 @@ share/hplip/ppd/HP/hp-deskjet_3820-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3820.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3822-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3822.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3830_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3830_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3840-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3840.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3870-hpijs.ppd.gz
@@ -1498,6 +1502,8 @@ share/hplip/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
 share/hplip/ppd/HP/hp-officejet_2620_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_2620_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_3830_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_3830_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
@@ -1586,6 +1592,8 @@ share/hplip/ppd/HP/hp-officejet_7400_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7400_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7510_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_8040_series-hpijs.ppd.gz
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.17 2015/06/17 10:21:02 wiz Exp $
+$NetBSD: distinfo,v 1.19 2015/08/27 23:53:24 khorben Exp $

-SHA1 (hplip-3.15.6.tar.gz) = dba9839d3daf1a2dc464a0d3094ba9b71fea422c
-RMD160 (hplip-3.15.6.tar.gz) = ded043f1c5c03949957057647f5e3bbeda3d6885
-Size (hplip-3.15.6.tar.gz) = 21956752 bytes
-SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e
+SHA1 (hplip-3.15.7.tar.gz) = f84e33b749ef34939c11b253767686c00ca2c30c
+RMD160 (hplip-3.15.7.tar.gz) = b8f5b9be838ed9261cb208df46b5aa7ef6680e31
+Size (hplip-3.15.7.tar.gz) = 21979938 bytes
+SHA1 (patch-aa) = 8eb162708a48e9b1720245f65f01177418a4ed85
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
-SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7
+SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605
+SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
--- a/print/hplip/patches/patch-aa
+++ b/print/hplip/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
+$NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $

 # lots of portability changes to configure.in, removing hard-coded paths
 # and pulling in the dynamic library loading modules..

 # pushed upstream as https://bugs.launchpad.net/hplip/+bug/726207

--- configure.in.orig	2013-10-11 09:40:26.000000000 +0000
+--- configure.in.orig	2015-06-07 19:25:40.000000000 +0000
 +++ configure.in
@@ -34,14 +34,15 @@ AC_DISABLE_STATIC
 # Checks for programs.
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
 
 # Checks for required header files.
 AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
-@@ -324,25 +325,25 @@ else
+@@ -316,25 +317,25 @@ else
 fi
 AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
 
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
 fi
 AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
    mimedir=$withval, mimedir="$abs_mimedir")
-@@ -471,12 +472,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
+@@ -467,12 +468,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
 
 # Determine where the PolicyKit policy file goes
 if test "$policykit" = "yes"; then
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
    fi
 else
    policykit_dir=
-@@ -582,6 +583,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
+@@ -581,6 +582,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
 AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
 AC_DEFINE_DIR([abs_docdir], [hpdocdir])
 AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $
+$NetBSD: patch-ae,v 1.9 2015/08/27 23:53:24 khorben Exp $

 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
@@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $
 # still needs to handle the buildlink path for libusb-1.0 :(
 # schnoebe -- Fri May 24 14:55:57 CDT 2013

--- Makefile.am.orig	2013-10-11 09:40:14.000000000 +0000
+--- Makefile.am.orig	2015-06-07 19:25:33.000000000 +0000
 +++ Makefile.am
@@ -105,22 +105,22 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x
 
@@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $
 dist_hplip_state_DATA =
 
 if FULL_BUILD
-@@ -344,9 +344,9 @@ endif
+@@ -359,9 +359,9 @@ endif
 
 # PolicyKit
 if POLICYKIT_INSTALL
@@ -58,7 +58,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $
 dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
 policykit_policydir = $(policykit_dir)
 dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -525,13 +525,13 @@ install-data-hook:
+@@ -541,13 +541,13 @@ install-data-hook:
 if HPLIP_BUILD
 #	   If scanner build, add hpaio entry to sane dll.conf.
 	if [ "$(scan_build)" = "yes" ]; then \
--- a/print/hplip/patches/patch-installer_dcheck.py
+++ b/print/hplip/patches/patch-installer_dcheck.py
@@ -0,0 +1,17 @@
+$NetBSD: patch-installer_dcheck.py,v 1.1 2015/08/27 23:53:24 khorben Exp $
+
+Locate libraries on systems without ldconfig(8)
+
+This only looks for libraries in pkgsrc's own library folder.
+
+--- installer/dcheck.py.orig	2015-06-07 19:25:11.000000000 +0000
+++ installer/dcheck.py
+@@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0):
+         #    pass
+         #else:
+         return True
+    elif check_file(lib+".so","/usr/lib"):
+        return True
+     else:
+         log.debug("Not found.")
+         return False
--- a/print/kbibtex/Makefile
+++ b/print/kbibtex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2015/06/14 13:09:30 markd Exp $
+# $NetBSD: Makefile,v 1.65 2015/07/15 15:09:39 wiz Exp $

 DISTNAME=		kbibtex-0.5.1
+PKGREVISION=		1
 CATEGORIES=		print kde
 MASTER_SITES=		http://download.gna.org/kbibtex/0.5/
 EXTRACT_SUFX=		.tar.xz
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2015/06/15 09:45:39 markd Exp $
+# $NetBSD: Makefile,v 1.38 2015/07/15 15:09:39 wiz Exp $

 DISTNAME=	luatex-beta-0.76.0-source
 PKGNAME=	${DISTNAME:S/-beta//:S/-source//}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	https://foundry.supelec.fr/frs/download.php/file/15745/
 EXTRACT_SUFX=	.tar.bz2
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/05/27 21:52:19 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/09/06 20:53:24 wiz Exp $

 DISTNAME=	mupdf-1.7a-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -22,6 +22,7 @@ MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=	XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=	build=release

+CFLAGS+=	-DJBIG_NO_MEMENTO
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600

 .include "options.mk"
--- a/print/okular/Makefile
+++ b/print/okular/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2015/05/04 21:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/15 15:09:39 wiz Exp $

 DISTNAME=	okular-${_KDE_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	print
 COMMENT=	KDE universal document viewer

--- a/print/p5-LaTeX-Table/Makefile
+++ b/print/p5-LaTeX-Table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/06/12 10:50:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/12 18:56:27 wiz Exp $
 #

 DISTNAME=	LaTeX-Table-v1.0.6
@@ -23,7 +23,7 @@ DEPENDS+=	p5-LaTeX-Driver-[0-9]*:../../print/p5-LaTeX-Driver
 DEPENDS+=	p5-LaTeX-Encode-[0-9]*:../../print/p5-LaTeX-Encode
 DEPENDS+=	p5-Number-Format-[0-9]*:../../textproc/p5-Number-Format
 DEPENDS+=	p5-Text-CSV-[0-9]*:../../textproc/p5-Text-CSV
-DEPENDS+=	{perl>=5.10.1,p5-autodie-[0-9]*}:../../devel/p5-autodie
+#DEPENDS+=	{perl>=5.10.1,p5-autodie-[0-9]*}:../../devel/p5-autodie

 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/LaTeX/Table/.packlist
--- a/print/p5-biblatex-biber/Makefile
+++ b/print/p5-biblatex-biber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/06/12 10:50:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/07/12 18:56:27 wiz Exp $

 VER=		1.9
 DISTNAME=	biblatex-biber
@@ -28,7 +28,7 @@ DEPENDS+=		p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp
 DEPENDS+=		p5-List-AllUtils-[0-9]*:../../devel/p5-List-AllUtils
 DEPENDS+=		p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl
 DEPENDS+=		p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
-DEPENDS+=		{perl>=5.15.9,p5-Unicode-Collate>=0.89}:../../converters/p5-Unicode-Collate
+#DEPENDS+=		{perl>=5.15.9,p5-Unicode-Collate>=0.89}:../../converters/p5-Unicode-Collate
 DEPENDS+=		p5-XML-LibXML-Simple-[0-9]*:../../textproc/p5-XML-LibXML-Simple
 DEPENDS+=		p5-XML-LibXSLT-[0-9]*:../../textproc/p5-XML-LibXSLT
 DEPENDS+=		p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer
--- a/print/pdf2djvu/Makefile
+++ b/print/pdf2djvu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2015/03/09 09:02:21 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2015/07/15 15:09:39 wiz Exp $
 #

 DISTNAME=	pdf2djvu_0.7.14
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	print
 MASTER_SITES=	http://pdf2djvu.googlecode.com/files/

--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2013/02/16 11:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/30 14:43:07 taca Exp $

 MODNAME=		pdflib
 PKGMODNAME=		pdf
-PECL_VERSION=		2.1.8
-PKGREVISION=		4
+PECL_VERSION=		2.1.10
 PECL_LEGACY_VERSION_SCHEME=	yes
 CATEGORIES+=		print
 COMMENT=		PHP extension for PDFlib on-the-fly PDF generation
--- a/print/php-pdflib/distinfo
+++ b/print/php-pdflib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/06/16 02:59:00 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/08/30 14:43:07 taca Exp $

-SHA1 (php-pdflib/pdflib-2.1.8.tgz) = 5d0b01dc6fe81a39e7832a4c719983ebd06f6174
-RMD160 (php-pdflib/pdflib-2.1.8.tgz) = a74d2bba8985bd85fbd61589450c591665663906
-Size (php-pdflib/pdflib-2.1.8.tgz) = 55797 bytes
+SHA1 (php-pdflib/pdflib-2.1.10.tgz) = adfb7d0d84e25f0686b524d260d65827de9d9d09
+RMD160 (php-pdflib/pdflib-2.1.10.tgz) = 65dd3567bf1200880378cd8ee01d5341e8d421b7
+Size (php-pdflib/pdflib-2.1.10.tgz) = 55880 bytes
 SHA1 (patch-pdf.c) = f6a2eb401f5da024df69e6fab119c482d6c8946b
 SHA1 (patch-pdf4.c) = 031c90ac70e3b83a92ea5d7f05388542aad1f2e0
 SHA1 (patch-pdf7.c) = a8cbd01525aa2b4bcbaceb15e82beff1223ce383
--- a/print/poppler-cpp/buildlink3.mk
+++ b/print/poppler-cpp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2015/01/08 10:16:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2015/07/15 15:09:37 wiz Exp $

 BUILDLINK_TREE+=	poppler-cpp

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-cpp
 POPPLER_CPP_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.poppler-cpp+=	poppler-cpp>=0.16.7
-BUILDLINK_ABI_DEPENDS.poppler-cpp+=	poppler-cpp>=0.30.0
+BUILDLINK_ABI_DEPENDS.poppler-cpp+=	poppler-cpp>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler-cpp?=	../../print/poppler-cpp

 .include "../../print/poppler/buildlink3.mk"
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.61 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.62 2015/07/14 09:03:05 wiz Exp $

-PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"

 PKGNAME=	poppler-glib-${POPPLER_VERS}
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/11/20 16:03:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/07/14 09:03:05 wiz Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -32,6 +32,8 @@ share/gtk-doc/html/poppler/api-index-0-16.html
 share/gtk-doc/html/poppler/api-index-0-18.html
 share/gtk-doc/html/poppler/api-index-0-20.html
 share/gtk-doc/html/poppler/api-index-0-22.html
+share/gtk-doc/html/poppler/api-index-0-26.html
+share/gtk-doc/html/poppler/api-index-0-33.html
 share/gtk-doc/html/poppler/api-index-deprecated.html
 share/gtk-doc/html/poppler/api-index-full.html
 share/gtk-doc/html/poppler/ch01.html
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.44 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2015/07/15 15:09:37 wiz Exp $

 BUILDLINK_TREE+=	poppler-glib

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-glib
 POPPLER_GLIB_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.32.0nb1
+BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib

 .include "../../devel/glib2/buildlink3.mk"
--- a/print/poppler-includes/buildlink3.mk
+++ b/print/poppler-includes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2015/01/08 10:16:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2015/07/15 15:09:37 wiz Exp $

 BUILDLINK_TREE+=	poppler-includes

@@ -8,7 +8,7 @@ POPPLER_INCLUDES_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.poppler-includes?=	build

 BUILDLINK_API_DEPENDS.poppler-includes+=	poppler-includes>=0.22.2
-BUILDLINK_ABI_DEPENDS.poppler-includes?=	poppler-includes>=0.30.0
+BUILDLINK_ABI_DEPENDS.poppler-includes?=	poppler-includes>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler-includes?=	../../print/poppler-includes
 .endif # POPPLER_INCLUDES_BUILDLINK3_MK

--- a/print/poppler-qt/buildlink3.mk
+++ b/print/poppler-qt/buildlink3.mk
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.21 2014/04/29 07:57:14 wiz Exp $
-
-BUILDLINK_TREE+=	poppler-qt
-
-.if !defined(POPPLER_QT_BUILDLINK3_MK)
-POPPLER_QT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.poppler-qt+=	poppler-qt>=0.4.5nb1
-BUILDLINK_ABI_DEPENDS.poppler-qt+=	poppler-qt>=0.16.7nb9
-BUILDLINK_PKGSRCDIR.poppler-qt?=	../../print/poppler-qt
-
-.include "../../print/poppler016/buildlink3.mk"
-.endif # POPPLER_QT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-poppler-qt
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.45 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2015/07/14 09:03:05 wiz Exp $

-PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"

 PKGNAME=		poppler-qt4-${POPPLER_VERS}
--- a/print/poppler-qt4/buildlink3.mk
+++ b/print/poppler-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2015/01/08 10:16:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2015/07/15 15:09:37 wiz Exp $

 BUILDLINK_TREE+=	poppler-qt4

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-qt4
 POPPLER_QT4_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.poppler-qt4+=	poppler-qt4>=0.6.1
-BUILDLINK_ABI_DEPENDS.poppler-qt4+=	poppler-qt4>=0.30.0
+BUILDLINK_ABI_DEPENDS.poppler-qt4+=	poppler-qt4>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler-qt4?=	../../print/poppler-qt4

 .include "../../print/poppler/buildlink3.mk"
--- a/print/poppler-qt5/Makefile
+++ b/print/poppler-qt5/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/14 09:03:05 wiz Exp $

-PKGREVISION= 2
 .include "../../print/poppler/Makefile.common"

 PKGNAME=		poppler-qt5-${POPPLER_VERS}
--- a/print/poppler-qt5/buildlink3.mk
+++ b/print/poppler-qt5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/01/08 10:16:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/07/15 15:09:37 wiz Exp $

 BUILDLINK_TREE+=	poppler-qt5

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-qt5
 POPPLER_QT5_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.poppler-qt5+=	poppler-qt5>=0.26.0
-BUILDLINK_ABI_DEPENDS.poppler-qt5?=	poppler-qt5>=0.30.0
+BUILDLINK_ABI_DEPENDS.poppler-qt5?=	poppler-qt5>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler-qt5?=	../../print/poppler-qt5

 .include "../../print/poppler/buildlink3.mk"
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2015/03/09 09:01:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.74 2015/07/14 09:03:05 wiz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -8,7 +8,7 @@
 # used by print/poppler-qt5/Makefile
 # used by print/poppler-utils/Makefile

-POPPLER_VERS=		0.32.0
+POPPLER_VERS=		0.34.0
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2015/03/09 09:01:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2015/07/15 15:09:38 wiz Exp $

 BUILDLINK_TREE+=	poppler

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler
 POPPLER_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.32.0
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.34.0
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler

 .include "../../graphics/lcms2/buildlink3.mk"
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.100 2015/03/09 09:01:52 wiz Exp $
+$NetBSD: distinfo,v 1.101 2015/07/14 09:03:05 wiz Exp $

-SHA1 (poppler-0.32.0.tar.xz) = 1b8d45b88d3ea4e86505a03e576736757142b5f5
-RMD160 (poppler-0.32.0.tar.xz) = 3c301db613399db407bd2ee9b033423b0232b8c2
-Size (poppler-0.32.0.tar.xz) = 1609624 bytes
+SHA1 (poppler-0.34.0.tar.xz) = f204cb6a57730971ef561732a269e7bafc8e8476
+RMD160 (poppler-0.34.0.tar.xz) = 6c353c84246c2f00fc8d7f88822dd9f97883d487
+Size (poppler-0.34.0.tar.xz) = 1615264 bytes
 SHA1 (patch-aa) = 4ff366a6da2a9bd125af18f6413d9b445ca3307a
 SHA1 (patch-ab) = 55bcf94d51f5c9c5bf999f7b4fa63afebe77c83c
 SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
--- a/print/poppler016-qt3/DESCR
+++ b/print/poppler016-qt3/DESCR
--- a/print/poppler016-qt3/Makefile
+++ b/print/poppler016-qt3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2015/09/14 13:34:09 joerg Exp $
 #

 .include "../../print/poppler016/Makefile.common"
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=	--enable-poppler-qt
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils

-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}<0.34
 .include "../../print/poppler016/buildlink3.mk"

 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
--- a/print/poppler016-qt3/PLIST
+++ b/print/poppler016-qt3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/09/11 10:09:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.1 2015/09/12 16:50:01 joerg Exp $
 include/poppler/qt3/poppler-link-qt3.h
 include/poppler/qt3/poppler-page-transition.h
 include/poppler/qt3/poppler-qt.h
--- a/print/poppler016-qt3/buildlink3.mk
+++ b/print/poppler016-qt3/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/09/12 16:50:01 joerg Exp $
+
+BUILDLINK_TREE+=	poppler016-qt3
+
+.if !defined(POPPLER_QT_BUILDLINK3_MK)
+POPPLER_QT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.poppler016-qt3+=	poppler-qt>=0.4.5nb1
+BUILDLINK_ABI_DEPENDS.poppler016-qt3+=	poppler-qt>=0.16.7nb9
+BUILDLINK_PKGSRCDIR.poppler016-qt3?=	../../print/poppler016-qt3
+
+.include "../../print/poppler016/buildlink3.mk"
+.endif # POPPLER_QT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-poppler016-qt3
--- a/print/poppler016/DESCR
+++ b/print/poppler016/DESCR
@@ -7,6 +7,4 @@ effort. And the poppler developers would like to move libpoppler
 forward in a number of areas that doesn't fit within the goals of
 xpdf.

-The GLib wrapper is available in the print/poppler-glib package.
-The QT wrapper is available in the print/poppler-qt package.
-The PDF utilities are available in the print/poppler-utils package.
+The QT wrapper is available in the print/poppler016-qt3 package.
--- a/print/poppler016/Makefile.common
+++ b/print/poppler016/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2014/10/05 16:41:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2015/09/12 16:50:01 joerg Exp $
 #
 # used by print/poppler016/Makefile
-# used by print/poppler-qt/Makefile
+# used by print/poppler016-qt3/Makefile

 POPPLER_VERS=		0.16.7
 DISTNAME=		poppler-${POPPLER_VERS}
--- a/print/poppler016/buildlink3.mk
+++ b/print/poppler016/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/04/29 07:57:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/09/12 16:47:24 joerg Exp $

 BUILDLINK_TREE+=	poppler

 .if !defined(POPPLER_BUILDLINK3_MK)
 POPPLER_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.16.7nb8
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1<0.34
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.16.7nb8<0.34
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler016

 pkgbase := poppler
--- a/print/py-PDF2/Makefile
+++ b/print/py-PDF2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/10/02 13:16:20 wen Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/18 17:01:08 kleink Exp $

-DISTNAME=	PyPDF2-1.23
+DISTNAME=	PyPDF2-1.25.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//}
 CATEGORIES=	print python
-MASTER_SITES=	https://pypi.python.org/packages/source/P/PyPDF2/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyPDF2/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mstamy2.github.io/PyPDF2/
--- a/print/py-PDF2/distinfo
+++ b/print/py-PDF2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/10/02 13:16:20 wen Exp $
+$NetBSD: distinfo,v 1.3 2015/08/18 16:58:21 kleink Exp $

-SHA1 (PyPDF2-1.23.tar.gz) = e5f6caac9c6ed490fe2a782de56c2840902eb1ca
-RMD160 (PyPDF2-1.23.tar.gz) = f009d1c3cc887605caf93fe61b38b85e0ec160f0
-Size (PyPDF2-1.23.tar.gz) = 59589 bytes
+SHA1 (PyPDF2-1.25.1.tar.gz) = b45adc8cf2129e4c7a3a22a2a3266fb80b64f457
+RMD160 (PyPDF2-1.25.1.tar.gz) = 50aba019402254fe36389426778462bae5890b7b
+Size (PyPDF2-1.25.1.tar.gz) = 194181 bytes
--- a/print/py-poppler/Makefile
+++ b/print/py-poppler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2015/04/25 14:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/15 15:09:39 wiz Exp $

 DISTNAME=	pypoppler-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/

--- a/print/py-weasyprint/DESCR
+++ b/print/py-weasyprint/DESCR
@@ -0,0 +1,7 @@
+WeasyPrint is a visual rendering engine for HTML and CSS that can
+export to PDF. It aims to support web standards for printing.
+WeasyPrint is free software made available under a BSD license.
+
+It is based on various libraries but not on a full rendering engine
+like WebKit or Gecko. The CSS layout engine is written in Python,
+designed for pagination, and meant to be easy to hack on.
--- a/print/py-weasyprint/Makefile
+++ b/print/py-weasyprint/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2015/08/14 17:05:04 kleink Exp $
+
+DISTNAME=	WeasyPrint-0.24
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
+CATEGORIES=	print python
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WeasyPrint/}
+
+MAINTAINER=	kleink@NetBSD.org
+HOMEPAGE=	http://weasyprint.org/
+COMMENT=	Converts HTML/CSS documents to PDF
+LICENSE=	modified-bsd
+
+USE_LANGUAGES=	# empty
+
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+
+DEPENDS+=	${PYPKGPREFIX}-cairosvg>=0.4.1:../../converters/py-cairosvg
+DEPENDS+=	${PYPKGPREFIX}-cairocffi>=0.5:../../graphics/py-cairocffi
+DEPENDS+=	${PYPKGPREFIX}-lxml>=3.0:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-html5lib>=0.999:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-tinycss>=0.3:../../textproc/py-tinycss
+DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.6:../../textproc/py-cssselect
+DEPENDS+=	${PYPKGPREFIX}-pyphen>=0.8:../../textproc/py-pyphen
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/Show More
+++ b/Show More