CVS commit: pkgsrc/sysutils/file

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan 29 13:06:26 UTC 2022

Modified Files:
        pkgsrc/sysutils/file: distinfo
        pkgsrc/sysutils/file/patches: patch-magic_myfile

Log Message:
Also set DYLD_LIBRARY_PATH=. (in addition to LD_PRELOAD) when generating
magic. Fixes build on macOS (Monterey and Snow Leopard tested) when file
is not already installed.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/file/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/file/patches/patch-magic_myfile

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

Modified files:

Index: pkgsrc/sysutils/file/distinfo
diff -u pkgsrc/sysutils/file/distinfo:1.41 pkgsrc/sysutils/file/distinfo:1.42
--- pkgsrc/sysutils/file/distinfo:1.41  Mon Dec 27 23:25:08 2021
+++ pkgsrc/sysutils/file/distinfo       Sat Jan 29 13:06:25 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2021/12/27 23:25:08 schmonz Exp $
+$NetBSD: distinfo,v 1.42 2022/01/29 13:06:25 schmonz Exp $
 
 BLAKE2s (file-5.40.tar.gz) = 81709bb3abd39d4eea0e8d93966f162496d89e5bfc7f9e88d6be31b86dd5ed75
 SHA512 (file-5.40.tar.gz) = 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 Size (file-5.40.tar.gz) = 1004214 bytes
 SHA1 (patch-aa) = df1206c65ebbffca766ad77f7d98f8caa26a8b1c
 SHA1 (patch-magic_Makefile.in) = 7870ab84573b2d2ce4b774083f073c620ba6f5d1
-SHA1 (patch-magic_myfile) = a977950ad98fd633aae6dec8357353a5b5ceee9d
+SHA1 (patch-magic_myfile) = a7c4621a661b3bf423d350641f052318c489c4bc
 SHA1 (patch-src_fsmagic.c) = f862c5335bc3c6b0d39dfcdfd79e2d99407e40f5

Index: pkgsrc/sysutils/file/patches/patch-magic_myfile
diff -u pkgsrc/sysutils/file/patches/patch-magic_myfile:1.1 pkgsrc/sysutils/file/patches/patch-magic_myfile:1.2
--- pkgsrc/sysutils/file/patches/patch-magic_myfile:1.1 Mon Dec 27 23:25:08 2021
+++ pkgsrc/sysutils/file/patches/patch-magic_myfile     Sat Jan 29 13:06:26 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-magic_myfile,v 1.1 2021/12/27 23:25:08 schmonz Exp $
+$NetBSD: patch-magic_myfile,v 1.2 2022/01/29 13:06:26 schmonz Exp $
 
 Use the just-built libmagic, not whatever might be already installed.
 
---- magic/myfile.orig  2021-12-27 21:10:43.590323858 +0000
+--- magic/myfile.orig  2022-01-29 13:08:32.000000000 +0000
 +++ magic/myfile
 @@ -0,0 +1,8 @@
 +#!@SH@
@@ -11,5 +11,5 @@ Use the just-built libmagic, not whateve
 +
 +magicdir=$(pwd)
 +cd ../src/.libs
-+LD_PRELOAD=./libmagic.so.1 ./file -C -m "${magicdir}/$1"
++DYLD_LIBRARY_PATH=. LD_PRELOAD=./libmagic.so.1 ./file -C -m "${magicdir}/$1"
 +cp magic.mgc ${magicdir}