Thu Sep 7 14:36:54 2023 UTC ()
print/mupdf: update to MuPDF 1.23.3

# Changes (local)

  * Import patch from OpenBSD ports, adding support for fine-grained zoom.
  * Fix scrolling with vi-like bindings (from FreeBSD ports).
  * Use REPLACE_INTERPRETER instead of an ad-hoc patch.
  * Don't install html documentation (turn it into an option in future?)
  * Provide .desktop application file and pixmap for mupdf.
  * Avoid executable bit being set on static libs.
  * Other minor fixes.
  * Package linted.

# Changes (upstream)

## 1.23.3 (2023-09-05)

  * Fix bug where an inconsistent xref caused problems when saving PDF.

## 1.23.2 (2023-08-31)

  * Fixes needed to allow tesseract builds in C++/Python bindings.

## 1.23.1 (2023-08-29)

  * Fix bug where implicit operations where not ended when creating
    signature widget annotations.
  * Fix bug where saving an encrypted PDF requiring encryption could
    cause an invalid saved file.
  * Fix bug where ink annotation line caps adhered to rendering in older
    Adobe Acrobat Reader.
  * Fix compilation issue of shared library used in pythong bindings.

## 1.23.0 (2023-08-22)

 New features:

  * New WASM library with same API as mutool run and Java, for both
    browser and Node environments.
  * Support CropBox, TrimBox, BleedBox, and ArtBox in PDF tools and
    viewers.
  * PhotoShop PSD image support.
  * mupdf-gl: Custom ICC display profile support.
  * mutool poster: Option to split in RTL direction.

 Miscellaneous improvements and notable bug fixes:

  * EPUB: Fix table cell height calculations.
  * EPUB: Inherit table cell background color from table row.
  * EPUB: Support files with partial encryption (only read unencrypted
    parts).
  * EPUB: Support files with incorrect directory prefixes.
  * TIFF: Stability improvements.
  * MOBI: Stability improvements.
  * PDF: Support old style border dash patterns.
  * PDF: Support GoToR links to remote PDF documents.
  * PDF: Improve link parsing and creation.
  * ZIP: Improve unicode file name handling.
  * Fall back to unhinted fonts if hints are broken.
  * Recognize document types by sniffing contents (don't need to rely on
    mimetype or file extension).

 New APIs:

  * More PDF document permission flags.
  * Tweaked exception error logging.
  * pdf_minimize_document to squeeze amount of memory used by an open
    document.

 Incompatible API changes:

  * pdf_field_name renamed to pdf_load_field_name.
  * mutool run: Changed many methods to match Java and new WASM library.

 New and improved documentation.


(vins)
diff -r1.107 -r1.108 pkgsrc/print/mupdf/Makefile
diff -r1.26 -r1.27 pkgsrc/print/mupdf/PLIST
diff -r1.68 -r1.69 pkgsrc/print/mupdf/distinfo
diff -r1.12 -r1.13 pkgsrc/print/mupdf/options.mk
diff -r0 -r1.1 pkgsrc/print/mupdf/files/mupdf.desktop
diff -r0 -r1.1 pkgsrc/print/mupdf/files/mupdf.xpm
diff -r1.27 -r1.28 pkgsrc/print/mupdf/patches/patch-ab
diff -r1.30 -r1.31 pkgsrc/print/mupdf/patches/patch-ac
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-docs_man_mupdf.1
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-platform_x11_curl__stream.c
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-source_helpers_pkcs7_pkcs7-openssl.c
diff -r0 -r1.3 pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c
diff -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh
Thu Sep 7 23:36:54 2023
Mon Jun 26 19:39:52 2023
pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh,v

anoncvs not yet been updated

cvs diff -r1.107 -r1.108 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2023/08/03 14:16:22 1.107
+++ pkgsrc/print/mupdf/Makefile 2023/09/07 14:36:54 1.108
@@ -1,70 +1,84 @@ @@ -1,70 +1,84 @@
1# $NetBSD: Makefile,v 1.107 2023/08/03 14:16:22 ryoon Exp $ 1# $NetBSD: Makefile,v 1.108 2023/09/07 14:36:54 vins Exp $
2 2
3DISTNAME= mupdf-1.22.2-source 3DISTNAME= mupdf-1.23.3-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5PKGREVISION= 1 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= https://mupdf.com/downloads/archive/ 6MASTER_SITES= https://mupdf.com/downloads/archive/
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://mupdf.com/ 9HOMEPAGE= https://mupdf.com/
11COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit 10COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit
12LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
13 12
14USE_LANGUAGES= c99 c++ 13USE_LANGUAGES= c99 c++11
15USE_TOOLS+= pkg-config gmake 14USE_TOOLS+= pkg-config gmake
16 15
17INSTALLATION_DIRS+= bin include lib/pkgconfig 16INSTALLATION_DIRS+= bin include lib/pkgconfig
18INSTALL_MAKE_FLAGS+= prefix=${PREFIX} 17INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
19INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 18INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
20LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib 19LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
21MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 20MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
22MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q} 21MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q}
 22MAKE_FLAGS+= XLIBS=${LIBS:Q}
23MAKE_FLAGS+= build=release 23MAKE_FLAGS+= build=release
24MAKE_FLAGS+= USE_SYSTEM_LIBS=yes 24MAKE_FLAGS+= USE_SYSTEM_LIBS=yes
25MAKE_FLAGS+= USE_SYSTEM_MUJS=yes 25MAKE_FLAGS+= USE_SYSTEM_MUJS=yes
26 26
27CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 27CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
28 28
29.include "options.mk" 29.include "options.mk"
30 30
 31REPLACE_INTERPRETER+= shell
 32REPLACE.shell.old= .*/bin/bash
 33REPLACE.shell.new= ${SH}
 34REPLACE_FILES.shell+= scripts/hexdump.sh
 35
 36INSTALLATION_DIRS+= share/pixmaps share/applications
 37
31# Remove thirdparty directory in order to use the libraries provided by pkgsrc 38# Remove thirdparty directory in order to use the libraries provided by pkgsrc
32# thirdparty/lcms2 is not removed intentionally because ICC support requires 39# thirdparty/lcms2 is not removed intentionally because ICC support requires
33# the internal lcms2 library. ICC support is essential to display some PDF 40# the internal lcms2 library. ICC support is essential to display some PDF
34# files with proper colors. 41# files with proper colors.
35ppost-extract: 42post-extract:
36 ${RM} -fr \ 43 ${RUN}${RM} -fr \
37 ${WRKSRC}/thirdparty/curl \ 44 ${WRKSRC}/thirdparty/curl \
38 ${WRKSRC}/thirdparty/freeglut \ 45 ${WRKSRC}/thirdparty/freeglut \
39 ${WRKSRC}/thirdparty/freetype \ 46 ${WRKSRC}/thirdparty/freetype \
40 ${WRKSRC}/thirdparty/gumbo-parser \ 47 ${WRKSRC}/thirdparty/gumbo-parser \
41 ${WRKSRC}/thirdparty/harfbuzz \ 48 ${WRKSRC}/thirdparty/harfbuzz \
42 ${WRKSRC}/thirdparty/jbig2dec \ 49 ${WRKSRC}/thirdparty/jbig2dec \
43 ${WRKSRC}/thirdparty/leptonica \ 50 ${WRKSRC}/thirdparty/leptonica \
44 ${WRKSRC}/thirdparty/libjpeg \ 51 ${WRKSRC}/thirdparty/libjpeg \
45 ${WRKSRC}/thirdparty/mujs \ 52 ${WRKSRC}/thirdparty/mujs \
46 ${WRKSRC}/thirdparty/openjpeg \ 53 ${WRKSRC}/thirdparty/openjpeg \
47 ${WRKSRC}/thirdparty/tesseract \ 54 ${WRKSRC}/thirdparty/tesseract \
48 ${WRKSRC}/thirdparty/zlib 55 ${WRKSRC}/thirdparty/zlib
49 56
50post-build: 57post-build:
51 sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \ 58 ${RUN}${SED} -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
52 ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc 59 ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
53 60
54post-install: 61post-install:
55 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 62 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 63 ${INSTALL_DATA} ${FILESDIR}/mupdf.desktop ${DESTDIR}${PREFIX}/share/applications
 64 ${INSTALL_DATA} ${FILESDIR}/mupdf.xpm ${DESTDIR}${PREFIX}/share/pixmaps
