Update to 1.15.0

* Update lcms2 comment
* Remove removed www/curl option

Changelog:
List of changes in MuPDF 1.15.0

General improvements:
	* WebAssembly build target and examples.
	* Improved forms API in both C and Java bindings.
	* Improved forms JavaScript support.
	* Create appearance streams for more form field types.
	* Fixed many bugs in ICC color management.
	* Fixed many memory leaks in error cleanup.
	* Fixed bugs in pdfwrite output.
	* Improved text extraction from LaTeX documents with math symbols.
	* Improved trace device formatting.
	* Support CBZ and CBT files larger than 2Gb.
	* Show table of contents for FB2 and XHTML documents.
	* Show embedded raster images in SVG and XHTML documents.
	* Show FB2 cover page.
	* Add option to save PDF files without encryption.
	* Add inhibit-spaces option to stext device to turn off missing space detection.
	* Simplified fz_try/fz_always/fz_catch macros.

mupdf-gl improvements:
	* Automatically open annotation editor when selecting an annotation.
	* Full page color tinting option in mupdf-gl.
	* Show/hide table of contents sections.
	* Trigger a reload with sighup.
	* Toggle spot color mode with 'e'.

mutool improvements:
	mutool show $PDF outline -- show outline with open/closed state indicator.
	mutool show $PDF js -- show document level javascript.
	mutool clean -A -- create appearance streams when missing.
	mutool clean -AA -- recreate all appearance streams.
	mutool run docs/examples/portfolio.js -- extract embedded files from PDF document.
	mutool run docs/examples/pdf-dejpx.js -- decompress JPEG2000 images in PDF document.
	mutool run docs/examples/fix-s22pdf.js -- fix fonts in documents generated by S22PDF.

Significant API changes:
	* New and improved forms API.
	* Renamed -DNO_ICC to -DFZ_ENABLE_ICC=0
	* Removed fz_annot superclass. Use pdf_annot and pdf_widget directly instead.
	* Annotations and Widgets now have separate enumerators.
	* Added optional separations argument to pixmap rendering utility functions.

Various cleanups:
	Per-function documentation comments moved to the source file.
	Hopefully they will stay up to date more often than when they
	were hidden away in the header file.

	Removed unused internal testing tools: mjsgen and jstest.

	Removed TGA output support. Use one of the more common and useful PAM,
	PNM, PNG, or TIFF formats instead.

	Removed support for PDF portfolios. This work-in-progress feature was
	never completed, and only worked for a small subset of files.

	Removed support for progressive loading. This rarely used feature added
	a lot of complexity and was an unending source of bugs and strange
	behaviour. Removing this feature has allowed us to clean up and
	simplify large amounts of code, and fix dozens of bugs in one fell
	swoop.

7 files changed, 90 insertions, 182 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 06c7209900f..84c1b53799c 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2018/12/13 19:51:36 adam Exp $
+# $NetBSD: Makefile,v 1.67 2019/05/12 12:27:02 ryoon Exp $
 
-DISTNAME=	mupdf-1.14.0-source
+DISTNAME=	mupdf-1.15.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://mupdf.com/downloads/archive/
 
@@ -11,14 +10,6 @@ HOMEPAGE=	https://mupdf.com/
 COMMENT=	Lightweight PDF, XPS and E-book viewer and toolkit
 LICENSE=	gnu-agpl-v3
 
-# XXX: The tarball originally packaged for mupdf-1.14.0 did not contain commit
-# XXX: id 7f77313e6d60fc917146b80cce2f9c1ab0152349 changes related to mupdf-gl
-# XXX: that defines realpath(3) for Windows and fix an inverted logic
-# XXX: condition regarding FREEGLUT macro check.
-# XXX: The DIST_SUBDIR definition can be removed in the next (post-1.14.0)
-# XXX: stable release of mupdf.
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
 USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
@@ -67,7 +58,7 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.7
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-# XXX: Needs lcms2-2.9 that ATM is not in pkgsrc.
+# XXX: lcms2-2.9 does not usable for mupdf
 #BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
 #.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index 04cc2166dd7..7d7937ad566 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.17 2018/10/04 19:02:33 leot Exp $
