Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 552928) +++ head/graphics/mupdf/Makefile (revision 552929) @@ -1,70 +1,67 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf -DISTVERSION= 1.17.0 +DISTVERSION= 1.18.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 USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg USE_XORG= x11 xcursor xext xinerama xrandr USE_GL= gl glut 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-libs 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 + @${REINPLACE_CMD} -e 's/-pipe -O2//' -e 's/-ldl//' ${WRKSRC}/Makerules post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \ ${STAGEDIR}${PREFIX}/bin/mupdf ${INSTALL_PROGRAM} \ ${WRKSRC}/build/release/muraster \ ${STAGEDIR}${PREFIX}/bin ${LN} -s libmupdf.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf.so ${LN} -s libmupdf-third.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf-third.so .include Index: head/graphics/mupdf/distinfo =================================================================== --- head/graphics/mupdf/distinfo (revision 552928) +++ head/graphics/mupdf/distinfo (revision 552929) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589721586 -SHA256 (mupdf-1.17.0-source.tar.gz) = 00e33fa89cb42f1ef9e3bb73671b1cb6d210f5159bd68168fa5c89ceb24dd48e -SIZE (mupdf-1.17.0-source.tar.gz) = 65510829 +TIMESTAMP = 1602272959 +SHA256 (mupdf-1.18.0-source.tar.gz) = 8860ea6d01fc3c360ba5e0fa9fede241c6fbb2a73f5215b17a105de409a19266 +SIZE (mupdf-1.18.0-source.tar.gz) = 72621417 Index: head/graphics/mupdf/files/patch-Makefile =================================================================== --- head/graphics/mupdf/files/patch-Makefile (revision 552928) +++ head/graphics/mupdf/files/patch-Makefile (revision 552929) @@ -1,22 +1,22 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ ---- Makefile.orig 2018-10-04 09:19:28 UTC +--- Makefile.orig 2020-10-10 08:56:03 UTC +++ Makefile -@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h +@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO) - # --- Library --- - + $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ) + else -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdf-third.a +MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION) +THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION) THREAD_LIB = $(OUT)/libmupdf-threads.a PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION) $(THIRD_LIB) : $(THIRD_OBJ) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION) $(THREAD_LIB) : $(THREAD_OBJ) $(PKCS7_LIB) : $(PKCS7_OBJ) - + endif Index: head/graphics/mupdf/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 552928) +++ head/graphics/mupdf/pkg-plist (revision 552929) @@ -1,114 +1,118 @@ bin/mupdf bin/mupdf-gl bin/muraster bin/mutool include/mupdf/fitz.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.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/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/log.h include/mupdf/fitz/outline.h include/mupdf/fitz/output-svg.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/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.h include/mupdf/pdf/annot.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/font.h include/mupdf/pdf/form.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/xref.h include/mupdf/ucdn.h lib/libmupdf-third.so lib/libmupdf-third.so.%%SOVERSION%% lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% man/man1/mupdf.1.gz man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%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%%/ecosystem.html +%%PORTDOCS%%%%DOCSDIR%%/ecosystem.png %%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js %%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/fix-s22pdf.js %%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-dejpx.js +%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-extract-rich-media.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js +%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.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-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