56 ${MV} ${DESTDIR}${PREFIX}/bin/mupdf-x11 ${DESTDIR}${PREFIX}/bin/mupdf 65 ${MV} ${DESTDIR}${PREFIX}/bin/mupdf-x11 ${DESTDIR}${PREFIX}/bin/mupdf
 66# do not toggle executable bit on static libs.
 67.for i in libmupdf libmupdf-third
 68 ${RUN}${CHMOD} -x ${DESTDIR}${PREFIX}/lib/${i}.a
 69.endfor
57 70
 71.include "../../sysutils/desktop-file-utils/desktopdb.mk"
58BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7 72BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7
59.include "../../devel/zlib/buildlink3.mk" 73.include "../../devel/zlib/buildlink3.mk"
60.include "../../fonts/harfbuzz/buildlink3.mk" 74.include "../../fonts/harfbuzz/buildlink3.mk"
61.include "../../graphics/freetype2/buildlink3.mk" 75.include "../../graphics/freetype2/buildlink3.mk"
62.include "../../graphics/jbig2dec/buildlink3.mk" 76.include "../../graphics/jbig2dec/buildlink3.mk"
63.include "../../mk/jpeg.buildlink3.mk" 77.include "../../mk/jpeg.buildlink3.mk"
64.include "../../mk/pthread.buildlink3.mk" 78.include "../../mk/pthread.buildlink3.mk"
65# XXX: mupdf needs lcms2-art fork 79# XXX: mupdf needs lcms2-art fork
66#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9 80#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
67#.include "../../graphics/lcms2/buildlink3.mk" 81#.include "../../graphics/lcms2/buildlink3.mk"
68.include "../../graphics/openjpeg/buildlink3.mk" 82.include "../../graphics/openjpeg/buildlink3.mk"
69.include "../../graphics/png/buildlink3.mk" 83.include "../../graphics/png/buildlink3.mk"
70.include "../../lang/mujs/buildlink3.mk" 84.include "../../lang/mujs/buildlink3.mk"

cvs diff -r1.26 -r1.27 pkgsrc/print/mupdf/PLIST (expand / switch to unified diff)

--- pkgsrc/print/mupdf/PLIST 2023/07/19 14:46:38 1.26
+++ pkgsrc/print/mupdf/PLIST 2023/09/07 14:36:54 1.27
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1@comment $NetBSD: PLIST,v 1.26 2023/07/19 14:46:38 vins Exp $ 1@comment $NetBSD: PLIST,v 1.27 2023/09/07 14:36:54 vins Exp $
2bin/mupdf 2bin/mupdf
3${PLIST.curl}bin/mupdf-x11-curl 
4${PLIST.opengl}bin/mupdf-gl 3${PLIST.opengl}bin/mupdf-gl
 4${PLIST.curl}bin/mupdf-x11-curl
5bin/muraster 5bin/muraster
6bin/mutool 6bin/mutool
7include/mupdf/fitz.h 7include/mupdf/fitz.h
8include/mupdf/fitz/archive.h 8include/mupdf/fitz/archive.h
9include/mupdf/fitz/band-writer.h 9include/mupdf/fitz/band-writer.h
10include/mupdf/fitz/bidi.h 10include/mupdf/fitz/bidi.h
11include/mupdf/fitz/bitmap.h 11include/mupdf/fitz/bitmap.h
12include/mupdf/fitz/buffer.h 12include/mupdf/fitz/buffer.h
13include/mupdf/fitz/color.h 13include/mupdf/fitz/color.h
14include/mupdf/fitz/compress.h 14include/mupdf/fitz/compress.h
15include/mupdf/fitz/compressed-buffer.h 15include/mupdf/fitz/compressed-buffer.h
16include/mupdf/fitz/config.h 16include/mupdf/fitz/config.h
17include/mupdf/fitz/context.h 17include/mupdf/fitz/context.h
@@ -69,64 +69,38 @@ include/mupdf/pdf/interpret.h @@ -69,64 +69,38 @@ include/mupdf/pdf/interpret.h
69include/mupdf/pdf/javascript.h 69include/mupdf/pdf/javascript.h
70include/mupdf/pdf/name-table.h 70include/mupdf/pdf/name-table.h
71include/mupdf/pdf/object.h 71include/mupdf/pdf/object.h
72include/mupdf/pdf/page.h 72include/mupdf/pdf/page.h
73include/mupdf/pdf/parse.h 73include/mupdf/pdf/parse.h
74include/mupdf/pdf/resource.h 74include/mupdf/pdf/resource.h
75include/mupdf/pdf/xref.h 75include/mupdf/pdf/xref.h
76include/mupdf/ucdn.h 76include/mupdf/ucdn.h
77lib/libmupdf-third.a 77lib/libmupdf-third.a
78lib/libmupdf.a 78lib/libmupdf.a
79lib/pkgconfig/mupdf.pc 79lib/pkgconfig/mupdf.pc
80man/man1/mupdf.1 80man/man1/mupdf.1
81man/man1/mutool.1 81man/man1/mutool.1
 82share/applications/mupdf.desktop
