Update to 1.5:

This is a bugfix release: dozens of bugs have been found and
exterminated!

A typo resulting in a potential stack overflow that could corrupt
files when saving edits to a PDF has been fixed. Another bug which
caused a significant slowdown has also been fixed.

We strongly recommend that you upgrade â especially if you are
using version 1.4.

5 files changed, 31 insertions, 49 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 63c6b3ae55a..71e88a6d2e5 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/05/30 21:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/15 14:14:18 wiz Exp $
 
-DISTNAME=	mupdf-1.4-source
+DISTNAME=	mupdf-1.5-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://mupdf.com/downloads/
 
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 65629bd0c1e..f7f1abfb59c 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2014/05/18 08:12:22 wiz Exp $
+$NetBSD: distinfo,v 1.15 2014/06/15 14:14:18 wiz Exp $
 
-SHA1 (mupdf-1.4-source.tar.gz) = 805f9b37de371638eddb2f964837fecec8b64b4a
-RMD160 (mupdf-1.4-source.tar.gz) = 368140a0f825483268faaf778328bc6c3f4d461f
-Size (mupdf-1.4-source.tar.gz) = 13253644 bytes
-SHA1 (patch-Makethird) = 950daf9a235f0da97d6a20dedd59bc8bd1c3e274
-SHA1 (patch-ab) = d2ad5e74e2649a1db6eb2d5d9c0ad0efe5206182
-SHA1 (patch-ac) = 87c4dbd17ff737f5edcfcf41c97add12722456ee
+SHA1 (mupdf-1.5-source.tar.gz) = 628470ed20f9a03c81e90cd5585a31c0fab386ef
+RMD160 (mupdf-1.5-source.tar.gz) = 0ef207d3b11744fc004999917699dfd2e6873191
+Size (mupdf-1.5-source.tar.gz) = 13269193 bytes
+SHA1 (patch-Makethird) = cf6cccdd55a2edafb610d1e6d55ce9570922e750
+SHA1 (patch-ab) = 2aab2ce65ce994b4213ad738bf85e250c8e7cbb8
+SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3
 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird
index a4f2f56f97e..71204a634ac 100644
--- a/print/mupdf/patches/patch-Makethird
+++ b/print/mupdf/patches/patch-Makethird
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makethird,v 1.2 2014/04/21 16:14:40 wiz Exp $
+$NetBSD: patch-Makethird,v 1.3 2014/06/15 14:14:18 wiz Exp $
 
 o mujs building support with libtool
 o libcurl (www/curl) support. By default mupdf can be installed with curl
  support *only* building it in ${WRKSRC}/thirdparty.
 
---- Makethird.orig	2014-04-11 15:10:41.000000000 +0000
+--- Makethird.orig	2014-06-10 15:09:28.000000000 +0000
 +++ Makethird
 @@ -50,14 +50,14 @@ endif
  
@@ -24,8 +24,8 @@ o libcurl (www/curl) support. By default mupdf can be installed with curl
  	$(CC_CMD)
  
  MUJS_CFLAGS := -I$(MUJS_DIR)
-@@ -456,6 +456,9 @@ CURL_LIBS := $(SYS_CURL_DEPS)
- HAVE_CURL := yes
+@@ -460,6 +460,9 @@ CURL_CFLAGS := $(SYS_CURL_CFLAGS)
+ CURL_LIBS := $(SYS_CURL_LIBS)
  endif
  
 +CURL_CFLAGS := $(SYS_CURL_CFLAGS)
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 4b12e7db5ca..3a3a2e32db8 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2014/05/18 08:12:22 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2014/06/15 14:14:18 wiz Exp $
 
 o Handle the various operating systems in the same way avoiding hardcoding
 o Build and link with openjpeg-2.1
 o libcurl (www/curl) support
 
---- Makerules.orig	2014-04-11 15:10:41.000000000 +0000
+--- Makerules.orig	2014-06-10 15:09:28.000000000 +0000
 +++ Makerules
 @@ -25,37 +25,6 @@ else
  $(error unknown build setting: '$(build)')
@@ -44,25 +44,7 @@ o libcurl (www/curl) support
  HAVE_X11 ?= yes
  
  ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-@@ -63,22 +32,21 @@ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(sh
- SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
- endif
- 
--# TODO: use pkg-config for system CURL
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
- SYS_CURL_DEPS = -lpthread -lrt
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
- 
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
- 
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
- SYS_JBIG2DEC_LIBS = -ljbig2dec
+@@ -81,8 +50,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 7ba714f3f15..3779537f59d 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2014/04/21 16:14:40 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2014/06/15 14:14:18 wiz 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	2014-04-11 15:10:41.000000000 +0000
+--- Makefile.orig	2014-06-10 15:09:28.000000000 +0000
 +++ Makefile
 @@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS)
  
@@ -147,12 +147,12 @@ o libmujs support: install like a non-thirdparty mupdf's library
 -$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN)
 -$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
 -$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN)
--$(OUT)/cmapdump.o : source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
+-$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
 +$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
 +$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN)
 +$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
 +$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
-+$(OUT)/cmapdump.lo : source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
++$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
  
  # --- Tools and Apps ---
  
@@ -170,7 +170,7 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
  $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUTOOL) : $(MUTOOL_OBJ)
-@@ -246,24 +239,24 @@ $(MUTOOL) : $(MUTOOL_OBJ)
+@@ -246,25 +239,25 @@ $(MUTOOL) : $(MUTOOL_OBJ)
  
  MJSGEN := $(OUT)/mjsgen
  $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
@@ -186,22 +186,23 @@ o libmujs support: install like a non-thirdparty mupdf's library
  
  ifeq "$(HAVE_X11)" "yes"
 -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) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
-+$(MUVIEW_X11) : $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
+ $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
  	$(LINK_CMD) $(X11_LIBS)
  
  ifeq "$(HAVE_CURL)" "yes"
 -MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
+-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
 +MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf
++MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
+ $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB)
--$(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
-+$(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
- 	$(LINK_CMD) $(X11_LIBS) $(CURL_LIBS)
- endif
- endif
-@@ -271,7 +264,12 @@ endif
+ $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
+@@ -275,7 +268,12 @@ endif
  MUVIEW := $(MUVIEW_X11)
  MUVIEW_CURL := $(MUVIEW_X11_CURL)
  
@@ -215,7 +216,7 @@ o libmujs support: install like a non-thirdparty mupdf's library
  
  # --- Update version string header ---
  
-@@ -304,24 +302,26 @@ libs: $(INSTALL_LIBS)
+@@ -308,24 +306,26 @@ libs: $(INSTALL_LIBS)
  apps: $(INSTALL_APPS)
  
  install: libs apps