mupdf: Update to 1.16.0

pkgsrc changes:
 - (re)add curl option to build mupdf with curl support (disabled by default).
   Unlike previous versions that supported curl now mupdf with curl support is
   installed as a separate binary as `mupdf-curl' as done by upstream.

Changes:
1.16.0
------
api: Major overhaul of color management architecture.
api: Improved functions to verify/sign PDF documents.
api: Number tree accessor function pdf_lookup_number.
api: Parse and handle more options for PWG output.
api: Removed obsolete gproof document type.
api: User callbacks for warning and error messages.

epub: Changed default page size to A5.
epub: Draw embedded SVG documents in EPUB/XHTML.
epub: New Noto fonts covering more unicode scripts.
epub: Support small-caps font-variant.
pdf: Add Redact annotation type and function to apply redactions.
pdf: Add/remove/change encryption and password when saving PDF files.
pdf: Improvements to text handling in PDF filter processor.
pdf: MP and DP operators now call begin/end_layer device methods.
pdf: New and improved progressive loading.
svg: Draw external images in SVG documents.

mutool show: Add 'form' selector to list PDF form fields.
mutool sign: Sign PDF documents from the command line.
mutool sign: Verify signatures in PDF documents from the command line.
viewer: Option to save a script of user actions for replay with mutool run.
viewer: Runtime toggle for ICC and spot rendering.
viewer: Tooltip when hovering over a link in mupdf-gl.

9 files changed, 125 insertions, 105 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index da23b804fb9..08ab9dcfc43 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2019/07/06 11:27:48 leot Exp $
+# $NetBSD: Makefile,v 1.70 2019/08/03 14:47:41 leot Exp $
 
-DISTNAME=	mupdf-1.15.0-source
+DISTNAME=	mupdf-1.16.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://mupdf.com/downloads/archive/
 
@@ -25,7 +24,6 @@ MAKE_FLAGS+=		build=release
 MAKE_ENV+=		HAVE_LIBCRYPTO=no	# Needs openssl-1.1.0
 MAKE_ENV+=		USE_SYSTEM_LIBS=yes
 
-CFLAGS+=	-DJBIG_NO_MEMENTO
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
 
 .include "options.mk"
@@ -35,6 +33,7 @@ CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
 # default Javascript interpreter for mupdf).
 post-extract:
 	${RM} -fr \
+	    ${WRKSRC}/thirdparty/curl \
 	    ${WRKSRC}/thirdparty/freeglut \
 	    ${WRKSRC}/thirdparty/freetype \
 	    ${WRKSRC}/thirdparty/harfbuzz \
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index 7d7937ad566..c80904c81ab 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.18 2019/05/12 12:27:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/08/03 14:47:41 leot Exp $
 bin/mupdf
+${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
 bin/muraster
 bin/mutool
@@ -9,8 +10,7 @@ include/mupdf/fitz/band-writer.h
 include/mupdf/fitz/bidi.h
 include/mupdf/fitz/bitmap.h
 include/mupdf/fitz/buffer.h
-include/mupdf/fitz/color-management.h
-include/mupdf/fitz/colorspace.h
+include/mupdf/fitz/color.h
 include/mupdf/fitz/compress.h
 include/mupdf/fitz/compressed-buffer.h
 include/mupdf/fitz/config.h
@@ -81,10 +81,10 @@ share/doc/mupdf/CHANGES
 share/doc/mupdf/COPYING
 share/doc/mupdf/README
 share/doc/mupdf/android-sdk.html
-share/doc/mupdf/api-changes.html
 share/doc/mupdf/artifex-logo.png
 share/doc/mupdf/building.html
 share/doc/mupdf/coding-overview.html
+share/doc/mupdf/coding-progressive.html
 share/doc/mupdf/coding-style.html
 share/doc/mupdf/examples/bbox-device.js
 share/doc/mupdf/examples/create-thumbnail.js
diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk
index 2f8abb99eca..f6340d75e41 100644
--- a/print/mupdf/buildlink3.mk
+++ b/print/mupdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2019/05/13 11:03:58 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2019/08/03 14:47:41 leot Exp $
 
 BUILDLINK_TREE+=	mupdf
 
@@ -12,6 +12,10 @@ BUILDLINK_PKGSRCDIR.mupdf?=	../../print/mupdf
 pkgbase := mupdf
 .include "../../mk/pkg-build-options.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index c0464840181..bb5af63f947 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.46 2019/07/06 11:27:48 leot Exp $
+$NetBSD: distinfo,v 1.47 2019/08/03 14:47:41 leot Exp $
 
-SHA1 (mupdf-1.15.0-source.tar.gz) = 4354a1c7245d4351ba604a4deed4a4ecf3e27492
-RMD160 (mupdf-1.15.0-source.tar.gz) = 892247f12a9e85d384c6cbc6c5a394d36e783158
-SHA512 (mupdf-1.15.0-source.tar.gz) = d44091e67c4772cad7bb90d66f6da6e05fed376ff5965636ff56eac4ca2faf262f75e80b34514ce52e6141af585cbb0095d5113d20f5b379e548c31fb664c287
-Size (mupdf-1.15.0-source.tar.gz) = 53023898 bytes
-SHA1 (patch-Makethird) = 3d339e860c45bedc074106fa510f64eb3118cd1a
-SHA1 (patch-ab) = 4824dcf66e7692212cb327515d48e281029564f7
-SHA1 (patch-ac) = 94294d03a0ad31e2e4063fca05e02bc6e2713bec
+SHA1 (mupdf-1.16.0-source.tar.gz) = 18f069b7cc125e53f541163ac305c588c94dea97
+RMD160 (mupdf-1.16.0-source.tar.gz) = b3d96cc1cc381c9e95f516680a9c64b17e388bc5
+SHA512 (mupdf-1.16.0-source.tar.gz) = d3eaa9cb4b13af6c35826a878eb8a80707e1ba402665d7f38a93343c09e36aef6a38b67eee70a0cdd74e037282defa12b377f49cb5837de7cf0aff8a5ebcf4ac
+Size (mupdf-1.16.0-source.tar.gz) = 60805124 bytes
+SHA1 (patch-Makethird) = 027f69be8ab3bb29535d3315d85c2d5d32a4dccf
+SHA1 (patch-ab) = 18bc9e283624ec810662d29309db9a8dd9268bb8
+SHA1 (patch-ac) = 97442b78e52e57b783d93771c6002702dda38e8f
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
-SHA1 (patch-source_fitz_list-device.c) = ea8ca9df49c16a91546ab05e8f3e57b1308c2278
 SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
 SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
diff --git a/print/mupdf/options.mk b/print/mupdf/options.mk
index 8c29b9c9a78..e168a86ce6f 100644
--- a/print/mupdf/options.mk
+++ b/print/mupdf/options.mk
@@ -1,11 +1,19 @@
-# $NetBSD: options.mk,v 1.7 2019/05/12 12:27:02 ryoon Exp $
+# $NetBSD: options.mk,v 1.8 2019/08/03 14:47:41 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS=	opengl
+PKG_SUPPORTED_OPTIONS=	curl opengl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		opengl
+PLIST_VARS+=		curl opengl
+
+#
+# curl support
+#
+.if !empty(PKG_OPTIONS:Mcurl)
+PLIST.curl=	yes
+.include "../../www/curl/buildlink3.mk"
+.endif
 
 #
 # glut support
diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird
index 066e95a8c51..34d49a53efe 100644
--- a/print/mupdf/patches/patch-Makethird
+++ b/print/mupdf/patches/patch-Makethird
@@ -1,10 +1,20 @@
-$NetBSD: patch-Makethird,v 1.10 2019/05/13 11:03:58 leot Exp $
+$NetBSD: patch-Makethird,v 1.11 2019/08/03 14:47:41 leot Exp $
 
-mujs building support with libtool
+- Do not pass thirdparty lcms2 CFLAGS (mupdf is always built without lcms2)
+- mujs building support with libtool
 
---- Makethird.orig	2018-09-25 12:39:17.000000000 +0000
+--- Makethird.orig	2019-07-23 12:23:08.000000000 +0000
 +++ Makethird
-@@ -229,7 +229,7 @@ else
+@@ -216,8 +216,6 @@ else
+ 
+ THIRD_SRC += $(sort $(wildcard thirdparty/lcms2/src/cms*.c))
+ 
+-THIRD_CFLAGS += -Ithirdparty/lcms2/include -DHAVE_LCMS2MT
+-
+ $(OUT)/thirdparty/lcms2/%.o: thirdparty/lcms2/%.c
+ 	$(CC_CMD) -Ithirdparty/lcms2/include
+ 
+@@ -233,7 +231,7 @@ else
  THIRD_SRC += thirdparty/mujs/one.c
  THIRD_CFLAGS += -Ithirdparty/mujs
  
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 7be05ae0c5b..2ed17817630 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
+$NetBSD: patch-ab,v 1.21 2019/08/03 14:47:41 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
   If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
---- Makerules.orig	2019-05-06 11:53:09.000000000 +0000
+--- Makerules.orig	2019-07-23 12:23:08.000000000 +0000
 +++ Makerules
 @@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
  OS := $(OS:Windows_NT=MINGW)
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
  SANITIZE_FLAGS += -fsanitize=address
  SANITIZE_FLAGS += -fsanitize=leak
  
-@@ -72,52 +61,40 @@ SYS_MUJS_LIBS := -lmujs
+@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
  SYS_OPENJPEG_LIBS := -lopenjp2
  SYS_ZLIB_LIBS := -lz
  
@@ -50,11 +50,11 @@ $NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
 -  AR = xcrun ar
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
--
--else ifeq ($(OS),Linux)
--  HAVE_OBJCOPY := yes
 +HAVE_OBJCOPY := no
  
+-else ifeq ($(OS),Linux)
+-  HAVE_OBJCOPY := yes
+-
 -  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
 +ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
  	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
@@ -94,22 +94,34 @@ $NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
 -  endif
 +endif
  
+-  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
+-  ifeq ($(HAVE_SYS_CURL),yes)
++HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ifeq ($(HAVE_SYS_CURL),yes)
+ 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+ 	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+-  endif
++endif
+ 
 -  HAVE_GLUT := yes
 -  ifeq ($(HAVE_GLUT),yes)
 -	SYS_GLUT_CFLAGS :=
 -	SYS_GLUT_LIBS := -lglut -lGL
 -  endif
-+ifeq ($(shell pkg-config --exists glut && echo yes),yes)
-+  HAVE_GLUT ?= yes
-+  SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-+  SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
++HAVE_GLUT ?= $(shell pkg-config --exists glut && echo yes)
++ifeq ($(HAVE_GLUT),yes)
++	SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
++	SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
 +endif
  
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-   ifeq ($(HAVE_X11),yes)
-@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux)
+-  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+-  ifeq ($(HAVE_X11),yes)
++HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
++ifeq ($(HAVE_X11),yes)
+ 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
  	X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
+-  endif
++endif
  
 -  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
 -  ifeq ($(HAVE_LIBCRYPTO),yes)
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index c6f21bb4048..87f6c75af3f 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
+$NetBSD: patch-ac,v 1.24 2019/08/03 14:47:41 leot Exp $
 
 - libtool support 
 - Install target cleanup
@@ -6,10 +6,11 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
 - Do not force `-O0' flag when building
 - Get rid of unused VERSION variable and `version:' target (otherwise `git' can
   be invoked during the building phase)