82share/doc/mupdf/CHANGES 83share/doc/mupdf/CHANGES
83share/doc/mupdf/COPYING 84share/doc/mupdf/COPYING
84share/doc/mupdf/README 85share/doc/mupdf/README
85share/doc/mupdf/android-library.html 
86share/doc/mupdf/artifex-logo.png 
87share/doc/mupdf/building.html 
88share/doc/mupdf/coding-overview.html 
89share/doc/mupdf/coding-progressive.html 
90share/doc/mupdf/coding-style.html 
91share/doc/mupdf/ecosystem.css 
92share/doc/mupdf/ecosystem.html 
93share/doc/mupdf/examples/SnarkFront.svg 86share/doc/mupdf/examples/SnarkFront.svg
94share/doc/mupdf/examples/bbox-device.js 87share/doc/mupdf/examples/bbox-device.js
95share/doc/mupdf/examples/create-thumbnail.js 88share/doc/mupdf/examples/create-thumbnail.js
96share/doc/mupdf/examples/draw-device.js 89share/doc/mupdf/examples/draw-device.js
97share/doc/mupdf/examples/draw-document.js 90share/doc/mupdf/examples/draw-document.js
98share/doc/mupdf/examples/example.c 91share/doc/mupdf/examples/example.c
99share/doc/mupdf/examples/fix-s22pdf.js 92share/doc/mupdf/examples/fix-s22pdf.js
100share/doc/mupdf/examples/huntingofthesnark.png 93share/doc/mupdf/examples/huntingofthesnark.png
101share/doc/mupdf/examples/jpx-to-pdf.js 94share/doc/mupdf/examples/jpx-to-pdf.js
102share/doc/mupdf/examples/multi-threaded.c 95share/doc/mupdf/examples/multi-threaded.c
103share/doc/mupdf/examples/pdf-create-lowlevel.js 96share/doc/mupdf/examples/pdf-create-lowlevel.js
104share/doc/mupdf/examples/pdf-create.js 97share/doc/mupdf/examples/pdf-create.js
105share/doc/mupdf/examples/pdf-dejpx.js 98share/doc/mupdf/examples/pdf-dejpx.js
106share/doc/mupdf/examples/pdf-extract-rich-media.js 99share/doc/mupdf/examples/pdf-extract-rich-media.js
107share/doc/mupdf/examples/pdf-merge.js 100share/doc/mupdf/examples/pdf-merge.js
108share/doc/mupdf/examples/pdf-portfolio.js 101share/doc/mupdf/examples/pdf-portfolio.js
109share/doc/mupdf/examples/pdf-trace.js 102share/doc/mupdf/examples/pdf-trace.js
110share/doc/mupdf/examples/storytest.c 103share/doc/mupdf/examples/storytest.c
111share/doc/mupdf/examples/storytest.js 104share/doc/mupdf/examples/storytest.js
112share/doc/mupdf/examples/trace-device.js 105share/doc/mupdf/examples/trace-device.js
113share/doc/mupdf/index.html 106share/pixmaps/mupdf.xpm
114share/doc/mupdf/library.html 
115share/doc/mupdf/manual-mupdf-gl.html 
116share/doc/mupdf/manual-mutool-clean.html 
117share/doc/mupdf/manual-mutool-convert.html 
118share/doc/mupdf/manual-mutool-create.html 
119share/doc/mupdf/manual-mutool-draw.html 
120share/doc/mupdf/manual-mutool-extract.html 
121share/doc/mupdf/manual-mutool-info.html 
122share/doc/mupdf/manual-mutool-merge.html 
123share/doc/mupdf/manual-mutool-pages.html 
124share/doc/mupdf/manual-mutool-poster.html 
125share/doc/mupdf/manual-mutool-run.html 
126share/doc/mupdf/manual-mutool-show.html 
127share/doc/mupdf/manual-mutool-sign.html 
128share/doc/mupdf/manual-mutool-trace.html 
129share/doc/mupdf/mutool.html 
130share/doc/mupdf/style.css 
131share/doc/mupdf/thirdparty.html 
132share/doc/mupdf/viewers.html 

cvs diff -r1.68 -r1.69 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2023/08/03 03:57:28 1.68
+++ pkgsrc/print/mupdf/distinfo 2023/09/07 14:36:54 1.69
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: distinfo,v 1.68 2023/08/03 03:57:28 ryoon Exp $ 1$NetBSD: distinfo,v 1.69 2023/09/07 14:36:54 vins Exp $
2 2
3BLAKE2s (mupdf-1.22.2-source.tar.gz) = 08b3154c05b4d7f2add872278f1f53b2fdafbf4b1546c21e04c50f4a47b713b9 3BLAKE2s (mupdf-1.23.3-source.tar.gz) = 8b4358ea917f4e068a56d4565bb1d0c342518854ea446b219a02df852d813094
4SHA512 (mupdf-1.22.2-source.tar.gz) = 1f2e1c8caab49fcc1fe9d3f2bc994d36c77166a8f424311fb8dd8cfdc18b279d85f2cec52966cdce84a0488465b50eadf9f26f22dda06cb9de6127096458b3b9 4SHA512 (mupdf-1.23.3-source.tar.gz) = 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
5Size (mupdf-1.22.2-source.tar.gz) = 57541621 bytes 5Size (mupdf-1.23.3-source.tar.gz) = 55144800 bytes
6SHA1 (patch-Makelists) = 714157e21b2b609ac4f0adacc73c3e3a2156640a 6SHA1 (patch-Makelists) = 714157e21b2b609ac4f0adacc73c3e3a2156640a
7SHA1 (patch-ab) = 8637625e231bcb313a60c6841ab2fc5107cf2af4 7SHA1 (patch-ab) = 548361a64a7ef6777e60e48a2653120034a35338
8SHA1 (patch-ac) = b66ee5026bebec1fc428b847de6672e8d90b7e16 8SHA1 (patch-ac) = 2377fe83c6ff3b976a20a912087694fcfe0e9168
9SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede 9SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 10SHA1 (patch-docs_man_mupdf.1) = c2a2c1ad283428168a714adb634aa50cdd6a4aba
10SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78 11SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
11SHA1 (patch-scripts_hexdump.sh) = 1f1299e24ffa5e6bf040f73b75dc49dd6f5272c4 12SHA1 (patch-platform_x11_curl__stream.c) = eb895282ca99daf49cffa6d9a5f04009e295993b
 13SHA1 (patch-platform_x11_pdfapp.c) = 33b53c845c6778614e4384a783a34d00b6814e74
12SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb 14SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
 15SHA1 (patch-source_helpers_pkcs7_pkcs7-openssl.c) = f3e949de8bdfc55e2da402a5bc59b4baf04b0d55

cvs diff -r1.12 -r1.13 pkgsrc/print/mupdf/options.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/options.mk 2023/07/19 14:46:38 1.12
+++ pkgsrc/print/mupdf/options.mk 2023/09/07 14:36:54 1.13
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: options.mk,v 1.12 2023/07/19 14:46:38 vins Exp $ 1# $NetBSD: options.mk,v 1.13 2023/09/07 14:36:54 vins Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf 3PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf
4PKG_SUPPORTED_OPTIONS= curl opengl 4PKG_SUPPORTED_OPTIONS= curl opengl
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8.if ${OPSYS} != "Darwin" 8.if ${OPSYS} != "Darwin"
9PKG_SUGGESTED_OPTIONS= opengl 9PKG_SUGGESTED_OPTIONS= opengl
10.endif 10.endif
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14PLIST_VARS+= curl opengl 14PLIST_VARS+= curl opengl
15 15
16# 16#
17# curl support 17# curl support
18# 18#
19.if !empty(PKG_OPTIONS:Mcurl) 19.if !empty(PKG_OPTIONS:Mcurl)
20PLIST.curl= yes 20PLIST.curl= yes
 21.include "../../security/openssl/buildlink3.mk" #-lcrypto
21.include "../../www/curl/buildlink3.mk" 22.include "../../www/curl/buildlink3.mk"
22.endif 23.endif
23 24
24# 25#
25# glut support 26# glut support
26# 27#
27.if !empty(PKG_OPTIONS:Mopengl) 28.if !empty(PKG_OPTIONS:Mopengl)
28PLIST.opengl= yes 29PLIST.opengl= yes
29.include "../../graphics/MesaLib/buildlink3.mk" 30.include "../../graphics/MesaLib/buildlink3.mk"
30.include "../../graphics/freeglut/buildlink3.mk" 31.include "../../graphics/freeglut/buildlink3.mk"
31LDFLAGS+= -lGL # for glCallList 32LDFLAGS+= -lGL # for glCallList
32.else 33.else
33MAKE_ENV+= HAVE_GLUT=no 34MAKE_ENV+= HAVE_GLUT=no

