CVS commit: pkgsrc/sysutils/py-magic

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Tue Sep 14 20:23:04 UTC 2021

Modified Files:
        pkgsrc/sysutils/py-magic: Makefile distinfo
Added Files:
        pkgsrc/sysutils/py-magic/patches: patch-magic_loader.py

Log Message:
Make sysutils/py-magic work in a chroot again

I have no idea why this patch was dropped, but dropping it broke things...


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/py-magic/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/py-magic/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/sysutils/py-magic/patches/patch-magic_loader.py

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

Modified files:

Index: pkgsrc/sysutils/py-magic/Makefile
diff -u pkgsrc/sysutils/py-magic/Makefile:1.12 pkgsrc/sysutils/py-magic/Makefile:1.13
--- pkgsrc/sysutils/py-magic/Makefile:1.12      Mon Jun  7 08:22:17 2021
+++ pkgsrc/sysutils/py-magic/Makefile   Tue Sep 14 20:23:04 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2021/06/07 08:22:17 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/09/14 20:23:04 js Exp $
 
 DISTNAME=      python-magic-0.4.24
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
+PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-magic/}
 

Index: pkgsrc/sysutils/py-magic/distinfo
diff -u pkgsrc/sysutils/py-magic/distinfo:1.9 pkgsrc/sysutils/py-magic/distinfo:1.10
--- pkgsrc/sysutils/py-magic/distinfo:1.9       Mon Jun  7 08:22:17 2021
+++ pkgsrc/sysutils/py-magic/distinfo   Tue Sep 14 20:23:04 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/06/07 08:22:17 adam Exp $
+$NetBSD: distinfo,v 1.10 2021/09/14 20:23:04 js Exp $
 
 SHA1 (python-magic-0.4.24.tar.gz) = 4eeda7a16b3784859b617797fa3e18d9ff18dded
 RMD160 (python-magic-0.4.24.tar.gz) = 139333b721a95953a1979fcee7623c4f186ed829
 SHA512 (python-magic-0.4.24.tar.gz) = 1d1dfea5b7b4b8246ddff7c25bec6df500423f0d26bbc08d490aa7120e6a66c50650ed6a52e958592056a59fcbd02af53c614a77aa7d43898de3ff90d2ca16de
 Size (python-magic-0.4.24.tar.gz) = 17295 bytes
+SHA1 (patch-magic_loader.py) = aca35be959e9ca249b0c4c59dab22c7d859cb45d

Added files:

Index: pkgsrc/sysutils/py-magic/patches/patch-magic_loader.py
diff -u /dev/null pkgsrc/sysutils/py-magic/patches/patch-magic_loader.py:1.3
--- /dev/null   Tue Sep 14 20:23:04 2021
+++ pkgsrc/sysutils/py-magic/patches/patch-magic_loader.py      Tue Sep 14 20:23:04 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-magic_loader.py,v 1.3 2021/09/14 20:23:04 js Exp $
+
+Make py-magic work in a chroot on NetBSD.
+
+--- magic/loader.py.orig       2021-06-03 13:42:29.000000000 +0000
++++ magic/loader.py
+@@ -33,6 +33,9 @@ def _lib_candidates():
+     # This is necessary because alpine is bad
+     yield 'libmagic.so.1'
+ 
++  elif sys.platform.startswith('netbsd'):
++    yield 'libmagic.so'
++
+ 
+ def load_lib():
+