graphics/mupdf: update to 1.7

Changes:	http://mupdf.com/news
PR:		199576
Submitted by:	Zsolt Udvari <udvzsolt@gmail.com> (maintainer)

5 files changed, 8 insertions, 47 deletions

diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index baeb34f4fafd..942e4ef4aab4 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mupdf
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE \
diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo
index c0d691362502..f49196a697f6 100644
--- a/graphics/mupdf/distinfo
+++ b/graphics/mupdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mupdf-1.6-source.tar.gz) = 9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563
-SIZE (mupdf-1.6-source.tar.gz) = 13975531
+SHA256 (mupdf-1.7-source.tar.gz) = d0bd5c656c464411cb5788c73d5a7c9a5b89f1e9e84e3c8c7c982ed8b90f5642
+SIZE (mupdf-1.7-source.tar.gz) = 13301969
diff --git a/graphics/mupdf/files/patch-platform__x11__x11_main.c b/graphics/mupdf/files/patch-platform__x11__x11_main.c
deleted file mode 100644
index b7852e3e9c33..000000000000
--- a/graphics/mupdf/files/patch-platform__x11__x11_main.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./platform/x11/x11_main.c.orig	2014-06-10 17:09:28.000000000 +0200
-+++ ./platform/x11/x11_main.c	2014-08-04 18:51:44.000000000 +0200
-@@ -794,6 +794,24 @@
- 	exit(1);
- }
- 
-+/* reference:
-+ * http://stackoverflow.com/questions/2621439/how-to-get-screen-dpi-linux-mac-programatically
-+ */
-+int get_dpi(void)
-+{
-+	Display *xdpy;
-+	int xscr;
-+	int x = 0;
-+
-+	if ((xdpy = XOpenDisplay(NULL))) {
-+		xscr = DefaultScreen(xdpy);
-+		x = (int) (DisplayWidth(xdpy, xscr) * 25.4 /
-+				DisplayWidthMM(xdpy, xscr) + 0.5);
-+		XCloseDisplay(xdpy);
-+	}
-+	return x;
-+}
-+
- int main(int argc, char **argv)
- {
- 	int c;
diff --git a/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c b/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c
index 4df7b1b9fa73..0718938e474f 100644
--- a/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c
+++ b/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c
@@ -34,16 +34,3 @@
  		panto = PAN_TO_TOP;
  		if (app->numberlen > 0)
  			app->pageno += atoi(app->number);
-@@ -1585,6 +1591,12 @@
- 				int isx = (modifiers & (1<<0));
- 				int xstep = isx ? 20 * dir : 0;
- 				int ystep = !isx ? 20 * dir : 0;
-+				if (!isx && dir < 0 && app->pany +
-+				    fz_pixmap_height(app->ctx, app->image) <= app->winh)
-+					pdfapp_onkey(app, 'j');
-+				else if (!isx && dir > 0 && app->pany >= 0)
-+					pdfapp_onkey(app, 'k');
-+				else
- 				pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
- 			}
- 		}
diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist
index fe3945286306..4602fe44f29a 100644
--- a/graphics/mupdf/pkg-plist
+++ b/graphics/mupdf/pkg-plist
@@ -3,7 +3,6 @@ bin/mujstest
 bin/mupdf
 bin/mupdf-x11-curl
 bin/mutool
-include/mupdf/cbz.h
 include/mupdf/fitz.h
 include/mupdf/fitz/annotation.h
 include/mupdf/fitz/bitmap.h
@@ -25,7 +24,6 @@ include/mupdf/fitz/hash.h
 include/mupdf/fitz/image.h
 include/mupdf/fitz/link.h
 include/mupdf/fitz/math.h
-include/mupdf/fitz/meta.h
 include/mupdf/fitz/outline.h
 include/mupdf/fitz/output-pcl.h
 include/mupdf/fitz/output-png.h
@@ -45,22 +43,26 @@ include/mupdf/fitz/system.h
 include/mupdf/fitz/text.h
 include/mupdf/fitz/transition.h
 include/mupdf/fitz/tree.h
+include/mupdf/fitz/unzip.h
 include/mupdf/fitz/version.h
 include/mupdf/fitz/write-document.h
 include/mupdf/fitz/xml.h
-include/mupdf/img.h
+include/mupdf/html.h
 include/mupdf/memento.h
 include/mupdf/pdf.h
 include/mupdf/pdf-tools.h
 include/mupdf/pdf/annot.h
 include/mupdf/pdf/appearance.h
+include/mupdf/pdf/clean.h
 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/interpret.h
 include/mupdf/pdf/javascript.h
+include/mupdf/pdf/name-table.h
 include/mupdf/pdf/object.h
 include/mupdf/pdf/output-pdf.h
 include/mupdf/pdf/page.h
@@ -68,7 +70,6 @@ include/mupdf/pdf/parse.h
 include/mupdf/pdf/resource.h
 include/mupdf/pdf/widget.h
 include/mupdf/pdf/xref.h
-include/mupdf/tiff.h
 include/mupdf/xps.h
 lib/libmupdf.a
 lib/libmupdf_pic.a