py-magic: update to version 0.4.23

From the CHANGELOG:

- Include a `py.typed` sentinal to enable type checking
- Improve fix for attribute error during destruction
- Cleanup library loading logic
- Add new homebrew library dir for OSX

Tested on NetBSD/amd64.

4 files changed, 13 insertions, 36 deletions

diff --git a/sysutils/py-magic/Makefile b/sysutils/py-magic/Makefile
index da7ab45cf41..e8bc915c23a 100644
--- a/sysutils/py-magic/Makefile
+++ b/sysutils/py-magic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2021/02/18 12:29:54 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/06/02 22:13:50 khorben Exp $
 
-DISTNAME=	python-magic-0.4.22
+DISTNAME=	python-magic-0.4.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^python-//}
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-magic/}
diff --git a/sysutils/py-magic/PLIST b/sysutils/py-magic/PLIST
index c6d3813147b..969df9372e1 100644
--- a/sysutils/py-magic/PLIST
+++ b/sysutils/py-magic/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/02/18 12:29:54 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2021/06/02 22:13:50 khorben Exp $
 ${PYSITELIB}/magic/__init__.py
 ${PYSITELIB}/magic/__init__.pyc
 ${PYSITELIB}/magic/__init__.pyo
@@ -12,3 +8,8 @@ ${PYSITELIB}/magic/compat.pyo
 ${PYSITELIB}/magic/loader.py
 ${PYSITELIB}/magic/loader.pyc
 ${PYSITELIB}/magic/loader.pyo
+${PYSITELIB}/magic/py.typed
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff --git a/sysutils/py-magic/distinfo b/sysutils/py-magic/distinfo
index 4ac9c36d1ab..a89288dd20d 100644
--- a/sysutils/py-magic/distinfo
+++ b/sysutils/py-magic/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/02/18 12:29:54 adam Exp $
+$NetBSD: distinfo,v 1.8 2021/06/02 22:13:50 khorben Exp $
 
-SHA1 (python-magic-0.4.22.tar.gz) = 36808b9a6138d862d0ac3128b936237191499cd0
-RMD160 (python-magic-0.4.22.tar.gz) = 3a90368e41f15584565321408145ba481e6c3680
-SHA512 (python-magic-0.4.22.tar.gz) = 7c49ba87625abb2fab8f813de85978ce6e9732a5a4be425dc498221008a46a172fd900a42740929964cb0984f925c8d440f4795f5b18fed2b3f8f869092351ff
-Size (python-magic-0.4.22.tar.gz) = 16964 bytes
-SHA1 (patch-magic_loader.py) = 12e8e10dbded41a0a9da885d0e5f50c0471a68bf
+SHA1 (python-magic-0.4.23.tar.gz) = 0cd14f831fa33270639f1fb75ec4401cb22d06fe
+RMD160 (python-magic-0.4.23.tar.gz) = 16c08412312fed4fa156a4a62319ffb3060a2c03
+SHA512 (python-magic-0.4.23.tar.gz) = 4f8964c3bf49805da5f0c93619d637129a5f67b5edf43c017351592387fdc029ad10e796af1167eb8c97ff078276ec5dae6e1a3e93d15255b0bdd1a1e513e7b4
+Size (python-magic-0.4.23.tar.gz) = 17246 bytes
diff --git a/sysutils/py-magic/patches/patch-magic_loader.py b/sysutils/py-magic/patches/patch-magic_loader.py
deleted file mode 100644
index 1a3bb06ab48..00000000000
--- a/sysutils/py-magic/patches/patch-magic_loader.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-magic_loader.py,v 1.1 2021/02/18 12:29:55 adam Exp $
-
-NetBSD support.
-
---- magic/loader.py.orig	2021-02-18 12:24:08.000000000 +0000
-+++ magic/loader.py
-@@ -24,9 +24,15 @@ def load_lib():
-                         'win32': windows_dlls,
-                         'cygwin': windows_dlls,
-                         'linux': ['libmagic.so.1'],
-+                        'netbsd': ['libmagic.so.6.0'],
-                         # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
-                         }
--      platform = 'linux' if sys.platform.startswith('linux') else sys.platform
-+      if sys.platform.startswith('linux'):
-+          platform = 'linux'
-+      elif sys.platform.startswith('netbsd'):
-+          platform = 'netbsd'
-+      else:
-+          sys.platform
-       for dll in platform_to_lib.get(platform, []):
-           try:
-               libmagic = ctypes.CDLL(dll)