Update print/mupdf to 1.8.

pkgsrc changes:
 * Bump BUILDLINK_API_DEPENDS (spotted and tested via the only print/mupdf
   consumer wip/zathura-mupdf)
 * OpenGL-based desktop viewer is still not enabled by default neither upstream
   nor in pkgsrc

Changes:
List of changes in MuPDF 1.8
* Headline changes:
	* New OpenGL-based barebones desktop viewer.
	* New URW fonts with greek and cyrillic.
	* 64-bit file support.
	* Ghostscript proofing mode (source only; not in shipped binaries).
* EPUB improvements:
	* User style sheets.
	* GIF images (also for CBZ).
	* Table of contents.
	* CJK text.
	* Page margins.
	* Many bug fixes.
* Bug fixes:
	* Updated FreeType to version 2.6.1.
	* Various font substitution bug fixes.
	* Fix setjmp/longjmp behaviour which could cause optimizing compilers to misbehave.

7 files changed, 72 insertions, 55 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index b3b35e9f225..7881822dc07 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.31 2015/09/06 20:53:24 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2015/11/11 17:08:25 leot Exp $
 
-DISTNAME=	mupdf-1.7a-source
+DISTNAME=	mupdf-1.8-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	print
 MASTER_SITES=	http://mupdf.com/downloads/
 
-MAINTAINER=	leot1990@users.sourceforge.net
+MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	http://mupdf.com/
 COMMENT=	Lightweight PDF viewer and toolkit
 LICENSE=	gnu-agpl-v3
 
-USE_LANGUAGES+=	c99
+USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
 
 INSTALLATION_DIRS+=	bin include lib/pkgconfig
 INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}
 INSTALL_MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
-LDFLAGS=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
-MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+=	XCFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=	build=release
+LDFLAGS=		${COMPILER_RPATH_FLAG}${X11BASE}/lib
+MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=		XCFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=		build=release
 
 CFLAGS+=	-DJBIG_NO_MEMENTO
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index f3ff5d05231..13ab82ffa33 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2015/04/17 07:18:21 wiz Exp $
-bin/mudraw
+@comment $NetBSD: PLIST,v 1.10 2015/11/11 17:08:25 leot Exp $
 bin/mujstest
 bin/mupdf
 bin/mutool
@@ -34,6 +33,7 @@ include/mupdf/fitz/output-tga.h
 include/mupdf/fitz/output.h
 include/mupdf/fitz/path.h
 include/mupdf/fitz/pixmap.h
+include/mupdf/fitz/separation.h
 include/mupdf/fitz/shade.h
 include/mupdf/fitz/store.h
 include/mupdf/fitz/stream.h
@@ -43,7 +43,9 @@ include/mupdf/fitz/system.h
 include/mupdf/fitz/text.h
 include/mupdf/fitz/transition.h
 include/mupdf/fitz/tree.h
+include/mupdf/fitz/ucdn.h
 include/mupdf/fitz/unzip.h
+include/mupdf/fitz/util.h
 include/mupdf/fitz/version.h
 include/mupdf/fitz/write-document.h
 include/mupdf/fitz/xml.h
@@ -74,7 +76,6 @@ include/mupdf/xps.h
 lib/libmujs.la
 lib/libmupdf.la
 lib/pkgconfig/mupdf.pc
-man/man1/mudraw.1
 man/man1/mupdf.1
 man/man1/mutool.1
 share/doc/mupdf/CHANGES
diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk
index 61d892a88e1..84a51c7db4a 100644
--- a/print/mupdf/buildlink3.mk
+++ b/print/mupdf/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/04/17 07:18:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/11/11 17:08:25 leot Exp $
 
 BUILDLINK_TREE+=	mupdf
 
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.7
+BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.8
 BUILDLINK_PKGSRCDIR.mupdf?=	../../print/mupdf
 
 pkgbase := mupdf
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index a342f20c09d..cbddb6e0c69 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 01:01:36 agc Exp $
+$NetBSD: distinfo,v 1.21 2015/11/11 17:08:25 leot Exp $
 