File Added: pkgsrc/print/mupdf/files/mupdf.desktop
[Desktop Entry]
Name=MuPDF
GenericName=PDF file viewer
Exec=mupdf %f
TryExec=mupdf
Icon=mupdf
Terminal=false
Type=Application
MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
Categories=Viewer;Graphics;
Actions=View
NoDisplay=true

[Desktop Action View]
Name=View with mupdf
Exec=mupdf %f

File Added: pkgsrc/print/mupdf/files/mupdf.xpm
/* XPM */
static char *mupdf[] = {
/* width height ncolors chars_per_pixel */
"48 48 442 2",
/* colors */
"   c #000000",
" . c #2E4558",
" X c #252121",
" o c #AFAFAF",
" O c #28313B",
" + c #231F1F",
" @ c #686666",
" # c #98BDD7",
" $ c #201B1C",
" % c #7CABCC",
" & c #4487B6",
" * c #DFDEDE",
" = c #4285B4",
" - c #615E5F",
" ; c #605E5E",
" : c #23262C",
" > c #D9D8D8",
" , c #F7FAFC",
" < c #D7D6D6",
" 1 c #BFD6E6",
" 2 c #6BA0C5",
" 3 c #232122",
" 4 c #555253",
" 5 c #CDCCCC",
" 6 c #E7EFF6",
" 7 c #4786B2",
" 8 c #CADDEA",
" 9 c #4085B5",
" 0 c #AECBDF",
" q c #CBCACA",
" w c #92B9D4",
" e c #365F7D",
" r c #5A95BE",
" t c #3E83B3",
" y c #304B60",
" u c #C7C6C6",
" i c #4D8EBB",
" p c #F1F6F9",
" a c #C1C0C0",
" s c #454243",
" d c #669CC3",
" f c #81AECD",
" g c #7A7777",
" h c #434041",
" j c #3E779F",
" k c #272E36",
" l c #413E3F",
" z c #3F3C3D",
" x c #5895BF",
" c c #3D3A3B",
" v c #C6DBE9",
" b c #B8B6B7",
" n c #4282B0",
" m c #FDFDFE",
" M c #B7B6B6",
" N c #8DB5D2",
" B c #242529",
" V c #B3B2B2",
" C c #222327",
" Z c #B0AEAF",
" A c #EDF4F8",
" S c #686565",
" D c #488AB9",
" F c #9ABED8",
" G c #7EACCD",
" H c #ECF2F7",
" J c #211C1C",
" K c #666363",
" L c #F1F1F2",
" P c #ABAAAA",
" I c #4588B6",
" U c #A9A8A8",
" Y c #2D2A2B",
" T c #A7A6A6",
" R c #615D5E",
" E c #2B2829",
" W c #8DB7D5",
" Q c #F9FBFD",
" ! c #DDE9F2",
" ~ c #F8FBFC",
" ^ c #DCE9F1",
" / c #A5C5DC",
" ( c #89B3D1",
" ) c #5C5959",
" _ c #A4C5DB",
" ` c #335A76",
" ' c #518FBB",
" ] c #E6E7E7",
" [ c #5A5757",
" { c #232021",
" } c #33536C",
" | c #98BED9",
".  c #E0E1E1",
".. c #7CACCE",
".X c #4488B8",
".o c #2D3F4F",
".O c #999898",
".+ c #4388B7",
".@ c #5E98C1",
".# c #CDCDCB",
".$ c #524F4F",
".% c #B0CCE0",
".& c #979696",
".* c #78A8CA",
".= c #5C96BF",
".- c #969495",
".; c #4084B4",
".: c #252930",
".> c #949293",
"., c #929091",
".< c #417FAB",
".1 c #4F8FBC",
".2 c #F3F7FA",
".3 c #D3D3D4",
".4 c #D7E5EF",
".5 c #222023",
".6 c #9FC1D9",
".7 c #679DC3",
".8 c #37678A",
".9 c #4B8BB8",
".0 c #3E769E",
".q c #3C749C",
".w c #403D3D",
".e c #92BAD6",
".r c #C8DCEA",
".t c #FEFEFE",
".y c #3D393A",
".u c #3B3738",
".i c #355974",
".p c #353132",
".a c #7A7879",
".s c #498BB9",
".d c #9BBFD8",
".f c #4E8AB4",
".g c #787677",
".h c #F2F2F2",
".j c #F0F0F0",
".k c #2F2B2C",
".l c #EEEEEE",
".z c #727071",
".x c #26282D",
".c c #ECECEC",
".v c #2B2728",
".b c #FAFCFD",
".n c #EAEAEA",
".m c #DEEAF2",
".M c #E9EAE9",
".N c #C2D8E7",
".B c #6E6C6D",
".V c #5390BC",
".C c #E8E8E8",
".Z c #6EA2C6",
".A c #272324",
".S c #E7E6E7",
".D c #E6E6E6",
".F c #252122",
".G c #29333D",
".H c #E4E4E4",
".J c #3F7AA5",
".K c #231F20",
".L c #E2E2E2",
".P c #211D1E",
".I c #E0E0E0",
".U c #EAF1F7",
".Y c #6099C2",
".T c #1F1B1C",
".R c #E9F1F6",
".E c #CDDFEB",
".W c #4387B6",
".Q c #96BBD6",
".! c #B1CDE0",
".~ c #DEDEDE",
".^ c #79A9CA",
"./ c #4285B5",
".( c #272A31",
".) c #5D97BF",
"._ c #4185B4",
".` c #DCDCDC",
".' c #959393",
".] c #DADADA",
".[ c #314B5F",
".{ c #D8D8D8",
".} c #D7D8D7",
".| c #D6D6D6",
"X  c #F5F8FB",
"X. c #D4D4D4",
"XX c #6AA0C5",
"Xo c #BDD4E5",
"XO c #3A6A8C",
"X+ c #232123",
"X@ c #D3D4D3",
"X# c #D2D2D2",
"X$ c #D0D0D0",
"X% c #CECECE",
"X& c #CCCCCC",
"X* c #CADDEB",
"X= c #37617F",
"X- c #242A31",
"X; c #CACACA",
"X: c #C8DBE9",
"X> c #90B7D3",
"X, c #817F7F",
"X< c #3F7EAB",
"X1 c #548FB9",
"X2 c #355873",
"X3 c #7D7B7B",
"X4 c #C2C2C2",
"X5 c #4B8CBA",
"X6 c #C0C0C0",
"X7 c #D4E4EE",
"X8 c #81AECE",
"X9 c #659CC3",
"X0 c #787576",
"Xq c #4788B6",
"Xw c #252C35",
"Xe c #757373",
"Xr c #BABABA",
"Xt c #FCFDFE",
"Xy c #B6B6B6",
"Xu c #C4D9E8",
"Xi c #706D6E",
"Xp c #8CB5D2",
"Xa c #70A3C7",
"Xs c #8BB5D1",
"Xd c #5491BC",
"Xf c #5391BB",
"Xg c #282424",
"Xh c #272223",
"Xj c #6C696A",
"Xk c #2F4659",
"Xl c #6B6969",
"Xz c #407BA5",
"Xx c #6A6768",
"Xc c #E4E3E3",
"Xv c #3E79A3",
"Xb c #231E1F",
"Xn c #221E1E",
"Xm c #E2E1E1",
"XM c #211C1D",
"XN c #EBF2F7",
"XB c #201C1C",
"XV c #CFE0EC",
"XC c #4588B7",
"XZ c #B3CEE1",
"XA c #366384",
"XS c #5F98C0",
"XD c #4386B5",
"XF c #DEDDDD",
"XG c #2B3D4B",
"XH c #615F5F",
"XJ c #5F5D5D",
"XK c #5E5B5C",
"XL c #DCE9F2",
"XP c #407DA8",
"XI c #86B1CF",
"XU c #D4D3D3",
"XY c #3A698B",
"XT c #3E7BA6",
"XR c #232022",
"XE c #545152",
"XW c #999899",
"XQ c #79AACC",
"X! c #524F50",
"X~ c #CCCDCB",
"X^ c #3D749B",
"X/ c #93BAD5",
"X( c #77A8CA",
"X) c #37607E",
"X_ c #5B96BF",
"X` c #3F84B4",
"X' c #CAC9C9",
"X] c #C6C5C5",
"X[ c #3F7DAA",
"X{ c #F2F7FA",
"X} c #C2C1C1",
"X| c #212023",
"o  c #9EC1D9",
"o. c #444142",
"oX c #3F78A0",
"oo c #90B8D5",
"oO c #FEFEFF",
"o+ c #E2ECF4",
"o@ c #2B3A47",
"o# c #25262A",
"o$ c #B1AFB0",
"o% c #28313A",
"o& c #221D1D",
"o* c #262F38",
"o= c #629BC2",
"o- c #302D2E",
"o; c #6199C1",
"o: c #201B1B",
"o> c #4587B6",
"o, c #F0F0F1",
"o< c #2D3E4C",
"o1 c #2E2B2C",
"o2 c #4385B4",
"o3 c #A8A7A7",
"o4 c #A7A5A6",
"o5 c #3D7197",
"o6 c #4183B2",
"o7 c #4083B1",
"o8 c #A5A3A4",
"o9 c #3B6F95",
"o0 c #5290BC",
"oq c #A4C4DB",
"ow c #E9F1F7",
"oe c #4387B7",
"or c #E7EFF5",
"ot c #CBDDEA",
"oy c #4185B5",
"ou c #5B95BE",
"oi c #3F83B3",
"op c #939192",
"oa c #929191",
"os c #2B3743",
"od c #4C4849",
"of c #2A3742",
"og c #F4F8FB",
"oh c #D8E6F0",
"oj c #4C8CB9",
"ok c #211F22",
"ol c #CFD0D0",
"oz c #444041",
"ox c #262C34",
"oc c #413E3E",
"ov c #403C3D",
"ob c #3B739B",
"on c #858384",
"om c #FFFFFF",
"oM c #E3EDF4",
"oN c #5995BF",
"oB c #3E3A3B",
"oV c #C7DBE9",
"oC c #2F4B61",
"oZ c #5793BD",
"oA c #3C3839",
"oS c #2A3945",
"oD c #7E7D7D",
"oF c #345873",
"oG c #363233",
"oH c #7B797A",
"oJ c #EFF4F9",
"oK c #EEF4F8",
"oL c #F3F3F3",
"oP c #9ABED7",
"oI c #4788B7",
"oU c #629AC1",
"oY c #ACAAAA",
"oT c #F1F1F1",
"oR c #EFEFEF",
"oE c #737172",
"oW c #EDEDED",
"oQ c #A9C9DF",
"o! c #FBFDFE",
"o~ c #EBEBEB",
"o^ c #DFEBF3",
"o/ c #4581AB",
"o( c #6F6D6E",
"o) c #EAE9EA",
"o_ c #E9E9E9",
"o` c #C1D7E6",
"o' c #E7E7E7",
"o] c #E6E7E6",
"o[ c #E5E5E5",
"o{ c #3F7BA5",
"o} c #242021",
"o| c #E3E3E3",
"O  c #3E79A4",
"O. c #221E1F",
"OX c #26303A",
"Oo c #9C9A9A",
"OO c #E1E1E1",
"O+ c #201C1D",
"O@ c #4488B7",
"O# c #DFDFDF",
"O$ c #7BAACC",
"O% c #356384",
"O& c #1E1A1B",
"O* c #4386B6",
"O= c #4286B5",
"O- c #95BAD5",
"O; c #DDDDDD",
"O: c #1C1819",
"O> c #DBDBDB",
"O, c #D9D9D9",
"O< c #D7D7D7",
"O1 c #417FAA",
"O2 c #DAE7F1",
"O3 c #F5F9FB",
"O4 c #D5D5D5",
"O5 c #242224",
"O6 c #D4D3D4",
"O7 c #85B1CF",
"O8 c #D3D3D3",
"O9 c #699FC4",
"O0 c #4D8DB9",
"Oq c #222022",
"Ow c #34556F",
"Oe c #D1D1D1",
"Or c #D0CFD0",
"Ot c #8A8888",
"Oy c #CFCFCF",
"Ou c #CDCDCD",
"Oi c #CCCDCC",
"Op c #CADEEB",
"Oa c #E5EEF5",
"Os c #C9DCEA",
"Od c #ADCADF",
"Of c #C8DCE9",
"Og c #91B8D4",
"Oh c #5994BE",
"Oj c #3D82B3",
"Ok c #5894BD",
"Ol c #3C82B2",
"Oz c #4181AD",
"Ox c #3B3737",
"Oc c #C5C5C5",
"Ov c #293643",
"Ob c #3E7DAA",
"On c #C1C1C1",
"Om c #353131",
"OM c #D4E3EE",
"ON c #B8D1E3",
"OB c #BFBFBF",
"OV c #9CBFD8",
"OC c #80ADCD",
"OZ c #649BC2",
"OA c #4889B7",
"OS c #BDBDBD",
"OD c #2E292A",
"OF c #4283B1",
"OG c #B7B7B7",
"OH c #4183B0",
"OJ c #5794BF",
"OK c #A7C6DC",
"OL c #365B77",
"OP c #8BB4D1",
"OI c #282324",
"OU c #272323",
"OY c #6C6A6A",
"OT c None",
/* pixels */
"  oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT  ",
"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
"O#O#O#O#.  g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O  iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
"  Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou  "
};