-bin/mjsgen
-bin/mujstest
+@comment $NetBSD: PLIST,v 1.18 2019/05/12 12:27:02 ryoon Exp $
 bin/mupdf
 ${PLIST.opengl}bin/mupdf-gl
 bin/muraster
 bin/mutool
 include/mupdf/fitz.h
-include/mupdf/fitz/annotation.h
 include/mupdf/fitz/archive.h
 include/mupdf/fitz/band-writer.h
 include/mupdf/fitz/bidi.h
@@ -32,15 +29,7 @@ include/mupdf/fitz/hash.h
 include/mupdf/fitz/image.h
 include/mupdf/fitz/link.h
 include/mupdf/fitz/outline.h
-include/mupdf/fitz/output-pcl.h
-include/mupdf/fitz/output-pclm.h
-include/mupdf/fitz/output-png.h
-include/mupdf/fitz/output-pnm.h
-include/mupdf/fitz/output-ps.h
-include/mupdf/fitz/output-psd.h
-include/mupdf/fitz/output-pwg.h
 include/mupdf/fitz/output-svg.h
-include/mupdf/fitz/output-tga.h
 include/mupdf/fitz/output.h
 include/mupdf/fitz/path.h
 include/mupdf/fitz/pixmap.h
@@ -58,10 +47,10 @@ include/mupdf/fitz/transition.h
 include/mupdf/fitz/tree.h
 include/mupdf/fitz/util.h
 include/mupdf/fitz/version.h
+include/mupdf/fitz/write-pixmap.h
 include/mupdf/fitz/writer.h
 include/mupdf/fitz/xml.h
 include/mupdf/memento.h
-include/mupdf/pdf-tools.h
 include/mupdf/pdf.h
 include/mupdf/pdf/annot.h
 include/mupdf/pdf/clean.h
@@ -69,8 +58,8 @@ include/mupdf/pdf/cmap.h
 include/mupdf/pdf/crypt.h
 include/mupdf/pdf/document.h
 include/mupdf/pdf/event.h
-include/mupdf/pdf/field.h
 include/mupdf/pdf/font.h
+include/mupdf/pdf/form.h
 include/mupdf/pdf/interpret.h
 include/mupdf/pdf/javascript.h
 include/mupdf/pdf/name-table.h
@@ -79,7 +68,6 @@ include/mupdf/pdf/output-pdf.h
 include/mupdf/pdf/page.h
 include/mupdf/pdf/parse.h
 include/mupdf/pdf/resource.h
-include/mupdf/pdf/widget.h
 include/mupdf/pdf/xref.h
 include/mupdf/ucdn.h
 lib/libmupdf-pkcs7.la
@@ -93,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
@@ -108,7 +96,9 @@ share/doc/mupdf/examples/jpx-to-pdf.js
 share/doc/mupdf/examples/multi-threaded.c
 share/doc/mupdf/examples/pdf-create-lowlevel.js
 share/doc/mupdf/examples/pdf-create.js
+share/doc/mupdf/examples/pdf-dejpx.js
 share/doc/mupdf/examples/pdf-merge.js
+share/doc/mupdf/examples/pdf-portfolio.js
 share/doc/mupdf/examples/trace-device.js
 share/doc/mupdf/index.html
 share/doc/mupdf/manual-mupdf-gl.html
@@ -118,7 +108,6 @@ share/doc/mupdf/manual-mutool-create.html
 share/doc/mupdf/manual-mutool-draw.html
 share/doc/mupdf/manual-mutool-extract.html
 share/doc/mupdf/manual-mutool-merge.html
-share/doc/mupdf/manual-mutool-portfolio.html
 share/doc/mupdf/manual-mutool-run.html
 share/doc/mupdf/manual-mutool-show.html
 share/doc/mupdf/manual-mutool-trace.html
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 29004142dae..23cbd1736c5 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.42 2018/10/09 12:34:16 ryoon Exp $
+$NetBSD: distinfo,v 1.43 2019/05/12 12:27:02 ryoon Exp $
 
