Received: by mail.netbsd.org (Postfix, from userid 605) id 793B784ED7; Sat, 23 Jul 2022 15:09:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B028B84ED2 for ; Sat, 23 Jul 2022 15:09:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3nuXFYaVUTlS for ; Sat, 23 Jul 2022 15:09:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 07C2884CEC for ; Sat, 23 Jul 2022 15:09:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F0168FB1A; Sat, 23 Jul 2022 15:09:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658588983143280" MIME-Version: 1.0 Date: Sat, 23 Jul 2022 15:09:43 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/print/mupdf To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20220723150943.F0168FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658588983143280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sat Jul 23 15:09:43 UTC 2022 Modified Files: pkgsrc/print/mupdf: Makefile PLIST distinfo pkgsrc/print/mupdf/patches: patch-ab patch-ac patch-thirdparty_mujs_Makefile Removed Files: pkgsrc/print/mupdf/patches: patch-source_fitz_color-lcms.c Log Message: mupdf: Update to 1.20.0 Changes: 1.20.0 ------ Experimental C# bindings. Cross compilation should no longer need a host compiler. Major additions to JNI bindings. New API to edit outline New API to resolve and create links New API to toggle individual layers in PDF Layer panel in mupdf-gl Layer option in mutool draw New API to add a Javascript console Console panel in mupdf-gl Text search API extended to be able to distinguish between separate search hits. Command line tool improvements: all: Negative page numbers to index from the last page mutool draw: Add option to render document without text mutool draw and convert: Support DPI option in text and HTML output New hybrid HTML output format using "scripts/pdftohtml" script: Graphics in a background image Text on top Improved WASM viewer demo Support high DPI screens Progressive loading Update to zlib 1.2.12 for security fix. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 pkgsrc/print/mupdf/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/mupdf/PLIST cvs rdiff -u -r1.57 -r1.58 pkgsrc/print/mupdf/distinfo cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/mupdf/patches/patch-ab cvs rdiff -u -r1.27 -r1.28 pkgsrc/print/mupdf/patches/patch-ac cvs rdiff -u -r1.1 -r0 \ pkgsrc/print/mupdf/patches/patch-source_fitz_color-lcms.c cvs rdiff -u -r1.8 -r1.9 \ pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1658588983143280 Content-Disposition: inline Content-Length: 18486 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/mupdf/Makefile diff -u pkgsrc/print/mupdf/Makefile:1.91 pkgsrc/print/mupdf/Makefile:1.92 --- pkgsrc/print/mupdf/Makefile:1.91 Sat Apr 30 13:05:24 2022 +++ pkgsrc/print/mupdf/Makefile Sat Jul 23 15:09:43 2022 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.91 2022/04/30 13:05:24 wen Exp $ +# $NetBSD: Makefile,v 1.92 2022/07/23 15:09:43 leot Exp $ -DISTNAME= mupdf-1.19.1-source +DISTNAME= mupdf-1.20.0-source PKGNAME= ${DISTNAME:S/-source//} CATEGORIES= print MASTER_SITES= https://mupdf.com/downloads/archive/ Index: pkgsrc/print/mupdf/PLIST diff -u pkgsrc/print/mupdf/PLIST:1.22 pkgsrc/print/mupdf/PLIST:1.23 --- pkgsrc/print/mupdf/PLIST:1.22 Sat Oct 23 15:22:07 2021 +++ pkgsrc/print/mupdf/PLIST Sat Jul 23 15:09:43 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2021/10/23 15:22:07 leot Exp $ +@comment $NetBSD: PLIST,v 1.23 2022/07/23 15:09:43 leot Exp $ bin/mupdf ${PLIST.curl}bin/mupdf-curl ${PLIST.opengl}bin/mupdf-gl @@ -47,6 +47,7 @@ include/mupdf/fitz/text.h include/mupdf/fitz/track-usage.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h +include/mupdf/fitz/types.h include/mupdf/fitz/util.h include/mupdf/fitz/version.h include/mupdf/fitz/write-pixmap.h @@ -81,14 +82,14 @@ man/man1/mutool.1 share/doc/mupdf/CHANGES share/doc/mupdf/COPYING share/doc/mupdf/README -share/doc/mupdf/android-sdk.html +share/doc/mupdf/android-library.html share/doc/mupdf/artifex-logo.png share/doc/mupdf/building.html share/doc/mupdf/coding-overview.html share/doc/mupdf/coding-progressive.html share/doc/mupdf/coding-style.html +share/doc/mupdf/ecosystem.css share/doc/mupdf/ecosystem.html -share/doc/mupdf/ecosystem.png share/doc/mupdf/examples/bbox-device.js share/doc/mupdf/examples/create-thumbnail.js share/doc/mupdf/examples/draw-device.js @@ -106,6 +107,7 @@ share/doc/mupdf/examples/pdf-portfolio.j share/doc/mupdf/examples/pdf-trace.js share/doc/mupdf/examples/trace-device.js share/doc/mupdf/index.html +share/doc/mupdf/library.html share/doc/mupdf/manual-mupdf-gl.html share/doc/mupdf/manual-mutool-clean.html share/doc/mupdf/manual-mutool-convert.html @@ -120,6 +122,7 @@ share/doc/mupdf/manual-mutool-run.html share/doc/mupdf/manual-mutool-show.html share/doc/mupdf/manual-mutool-sign.html share/doc/mupdf/manual-mutool-trace.html +share/doc/mupdf/mutool.html share/doc/mupdf/style.css -share/doc/mupdf/template.html share/doc/mupdf/thirdparty.html +share/doc/mupdf/viewers.html Index: pkgsrc/print/mupdf/distinfo diff -u pkgsrc/print/mupdf/distinfo:1.57 pkgsrc/print/mupdf/distinfo:1.58 --- pkgsrc/print/mupdf/distinfo:1.57 Sat Apr 30 13:05:24 2022 +++ pkgsrc/print/mupdf/distinfo Sat Jul 23 15:09:43 2022 @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.57 2022/04/30 13:05:24 wen Exp $ +$NetBSD: distinfo,v 1.58 2022/07/23 15:09:43 leot Exp $ -BLAKE2s (mupdf-1.19.1-source.tar.gz) = 74d6f71d54ec0ae93ac0c0a0216b2d660f2c849355af1da3d695224dd08bccf8 -SHA512 (mupdf-1.19.1-source.tar.gz) = bd77214db981f962bcc186fa75863bf01b713bbac1cebe3ae3c8eb229cf58cc07fd714ea5e6f3d97f40e1479c0e435a7b9aafed2434937ab6f08a9b4feccd228 -Size (mupdf-1.19.1-source.tar.gz) = 91675366 bytes +BLAKE2s (mupdf-1.20.0-source.tar.gz) = 64fd8e785c6795a23894c6905b9590f1188d8956752c1b5ced032bb9911a28ed +SHA512 (mupdf-1.20.0-source.tar.gz) = 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 +Size (mupdf-1.20.0-source.tar.gz) = 88455853 bytes SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad SHA1 (patch-Makethird) = 415a3fe6e0e58a948565b9098c8325e85d19d561 -SHA1 (patch-ab) = 3323dd627001e76c47e6b231b2d93952e3c3acf3 -SHA1 (patch-ac) = 1bcbb499dd00cef04d3123daefe2d7b92b567054 +SHA1 (patch-ab) = acbb4e8a34ccad701323a521600f361175668b9e +SHA1 (patch-ac) = 81d3edd4732e4cf8a0dc8d37b219ac2e3998277b SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b -SHA1 (patch-source_fitz_color-lcms.c) = a43f5046063c68dea16824b9364c386505b6fadd SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb -SHA1 (patch-thirdparty_mujs_Makefile) = e959ad04995bf2268563d2c2939edd5dba12e4b2 +SHA1 (patch-thirdparty_mujs_Makefile) = dda76ff0d35abca49a828cd85e29a28b700518a1 Index: pkgsrc/print/mupdf/patches/patch-ab diff -u pkgsrc/print/mupdf/patches/patch-ab:1.24 pkgsrc/print/mupdf/patches/patch-ab:1.25 --- pkgsrc/print/mupdf/patches/patch-ab:1.24 Sat Oct 23 15:22:07 2021 +++ pkgsrc/print/mupdf/patches/patch-ab Sat Jul 23 15:09:43 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.24 2021/10/23 15:22:07 leot Exp $ +$NetBSD: patch-ab,v 1.25 2022/07/23 15:09:43 leot Exp $ - Handle the various operating systems in the same way avoiding hardcoding - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with @@ -14,9 +14,9 @@ $NetBSD: patch-ab,v 1.24 2021/10/23 15:2 If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via CFLAGS. ---- Makerules.orig 2021-10-05 10:44:43.000000000 +0000 +--- Makerules.orig 2022-06-14 12:19:22.000000000 +0000 +++ Makerules -@@ -27,29 +27,6 @@ endif +@@ -27,30 +27,6 @@ endif # System specific features @@ -32,6 +32,7 @@ $NetBSD: patch-ab,v 1.24 2021/10/23 15:2 - LDREMOVEUNREACH := -Wl,--gc-sections - ifeq ($(OS),MINGW) - SO := dll +- EXE := .exe - else - SO := so - endif @@ -46,7 +47,7 @@ $NetBSD: patch-ab,v 1.24 2021/10/23 15:2 SANITIZE_FLAGS += -fsanitize=address SANITIZE_FLAGS += -fsanitize=leak -@@ -132,103 +109,79 @@ ifneq "$(CLUSTER)" "" +@@ -133,103 +109,79 @@ ifneq "$(CLUSTER)" "" CFLAGS += -DCLUSTER endif Index: pkgsrc/print/mupdf/patches/patch-ac diff -u pkgsrc/print/mupdf/patches/patch-ac:1.27 pkgsrc/print/mupdf/patches/patch-ac:1.28 --- pkgsrc/print/mupdf/patches/patch-ac:1.27 Sat Oct 23 15:22:07 2021 +++ pkgsrc/print/mupdf/patches/patch-ac Sat Jul 23 15:09:43 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.27 2021/10/23 15:22:07 leot Exp $ +$NetBSD: patch-ac,v 1.28 2022/07/23 15:09:43 leot Exp $ - libtool support - Install target cleanup @@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 be invoked during the building phase) - Install mupdf with curl support as `mupdf-curl' ---- Makefile.orig 2021-10-05 10:44:43.000000000 +0000 +--- Makefile.orig 2022-06-14 12:19:22.000000000 +0000 +++ Makefile @@ -54,13 +54,13 @@ ifneq ($(verbose),yes) endif @@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 $(AR_CMD) $(RANLIB_CMD) -@@ -93,57 +93,57 @@ $(OUT)/%.def: $(OUT)/%.$(SO) +@@ -93,39 +93,39 @@ $(OUT)/%.def: $(OUT)/%.$(SO) $(OUT)/%_$(SO).a: $(OUT)/%.def $(DLLTOOL_CMD) @@ -95,7 +95,12 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 -$(OUT)/source/%.o : source/%.cpp +$(OUT)/source/%.lo : source/%.cpp - $(CXX_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS) $(TESSERACT_BUILD_CFLAGS) + $(CXX_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS) + + ifeq ($(HAVE_TESSERACT),yes) +@@ -133,22 +133,22 @@ $(OUT)/source/fitz/tessocr.o : source/fi + $(CXX_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS) $(TESSERACT_CFLAGS) $(TESSERACT_DEFINES) $(TESSERACT_LANGFLAGS) + endif -$(OUT)/platform/%.o : platform/%.c +$(OUT)/platform/%.lo : platform/%.c @@ -123,7 +128,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 MUPDF_SRC := $(sort $(wildcard source/fitz/*.c)) MUPDF_SRC += $(sort $(wildcard source/fitz/*.cpp)) -@@ -154,14 +154,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht +@@ -159,14 +159,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht MUPDF_SRC += $(sort $(wildcard source/reflow/*.c)) MUPDF_SRC += $(sort $(wildcard source/cbz/*.c)) @@ -142,8 +147,8 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 # --- Generated embedded font files --- -@@ -182,13 +182,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_EXE) - generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $< +@@ -187,13 +187,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_SH) + generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $< ifeq ($(HAVE_OBJCOPY),yes) - MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o) @@ -162,7 +167,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 endif generate: $(FONT_GEN) -@@ -242,24 +242,24 @@ else +@@ -247,24 +247,24 @@ else LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) endif ifneq ($(USE_SYSTEM_GLUT),yes) @@ -196,50 +201,50 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) : $(THIRD_OBJ) -@@ -282,13 +282,13 @@ MUTOOL_SRC += source/tools/murun.c +@@ -287,13 +287,13 @@ MUTOOL_SRC += source/tools/murun.c MUTOOL_SRC += source/tools/mutrace.c MUTOOL_SRC += source/tools/cmapdump.c MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c)) -MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o) +MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.lo) - MUTOOL_EXE := $(OUT)/mutool + MUTOOL_EXE := $(OUT)/mutool$(EXE) $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB) $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS) TOOL_APPS += $(MUTOOL_EXE) -MURASTER_OBJ := $(OUT)/source/tools/muraster.o +MURASTER_OBJ := $(OUT)/source/tools/muraster.lo - MURASTER_EXE := $(OUT)/muraster + MURASTER_EXE := $(OUT)/muraster$(EXE) $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB) $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS) -@@ -296,7 +296,7 @@ TOOL_APPS += $(MURASTER_EXE) +@@ -301,7 +301,7 @@ TOOL_APPS += $(MURASTER_EXE) ifeq ($(HAVE_GLUT),yes) MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c)) - MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o) + MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo) - MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl + MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl$(EXE) $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THIRD_GLUT_LIB) $(PKCS7_LIB) $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(THIRD_GLUT_LIBS) -@@ -304,10 +304,10 @@ ifeq ($(HAVE_GLUT),yes) +@@ -309,10 +309,10 @@ ifeq ($(HAVE_GLUT),yes) endif ifeq ($(HAVE_X11),yes) -- MUVIEW_X11_EXE := $(OUT)/mupdf-x11 +- MUVIEW_X11_EXE := $(OUT)/mupdf-x11$(EXE) - MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.o - MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.o - MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.o -+ MUVIEW_X11_EXE := $(OUT)/mupdf ++ MUVIEW_X11_EXE := $(OUT)/mupdf$(EXE) + MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.lo + MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.lo + MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.lo $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS) VIEW_APPS += $(MUVIEW_X11_EXE) -@@ -315,9 +315,9 @@ endif +@@ -320,9 +320,9 @@ endif ifeq ($(HAVE_WIN32),yes) - MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32 + MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32$(EXE) - MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/pdfapp.o - MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.o - MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.o @@ -249,17 +254,17 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS) VIEW_APPS += $(MUVIEW_WIN32_EXE) -@@ -326,12 +326,12 @@ endif +@@ -331,12 +331,12 @@ endif ifeq ($(HAVE_X11),yes) ifeq ($(HAVE_CURL),yes) ifeq ($(HAVE_PTHREAD),yes) -- MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl +- MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl$(EXE) - MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.o - MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.o - MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.o - MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.o - MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.o -+ MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-curl ++ MUVIEW_X11_CURL_EXE := $(OUT)/mupdf$(EXE) + MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.lo + MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.lo + MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.lo @@ -268,7 +273,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB) $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS) $(CURL_LIBS) $(PTHREAD_LIBS) VIEW_APPS += $(MUVIEW_X11_CURL_EXE) -@@ -341,19 +341,19 @@ endif +@@ -346,19 +346,19 @@ endif # --- Generated dependencies --- @@ -300,7 +305,7 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 # --- Examples --- -@@ -366,10 +366,10 @@ $(OUT)/multi-threaded: docs/examples/mul +@@ -371,10 +371,10 @@ $(OUT)/multi-threaded: docs/examples/mul # --- Update version string header --- @@ -315,10 +320,10 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 # --- Format man pages --- -@@ -397,29 +397,33 @@ tools: $(TOOL_APPS) +@@ -402,30 +402,34 @@ tools: $(TOOL_APPS) apps: $(TOOL_APPS) $(VIEW_APPS) - install: libs apps + install-libs: libs - install -d $(DESTDIR)$(incdir)/mupdf - install -d $(DESTDIR)$(incdir)/mupdf/fitz - install -d $(DESTDIR)$(incdir)/mupdf/pdf @@ -331,42 +336,39 @@ $NetBSD: patch-ac,v 1.27 2021/10/23 15:2 + ${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf + ${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz + ${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf - ifneq ($(LIBS_TO_INSTALL_IN_LIB),) - install -d $(DESTDIR)$(libdir) - install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir) --endif -- -- install -d $(DESTDIR)$(bindir) -- install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) -- -- install -d $(DESTDIR)$(mandir)/man1 -- install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1 -- -- install -d $(DESTDIR)$(docdir) -- install -d $(DESTDIR)$(docdir)/examples -- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) -- install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) -- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir) + for f in $(LIBS_TO_INSTALL_IN_LIB); do \ + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \ + done -+endif -+ + endif + + install-apps: apps +- install -d $(DESTDIR)$(bindir) +- install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir) + for f in $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS); do \ + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \ + done -+ + + install-docs: +- install -d $(DESTDIR)$(mandir)/man1 +- install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1 + ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1 + ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1 -+ + +- install -d $(DESTDIR)$(docdir) +- install -d $(DESTDIR)$(docdir)/examples +- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) +- install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) +- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir) + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples + ${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir) + ${BSD_INSTALL_DATA} docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) + ${BSD_INSTALL_DATA} docs/examples/* $(DESTDIR)$(docdir)/examples - tarball: - bash scripts/archive.sh + install: install-libs install-apps install-docs + Index: pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile diff -u pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.8 pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.9 --- pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.8 Sat Oct 23 15:22:07 2021 +++ pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile Sat Jul 23 15:09:43 2022 @@ -1,9 +1,9 @@ -$NetBSD: patch-thirdparty_mujs_Makefile,v 1.8 2021/10/23 15:22:07 leot Exp $ +$NetBSD: patch-thirdparty_mujs_Makefile,v 1.9 2022/07/23 15:09:43 leot Exp $ - Add libtool support to mujs. - Avoid to set (unused) VERSION variable. ---- thirdparty/mujs/Makefile.orig 2021-06-08 11:41:51.000000000 +0000 +--- thirdparty/mujs/Makefile.orig 2021-12-08 11:56:12.000000000 +0000 +++ thirdparty/mujs/Makefile @@ -9,12 +9,6 @@ bindir ?= $(prefix)/bin incdir ?= $(prefix)/include @@ -15,19 +15,19 @@ $NetBSD: patch-thirdparty_mujs_Makefile, - VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,) -endif - - # Compiler flags for various configurations: - - CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter -@@ -54,7 +48,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re + ifeq ($(shell uname),Darwin) + SO_EXT := dylib + else +@@ -60,7 +54,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re default: shell shell: $(OUT)/mujs $(OUT)/mujs-pp -static: $(OUT)/libmujs.a +static: $(OUT)/libmujs.la - shared: $(OUT)/libmujs.so + shared: $(OUT)/libmujs.$(SO_EXT) astnames.h: jsparse.h -@@ -68,15 +62,15 @@ one.c: $(SRCS) +@@ -74,15 +68,15 @@ one.c: $(SRCS) jsdump.c: astnames.h opnames.h @@ -46,7 +46,7 @@ $NetBSD: patch-thirdparty_mujs_Makefile, @ mkdir -p $(dir $@) $(AR) cr $@ $^ -@@ -84,11 +78,11 @@ $(OUT)/libmujs.so: one.c $(HDRS) +@@ -90,11 +84,11 @@ $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS) @ mkdir -p $(dir $@) $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm @@ -60,7 +60,7 @@ $NetBSD: patch-thirdparty_mujs_Makefile, @ mkdir -p $(dir $@) $(CC) $(LDFLAGS) -o $@ $^ -lm -@@ -114,8 +108,8 @@ install-common: $(OUT)/mujs $(OUT)/mujs. +@@ -120,8 +114,8 @@ install-common: $(OUT)/mujs $(OUT)/mujs. install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir) @@ -69,5 +69,5 @@ $NetBSD: patch-thirdparty_mujs_Makefile, +install-static: install-common $(OUT)/libmujs.la + ${LIBTOOL} --mode=install $(OUT)/libmujs.la $(DESTDIR)$(libdir) - install-shared: install-common $(OUT)/libmujs.so - install -m 755 $(OUT)/libmujs.so $(DESTDIR)$(libdir) + install-shared: install-common $(OUT)/libmujs.$(SO_EXT) + install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir) --_----------=_1658588983143280--