-SHA1 (mupdf-1.7a-source.tar.gz) = 6114cb8d318c71f877cea4660df2eb513fcf82b9
-RMD160 (mupdf-1.7a-source.tar.gz) = cc9260029a7665004584ff6aa1b49e259b08be37
-SHA512 (mupdf-1.7a-source.tar.gz) = 5b8dc8146ef0aa652cc889b6470fc157287bb351cb0990216d5e891bdc4c1b287e0299b4291161938369df4b2591cb36a53ea415b7bd13b0c1415cb51b196ca7
-Size (mupdf-1.7a-source.tar.gz) = 13310720 bytes
+SHA1 (mupdf-1.8-source.tar.gz) = 9fbc9e06f0b74fe904745c363324eaca3517bfce
+RMD160 (mupdf-1.8-source.tar.gz) = 2708f5650f23101a66cef92b7903aafb716f9c02
+SHA512 (mupdf-1.8-source.tar.gz) = 938fbed4afc0dd0aa621911cd70b9289c6a4f13d026f9390b11fc86d5b37845a76943c9fa42f218f67fe298295f15d6664a18be7bf73b5d952724122510f9deb
+Size (mupdf-1.8-source.tar.gz) = 14169777 bytes
 SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
-SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3
-SHA1 (patch-ac) = 2db78731ebbac03a2cfe3329e20544db013b3b10
+SHA1 (patch-ab) = 8f8f167d9207734891c68e358c802107f5600da2
+SHA1 (patch-ac) = 81bad722bc5d30e6aeb367b30d9d1c4bad816429
 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
diff --git a/print/mupdf/files/mupdf.pc b/print/mupdf/files/mupdf.pc
index 4b1c28d48cb..4fce120701c 100644
--- a/print/mupdf/files/mupdf.pc
+++ b/print/mupdf/files/mupdf.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: mupdf
 Description: library for PDF files
-Version: 1.7
+Version: 1.8
 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
 Cflags: -I${includedir}
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 45fb3b9c188..6785630d5a7 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,21 +1,28 @@
-$NetBSD: patch-ab,v 1.9 2014/06/15 19:15:51 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2015/11/11 17:08:25 leot Exp $
 
 o Handle the various operating systems in the same way avoiding hardcoding
 o Build and link with openjpeg-2.1
 
---- Makerules.orig	2014-06-10 15:09:28.000000000 +0000
+--- Makerules.orig	2015-10-21 14:45:11.000000000 +0000
 +++ Makerules
-@@ -25,37 +25,6 @@ else
- $(error unknown build setting: '$(build)')
+@@ -29,46 +29,6 @@ ifeq "$(largefile)" "yes"
+ CFLAGS += -DFZ_LARGEFILE
  endif
  
 -# Windows (MINGW) build doesn't use system libraries.
 -ifeq "$(OS)" "MINGW"
 -
+-HAVE_X11 ?= no
+-HAVE_GLUT ?= yes
+-
+-SYS_GLUT_CFLAGS = -DFREEGLUT_STATIC -Ithirdparty/freeglut/include
+-SYS_GLUT_LIBS = -Lthirdparty/freeglut/lib -lfreeglut_static -lopengl32 -lgdi32 -lwinmm
+-
 -# Mac OS X doesn't have pkg-config so we hard code paths.
 -else ifeq "$(OS)" "MACOS"
 -
 -HAVE_X11 ?= yes
+-HAVE_GLUT ?= yes
 -
 -SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
 -SYS_OPENSSL_LIBS = -lcrypto
@@ -24,6 +31,8 @@ o Build and link with openjpeg-2.1
 -
 -SYS_X11_CFLAGS = -I/usr/X11R6/include
 -SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
+-SYS_GLUT_CFLAGS = -Wno-deprecated-declarations
+-SYS_GLUT_LIBS = -framework GLUT -framework OpenGL
 -
 -SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2
 -SYS_FREETYPE_LIBS = -lfreetype
@@ -41,9 +50,9 @@ o Build and link with openjpeg-2.1
 -else ifeq "$(OS)" "Linux"
 -
  HAVE_X11 ?= yes
+ HAVE_GLUT ?= yes
  
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-@@ -81,8 +50,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
+@@ -98,8 +58,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
  SYS_JPEG_LIBS = -ljpeg
  SYS_ZLIB_LIBS = -lz
  
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index 6ee67ca8064..f3040ce33be 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2015/04/17 07:18:21 wiz Exp $
+$NetBSD: patch-ac,v 1.11 2015/11/11 17:08:25 leot Exp $
 
 o libtool support 
 o Install target cleanup
@@ -6,7 +6,7 @@ o Install only one "mupdf" binary, prefer the featureful one and always
  install it as "mupdf"
 o libmujs support: install like a non-thirdparty mupdf's library
 
---- Makefile.orig	2015-04-08 15:04:10.000000000 +0000
+--- Makefile.orig	2015-10-21 14:45:11.000000000 +0000
 +++ Makefile
 @@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS)
  
@@ -37,20 +37,22 @@ o libmujs support: install like a non-thirdparty mupdf's library
  
  # --- File lists ---
  