-SHA1 (mupdf-1.14.0/mupdf-1.14.0-source.tar.gz) = b55179569716b9fd85655f6018ffd999b101f3c5
-RMD160 (mupdf-1.14.0/mupdf-1.14.0-source.tar.gz) = 4bff6300792025f5bd76b46d010dcfc8d2edeeb1
-SHA512 (mupdf-1.14.0/mupdf-1.14.0-source.tar.gz) = 2dbe4e1d02e296dd01f59471d34771066eaab10b81d9a357f5ea9661298116b5dbfec61858dc0fb3e6714d66bde9fa22d2b665b90165b8642342ec838289dcf9
-Size (mupdf-1.14.0/mupdf-1.14.0-source.tar.gz) = 55654104 bytes
+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) = 33b7ccf235e971c44e159a687cecc033155957ba
-SHA1 (patch-ab) = 5ef190923d648165cdf29174f1521bd069c7e6f9
-SHA1 (patch-ac) = 4f685e425bff4d257ca3bce3d2b536d5cea1e8aa
+SHA1 (patch-ab) = abddcb1d72a16bd421b6ae924a4b4d759e8371e3
+SHA1 (patch-ac) = 693f1c98f12450f8e23707cf560094ab6166c8eb
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
 SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
-SHA1 (patch-thirdparty_mujs_Makefile) = fc7cbbbeb2a59c4322e2ed46e12cf3dddfd21d28
+SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
diff --git a/print/mupdf/options.mk b/print/mupdf/options.mk
index aee17a80a98..8c29b9c9a78 100644
--- a/print/mupdf/options.mk
+++ b/print/mupdf/options.mk
@@ -1,22 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2017/12/18 15:06:33 leot Exp $
+# $NetBSD: options.mk,v 1.7 2019/05/12 12:27:02 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS=	curl opengl
+PKG_SUPPORTED_OPTIONS=	opengl
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		opengl
 
 #
