CVS commit: pkgsrc/print/mupdf

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Jul 24 10:13:38 UTC 2022

Modified Files:
        pkgsrc/print/mupdf: distinfo
        pkgsrc/print/mupdf/patches: patch-ac
Added Files:
        pkgsrc/print/mupdf/patches: patch-scripts_hexdump.sh

Log Message:
mupdf: Avoid bash dependency

Should hopefully fix the build.

Problem reported by <wiz>, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/mupdf/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.58 pkgsrc/print/mupdf/distinfo:1.59
--- pkgsrc/print/mupdf/distinfo:1.58    Sat Jul 23 15:09:43 2022
+++ pkgsrc/print/mupdf/distinfo Sun Jul 24 10:13:38 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2022/07/23 15:09:43 leot Exp $
+$NetBSD: distinfo,v 1.59 2022/07/24 10:13:38 leot Exp $
 
 BLAKE2s (mupdf-1.20.0-source.tar.gz) = 64fd8e785c6795a23894c6905b9590f1188d8956752c1b5ced032bb9911a28ed
 SHA512 (mupdf-1.20.0-source.tar.gz) = 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
@@ -6,9 +6,10 @@ Size (mupdf-1.20.0-source.tar.gz) = 8845
 SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad
 SHA1 (patch-Makethird) = 415a3fe6e0e58a948565b9098c8325e85d19d561
 SHA1 (patch-ab) = acbb4e8a34ccad701323a521600f361175668b9e
-SHA1 (patch-ac) = 81d3edd4732e4cf8a0dc8d37b219ac2e3998277b
+SHA1 (patch-ac) = d3d70857bdffa9e4264444c2047f1ad909f141ce
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
 SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
+SHA1 (patch-scripts_hexdump.sh) = 1f1299e24ffa5e6bf040f73b75dc49dd6f5272c4
 SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
 SHA1 (patch-thirdparty_mujs_Makefile) = dda76ff0d35abca49a828cd85e29a28b700518a1

Index: pkgsrc/print/mupdf/patches/patch-ac
diff -u pkgsrc/print/mupdf/patches/patch-ac:1.28 pkgsrc/print/mupdf/patches/patch-ac:1.29
--- pkgsrc/print/mupdf/patches/patch-ac:1.28    Sat Jul 23 15:09:43 2022
+++ pkgsrc/print/mupdf/patches/patch-ac Sun Jul 24 10:13:38 2022
@@ -1,9 +1,10 @@
-$NetBSD: patch-ac,v 1.28 2022/07/23 15:09:43 leot Exp $
+$NetBSD: patch-ac,v 1.29 2022/07/24 10:13:38 leot Exp $
 
 - libtool support 
 - Install target cleanup
 - Also install muthreads and mupkcs7 libraries (needed by various tools)
 - Do not force `-O0' flag when building
+- Use sh instead of bash
 - Get rid of unused VERSION variable and `version:' target (otherwise `git' can
   be invoked during the building phase)
 - Install mupdf with curl support as `mupdf-curl'
@@ -147,8 +148,18 @@ $NetBSD: patch-ac,v 1.28 2022/07/23 15:0
  
  # --- Generated embedded font files ---
  
-@@ -187,13 +187,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_SH) 
- generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
+@@ -181,19 +181,19 @@ FONT_BIN += $(sort $(wildcard resources/
+ 
+ FONT_GEN := $(FONT_BIN:%=generated/%.c)
+ 
+-generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
+-generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
+-generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
+-generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; bash $(HEXDUMP_SH) > $@ $<
++generated/%.cff.c : %.cff $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
++generated/%.otf.c : %.otf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
++generated/%.ttf.c : %.ttf $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
++generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
  
  ifeq ($(HAVE_OBJCOPY),yes)
 -  MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)

Added files:

Index: pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh
diff -u /dev/null pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh:1.1
--- /dev/null   Sun Jul 24 10:13:38 2022
+++ pkgsrc/print/mupdf/patches/patch-scripts_hexdump.sh Sun Jul 24 10:13:38 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-scripts_hexdump.sh,v 1.1 2022/07/24 10:13:38 leot Exp $
+
+Avoid bash dependency, there is not any bash-ism in the script.
+
+--- scripts/hexdump.sh.orig    2022-06-14 12:19:22.000000000 +0000
++++ scripts/hexdump.sh
+@@ -1,9 +1,9 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ FILE=$1
+ if [ ! -f "$FILE" ]
+ then
+-      echo usage: bash scripts/hexdump.sh input.ttf
++      echo usage: sh scripts/hexdump.sh input.ttf
+       exit 1
+ fi
+