cvs diff -r1.27 -r1.28 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2023/08/03 03:57:28 1.27
+++ pkgsrc/print/mupdf/patches/patch-ab 2023/09/07 14:36:54 1.28
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ab,v 1.27 2023/08/03 03:57:28 ryoon Exp $ 1$NetBSD: patch-ab,v 1.28 2023/09/07 14:36:54 vins Exp $
2 2
3- Handle the various operating systems in the same way avoiding hardcoding 3- Handle the various operating systems in the same way avoiding hardcoding
4- Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with 4- Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
5 `USE_TOOLS+= objcopy' the objcopy-ing fails as follow: 5 `USE_TOOLS+= objcopy' the objcopy-ing fails as follow:
6 OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o 6 OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o
7 build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored 7 build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored
8 build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator. Stop. 8 build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator. Stop.
9 (also for other fonts)). This needs to be investigated further. 9 (also for other fonts)). This needs to be investigated further.
10- Avoid internal version of freeglut and try to pick it up via pkg-config and 10- Avoid internal version of freeglut and try to pick it up via pkg-config and
11 set SYS_GLUT_{CFLAGS,LIBS} accordingly. 11 set SYS_GLUT_{CFLAGS,LIBS} accordingly.
12 12
13--- Makerules.orig 2022-06-14 12:19:22.000000000 +0000 13--- Makerules.orig 2023-09-05 11:51:19.000000000 +0000
14+++ Makerules 14+++ Makerules
15@@ -27,30 +27,6 @@ endif 15@@ -42,30 +42,6 @@ endif
16  16
17 # System specific features 17 # System specific features
18  18
19-ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),) 19-ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
20- # clang does not support these in combination with -fembed-bitcode 20- # clang does not support these in combination with -fembed-bitcode
21- CFLAGS += -ffunction-sections -fdata-sections 21- CFLAGS += -ffunction-sections -fdata-sections
22-endif 22-endif
23- 23-
24-ifeq ($(OS),MACOS) 24-ifeq ($(OS),MACOS)
25- LDREMOVEUNREACH := -Wl,-dead_strip 25- LDREMOVEUNREACH := -Wl,-dead_strip
26- SO := dylib 26- SO := dylib
27-else 27-else
28- LDREMOVEUNREACH := -Wl,--gc-sections 28- LDREMOVEUNREACH := -Wl,--gc-sections
@@ -33,156 +33,80 @@ $NetBSD: patch-ab,v 1.27 2023/08/03 03:5 @@ -33,156 +33,80 @@ $NetBSD: patch-ab,v 1.27 2023/08/03 03:5
33- SO := so 33- SO := so
34- endif 34- endif
35-endif 35-endif
36- 36-
37-ifeq "$(OS)" "ios" 37-ifeq "$(OS)" "ios"
38- NEONFLAGS = 38- NEONFLAGS =
39-else 39-else
40- NEONFLAGS = -mneon 40- NEONFLAGS = -mneon
41-endif 41-endif
42- 42-
43 SANITIZE_FLAGS += -fsanitize=address 43 SANITIZE_FLAGS += -fsanitize=address
44 SANITIZE_FLAGS += -fsanitize=leak 44 SANITIZE_FLAGS += -fsanitize=leak
45  45
46@@ -133,103 +109,79 @@ ifneq "$(CLUSTER)" "" 46@@ -154,41 +130,7 @@ ifneq "$(CLUSTER)" ""
47 CFLAGS += -DCLUSTER 47 CFLAGS += -DCLUSTER
48 endif 48 endif
49  49
50-ifeq ($(OS),MINGW) 50-ifeq ($(OS),MINGW)
51- WINDRES := windres 51- WINDRES := windres
52- HAVE_WIN32 := yes 52- HAVE_WIN32 := yes
53- 53-
54-else ifeq ($(OS),MACOS) 54-else ifeq ($(OS),MACOS)
55- HAVE_GLUT := yes 55- HAVE_GLUT := yes
56- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations 56- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
57- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL 57- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
58- CC = xcrun cc 58- CC = xcrun cc
59- AR = xcrun ar 59- AR = xcrun ar
60- LD = xcrun ld 60- LD = xcrun ld
61- RANLIB = xcrun ranlib 61- RANLIB = xcrun ranlib
62- 62-
63- ifeq (, $(shell which pkg-config)) 63- ifneq ($(ARCHFLAGS),)
 64- $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
 65- HAVE_LIBCRYPTO := no
 66- else ifeq (, $(shell which pkg-config))
