--- graphics/mupdf/Makefile	(revision 500936)
+++ graphics/mupdf/Makefile	(working copy)
@@ -2,9 +2,8 @@ 
 # $FreeBSD$
 
 PORTNAME=	mupdf
-DISTVERSION=	1.14.0
+DISTVERSION=	1.15.0
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mupdf.com/downloads/ \
@@ -25,17 +24,19 @@ 
 USES=		cpe compiler:c++11-lang gl gmake jpeg pkgconfig
 USE_XORG=	x11 xcursor xext xinerama xrandr
 USE_GL=		gl glut
-CPE_VENDOR=	artifex
 USE_LDCONFIG=	yes
 
+CPE_VENDOR=	artifex
+
 # pkg-config to avoid the conflict with openjpeg15
 CFLAGS+=	`pkg-config --cflags libopenjp2`
+LDFLAGS+=	`pkg-config --libs libjpeg libopenjp2` -ljbig2dec
 
 MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
 		XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \
 		XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \
 		SOVERSION=${DISTVERSION}
-ALL_TARGET=	all extra
+ALL_TARGET=	all extra-libs
 
 OPTIONS_DEFINE=	DOCS JS SCROLL
 OPTIONS_DEFAULT=	SCROLL
@@ -59,8 +60,6 @@ 
 	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \
 		${STAGEDIR}${PREFIX}/bin/mupdf
 	${INSTALL_PROGRAM} \
-		${WRKSRC}/build/release/mjsgen \
-		${WRKSRC}/build/release/mujstest \
 		${WRKSRC}/build/release/muraster \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -s libmupdf.so.${PORTVERSION} \
--- graphics/mupdf/distinfo	(revision 500936)
+++ graphics/mupdf/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1542296614
-SHA256 (mupdf-1.14.0-source.tar.gz) = c443483a678c3fc258fa4adc124146225d0bb443c522619faadebf6b363d7724
-SIZE (mupdf-1.14.0-source.tar.gz) = 55654104
+TIMESTAMP = 1557205886
+SHA256 (mupdf-1.15.0-source.tar.gz) = 9fe6773ee0dc192d1878b7886b51150cbeb1a8ad81d3cd806d8e1ab343ffd471
+SIZE (mupdf-1.15.0-source.tar.gz) = 53023898
--- graphics/mupdf/pkg-plist	(revision 500936)
+++ graphics/mupdf/pkg-plist	(working copy)
@@ -1,11 +1,8 @@ 
-bin/mjsgen
-bin/mujstest
 bin/mupdf
 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
@@ -31,15 +28,7 @@ 
 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
@@ -57,10 +46,10 @@ 
 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
@@ -68,8 +57,8 @@ 
 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
@@ -78,7 +67,6 @@ 
 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-third.so
@@ -91,10 +79,10 @@ 
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/android-sdk.html
+%%PORTDOCS%%%%DOCSDIR%%/api-changes.html
 %%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png
 %%PORTDOCS%%%%DOCSDIR%%/building.html
 %%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
 %%PORTDOCS%%%%DOCSDIR%%/coding-style.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js
 %%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
@@ -106,7 +94,9 @@ 
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js
 %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create.js
+%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-dejpx.js
 %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js
+%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js
 %%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html
@@ -116,7 +106,6 @@ 
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-portfolio.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html
--- graphics/zathura-pdf-mupdf/Makefile	(revision 500936)
+++ graphics/zathura-pdf-mupdf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	zathura-pdf-mupdf
 DISTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/