Index: head/graphics/llpp/Makefile =================================================================== --- head/graphics/llpp/Makefile (revision 433549) +++ head/graphics/llpp/Makefile (revision 433550) @@ -1,60 +1,60 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= llpp PORTVERSION= 25 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://repo.or.cz/llpp.git/snapshot/ DISTNAME= v${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= t@tobik.me COMMENT= PDF pager # llpp itself is in the public domain, but it bundles lablGL which -# uses a BSD 3-clause license and statically links to mupdf which is -# AGPLv3 licensed. -LICENSE= PUBLIC_DOMAIN BSD3CLAUSE AGPLv3 +# 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 \ - ${LOCALBASE}/lib/libmupdf_pic.a:graphics/mupdf +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/llpp/files/patch-build.sh =================================================================== --- head/graphics/llpp/files/patch-build.sh (revision 433549) +++ head/graphics/llpp/files/patch-build.sh (revision 433550) @@ -1,38 +1,38 @@ --- build.sh.orig 2016-11-29 15:11:31 UTC +++ build.sh @@ -7,7 +7,7 @@ else builddir="$1" fi -ccopt="$CFLAGS -Wno-pointer-sign -O2" +ccopt="$CFLAGS -Wno-pointer-sign -I${LOCALBASE}/include" mlopt='-warn-error +a -w +a -g -safe-string' if test -z "$native"; then comp=ocamlc.opt @@ -22,13 +22,13 @@ else fi mkdir -p "$builddir/lablGL" srcdir=$(dirname $0) -version=$(cd $srcdir && git describe --tags 2>/dev/null) || version=unknown +version="v${PORTVERSION}" mloptgl="-I $srcdir/lablGL -I $builddir/lablGL" set -x $comp -ccopt "$ccopt -o $builddir/lablGL/ml_raw.o" -c $srcdir/lablGL/ml_raw.c $comp -ccopt "$ccopt -o $builddir/lablGL/ml_gl.o" -c $srcdir/lablGL/ml_gl.c $comp -ccopt "$ccopt -o $builddir/lablGL/ml_glarray.o" -c $srcdir/lablGL/ml_glarray.c -$comp -ccopt "-I $srcdir/mupdf/include -I $srcdir/mupdf/thirdparty/freetype/include -Wextra -Wall -Werror -D_GNU_SOURCE -O -g -std=c99 -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow -o $builddir/link.o" -c $srcdir/link.c +$comp -ccopt "-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include -Wextra -Wall -Wno-variadic-macros -D_GNU_SOURCE -std=c99 -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow -o $builddir/link.o" -c $srcdir/link.c /bin/sh $srcdir/mkhelp.sh $srcdir/KEYS "$version" >$builddir/help.ml $comp -c $mloptgl -o $builddir/lablGL/gl$osu $srcdir/lablGL/gl.ml $comp -c $mloptgl -o $builddir/lablGL/raw$osu $srcdir/lablGL/raw.ml @@ -45,8 +45,9 @@ $comp -c $mloptgl -o $builddir/lablGL/gl $comp -c -o $builddir/help$osu $builddir/help.ml $comp -c $mlopt -o $builddir/utils$osu $srcdir/utils.ml $comp -c $mlopt -I $builddir -o $builddir/parser$osu $srcdir/parser.ml +$comp -c $mlopt -I $builddir -o $builddir/keys$osu $srcdir/keys.ml $comp -c $mlopt -I $builddir -o $builddir/wsi.cmi $srcdir/wsi.mli $comp -c $mloptgl -I $builddir -o $builddir/config$osu $srcdir/config.ml $comp -c $mloptgl -I $builddir -o $builddir/main$osu $srcdir/main.ml $comp -c $mlopt -I $builddir -o $builddir/wsi$osu $srcdir/wsi.ml -$comp -g $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-lGL -lX11 -lmupdf -lmupdfthird -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o" -+$comp $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-L${LOCALBASE}/lib -lGL -lX11 -lmupdf_pic -lmupdfthird_pic -lharfbuzz -lz -lfreetype -ljpeg -ljbig2dec -lopenjp2 -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o" ++$comp $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-L${LOCALBASE}/lib -lGL -lX11 -lmupdf -lmupdfthird -lharfbuzz -lz -lfreetype -ljpeg -ljbig2dec -lopenjp2 -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o" Index: head/graphics/llpp/files/patch-main.ml =================================================================== --- head/graphics/llpp/files/patch-main.ml (nonexistent) +++ head/graphics/llpp/files/patch-main.ml (revision 433550) @@ -0,0 +1,15 @@ +Fix brightness increase key + +Upstream commit: 35113fbe37a385e8a886288a86cf970ac85e742e + +--- main.ml.orig 2017-02-01 01:49:58 UTC ++++ main.ml +@@ -5057,7 +5057,7 @@ let viewkeyboard key mask = + + | Ascii ('['|']' as c) -> + conf.colorscale <- +- bound (conf.colorscale +. (if c = '>' then 0.1 else -0.1)) 0.0 1.0; ++ bound (conf.colorscale +. (if c = ']' then 0.1 else -0.1)) 0.0 1.0; + G.postRedisplay "brightness"; + + | Ascii 'c' when state.mode = View -> Property changes on: head/graphics/llpp/files/patch-main.ml ___________________________________________________________________ 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/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 433549) +++ head/graphics/mupdf/Makefile (revision 433550) @@ -1,67 +1,68 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf PORTVERSION= 1.10a DISTVERSIONSUFFIX= -source +PORTREVISION= 1 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 +CFLAGS+= -I${WRKSRC}/include/mupdf -fPIC LIBS+= -L${LOCALBASE}/lib -MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes +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 @${RM} -r ${WRKSRC}/thirdparty/curl \ ${WRKSRC}/thirdparty/freetype \ ${WRKSRC}/thirdparty/harfbuzz \ ${WRKSRC}/thirdparty/jbig2dec \ ${WRKSRC}/thirdparty/jpeg \ ${WRKSRC}/thirdparty/openjpeg \ ${WRKSRC}/thirdparty/zlib -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 - ${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdfthird.a \ - ${STAGEDIR}${PREFIX}/lib/libmupdfthird_pic.a ${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/files/patch-Makefile =================================================================== --- head/graphics/mupdf/files/patch-Makefile (nonexistent) +++ head/graphics/mupdf/files/patch-Makefile (revision 433550) @@ -0,0 +1,23 @@ +$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ +--- Makefile.orig 2016-11-28 13:34:04 UTC ++++ Makefile +@@ -152,14 +152,17 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL) + + # --- Library --- + +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdfthird.a ++MUPDF_LIB = libmupdf.so.$(SOVERSION) ++THIRD_LIB = libmupdfthird.so.$(SOVERSION) + + 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) + + $(MUPDF_LIB) : $(MUPDF_OBJ) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ + $(THIRD_LIB) : $(THIRD_OBJ) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) + + INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) + Property changes on: head/graphics/mupdf/files/patch-Makefile ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 433549) +++ head/graphics/mupdf/pkg-plist (revision 433550) @@ -1,97 +1,97 @@ 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/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/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/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.a -lib/libmupdfthird.a -lib/libmupdfthird_pic.a -lib/libmupdf_pic.a +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 433549) +++ head/graphics/zathura-pdf-mupdf/Makefile (revision 433550) @@ -1,37 +1,37 @@ # Created by: Zsolt Udvari # $FreeBSD$ PORTNAME= zathura-pdf-mupdf PORTVERSION= 0.3.1 +PORTREVISION= 1 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 \ - mupdf>=1.8,1:graphics/mupdf +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 \ - libopenjp2.so:graphics/openjpeg \ - libgirara-gtk3.so:x11-toolkits/girara + libmupdf.so:graphics/mupdf \ + libopenjp2.so:graphics/openjpeg PLIST_FILES= lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop -MAKE_ARGS= MUPDF_LIB="-lmupdf_pic -lmupdfthird_pic" OPENSSL_INC=-I${OPENSSLINC} \ - OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto" +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