64- $(warning "No pkg-config found, install it for proper integration of libcrypto") 67- $(warning "No pkg-config found, install it for proper integration of libcrypto")
65- else 68- else
66- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) 69- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
67- ifeq ($(HAVE_LIBCRYPTO),yes) 70- ifeq ($(HAVE_LIBCRYPTO),yes)
68- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO 71- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
69- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) 72- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
70- endif 73- endif
71- endif 74- endif
72+HAVE_OBJCOPY := no 
73  
74-else ifeq ($(OS),Linux) 
75- HAVE_OBJCOPY := yes 
76- 75-
77- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) 76-else ifeq ($(OS),Linux)
78+ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) 77- ifeq ($(PYODIDE_ROOT),)
79 SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) 78- HAVE_OBJCOPY := yes
80 SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) 79- else
81- endif 80- # Pyodide's ld does not support -b so we cannot use it to create object
82- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) 81- # files containing font data, so leave HAVE_OBJCOPY unset. And we need
83+endif 82- # extra memory when linking.
84+ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) 83- LDFLAGS += -sTOTAL_MEMORY=48MB
85 SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) 
86 SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) 
87- endif 
88- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) 
89+endif 
90+ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) 
91 SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) 
92 SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) 
93- endif 
94- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) 
95+endif 
96+ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) 
97 SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) 
98 SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) 
99- endif 
100- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) 
101+else 
102+ #CFLAGS += -DFZ_ENABLE_ICC=0 
103+endif 
104+ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) 
105 SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) 
106 SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) 
107- endif 
108- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) 
109+endif 
110+ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) 
111 SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) 
112 SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) 
113- endif 
114- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) 
115+endif 
116+ifeq ($(shell pkg-config --exists zlib && echo yes),yes) 
117 SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) 
118 SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) 
119- endif 
120+endif 
121  
122- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) 
123- ifeq ($(HAVE_SYS_LEPTONICA),yes) 
124+HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) 
125+ifeq ($(HAVE_SYS_LEPTONICA),yes) 
126 SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept) 
127 SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept) 
128- endif 
129+endif 
130  
131- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes) 
132- ifeq ($(HAVE_SYS_TESSERACT),yes) 
133+HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes) 
134+ifeq ($(HAVE_SYS_TESSERACT),yes) 
135 SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract) 
136 SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract) 
137- endif 84- endif
138+endif 85+HAVE_OBJCOPY := no
139  86
140- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) 87 ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
141- ifeq ($(HAVE_SYS_CURL),yes) 88 SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
142+HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) 89@@ -237,10 +179,10 @@ else ifeq ($(OS),Linux)
143+ifeq ($(HAVE_SYS_CURL),yes) 
144 SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) 
145 SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) 90 SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
146- endif 91 endif
147+endif 
148  92
149- HAVE_GLUT := yes 93- HAVE_GLUT := yes
150- ifeq ($(HAVE_GLUT),yes) 94- ifeq ($(HAVE_GLUT),yes)
151- SYS_GLUT_CFLAGS := 95- SYS_GLUT_CFLAGS :=
152- SYS_GLUT_LIBS := -lglut -lGL 96- SYS_GLUT_LIBS := -lglut -lGL
153- endif 97+ HAVE_GLUT := $(shell pkg-config --exists glut && echo yes)
154+HAVE_GLUT := $(shell pkg-config --exists glut && echo yes) 98+ ifeq ($(shell pkg-config --exists glut && echo yes),yes)
155+ifeq ($(shell pkg-config --exists glut && echo yes),yes) 
156+ SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut) 99+ SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
157+ SYS_GLUT_LIBS := $(shell pkg-config --libs glut) 100+ SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
158+endif 101 endif
159  
160- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) 
161- ifeq ($(HAVE_X11),yes) 
162+HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) 
163+ifeq ($(HAVE_X11),yes) 
164 X11_CFLAGS := $(shell pkg-config --cflags x11 xext) 
165 X11_LIBS := $(shell pkg-config --libs x11 xext) 
166- endif 
167+endif 
168  102
169- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) 103 HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
170- ifeq ($(HAVE_LIBCRYPTO),yes) 104@@ -263,8 +205,6 @@ else ifeq ($(OS),Linux)
171+HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) 
172+ifeq ($(HAVE_LIBCRYPTO),yes) 
173 LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO 
174 LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) 
175- endif 
176+endif 
177  
178- HAVE_PTHREAD := yes 
179- ifeq ($(HAVE_PTHREAD),yes) 
180+HAVE_PTHREAD := yes 
181+ifeq ($(HAVE_PTHREAD),yes) 
182 PTHREAD_CFLAGS := 
183 PTHREAD_LIBS := -lpthread 105 PTHREAD_LIBS := -lpthread
184- endif 106 endif
185- 
186 endif 
187  107
 108-endif
 109-
