diff -urN graphics/mupdf.orig/Makefile graphics/mupdf/Makefile --- graphics/mupdf.orig/Makefile 2015-04-22 07:28:40.000000000 +0200 +++ graphics/mupdf/Makefile 2015-04-22 07:56:56.000000000 +0200 @@ -2,7 +2,7 @@ # $FreeBSD: head/graphics/mupdf/Makefile 370949 2014-10-15 19:48:22Z amdmi3 $ PORTNAME= mupdf -PORTVERSION= 1.6 +PORTVERSION= 1.7 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ diff -urN graphics/mupdf.orig/distinfo graphics/mupdf/distinfo --- graphics/mupdf.orig/distinfo 2015-04-22 07:28:40.000000000 +0200 +++ graphics/mupdf/distinfo 2015-04-22 07:56:56.000000000 +0200 @@ -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 -urN graphics/mupdf.orig/files/patch-platform__x11__x11_main.c graphics/mupdf/files/patch-platform__x11__x11_main.c --- graphics/mupdf.orig/files/patch-platform__x11__x11_main.c 2015-04-22 07:28:40.000000000 +0200 +++ graphics/mupdf/files/patch-platform__x11__x11_main.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -urN graphics/mupdf.orig/files/scroll_hack-platform__x11__pdfapp.c graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c --- graphics/mupdf.orig/files/scroll_hack-platform__x11__pdfapp.c 2015-04-22 07:28:40.000000000 +0200 +++ graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c 2015-04-22 07:56:56.000000000 +0200 @@ -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 -urN graphics/mupdf.orig/mupdf/Makefile graphics/mupdf/mupdf/Makefile --- graphics/mupdf.orig/mupdf/Makefile 2014-10-15 21:48:22.000000000 +0200 +++ graphics/mupdf/mupdf/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -# Created by: Martin Dieringer -# $FreeBSD: head/graphics/mupdf/Makefile 370949 2014-10-15 19:48:22Z amdmi3 $ - -PORTNAME= mupdf -PORTVERSION= 1.6 -PORTEPOCH= 1 -CATEGORIES= graphics -MASTER_SITES= GOOGLE_CODE \ - http://www.mupdf.com/download/ -EXTRACT_SUFX= -source.tar.gz - -MAINTAINER= udvzsolt@gmail.com -COMMENT= Lightweight PDF viewer and toolkit - -LICENSE= AGPLv3 - -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ - libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ - libopenjp2.so:${PORTSDIR}/graphics/openjpeg - -LIBS+= -L${LOCALBASE}/lib -MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes -USES= compiler:c++11-lang pkgconfig gmake -USE_XORG= x11 xext - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source - -OPTIONS_DEFINE= SCROLL JS -OPTIONS_DEFAULT=SCROLL - -SCROLL_DESC= Build with scroll hacks -JS_DESC= JavaScript support (V8 engine) - -.include - -.if ${PORT_OPTIONS:MSCROLL} -EXTRA_PATCHES+= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c -.endif - -.if ${PORT_OPTIONS:MJS} -LIB_DEPENDS+= libv8.so:${PORTSDIR}/lang/v8 -MAKE_ARGS+= V8_PRESENT=1 V8LIBS=-lv8 -.endif - -post-patch: - @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ - -e 's|/usr/local|${LOCALBASE}|' \ - -e 's/Linux/FreeBSD/' \ - ${WRKSRC}/Makerules - @${REINPLACE_CMD} '/^CFLAGS/s|$$| -I${LOCALBASE}/include|' \ - ${WRKSRC}/Makefile - @${RM} -r ${WRKSRC}/thirdparty/* - -post-build: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} OUT=build/pic XCFLAGS=-fpic libs) - -post-install: - ${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdf.a \ - ${STAGEDIR}${PREFIX}/lib/libmupdf_pic.a - ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf -.for binary in mudraw mutool mujstest mupdf mupdf-x11-curl - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary} -.endfor - -.include diff -urN graphics/mupdf.orig/mupdf/distinfo graphics/mupdf/mupdf/distinfo --- graphics/mupdf.orig/mupdf/distinfo 2014-10-15 21:48:22.000000000 +0200 +++ graphics/mupdf/mupdf/distinfo 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SHA256 (mupdf-1.6-source.tar.gz) = 9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563 -SIZE (mupdf-1.6-source.tar.gz) = 13975531 diff -urN graphics/mupdf.orig/mupdf/files/patch-platform__x11__x11_main.c graphics/mupdf/mupdf/files/patch-platform__x11__x11_main.c --- graphics/mupdf.orig/mupdf/files/patch-platform__x11__x11_main.c 2014-08-04 22:19:28.000000000 +0200 +++ graphics/mupdf/mupdf/files/patch-platform__x11__x11_main.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -urN graphics/mupdf.orig/mupdf/files/patch-source__fitz__load-jpx.c graphics/mupdf/mupdf/files/patch-source__fitz__load-jpx.c --- graphics/mupdf.orig/mupdf/files/patch-source__fitz__load-jpx.c 2014-08-04 22:19:28.000000000 +0200 +++ graphics/mupdf/mupdf/files/patch-source__fitz__load-jpx.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- ./source/fitz/load-jpx.c.orig 2014-06-10 17:09:28.000000000 +0200 -+++ ./source/fitz/load-jpx.c 2014-08-04 18:51:45.000000000 +0200 -@@ -8,7 +8,7 @@ - #define OPJ_HAVE_STDINT_H - #endif - --#include -+#include - - static void fz_opj_error_callback(const char *msg, void *client_data) - { -@@ -116,7 +116,7 @@ - opj_stream_set_read_function(stream, fz_opj_stream_read); - opj_stream_set_skip_function(stream, fz_opj_stream_skip); - opj_stream_set_seek_function(stream, fz_opj_stream_seek); -- opj_stream_set_user_data(stream, &sb); -+ opj_stream_set_user_data(stream, &sb,NULL); - /* Set the length to avoid an assert */ - opj_stream_set_user_data_length(stream, size); - diff -urN graphics/mupdf.orig/mupdf/files/scroll_hack-platform__x11__pdfapp.c graphics/mupdf/mupdf/files/scroll_hack-platform__x11__pdfapp.c --- graphics/mupdf.orig/mupdf/files/scroll_hack-platform__x11__pdfapp.c 2014-08-04 22:19:28.000000000 +0200 +++ graphics/mupdf/mupdf/files/scroll_hack-platform__x11__pdfapp.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ ---- ./platform/x11/pdfapp.c.orig 2014-08-04 19:59:53.000000000 +0200 -+++ ./platform/x11/pdfapp.c 2014-08-04 20:03:46.000000000 +0200 -@@ -1166,6 +1166,8 @@ - case 'j': - { - int h = fz_pixmap_height(app->ctx, app->image); -+ if ( (app->pany + h) <= app->winh ) -+ goto pagedown; - if (h <= app->winh || app->pany <= app->winh - h) - { - panto = PAN_TO_TOP; -@@ -1182,6 +1184,8 @@ - case 'k': - { - int h = fz_pixmap_height(app->ctx, app->image); -+ if (app->pany >= 0) -+ goto pageup; - if (h <= app->winh || app->pany == 0) - { - panto = PAN_TO_BOTTOM; -@@ -1257,6 +1261,7 @@ - */ - - case ',': -+ pageup: - panto = PAN_TO_BOTTOM; - if (app->numberlen > 0) - app->pageno -= atoi(app->number); -@@ -1265,6 +1270,7 @@ - break; - - case '.': -+ pagedown: - 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 -urN graphics/mupdf.orig/mupdf/pkg-descr graphics/mupdf/mupdf/pkg-descr --- graphics/mupdf.orig/mupdf/pkg-descr 2014-01-22 16:44:51.000000000 +0100 +++ graphics/mupdf/mupdf/pkg-descr 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -MuPDF is a lightweight PDF viewer and toolkit written in portable C. - -The renderer in MuPDF is tailored for high quality anti-aliased graphics. It -renders text with metrics and spacing accurate to within fractions of a -pixel for the highest fidelity in reproducing the look of a printed page on -screen. - -MuPDF has a small footprint. A binary that includes the standard Roman fonts -is only one megabyte. A build with full CJK support (including an Asian -font) is approximately five megabytes. - -MuPDF has support for all non-interactive PDF 1.7 features, and the toolkit -provides a simple API for accessing the internal structures of the PDF -document. Example code for navigating interactive links and bookmarks, -encrypting PDF files, extracting fonts, images, and searchable text, and -rendering pages to image files is provided. - -WWW: http://www.mupdf.com/ diff -urN graphics/mupdf.orig/mupdf/pkg-plist graphics/mupdf/mupdf/pkg-plist --- graphics/mupdf.orig/mupdf/pkg-plist 2014-10-15 21:48:22.000000000 +0200 +++ graphics/mupdf/mupdf/pkg-plist 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -bin/mudraw -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 -include/mupdf/fitz/buffer.h -include/mupdf/fitz/colorspace.h -include/mupdf/fitz/compressed-buffer.h -include/mupdf/fitz/context.h -include/mupdf/fitz/crypt.h -include/mupdf/fitz/device.h -include/mupdf/fitz/display-list.h -include/mupdf/fitz/document.h -include/mupdf/fitz/filter.h -include/mupdf/fitz/font.h -include/mupdf/fitz/function.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/meta.h -include/mupdf/fitz/outline.h -include/mupdf/fitz/output-pcl.h -include/mupdf/fitz/output-png.h -include/mupdf/fitz/output-pnm.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 -include/mupdf/fitz/shade.h -include/mupdf/fitz/store.h -include/mupdf/fitz/stream.h -include/mupdf/fitz/string.h -include/mupdf/fitz/structured-text.h -include/mupdf/fitz/system.h -include/mupdf/fitz/text.h -include/mupdf/fitz/transition.h -include/mupdf/fitz/tree.h -include/mupdf/fitz/version.h -include/mupdf/fitz/write-document.h -include/mupdf/fitz/xml.h -include/mupdf/img.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/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/javascript.h -include/mupdf/pdf/object.h -include/mupdf/pdf/output-pdf.h -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/tiff.h -include/mupdf/xps.h -lib/libmupdf.a -lib/libmupdf_pic.a -man/man1/mudraw.1.gz -man/man1/mupdf.1.gz -man/man1/mutool.1.gz -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/naming.txt -%%PORTDOCS%%%%DOCSDIR%%/overview.txt -%%PORTDOCS%%%%DOCSDIR%%/progressive.txt -%%PORTDOCS%%%%DOCSDIR%%/refcount.txt -%%PORTDOCS%%%%DOCSDIR%%/thirdparty.txt diff -urN graphics/mupdf.orig/pkg-plist graphics/mupdf/pkg-plist --- graphics/mupdf.orig/pkg-plist 2015-04-22 07:28:40.000000000 +0200 +++ graphics/mupdf/pkg-plist 2015-04-22 07:56:56.000000000 +0200 @@ -3,7 +3,6 @@ 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/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/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/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