+- Install mupdf with curl support as `mupdf-curl'
 
---- Makefile.orig	2019-05-06 11:53:09.000000000 +0000
+--- Makefile.orig	2019-07-26 14:10:07.000000000 +0000
 +++ Makefile
-@@ -51,65 +51,65 @@ ifneq ($(verbose),yes)
+@@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
  endif
  
  MKTGTDIR = mkdir -p $(dir $@)
@@ -51,14 +52,17 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  	$(CC_CMD) -Wall $(THIRD_CFLAGS) $(THREADING_CFLAGS)
  
 -$(OUT)/generated/%.o : generated/%.c
--	$(CC_CMD) -O0
 +$(OUT)/generated/%.lo : generated/%.c
-+	$(CC_CMD)
+ 	$(CC_CMD) -O0
  
 -$(OUT)/platform/x11/%.o : platform/x11/%.c
 +$(OUT)/platform/x11/%.lo : platform/x11/%.c
  	$(CC_CMD) -Wall $(X11_CFLAGS)
  
+-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c
++$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c
+ 	$(CC_CMD) -Wall $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
+ 
 -$(OUT)/platform/gl/%.o : platform/gl/%.c
 +$(OUT)/platform/gl/%.lo : platform/gl/%.c
  	$(CC_CMD) -Wall $(THIRD_CFLAGS) $(GLUT_CFLAGS)
@@ -94,9 +98,9 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -119,14 +119,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
+@@ -121,14 +121,14 @@ MUPDF_SRC += $(sort $(wildcard source/sv
+ MUPDF_SRC += $(sort $(wildcard source/html/*.c))
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
- MUPDF_SRC += $(sort $(wildcard source/gprf/*.c))
  
 -MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
 +MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.lo)
@@ -112,16 +116,27 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  
  # --- Generated embedded font files ---
  
-@@ -153,7 +153,7 @@ ifeq ($(HAVE_OBJCOPY),yes)
-   $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
-   $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
+@@ -149,13 +149,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_EXE)
+ generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
+ 
+ ifeq ($(HAVE_OBJCOPY),yes)
+-  MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
+-  $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD)
+-  $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD)
+-  $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
+-  $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
++  MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.lo)
++  $(OUT)/%.cff.lo : %.cff ; $(OBJCOPY_CMD)
++  $(OUT)/%.otf.lo : %.otf ; $(OBJCOPY_CMD)
++  $(OUT)/%.ttf.lo : %.ttf ; $(OBJCOPY_CMD)
++  $(OUT)/%.ttc.lo : %.ttc ; $(OBJCOPY_CMD)
  else
 -  MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.o)
 +  MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.lo)
  endif
  
  generate: $(FONT_GEN)
-@@ -187,17 +187,17 @@ generate: source/pdf/js/util.js.h
+@@ -189,17 +189,17 @@ generate: source/pdf/js/util.js.h
  
  # --- Library ---
  
@@ -144,7 +159,7 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  
  # --- Main tools and viewers ---
  
-@@ -208,13 +208,13 @@ MUTOOL_SRC += source/tools/murun.c
+@@ -210,13 +210,13 @@ MUTOOL_SRC += source/tools/murun.c
  MUTOOL_SRC += source/tools/mutrace.c
  MUTOOL_SRC += source/tools/cmapdump.c
  MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c))
@@ -160,7 +175,7 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  MURASTER_EXE := $(OUT)/muraster
  $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
-@@ -222,7 +222,7 @@ TOOL_APPS += $(MURASTER_EXE)
+@@ -224,7 +224,7 @@ TOOL_APPS += $(MURASTER_EXE)
  
  ifeq ($(HAVE_GLUT),yes)
    MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
@@ -169,7 +184,7 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
    MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
    $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(GLUT_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)
-@@ -230,10 +230,10 @@ ifeq ($(HAVE_GLUT),yes)
+@@ -232,10 +232,10 @@ ifeq ($(HAVE_GLUT),yes)
  endif
  
  ifeq ($(HAVE_X11),yes)
@@ -184,7 +199,7 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
    $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_X11_EXE)
-@@ -241,9 +241,9 @@ endif
+@@ -243,9 +243,9 @@ endif
  
  ifeq ($(HAVE_WIN32),yes)
    MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32
@@ -197,7 +212,26 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_WIN32_EXE)
-@@ -251,18 +251,18 @@ endif
+@@ -254,12 +254,12 @@ endif
+ ifeq ($(HAVE_X11),yes)
+ ifeq ($(HAVE_CURL),yes)
+ ifeq ($(HAVE_PTHREAD),yes)
+-  MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl
+-  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.o
+-  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.o
+-  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.o
+-  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.o
+-  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.o
++  MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-curl
++  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.lo
++  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.lo
++  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.lo
++  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.lo
++  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.lo
+   $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
+ 	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS) $(CURL_LIBS) $(PTHREAD_LIBS)
+   VIEW_APPS += $(MUVIEW_X11_CURL_EXE)
+@@ -269,19 +269,19 @@ endif
  
  # --- Generated dependencies ---
  
@@ -223,11 +257,13 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
 +-include $(MUVIEW_WIN32_OBJ:%.lo=%.d)
  
 --include $(MURASTER_OBJ:%.o=%.d)
+--include $(MUVIEW_X11_CURL_OBJ:%.o=%.d)
 +-include $(MURASTER_OBJ:%.lo=%.d)
++-include $(MUVIEW_X11_CURL_OBJ:%.lo=%.d)
  
  # --- Examples ---
  
-@@ -273,10 +273,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -292,10 +292,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  
  # --- Update version string header ---
  
@@ -242,7 +278,7 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
  
  # --- Format man pages ---
  
-@@ -304,27 +304,30 @@ tools: $(TOOL_APPS)
+@@ -323,27 +323,30 @@ tools: $(TOOL_APPS)
  apps: $(TOOL_APPS) $(VIEW_APPS)
  
  install: libs apps
diff --git a/print/mupdf/patches/patch-source_fitz_list-device.c b/print/mupdf/patches/patch-source_fitz_list-device.c
deleted file mode 100644
index 5992646c8ea..00000000000
--- a/print/mupdf/patches/patch-source_fitz_list-device.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-source_fitz_list-device.c,v 1.1 2019/07/06 11:27:48 leot Exp $
-
-Backport commits ed19bc806809ad10c4ddce515d375581b86ede85 and
-aaf794439e40a2ef544f15b50c20e657414dec7a to address CVE-2019-13290.
-
-Commit ed19bc806809ad10c4ddce515d375581b86ede85:
-> Bug 701118: Handle appending large display list nodes.
-> 
-> The size of the begin layer node depends on the size of the layer
-> name. That name may be a string from the page's property resources,
-> and is only bounded by memory when parsed by lex_string(). So the
-> append_list_node() logic cannot simply double the size of the
-> display list and hope that the node fits, since the node may be
-> of arbitrary size.
-> 
-> Now append_list_node() would repeatedly double the size of the
-> display list until the node fits, or malloc() runs out of memory.
-
-Commit aaf794439e40a2ef544f15b50c20e657414dec7a:
-> Bug 701118: Limit size of begin layer nodes in display list.
-> 
-> The size of the begin layer node depends on the size of the layer
-> name. That name may be a string from the page's property resources,
-> and is only bounded by memory when parsed by lex_string(). The
-> layer name may cause a display node to be larger than the maximum
-> size allowed. This condition is now checked for.
-
---- source/fitz/list-device.c.orig
-+++ source/fitz/list-device.c
-@@ -462,6 +462,9 @@ fz_append_display_node(
- 	}
- 	if (private_data != NULL)
- 	{
-+		int max = SIZE_IN_NODES(MAX_NODE_SIZE) - size;
-+		if (SIZE_IN_NODES(private_data_len) > max)
-+			fz_throw(ctx, FZ_ERROR_GENERIC, "Private data too large to pack into display list node");
- 		private_off = size;
- 		size += SIZE_IN_NODES(private_data_len);
- 	}
-@@ -466,7 +466,7 @@ fz_append_display_node(
- 		size += SIZE_IN_NODES(private_data_len);
- 	}
- 
--	if (list->len + size > list->max)
-+	while (list->len + size > list->max)
- 	{
- 		int newsize = list->max * 2;
- 		fz_display_node *old = list->list;