-@@ -87,32 +77,32 @@ PDF_SRC_HDR := $(wildcard source/pdf/*.h
- XPS_SRC_HDR := $(wildcard source/xps/*.h)
+@@ -91,33 +81,33 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h
  HTML_SRC_HDR := $(wildcard source/html/*.h)
+ GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
  
 -FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
 -PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
 -XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
 -CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
 -HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
+-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC))))
 +FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
 +PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
 +XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
 +CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
 +HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
++GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC))))
  
  # --- Choice of Javascript library ---
  
@@ -82,14 +84,14 @@ o libmujs support: install like a non-thirdparty mupdf's library
  endif
  
  $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
-@@ -123,44 +113,47 @@ $(HTML_OBJ) : $(FITZ_HDR) $(HTML_HDR) $(
+@@ -129,47 +119,50 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $(
  
  # --- Library ---
  
 -MUPDF_LIB := $(OUT)/libmupdf.a
 +MUPDF_LIB := $(OUT)/libmupdf.la
  
- $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ)
+ $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
  
  INSTALL_LIBS := $(MUPDF_LIB)
 +ifeq "$(HAVE_MUJS)" "yes"
@@ -135,12 +137,16 @@ o libmujs support: install like a non-thirdparty mupdf's library
 +$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
  	$(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
  
+-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
++$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR)
+ 	$(CC_CMD) $(GLFW_CFLAGS)
+ 
 -.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
 +.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
  
  # --- Generated CMAP, FONT and JAVASCRIPT files ---
  
-@@ -224,24 +217,24 @@ endif
+@@ -233,17 +226,17 @@ endif
  
  generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
  
@@ -159,21 +165,13 @@ o libmujs support: install like a non-thirdparty mupdf's library
  
  # --- Tools and Apps ---
  
- MUDRAW := $(addprefix $(OUT)/, mudraw)
--MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.o)
-+MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.lo)
- $(MUDRAW_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS)
- $(MUDRAW) : $(MUDRAW_OBJ)
- 	$(LINK_CMD)
- 
  MUTOOL := $(addprefix $(OUT)/, mutool)
--MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o)
-+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo)
+-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o)
++MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo mudraw.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo)
  $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
  $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUTOOL) : $(MUTOOL_OBJ)
-@@ -249,27 +242,27 @@ $(MUTOOL) : $(MUTOOL_OBJ)
+@@ -251,11 +244,11 @@ $(MUTOOL) : $(MUTOOL_OBJ)
  
  MJSGEN := $(OUT)/mjsgen
  $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
@@ -187,17 +185,26 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUJSTEST) : $(MUJSTEST_OBJ)
- 	$(LINK_CMD)
+@@ -263,7 +256,7 @@ $(MUJSTEST) : $(MUJSTEST_OBJ)
  
  ifeq "$(HAVE_X11)" "yes"
--MUVIEW_X11 := $(OUT)/mupdf-x11
+ MUVIEW_X11 := $(OUT)/mupdf-x11
 -MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
-+MUVIEW_X11 := $(OUT)/platform/x11/mupdf
 +MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
  $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
- 	$(LINK_CMD) $(X11_LIBS)
+@@ -271,7 +264,7 @@ $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
+ 
+ ifeq "$(HAVE_GLFW)" "yes"
+ MUVIEW_GLFW := $(OUT)/mupdf-gl
+-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
++MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo)
+ $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
+ $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB)
+ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
+@@ -279,8 +272,8 @@ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
+ endif
  
  ifeq "$(HAVE_CURL)" "yes"
 -MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
@@ -207,7 +214,7 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB)
  $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
-@@ -279,7 +272,7 @@ endif
+@@ -290,7 +283,7 @@ endif
  
  ifeq "$(HAVE_WIN32)" "yes"
  MUVIEW_WIN32 := $(OUT)/mupdf
@@ -216,12 +223,12 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
-@@ -289,7 +282,12 @@ endif
- MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32)
+@@ -300,7 +293,12 @@ endif
+ MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
  MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
  
--INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL)
-+INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUJSTEST)
+-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL)
++INSTALL_APPS := $(MUTOOL) $(MUJSTEST)
 +ifeq "$(HAVE_CURL)" "yes"
 +INSTALL_APPS += $(MUVIEW_CURL)
 +else ifeq "$(HAVE_X11)" "yes"
@@ -230,7 +237,7 @@ o libmujs support: install like a non-thirdparty mupdf's library
  
  # --- Examples ---
  
-@@ -331,24 +329,26 @@ libs: $(INSTALL_LIBS)
+@@ -343,24 +341,26 @@ libs: $(INSTALL_LIBS)
  apps: $(INSTALL_APPS)
  
  install: libs apps