Update to 1.11

- Prevent linking with libcrypto when a pkg-config file for it exists
  on the system [1]
- Bump PORTREVISION of dependent ports

PR:		218996, 218688 [1]
Reported by:	rsmith@xs4all.nl [1]
Submitted by:	Zsolt Udvari <udvzsolt@gmail.com> (maintainer)
Approved by:	lme (mentor)
Differential Revision:	https://reviews.freebsd.org/D10561

9 files changed, 84 insertions, 33 deletions

diff --git a/graphics/llpp/Makefile b/graphics/llpp/Makefile
index 18f04c3..0bc2d34 100644
--- a/graphics/llpp/Makefile
+++ b/graphics/llpp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	llpp
 PORTVERSION=	25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://repo.or.cz/llpp.git/snapshot/
 DISTNAME=	v${PORTVERSION}
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 789e5b2..da46c0f 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mupdf
-PORTVERSION=	1.10a
+PORTVERSION=	1.11
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mupdf.com/downloads/ \
@@ -47,14 +46,13 @@ PLIST_SUB=	SOVERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-pipe -O2 //' \
-		-e 's|/usr/local|${LOCALBASE}|' \
-		-e 's/Linux/FreeBSD/' \
 		${WRKSRC}/Makerules
+	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
 	@${RM} -r ${WRKSRC}/thirdparty/curl \
 		${WRKSRC}/thirdparty/freetype \
 		${WRKSRC}/thirdparty/harfbuzz \
 	 	${WRKSRC}/thirdparty/jbig2dec \
-	 	${WRKSRC}/thirdparty/jpeg \
+	 	${WRKSRC}/thirdparty/libjpeg \
 	 	${WRKSRC}/thirdparty/openjpeg \
 	 	${WRKSRC}/thirdparty/zlib
 
diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo
index eb94e11..bba4098 100644
--- a/graphics/mupdf/distinfo
+++ b/graphics/mupdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484401133
-SHA256 (mupdf-1.10a-source.tar.gz) = aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836
-SIZE (mupdf-1.10a-source.tar.gz) = 42264707
+TIMESTAMP = 1492430059
+SHA256 (mupdf-1.11-source.tar.gz) = 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
+SIZE (mupdf-1.11-source.tar.gz) = 40156070
diff --git a/graphics/mupdf/files/patch-Makefile b/graphics/mupdf/files/patch-Makefile
index 0d2857e..6a1e04e 100644
--- a/graphics/mupdf/files/patch-Makefile
+++ b/graphics/mupdf/files/patch-Makefile
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
---- Makefile.orig	2016-11-28 13:34:04 UTC
+--- Makefile.orig	2017-04-05 11:02:21 UTC
 +++ Makefile
-@@ -152,14 +152,17 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL)
+@@ -300,8 +300,8 @@ generate: $(JAVASCRIPT_GEN)
  
  # --- Library ---
  
@@ -9,15 +9,18 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
 -THIRD_LIB = $(OUT)/libmupdfthird.a
 +MUPDF_LIB = libmupdf.so.$(SOVERSION)
 +THIRD_LIB = libmupdfthird.so.$(SOVERSION)
+ THREAD_LIB = $(OUT)/libmuthreads.a
  
  MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
- THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+@@ -309,7 +309,11 @@ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_
+ THREAD_OBJ := $(THREAD_OBJ)
  
  $(MUPDF_LIB) : $(MUPDF_OBJ)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
 +
  $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
++
+ $(THREAD_LIB) : $(THREAD_OBJ)
  
  INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
- 
diff --git a/graphics/mupdf/files/patch-Makerules b/graphics/mupdf/files/patch-Makerules
new file mode 100644
index 0000000..20c19a7
--- /dev/null
+++ b/graphics/mupdf/files/patch-Makerules
@@ -0,0 +1,35 @@
+--- Makerules.orig	2017-04-05 11:02:21 UTC
++++ Makerules
+@@ -110,27 +110,21 @@ LD := xcrun ld
+ RANLIB_CMD := xcrun ranlib $@
+ 
+ # Linux uses pkg-config for system libraries.
+-else ifeq "$(OS)" "Linux"
++else ifeq "$(OS)" "FreeBSD"
+ 
+ HAVE_PTHREAD := yes
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+ 
+-ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+-HAVE_LIBCRYPTO := yes
+-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+-SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+-endif
++HAVE_LIBCRYPTO := no
++SYS_LIBCRYPTO_CFLAGS :=
++SYS_LIBCRYPTO_LIBS :=
+ 
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+-ifeq "$(shell pkg-config --exists openssl && echo yes)" "yes"
+-HAVE_OPENSSL_SSL := yes
+-SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
+-SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+-endif
++HAVE_OPENSSL_SSL := no
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
+ 
diff --git a/graphics/mupdf/files/patch-scripts_fontdump.c b/graphics/mupdf/files/patch-scripts_hexdump.c
index f07944a..4255c81 100644
--- a/graphics/mupdf/files/patch-scripts_fontdump.c
+++ b/graphics/mupdf/files/patch-scripts_hexdump.c
@@ -1,9 +1,9 @@
---- scripts/fontdump.c.orig	2016-11-28 13:34:04 UTC
-+++ scripts/fontdump.c
+--- scripts/hexdump.c.orig	2017-04-05 11:02:21 UTC
++++ scripts/hexdump.c
 @@ -50,7 +50,6 @@ main(int argc, char **argv)
  	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
  	fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)\n");
