Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 458739) +++ head/graphics/mupdf/Makefile (revision 458740) @@ -1,67 +1,67 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf -PORTVERSION= 1.11 -PORTREVISION= 2 +PORTVERSION= 1.12.0 DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ http://www.mupdf.com/downloads/archive/ MAINTAINER= uzsolt@uzsolt.hu COMMENT= Lightweight PDF viewer and toolkit LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ libopenjp2.so:graphics/openjpeg CFLAGS+= -I${WRKSRC}/include/mupdf -fPIC LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ SOVERSION=${PORTVERSION} USES= cpe compiler:c++11-lang gmake jpeg pkgconfig USE_XORG= x11 xcursor xext xinerama xrandr -USE_GL= gl +USE_GL= gl glut USE_LDCONFIG= yes CPE_VENDOR= artifex -OPTIONS_DEFINE= JS SCROLL +OPTIONS_DEFINE= DOCS JS SCROLL OPTIONS_DEFAULT=SCROLL JS_DESC= JavaScript support (V8 engine) SCROLL_DESC= Build with scroll hacks JS_LIB_DEPENDS= libv8.so:lang/v8 JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c PLIST_SUB= SOVERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ ${WRKSRC}/Makerules @${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird @${RM} -r ${WRKSRC}/thirdparty/curl \ ${WRKSRC}/thirdparty/freetype \ + ${WRKSRC}/thirdparty/freeglut \ ${WRKSRC}/thirdparty/harfbuzz \ ${WRKSRC}/thirdparty/jbig2dec \ ${WRKSRC}/thirdparty/libjpeg \ ${WRKSRC}/thirdparty/openjpeg \ ${WRKSRC}/thirdparty/zlib post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf ${LN} -s libmupdf.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf.so ${LN} -s libmupdfthird.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdfthird.so .include Index: head/graphics/mupdf/distinfo =================================================================== --- head/graphics/mupdf/distinfo (revision 458739) +++ head/graphics/mupdf/distinfo (revision 458740) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492430059 -SHA256 (mupdf-1.11-source.tar.gz) = 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a -SIZE (mupdf-1.11-source.tar.gz) = 40156070 +TIMESTAMP = 1514557967 +SHA256 (mupdf-1.12.0-source.tar.gz) = 5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755 +SIZE (mupdf-1.12.0-source.tar.gz) = 51508917 Index: head/graphics/mupdf/files/patch-scripts_hexdump.c =================================================================== --- head/graphics/mupdf/files/patch-scripts_hexdump.c (revision 458739) +++ head/graphics/mupdf/files/patch-scripts_hexdump.c (nonexistent) @@ -1,10 +0,0 @@ ---- 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) && !defined(__ANDROID__)\n"); -- fprintf(fo, "#define HAVE_INCBIN\n"); - fprintf(fo, "#endif\n"); - fprintf(fo, "#endif\n"); - fprintf(fo, "#endif\n"); Property changes on: head/graphics/mupdf/files/patch-scripts_hexdump.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mupdf/files/patch-Makefile =================================================================== --- head/graphics/mupdf/files/patch-Makefile (revision 458739) +++ head/graphics/mupdf/files/patch-Makefile (revision 458740) @@ -1,26 +1,26 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ ---- Makefile.orig 2017-04-05 11:02:21 UTC +--- Makefile.orig 2017-12-13 14:00:30 UTC +++ Makefile -@@ -300,8 +300,8 @@ generate: $(JAVASCRIPT_GEN) +@@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN) # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a -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) -@@ -309,7 +309,11 @@ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_ + MUPDF_OBJ := \ +@@ -344,7 +344,11 @@ THIRD_OBJ := \ THREAD_OBJ := $(THREAD_OBJ) $(MUPDF_LIB) : $(MUPDF_OBJ) + $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) + $(THIRD_LIB) : $(THIRD_OBJ) + $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) + $(THREAD_LIB) : $(THREAD_OBJ) INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) Index: head/graphics/mupdf/files/patch-Makerules =================================================================== --- head/graphics/mupdf/files/patch-Makerules (revision 458739) +++ head/graphics/mupdf/files/patch-Makerules (revision 458740) @@ -1,35 +1,37 @@ ---- Makerules.orig 2017-04-05 11:02:21 UTC +--- Makerules.orig 2017-12-13 14:00:30 UTC +++ Makerules -@@ -110,27 +110,21 @@ LD := xcrun ld - RANLIB_CMD := xcrun ranlib $@ +@@ -87,7 +87,7 @@ 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 +@@ -97,21 +97,15 @@ HAVE_GLUT := yes + SYS_GLUT_CFLAGS := + SYS_GLUT_LIBS := -lglut -lGL -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 Index: head/graphics/mupdf/files/patch-source__fitz__load-jpx.c =================================================================== --- head/graphics/mupdf/files/patch-source__fitz__load-jpx.c (revision 458739) +++ head/graphics/mupdf/files/patch-source__fitz__load-jpx.c (revision 458740) @@ -1,33 +1,33 @@ ---- source/fitz/load-jpx.c.orig 2017-04-05 11:02:21 UTC +--- source/fitz/load-jpx.c.orig 2017-12-13 14:00:30 UTC +++ source/fitz/load-jpx.c -@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsign +@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const #else /* HAVE_LURATECH */ +#ifdef __cplusplus +extern "C" +{ #define OPJ_STATIC #define OPJ_HAVE_INTTYPES_H - #if !defined(_WIN32) && !defined(_WIN64) + #if !defined(_MSC_VER) || _MSC_VER >= 1600 #define OPJ_HAVE_STDINT_H #endif +#endif #define USE_JPIP -#include +#include struct fz_jpxd_s { -@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsign +@@ -930,6 +934,10 @@ fz_load_jpx_info(fz_context *ctx, const *yresp = state.yres; } +#ifdef __cplusplus +} +#endif + #endif /* HAVE_LURATECH */ #else /* FZ_ENABLE_JPX */ Index: head/graphics/mupdf/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 458739) +++ head/graphics/mupdf/pkg-plist (revision 458740) @@ -1,98 +1,125 @@ +bin/mjsgen bin/mujstest bin/mupdf bin/mupdf-gl bin/mupdf-x11-curl 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 include/mupdf/fitz/bitmap.h include/mupdf/fitz/buffer.h +include/mupdf/fitz/color-management.h include/mupdf/fitz/colorspace.h +include/mupdf/fitz/compress.h include/mupdf/fitz/compressed-buffer.h include/mupdf/fitz/config.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/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/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 include/mupdf/fitz/pool.h include/mupdf/fitz/separation.h include/mupdf/fitz/shade.h include/mupdf/fitz/store.h include/mupdf/fitz/stream.h include/mupdf/fitz/string-util.h include/mupdf/fitz/structured-text.h include/mupdf/fitz/system.h include/mupdf/fitz/text.h include/mupdf/fitz/track-usage.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h -include/mupdf/fitz/ucdn.h include/mupdf/fitz/util.h include/mupdf/fitz/version.h include/mupdf/fitz/writer.h include/mupdf/fitz/xml.h -include/mupdf/html.h include/mupdf/memento.h -include/mupdf/pdf.h include/mupdf/pdf-tools.h +include/mupdf/pdf.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 include/mupdf/pdf/parse.h include/mupdf/pdf/resource.h include/mupdf/pdf/widget.h include/mupdf/pdf/xref.h -include/mupdf/svg.h +include/mupdf/ucdn.h lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% lib/libmupdfthird.so lib/libmupdfthird.so.%%SOVERSION%% 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 -%%PORTDOCS%%%%DOCSDIR%%/types.txt +%%PORTDOCS%%%%DOCSDIR%%/android-sdk.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/create-thumbnail.js +%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js +%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js +%%PORTDOCS%%%%DOCSDIR%%/examples/example.c +%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js +%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c +%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js +%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create.js +%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js +%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html +%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html +%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html +%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html +%%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 +%%PORTDOCS%%%%DOCSDIR%%/style.css +%%PORTDOCS%%%%DOCSDIR%%/template.html +%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html