-# curl support
-#
-.if !empty(PKG_OPTIONS:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-.else
-MAKE_ENV+=	HAVE_CURL=no
-.endif
-
-#
 # glut support
 #
 .if !empty(PKG_OPTIONS:Mopengl)
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 892d2dddf64..3b5da57d8dc 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 ryoon 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.18 2018/10/04 19:02:33 leot Exp $
   If no lcms2 is available just pass `-DNO_ICC' to disable it via
   CFLAGS.
 
---- Makerules.orig	2018-09-25 12:39:17.000000000 +0000
+--- Makerules.orig	2019-05-06 11:53:09.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.18 2018/10/04 19:02:33 leot Exp $
  SANITIZE_FLAGS += -fsanitize=address
  SANITIZE_FLAGS += -fsanitize=leak
  
-@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
+@@ -72,52 +61,40 @@ SYS_MUJS_LIBS := -lmujs
  SYS_OPENJPEG_LIBS := -lopenjp2
  SYS_ZLIB_LIBS := -lz
  
@@ -50,11 +50,11 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $
 -  AR = xcrun ar
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
-+HAVE_OBJCOPY := no
- 
+-
 -else ifeq ($(OS),Linux)
 -  HAVE_OBJCOPY := yes
--
++HAVE_OBJCOPY := no
+ 
 -  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)
@@ -74,7 +74,7 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $
 -  endif
 -  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
 +else
-+	CFLAGS += -DNO_ICC
++	CFLAGS += -DFZ_ENABLE_ICC=0
 +endif
 +ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
  	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
@@ -94,34 +94,21 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $
 -  endif
 +endif
  
--  HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
--  ifeq ($(HAVE_CURL),yes)
-+HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+ifeq ($(HAVE_CURL),yes)
- 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
- 	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
--  endif
-+endif
- 
--  HAVE_GLUT := yes
++ifeq ($(shell pkg-config --exists glut && echo yes),yes)
+   HAVE_GLUT := yes
 -  ifeq ($(HAVE_GLUT),yes)
 -	SYS_GLUT_CFLAGS :=
 -	SYS_GLUT_LIBS := -lglut -lGL
 -  endif
-+ifeq "$(shell pkg-config --exists glut && pkg-config --exists gl && echo yes)" "yes"
-+HAVE_GLUT ?= yes
-+SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-+SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
++  SYS_GLUT_CFLAGS :=
++  SYS_GLUT_LIBS := -lglut -lGL
 +endif
  
--  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)
+   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+   ifeq ($(HAVE_X11),yes)
+@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux)
  	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 62c6ba1ffb6..ad2fa0e4a0f 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-ac,v 1.21 2019/05/12 12:27:02 ryoon Exp $
 
 - libtool support 
 - Install target cleanup
@@ -10,24 +10,24 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
   install it as `mupdf'.
 - Install all EXTRA_APPS (muraster, mujstest, mjsgen)
 
---- Makefile.orig	2018-09-25 12:39:17.000000000 +0000
+--- Makefile.orig	2019-05-06 11:53:09.000000000 +0000
 +++ Makefile
-@@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
+@@ -51,65 +51,65 @@ ifneq ($(verbose),yes)
  endif
  
  MKTGTDIR = mkdir -p $(dir $@)
 -CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
 -CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
 -AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
-+CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
-+CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
-+AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
++CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
++CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
++AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath $(PREFIX)/lib $^
  ifdef RANLIB
    RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
  endif
 -LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- TAGS_CMD = $(QUIET_TAGS) ctags $^
++LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ TAGS_CMD = $(QUIET_TAGS) ctags -R
  WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
  OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
  
@@ -62,10 +62,6 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 +$(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)
@@ -101,7 +97,7 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -122,14 +122,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
+@@ -119,14 +119,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/gprf/*.c))
  
@@ -119,7 +115,7 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  
  # --- Generated embedded font files ---
  
-@@ -156,7 +156,7 @@ ifeq ($(HAVE_OBJCOPY),yes)
+@@ -153,7 +153,7 @@ ifeq ($(HAVE_OBJCOPY),yes)
    $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
    $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
  else
@@ -128,7 +124,7 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  endif
  
  generate: $(FONT_GEN)
-@@ -190,17 +190,17 @@ generate: source/pdf/js/util.js.h
+@@ -187,17 +187,17 @@ generate: source/pdf/js/util.js.h
  
  # --- Library ---
  
@@ -151,7 +147,7 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  
  # --- Main tools and viewers ---
  
-@@ -211,7 +211,7 @@ MUTOOL_SRC += source/tools/murun.c
+@@ -208,13 +208,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,17 +156,23 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  MUTOOL_EXE := $(OUT)/mutool
  $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
-@@ -219,28 +219,27 @@ INSTALL_APPS += $(MUTOOL_EXE)
+ TOOL_APPS += $(MUTOOL_EXE)
+ 
+-MURASTER_OBJ := $(OUT)/source/tools/muraster.o
++MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
+ 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)
  
  ifeq ($(HAVE_GLUT),yes)
    MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
 -  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
--  MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
 +  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo)
-+  MUVIEW_GLUT_EXE := $(OUT)/platform/gl/mupdf-gl
+   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)
-   INSTALL_APPS += $(MUVIEW_GLUT_EXE)
+@@ -230,10 +230,10 @@ ifeq ($(HAVE_GLUT),yes)
  endif
  
  ifeq ($(HAVE_X11),yes)
@@ -178,14 +180,14 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.o
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.o
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.o
-+  MUVIEW_X11_EXE := $(OUT)/platform/x11/mupdf
++  MUVIEW_X11_EXE := $(OUT)/mupdf
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.lo
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.lo
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.lo
    $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
--  INSTALL_APPS += $(MUVIEW_X11_EXE)
- endif
+   VIEW_APPS += $(MUVIEW_X11_EXE)
+@@ -241,9 +241,9 @@ endif
  
  ifeq ($(HAVE_WIN32),yes)
    MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32
@@ -197,56 +199,9 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 +  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.lo
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
-   INSTALL_APPS += $(MUVIEW_WIN32_EXE)
-@@ -248,19 +247,19 @@ endif
- 
- # --- Extra tools and viewers ---
- 
--MURASTER_OBJ := $(OUT)/source/tools/muraster.o
-+MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
- MURASTER_EXE := $(OUT)/muraster
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
- 	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
- EXTRA_APPS += $(MURASTER_EXE)
- 
--MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.o
-+MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.lo
- MJSGEN_EXE := $(OUT)/mjsgen
- $(MJSGEN_EXE) : $(MJSGEN_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- 	$(LINK_CMD) $(THIRD_LIBS)
- EXTRA_APPS += $(MJSGEN_EXE)
- 
--MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
-+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
- MUJSTEST_EXE := $(OUT)/mujstest
- $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
- 	$(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
-@@ -268,33 +267,38 @@ EXTRA_APPS += $(MUJSTEST_EXE)
+   VIEW_APPS += $(MUVIEW_WIN32_EXE)
+@@ -251,18 +251,18 @@ endif
  
- ifeq ($(HAVE_X11),yes)
- ifeq ($(HAVE_CURL),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_EXE := $(OUT)/platform/x11/curl/mupdf
-+  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_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
- 	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(CURL_LIBS) $(LIBCRYPTO_LIBS)
--  EXTRA_APPS += $(MUVIEW_X11_CURL_EXE)
- endif
- endif
- 
-+ifeq "$(HAVE_CURL)" "yes"
-+INSTALL_APPS += $(MUVIEW_X11_CURL_EXE)
-+else ifeq "$(HAVE_X11)" "yes"
-+INSTALL_APPS += $(MUVIEW_X11_EXE)
-+endif
-+
  # --- Generated dependencies ---
  
 --include $(MUPDF_OBJ:%.o=%.d)
@@ -254,7 +209,6 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 --include $(THREAD_OBJ:%.o=%.d)
 --include $(THIRD_OBJ:%.o=%.d)
 --include $(GLUT_OBJ:%.o=%.d)
---include $(CURL_OBJ:%.o=%.d)
 -
 --include $(MUTOOL_OBJ:%.o=%.d)
 --include $(MUVIEW_GLUT_OBJ:%.o=%.d)
@@ -265,7 +219,6 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 +-include $(THREAD_OBJ:%.lo=%.d)
 +-include $(THIRD_OBJ:%.lo=%.d)
 +-include $(GLUT_OBJ:%.lo=%.d)
-+-include $(CURL_OBJ:%.lo=%.d)
 +
 +-include $(MUTOOL_OBJ:%.lo=%.d)
 +-include $(MUVIEW_GLUT_OBJ:%.lo=%.d)
@@ -273,13 +226,11 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot 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 ---
  
-@@ -305,10 +309,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -273,10 +273,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  
  # --- Update version string header ---
  
@@ -294,34 +245,34 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
  
  # --- Format man pages ---
  
-@@ -336,28 +340,30 @@ apps: $(INSTALL_APPS)
- extra-apps: $(EXTRA_APPS)
- extra: extra-libs extra-apps
+@@ -304,27 +304,30 @@ tools: $(TOOL_APPS)
+ apps: $(TOOL_APPS) $(VIEW_APPS)
  
--install: libs apps
+ install: libs apps
 -	install -d $(DESTDIR)$(incdir)/mupdf
 -	install -d $(DESTDIR)$(incdir)/mupdf/fitz
 -	install -d $(DESTDIR)$(incdir)/mupdf/pdf
--	install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
--	install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
--	install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
+-	install -m 644 include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
+-	install -m 644 include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
+-	install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
 -
 -	install -d $(DESTDIR)$(libdir)
--	install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
+-	install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir)
 -
 -	install -d $(DESTDIR)$(bindir)
--	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
+-	install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
 -
 -	install -d $(DESTDIR)$(mandir)/man1
--	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
+-	install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
 -
 -	install -d $(DESTDIR)$(docdir)
 -	install -d $(DESTDIR)$(docdir)/examples
--	install README COPYING CHANGES $(DESTDIR)$(docdir)
--	install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
--	install docs/examples/* $(DESTDIR)$(docdir)/examples
-+install: libs apps extra-apps
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir) $(DESTDIR)$(incdir)/mupdf $(DESTDIR)$(incdir)/mupdf/fitz $(DESTDIR)$(incdir)/mupdf/pdf
+-	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
+-	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+-	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/fitz
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/pdf
 +	${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
 +	${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
 +	${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
@@ -332,14 +283,13 @@ $NetBSD: patch-ac,v 1.20 2018/10/04 19:02:33 leot Exp $
 +	done
 +
 +	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
-+	for f in $(INSTALL_APPS) $(EXTRA_APPS); do \
-+		${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(DESTDIR)$(bindir); \
++	for f in $(TOOL_APPS) $(VIEW_APPS); do \
++		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
 +	done
 +
 +	${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
 +	${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
 +
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples
 +	${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir)
 +	${BSD_INSTALL_DATA} docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
diff --git a/print/mupdf/patches/patch-thirdparty_mujs_Makefile b/print/mupdf/patches/patch-thirdparty_mujs_Makefile
index 6c80803452f..528673b8dd9 100644
--- a/print/mupdf/patches/patch-thirdparty_mujs_Makefile
+++ b/print/mupdf/patches/patch-thirdparty_mujs_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.5 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-thirdparty_mujs_Makefile,v 1.6 2019/05/12 12:27:02 ryoon Exp $
 
 - Add libtool support to mujs.
 - Avoid to set (unused) VERSION variable.
 
---- thirdparty/mujs/Makefile.orig	2018-09-11 10:47:31.000000000 +0000
+--- thirdparty/mujs/Makefile.orig	2019-04-04 10:41:04.000000000 +0000
 +++ thirdparty/mujs/Makefile
 @@ -7,12 +7,6 @@ bindir ?= $(prefix)/bin
  incdir ?= $(prefix)/include
@@ -18,7 +18,7 @@ $NetBSD: patch-thirdparty_mujs_Makefile,v 1.5 2018/10/04 19:02:33 leot Exp $
  # Compiler flags for various configurations:
  
  CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-@@ -64,15 +58,15 @@ one.c: $(SRCS)
+@@ -65,15 +59,15 @@ one.c: $(SRCS)
  
  jsdump.c: astnames.h opnames.h
  
@@ -37,7 +37,7 @@ $NetBSD: patch-thirdparty_mujs_Makefile,v 1.5 2018/10/04 19:02:33 leot Exp $
  	@ mkdir -p $(dir $@)
  	$(AR) cr $@ $^
  
-@@ -80,11 +74,11 @@ $(OUT)/libmujs.so: one.c $(HDRS)
+@@ -81,11 +75,11 @@ $(OUT)/libmujs.so: one.c $(HDRS)
  	@ mkdir -p $(dir $@)
  	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
  
@@ -51,12 +51,12 @@ $NetBSD: patch-thirdparty_mujs_Makefile,v 1.5 2018/10/04 19:02:33 leot Exp $
  	@ mkdir -p $(dir $@)
  	$(CC) $(LDFLAGS) -o $@ $^ -lm
  
-@@ -110,7 +104,7 @@ install-common: release
- 	install -m 755 build/release/mujs $(DESTDIR)$(bindir)
+@@ -112,7 +106,7 @@ install-common: shell $(OUT)/mujs.pc
+ 	install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir)
  
- install-static: install-common
--	install -m 644 build/release/libmujs.a $(DESTDIR)$(libdir)
-+	install -m 644 build/release/libmujs.la $(DESTDIR)$(libdir)
+ install-static: install-common static
+-	install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
++	${LIBTOOL} --mode=install $(OUT)/libmujs.la $(DESTDIR)$(libdir)
  
- install-shared: install-common
- 	install -m 755 build/release/libmujs.so $(DESTDIR)$(libdir)
+ install-shared: install-common shared
+ 	install -m 755 $(OUT)/libmujs.so $(DESTDIR)$(libdir)