188 # The following section has various cross compilation configurations. 110 # The following section has various cross compilation configurations.
 111 #
 112 # Invoke these as:

cvs diff -r1.30 -r1.31 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2023/04/29 08:17:53 1.30
+++ pkgsrc/print/mupdf/patches/patch-ac 2023/09/07 14:36:54 1.31
@@ -1,84 +1,75 @@ @@ -1,84 +1,75 @@
1$NetBSD: patch-ac,v 1.30 2023/04/29 08:17:53 wiz Exp $ 1$NetBSD: patch-ac,v 1.31 2023/09/07 14:36:54 vins Exp $
2 2
3- Install target cleanup 3- Install target cleanup
4- Also install muthreads and mupkcs7 libraries (needed by various tools) 4- Also install muthreads and mupkcs7 libraries (needed by various tools)
5- Use sh instead of bash 5- Use sh instead of bash
6 6
7--- Makefile.orig 2022-06-14 12:19:22.000000000 +0000 7--- Makefile.orig 2023-09-05 11:51:19.000000000 +0000
8+++ Makefile 8+++ Makefile
9@@ -181,19 +181,19 @@ FONT_BIN += $(sort $(wildcard resources/ 9@@ -214,10 +214,10 @@ endif
10  10
11 FONT_GEN := $(FONT_BIN:%=generated/%.c) 11 FONT_GEN := $(FONT_BIN:%=generated/%.c)
12  12
13-generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $< 13-generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
14-generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $< 14-generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
15-generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $< 15-generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
16-generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $< 16-generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
17+generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $< 17+generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
18+generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $< 18+generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
19+generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $< 19+generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
20+generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $< 20+generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
21  21
22 ifeq ($(HAVE_OBJCOPY),yes) 22 ifeq ($(HAVE_OBJCOPY),yes)
23 MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o) 23 MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
24 $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD) 24@@ -440,29 +440,35 @@ tools: $(TOOL_APPS)
25 $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD) 
26 $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD) 
27 $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD) 
28 else 
29 MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.o) 
30 endif 
31  
32 generate: $(FONT_GEN) 
33@@ -402,30 +402,34 @@ tools: $(TOOL_APPS) 
34 apps: $(TOOL_APPS) $(VIEW_APPS) 25 apps: $(TOOL_APPS) $(VIEW_APPS)
35  26
36 install-libs: libs 27 install-libs: libs
37- install -d $(DESTDIR)$(incdir)/mupdf 28- install -d $(DESTDIR)$(incdir)/mupdf
38- install -d $(DESTDIR)$(incdir)/mupdf/fitz 29- install -d $(DESTDIR)$(incdir)/mupdf/fitz
39- install -d $(DESTDIR)$(incdir)/mupdf/pdf 30- install -d $(DESTDIR)$(incdir)/mupdf/pdf
40- install -m 644 include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf 31- install -m 644 include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
41- install -m 644 include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz 32- install -m 644 include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
42- install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf 33- install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf 34+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf
44+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/fitz 35+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/fitz
45+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/pdf 36+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/pdf
46+ ${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf 37+ ${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
47+ ${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz 38+ ${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
48+ ${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf 39+ ${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
49 ifneq ($(LIBS_TO_INSTALL_IN_LIB),) 40 ifneq ($(LIBS_TO_INSTALL_IN_LIB),)
50- install -d $(DESTDIR)$(libdir) 41- install -d $(DESTDIR)$(libdir)
51- install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir) 42- install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir)
52+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir) 43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir)
53+ for f in $(LIBS_TO_INSTALL_IN_LIB); do \ 44+ for f in $(LIBS_TO_INSTALL_IN_LIB); do \
54+ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \ 45+ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
55+ done 46+ done
 47+
56 endif 48 endif
57  49
58 install-apps: apps 50 install-apps: apps
59- install -d $(DESTDIR)$(bindir) 51- install -d $(DESTDIR)$(bindir)
60- install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) 52- install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
61+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir) 53+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir)
62+ for f in $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS); do \ 54+ for f in $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS); do \
63+ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \ 55+ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
64+ done 56+ done
65  57
66 install-docs: 58 install-docs:
67- install -d $(DESTDIR)$(mandir)/man1 59- install -d $(DESTDIR)$(mandir)/man1
68- install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1 60- install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
69+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1 61+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
70+ ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1 62+ ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
 63+
 64+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
 65+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples
 66+ ${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir)
 67+ ${BSD_INSTALL_DATA} docs/examples/* $(DESTDIR)$(docdir)/examples
71  68
72- install -d $(DESTDIR)$(docdir) 69- install -d $(DESTDIR)$(docdir)
73- install -d $(DESTDIR)$(docdir)/examples 70- install -d $(DESTDIR)$(docdir)/examples
74- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) 71- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
75- install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) 
76- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples 72- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
77+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir) 
78+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples 
79+ ${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir) 
80+ ${BSD_INSTALL_DATA} docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) 
81+ ${BSD_INSTALL_DATA} docs/examples/* $(DESTDIR)$(docdir)/examples 
82  73
83 install: install-libs install-apps install-docs 74 install: install-libs install-apps install-docs
84  75

File Added: pkgsrc/print/mupdf/patches/patch-docs_man_mupdf.1
$NetBSD: patch-docs_man_mupdf.1,v 1.1 2023/09/07 14:36:54 vins Exp $

Document fine-grained zoom function.

--- docs/man/mupdf.1.orig	2023-09-05 11:51:19.000000000 +0000
+++ docs/man/mupdf.1
@@ -94,6 +94,9 @@ Pan page left or right.
 .TP
 .B Control + Scroll wheel
 Zoom in or out.
+.TP
+.B Shift + Control + Scroll wheel
+Fine grained Zoom in or out.
 
 .SH KEY BINDINGS
 

File Added: pkgsrc/print/mupdf/patches/patch-platform_x11_curl__stream.c
$NetBSD: patch-platform_x11_curl__stream.c,v 1.1 2023/09/07 14:36:54 vins Exp $

offset is ia 64-bit integer.

--- platform/x11/curl_stream.c.orig	2023-09-05 11:51:19.000000000 +0000
+++ platform/x11/curl_stream.c
@@ -397,7 +397,7 @@ static int cs_next(fz_context *ctx, fz_s
 	{
 		unlock(state);
 		if (state->data_arrived == 0)
-			fz_throw(ctx, err_type, "read of a block we don't have (A) (offset=%ld)", read_point);
+			fz_throw(ctx, err_type, "read of a block we don't have (A) (offset=%lld)", read_point);
 		return EOF;
 	}
 
@@ -411,7 +411,7 @@ static int cs_next(fz_context *ctx, fz_s
 		if (read_point + len > state->current_fill_start)
 		{
 			unlock(state);
-			fz_throw(ctx, err_type, "read of a block we don't have (B) (offset=%ld)", read_point);
+			fz_throw(ctx, err_type, "read of a block we don't have (B) (offset=%lld)", read_point);
 		}
 		memcpy(buf, state->buffer + read_point, len);
 		unlock(state);
@@ -434,7 +434,7 @@ static int cs_next(fz_context *ctx, fz_s
 		{
 			state->next_fill_start = block<<BLOCK_SHIFT;
 			unlock(state);
-			fz_throw(ctx, err_type, "read of a block we don't have (C) (offset=%ld)", read_point);
+			fz_throw(ctx, err_type, "read of a block we don't have (C) (offset=%lld)", read_point);
 		}
 		block++;
 		memcpy(buf, state->buffer + read_point, left_over);
@@ -457,7 +457,7 @@ static int cs_next(fz_context *ctx, fz_s
 			stream->pos += len_read;
 			/* If we haven't fetched anything, throw. */
 			if (len_read == 0)
