head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.34
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.32
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.30
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.28
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.26
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.24
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.22
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.20
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.18
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.16
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.14
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.12
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.10
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.8
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.6
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.4
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.2
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.1.0.2
	pkgsrc-2021Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2022.01.29.13.06.26;	author schmonz;	state Exp;
branches;
next	1.1;
commitid	g3aWVcZdnbfQWwqD;

1.1
date	2021.12.27.23.25.08;	author schmonz;	state Exp;
branches;
next	;
commitid	9NlFZgfYXYJRqlmD;


desc
@@


1.2
log
@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.
@
text
@$NetBSD: patch-magic_myfile,v 1.1 2021/12/27 23:25:08 schmonz Exp $

Use the just-built libmagic, not whatever might be already installed.

--- magic/myfile.orig	2022-01-29 13:08:32.000000000 +0000
+++ magic/myfile
@@@@ -0,0 +1,8 @@@@
+#!@@SH@@
+
+set -e
+
+magicdir=$(pwd)
+cd ../src/.libs
+DYLD_LIBRARY_PATH=. LD_PRELOAD=./libmagic.so.1 ./file -C -m "${magicdir}/$1"
+cp magic.mgc ${magicdir}
@


1.1
log
@Adjust previous use of LD_PRELOAD to fix Solaris 11 build, hoping it'll
fix the SmartOS bulk build (which gave similar errors, but which I
couldn't reproduce on my SmartOS or Tribblix systems).

Does not break:
- macOS 12.1
- NetBSD 9.2 and -current
- OpenBSD 7.0
- FreeBSD 13.0
- Tribblix m25.1
- CentOS 7 and 8
- Debian 9, 10, and 11
- Devuan 4
- Ubuntu 14, 16, 18, and 20
- Void
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- magic/myfile.orig	2021-12-27 21:10:43.590323858 +0000
d14 1
a14 1
+LD_PRELOAD=./libmagic.so.1 ./file -C -m "${magicdir}/$1"
@