Index: head/graphics/llpp/Makefile =================================================================== --- head/graphics/llpp/Makefile (revision 439941) +++ head/graphics/llpp/Makefile (revision 439942) @@ -1,60 +1,60 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= llpp PORTVERSION= 25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://repo.or.cz/llpp.git/snapshot/ DISTNAME= v${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= tobik@FreeBSD.org COMMENT= PDF pager # llpp itself is in the public domain, but it bundles lablGL which # uses a BSD 3-clause license LICENSE= PUBLIC_DOMAIN BSD3CLAUSE LICENSE_COMB= multi LICENSE_NAME_PUBLIC_DOMAIN= Public Domain LICENSE_FILE_PUBLIC_DOMAIN= ${WRKSRC}/README LICENSE_PERMS_PUBLIC_DOMAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ libmupdf.so:graphics/mupdf \ libopenjp2.so:graphics/openjpeg RUN_DEPENDS= xsel:x11/xsel-conrad STRIP= # Stripping renders the executable unusable, so don't do it for now USES= desktop-file-utils gmake jpeg ssl USE_GL= gl USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes USE_OPENGL= yes USE_XORG= x11 xext WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTNAME}-14986ea do-build: @(cd ${WRKSRC} && ${SETENV} \ LOCALBASE="${LOCALBASE}" \ PORTVERSION="${PORTVERSION}" \ ${SH} build.sh build) @(cd ${WRKSRC}/misc/completions && ${GMAKE}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/llpp ${STAGEDIR}${PREFIX}/bin/llpp ${INSTALL_SCRIPT} ${WRKSRC}/misc/llppac ${STAGEDIR}${PREFIX}/bin/llppac ${INSTALL_DATA} ${WRKSRC}/misc/llpp.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/misc/completions/bash/llpp ${STAGEDIR}${PREFIX}/etc/bash_completion.d/_llpp.bash ${INSTALL_DATA} ${WRKSRC}/misc/completions/bash/llppac ${STAGEDIR}${PREFIX}/etc/bash_completion.d/_llppac.bash ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/misc/completions/zsh/llpp ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_llpp ${INSTALL_DATA} ${WRKSRC}/misc/completions/zsh/llppac ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_llppac .include Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 439941) +++ head/graphics/mupdf/Makefile (revision 439942) @@ -1,68 +1,66 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf -PORTVERSION= 1.10a +PORTVERSION= 1.11 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ http://www.mupdf.com/downloads/archive/ MAINTAINER= udvzsolt@gmail.com 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_LDCONFIG= yes CPE_VENDOR= artifex OPTIONS_DEFINE= 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 //' \ - -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 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 439941) +++ head/graphics/mupdf/distinfo (revision 439942) @@ -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 Index: head/graphics/mupdf/files/patch-scripts_fontdump.c =================================================================== --- head/graphics/mupdf/files/patch-scripts_fontdump.c (revision 439941) +++ head/graphics/mupdf/files/patch-scripts_fontdump.c (nonexistent) @@ -1,10 +0,0 @@ ---- scripts/fontdump.c.orig 2016-11-28 13:34:04 UTC -+++ scripts/fontdump.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, "#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_fontdump.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 439941) +++ head/graphics/mupdf/files/patch-Makefile (revision 439942) @@ -1,23 +1,26 @@ $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 --- -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) - 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) - Index: head/graphics/mupdf/files/patch-Makerules =================================================================== --- head/graphics/mupdf/files/patch-Makerules (nonexistent) +++ head/graphics/mupdf/files/patch-Makerules (revision 439942) @@ -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 + Property changes on: head/graphics/mupdf/files/patch-Makerules ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mupdf/files/patch-scripts_hexdump.c =================================================================== --- head/graphics/mupdf/files/patch-scripts_hexdump.c (nonexistent) +++ head/graphics/mupdf/files/patch-scripts_hexdump.c (revision 439942) @@ -0,0 +1,10 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mupdf/files/patch-source__fitz__load-jpx.c =================================================================== --- head/graphics/mupdf/files/patch-source__fitz__load-jpx.c (revision 439941) +++ head/graphics/mupdf/files/patch-source__fitz__load-jpx.c (revision 439942) @@ -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 +#include - /* 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 */ Index: head/graphics/mupdf/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 439941) +++ head/graphics/mupdf/pkg-plist (revision 439942) @@ -1,97 +1,98 @@ 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/colorspace.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/math.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-ps.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.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/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 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 Index: head/graphics/zathura-pdf-mupdf/Makefile =================================================================== --- head/graphics/zathura-pdf-mupdf/Makefile (revision 439941) +++ head/graphics/zathura-pdf-mupdf/Makefile (revision 439942) @@ -1,37 +1,37 @@ # Created by: Zsolt Udvari # $FreeBSD$ 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/ MAINTAINER= udvzsolt@gmail.com COMMENT= MuPDF render PDF plugin for Zathura PDF viewer LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= zathura:graphics/zathura RUN_DEPENDS= zathura:graphics/zathura LIB_DEPENDS= libjbig2dec.so:graphics/jbig2dec \ libfreetype.so:print/freetype2 \ libgirara-gtk3.so:x11-toolkits/girara \ libharfbuzz.so:print/harfbuzz \ libmupdf.so:graphics/mupdf \ libopenjp2.so:graphics/openjpeg PLIST_FILES= lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop MAKE_ARGS= OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto" USES= compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 CONFLICTS_INSTALL= zathura-pdf-poppler-[0-9]* post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/zathura/pdf.so .include