py-notmuch2: Use PYSETUPSUBDIR

[Malte Dehling <mdehling%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Malte Dehling <mdehling%gmail.com@localhost>
Pushed By:	mdehling
Date:		Fri Mar 8 10:43:13 2024 -0800
Changeset:	4a6d8c7b9074e7592186e5e308412c12400ab92e

Modified Files:
	py-notmuch2/Makefile
	py-notmuch2/distinfo
Added Files:
	py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py
Removed Files:
	py-notmuch2/patches/patch-__notmuch__config.py

Log Message:
py-notmuch2: Use PYSETUPSUBDIR

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4a6d8c7b9074e7592186e5e308412c12400ab92e

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

diffstat:
 py-notmuch2/Makefile                                          |  4 +---
 py-notmuch2/distinfo                                          |  2 +-
 py-notmuch2/patches/patch-__notmuch__config.py                | 11 -----------
 .../patches/patch-bindings_python-cffi___notmuch__config.py   | 11 +++++++++++
 4 files changed, 13 insertions(+), 15 deletions(-)

diffs:
diff --git a/py-notmuch2/Makefile b/py-notmuch2/Makefile
index b39e1dba6d..5149ee6dbb 100644
--- a/py-notmuch2/Makefile
+++ b/py-notmuch2/Makefile
@@ -19,9 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-# wheel.mk does not handle this
-#PYSETUPSUBDIR=	bindings/python-cffi
-WRKSRC=		${WRKDIR}/${DISTNAME}/bindings/python-cffi
+PYSETUPSUBDIR=	bindings/python-cffi
 
 .include "../../mail/notmuch/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
diff --git a/py-notmuch2/distinfo b/py-notmuch2/distinfo
index bd9713fb8d..04b951474e 100644
--- a/py-notmuch2/distinfo
+++ b/py-notmuch2/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (notmuch-0.38.2.tar.xz) = 8706c2b8b8cce95b32e3d80c921c8a50739aaabd5a082dbed858629497bba845
 SHA512 (notmuch-0.38.2.tar.xz) = fcf5cd927d2acff1a3632c8a4790d4115320cd3ca0d7f61955789a060e363d196c6be64e0e98c883e9918f6b5032a72150977d5f80f9c890f9bd3ab8ed5d8154
 Size (notmuch-0.38.2.tar.xz) = 805268 bytes
-SHA1 (patch-__notmuch__config.py) = 682c1052c255f54385c695ae8eaa666bea02b2b5
+SHA1 (patch-bindings_python-cffi___notmuch__config.py) = 556084c6451cab7b090b21b951238363cebe07fd
diff --git a/py-notmuch2/patches/patch-__notmuch__config.py b/py-notmuch2/patches/patch-__notmuch__config.py
deleted file mode 100644
index 4e735e6db1..0000000000
--- a/py-notmuch2/patches/patch-__notmuch__config.py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-This file would normally be created by the configure script, but we
-don't run it.
-
---- _notmuch_config.py.orig	2024-03-01 22:02:43.485120189 +0000
-+++ _notmuch_config.py
-@@ -0,0 +1,3 @@
-+NOTMUCH_VERSION_FILE='../../version.txt'
-+NOTMUCH_INCLUDE_DIR='../../lib'
-+NOTMUCH_LIB_DIR='../../lib'
diff --git a/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py b/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py
new file mode 100644
index 0000000000..7ef7fdf9c7
--- /dev/null
+++ b/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py
@@ -0,0 +1,11 @@
+$NetBSD$
+
+This file would normally be created by the configure script, but we
+don't run it.
+
+--- bindings/python-cffi/_notmuch_config.py.orig	2024-02-17 05:03:35.281766718 +0000
++++ bindings/python-cffi/_notmuch_config.py
+@@ -0,0 +1,3 @@
++NOTMUCH_VERSION_FILE='../../version.txt'
++NOTMUCH_INCLUDE_DIR='../../lib'
++NOTMUCH_LIB_DIR='../../lib'