- 	fprintf(fo, "#if !defined(__ICC)\n");
+ 	fprintf(fo, "#if !defined(__ICC) && !defined(__ANDROID__)\n");
 -	fprintf(fo, "#define HAVE_INCBIN\n");
  	fprintf(fo, "#endif\n");
  	fprintf(fo, "#endif\n");
diff --git a/graphics/mupdf/files/patch-source__fitz__load-jpx.c b/graphics/mupdf/files/patch-source__fitz__load-jpx.c
index ef42f75..34fe65d 100644
--- a/graphics/mupdf/files/patch-source__fitz__load-jpx.c
+++ b/graphics/mupdf/files/patch-source__fitz__load-jpx.c
@@ -1,19 +1,33 @@
---- source/fitz/load-jpx.c.orig	2016-11-28 13:34:04 UTC
+--- source/fitz/load-jpx.c.orig	2017-04-05 11:02:21 UTC
 +++ source/fitz/load-jpx.c
-@@ -481,15 +481,7 @@ fz_load_jpx_info(fz_context *ctx, unsign
+@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsign
  
  #else /* HAVE_LURATECH */
  
--/* Without the definition of OPJ_STATIC, compilation fails on windows
-- * due to the use of __stdcall. We believe it is required on some
-- * linux toolchains too. */
--#define OPJ_STATIC
--#ifndef _MSC_VER
--#define OPJ_HAVE_STDINT_H
--#endif
--
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #define OPJ_HAVE_INTTYPES_H
+ #if !defined(_WIN32) && !defined(_WIN64)
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+ #define USE_JPIP
+ 
 -#include <openjpeg.h>
 +#include <openjpeg-2.1/openjpeg.h>
  
- /* OpenJPEG does not provide a safe mechanism to intercept
-  * allocations. In the latest version all allocations go
+ struct fz_jpxd_s
+ {
+@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsign
+ 	*yresp = state.yres;
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* HAVE_LURATECH */
+ 
+ #else /* FZ_ENABLE_JPX */
diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist
index 6d16370..71acb98 100644
--- a/graphics/mupdf/pkg-plist
+++ b/graphics/mupdf/pkg-plist
@@ -7,6 +7,7 @@ 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
 include/mupdf/fitz/bitmap.h
 include/mupdf/fitz/buffer.h
@@ -21,13 +22,13 @@ include/mupdf/fitz/document.h
 include/mupdf/fitz/filter.h
 include/mupdf/fitz/font.h
 include/mupdf/fitz/function.h
+include/mupdf/fitz/geometry.h
 include/mupdf/fitz/getopt.h
 include/mupdf/fitz/glyph-cache.h
 include/mupdf/fitz/glyph.h
 include/mupdf/fitz/hash.h
 include/mupdf/fitz/image.h
 include/mupdf/fitz/link.h
-include/mupdf/fitz/math.h
 include/mupdf/fitz/outline.h
 include/mupdf/fitz/output-pcl.h
 include/mupdf/fitz/output-png.h
@@ -44,7 +45,7 @@ include/mupdf/fitz/separation.h
 include/mupdf/fitz/shade.h
 include/mupdf/fitz/store.h
 include/mupdf/fitz/stream.h
-include/mupdf/fitz/string.h
+include/mupdf/fitz/string-util.h
 include/mupdf/fitz/structured-text.h
 include/mupdf/fitz/system.h
 include/mupdf/fitz/text.h
diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile
index 5b94b5f3..1703311 100644
--- a/graphics/zathura-pdf-mupdf/Makefile
+++ b/graphics/zathura-pdf-mupdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura-pdf-mupdf
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/