-				fz_throw(ctx, err_type, "read of a block we don't have (D) (offset=%ld)", read_point);
+				fz_throw(ctx, err_type, "read of a block we don't have (D) (offset=%lld)", read_point);
 			/* Otherwise, we got at least one byte, so we can safely return that. */
 			return *stream->rp++;
 		}
@@ -482,7 +482,7 @@ static int cs_next(fz_context *ctx, fz_s
 			stream->pos += len_read;
 			/* If we haven't fetched anything, throw. */
 			if (len_read == 0)
-				fz_throw(ctx, err_type, "read of a block we don't have (E) (offset=%ld)", read_point);
+				fz_throw(ctx, err_type, "read of a block we don't have (E) (offset=%lld)", read_point);
 			/* Otherwise, we got at least one byte, so we can safely return that. */
 			return *stream->rp++;
 		}

File Added: pkgsrc/print/mupdf/patches/patch-source_helpers_pkcs7_pkcs7-openssl.c
$NetBSD: patch-source_helpers_pkcs7_pkcs7-openssl.c,v 1.1 2023/09/07 14:36:54 vins Exp $

Add default_paths to STORE for checking signatures.
From OpenBSD ports.

--- source/helpers/pkcs7/pkcs7-openssl.c.orig	2023-09-05 11:51:19.000000000 +0000
+++ source/helpers/pkcs7/pkcs7-openssl.c
@@ -203,7 +203,7 @@ static int stream_free(BIO *b)
 	return 1;
 }
 
-static long stream_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+static long stream_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
 	return 1;
 }
@@ -519,6 +519,9 @@ check_certificate(fz_context *ctx, pdf_p
 		}
 	}
 
+	/* Add default paths */
+	X509_STORE_set_default_paths(st);
+
 	res = pk7_verify_cert(st, pk7sig);
 
 exit:

File Added: pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c
$NetBSD: patch-platform_x11_pdfapp.c,v 1.3 2023/09/07 14:36:54 vins Exp $

* Implement fine-grained zoom control (from OpenBSD ports).
* Fix up/down scrolling with vi-like keys (from FreeBSD ports).

--- platform/x11/pdfapp.c.orig	2023-09-05 11:51:19.000000000 +0000
+++ platform/x11/pdfapp.c
@@ -175,11 +175,21 @@ static void pdfapp_sleep(int ms)
 static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repaint, int transition, int searching);
 
 static const int zoomlist[] = {
-	18, 24, 36, 54, 72, 96, 120, 144, 180,
-	216, 288, 360, 432, 504, 576, 648, 720,
-	792, 864, 936, 1008, 1080, 1152
+	18, 21, 24, 30, 36, 44, 54, 62, 72, 83, 96, 107, 120, 131, 144, 160, 180, 197,
+	216, 250, 288, 322, 360, 394, 432, 466, 504, 538, 576, 610, 648, 682, 720, 754,
+	792, 826, 864, 898, 936, 970, 1008, 1042, 1080, 1114, 1152
 };
 
+static int fine_zoom_in(int oldres)
+{
+	return oldres+1;
+}
+
+static int fine_zoom_out(int oldres)
+{
+	return oldres-1;
+}
+
 static int zoom_in(int oldres)
 {
 	int i;
@@ -1538,6 +1548,8 @@ key_rewritten:
 
 	case 'j':
 		{
+			if (app->pany + app->imgh <= app->winh)
+			  goto pagedown;
 			if (app->imgh <= app->winh || app->pany <= app->winh - app->imgh)
 			{
 				panto = PAN_TO_TOP;
@@ -1553,6 +1565,8 @@ key_rewritten:
 
 	case 'k':
 		{
+			if (app->pany >= 0)
+			  goto pageup;
 			if (app->imgh <= app->winh || app->pany == 0)
 			{
 				panto = PAN_TO_BOTTOM;
@@ -1627,6 +1641,7 @@ key_rewritten:
 	 */
 
 	case ',':
+		pageup:
 		panto = DONT_PAN;
 		if (app->numberlen > 0)
 			app->pageno -= atoi(app->number);
@@ -1635,6 +1650,7 @@ key_rewritten:
 		break;
 
 	case '.':
+		pagedown:
 		panto = DONT_PAN;
 		if (app->numberlen > 0)
 			app->pageno += atoi(app->number);
@@ -1642,6 +1658,7 @@ key_rewritten:
 			app->pageno++;
 		break;
 
+	case '\b': /* backspace */
 	case 'b':
 		{
 			int number = 1;
@@ -1688,7 +1705,7 @@ key_rewritten:
 				{
 					if (app->imgw + app->panx <= app->winw + app->imgw/20)
 					{
-						if (app->pageno + 1 <= app->pagecount)
+						if (app->pageno <= app->pagecount)
 						{
 							app->panx = 0;
 							app->pany = 0;
@@ -1800,9 +1817,9 @@ static void handlescroll(pdfapp_t *app, 
 	{
 		/* zoom in/out if ctrl is pressed */
 		if (dir > 0)
-			app->resolution = zoom_in(app->resolution);
+			app->resolution = ((modifiers & (1<<0)) ? fine_zoom_in : zoom_in)(app->resolution);
 		else
-			app->resolution = zoom_out(app->resolution);
+			app->resolution = ((modifiers & (1<<0)) ? fine_zoom_out : zoom_out)(app->resolution);
 		if (app->resolution > MAXRES)
 			app->resolution = MAXRES;
 		if (app->resolution < MINRES)

File Deleted: pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh