(devel/{py-ninja,ninja-build) DISTFILE conflict ?

[Makoto mef Fujiwara <makoto%ki.nu@localhost>]

I think we need following changes:
Following two are not the same tarball families:

think-c11@makoto 07:50:42/260127(..usr/pkgsrc)% ls -l distfiles/*/ninja*
-rw-r--r--  1 root  wheel  292385 Jan 27 07:36 distfiles/ninja-build/ninja-1.13.2.tar.gz
-rw-r--r--  1 root  wheel  242558 Aug 12 00:10 distfiles/py-ninja/ninja-1.13.0.tar.gz

correct ?



Index: devel/py-ninja/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-ninja/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- devel/py-ninja/Makefile	27 Dec 2025 22:17:02 -0000	1.7
+++ devel/py-ninja/Makefile	26 Jan 2026 22:47:52 -0000
@@ -10,6 +10,8 @@
 COMMENT=	Python bindings for the ninja build tool
 LICENSE=	apache-2.0
 
+DIST_SUBDIR=	py-ninja
+
 TOOL_DEPENDS+=	cmake-[0-9]*:../../devel/cmake
 TOOL_DEPENDS+=	${PYPKGPREFIX}-hatch-fancy-pypi-readme-[0-9]*:../../devel/py-hatch-fancy-pypi-readme
 TOOL_DEPENDS+=	${PYPKGPREFIX}-scikit-build-core-[0-9]*:../../devel/py-scikit-build-core
Index: devel/py-ninja/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-ninja/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- devel/py-ninja/distinfo	27 Dec 2025 22:17:02 -0000	1.5
+++ devel/py-ninja/distinfo	26 Jan 2026 22:47:52 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2025/12/27 22:17:02 adam Exp $
 
-BLAKE2s (ninja-1.13.0.tar.gz) = 2d52248690f4623a5d8935b6685e5fc5e7ec6667f0d0d08273748c663a7c823b
-SHA512 (ninja-1.13.0.tar.gz) = 383c342ff3ea061e83ccec0100d6e03b65268792a93fed58f6e7a6fc29d996c9639ed5f71b5800e69fec6f989b3e6221de496e35f9ee67d9f5f2e84621fb3d08
-Size (ninja-1.13.0.tar.gz) = 242558 bytes
+BLAKE2s (py-ninja/ninja-1.13.0.tar.gz) = 2d52248690f4623a5d8935b6685e5fc5e7ec6667f0d0d08273748c663a7c823b
+SHA512 (py-ninja/ninja-1.13.0.tar.gz) = 383c342ff3ea061e83ccec0100d6e03b65268792a93fed58f6e7a6fc29d996c9639ed5f71b5800e69fec6f989b3e6221de496e35f9ee67d9f5f2e84621fb3d08
+Size (py-ninja/ninja-1.13.0.tar.gz) = 242558 bytes
 SHA1 (patch-CMakeLists.txt) = 071d718895af64ee7a215bb9c0d3a7e6f6619458
Index: devel/ninja-build/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ninja-build/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- devel/ninja-build/Makefile	21 Nov 2025 09:23:00 -0000	1.27
+++ devel/ninja-build/Makefile	26 Jan 2026 22:47:52 -0000
@@ -11,6 +11,7 @@
 HOMEPAGE=	https://ninja-build.org/
 COMMENT=	Small build system with a focus on speed
 LICENSE=	apache-2.0
+DIST_SUBDIR=	ninja-build
 
 TOOL_DEPENDS+=	re2c>=0.11.3:../../devel/re2c
 
Index: devel/ninja-build/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ninja-build/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- devel/ninja-build/distinfo	21 Nov 2025 09:23:00 -0000	1.25
+++ devel/ninja-build/distinfo	26 Jan 2026 22:47:52 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.25 2025/11/21 09:23:00 adam Exp $
 
-BLAKE2s (ninja-1.13.2.tar.gz) = 8a5c284016bb7c3cf83d3331f7aa84c1cfbaa40d2ea9f745f2a5bd312ffc1e1c
-SHA512 (ninja-1.13.2.tar.gz) = c0b401b4db91a2eea01a474ee979b2c6f1daa97b4c8d1f856871ce5f6d567c4b26d6246bc57e2a5f914329302abcd9c00ab0d4394a25f2ad502b6b00a07903d2
-Size (ninja-1.13.2.tar.gz) = 292385 bytes
+BLAKE2s (ninja-build/ninja-1.13.2.tar.gz) = 8a5c284016bb7c3cf83d3331f7aa84c1cfbaa40d2ea9f745f2a5bd312ffc1e1c
+SHA512 (ninja-build/ninja-1.13.2.tar.gz) = c0b401b4db91a2eea01a474ee979b2c6f1daa97b4c8d1f856871ce5f6d567c4b26d6246bc57e2a5f914329302abcd9c00ab0d4394a25f2ad502b6b00a07903d2
+Size (ninja-build/ninja-1.13.2.tar.gz) = 292385 bytes
 SHA1 (patch-src_subprocess-posix.cc) = aff45ff1080c8556bc9a749666c532896bd73609