CVS commit: pkgsrc/devel

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Jan 27 12:59:15 UTC 2026

Modified Files:
        pkgsrc/devel/ninja-build: Makefile distinfo
        pkgsrc/devel/py-ninja: Makefile distinfo

Log Message:
(devel/py-ninja devel/ninja-build) +DIST_SUBDIR to avoid conflict


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/ninja-build/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/ninja-build/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-ninja/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-ninja/distinfo

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

Modified files:

Index: pkgsrc/devel/ninja-build/Makefile
diff -u pkgsrc/devel/ninja-build/Makefile:1.27 pkgsrc/devel/ninja-build/Makefile:1.28
--- pkgsrc/devel/ninja-build/Makefile:1.27      Fri Nov 21 09:23:00 2025
+++ pkgsrc/devel/ninja-build/Makefile   Tue Jan 27 12:59:15 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2025/11/21 09:23:00 adam Exp $
+# $NetBSD: Makefile,v 1.28 2026/01/27 12:59:15 mef Exp $
 
 DISTNAME=      ninja-1.13.2
 PKGNAME=       ${DISTNAME:S/ninja/ninja-build/}
@@ -12,6 +12,9 @@ HOMEPAGE=     https://ninja-build.org/
 COMMENT=       Small build system with a focus on speed
 LICENSE=       apache-2.0
 
+# avoid conflict with devel/py-ninja
+DIST_SUBDIR=   ninja-build
+
 TOOL_DEPENDS+= re2c>=0.11.3:../../devel/re2c
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/devel/ninja-build/distinfo
diff -u pkgsrc/devel/ninja-build/distinfo:1.25 pkgsrc/devel/ninja-build/distinfo:1.26
--- pkgsrc/devel/ninja-build/distinfo:1.25      Fri Nov 21 09:23:00 2025
+++ pkgsrc/devel/ninja-build/distinfo   Tue Jan 27 12:59:15 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2025/11/21 09:23:00 adam Exp $
+$NetBSD: distinfo,v 1.26 2026/01/27 12:59:15 mef 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

Index: pkgsrc/devel/py-ninja/Makefile
diff -u pkgsrc/devel/py-ninja/Makefile:1.7 pkgsrc/devel/py-ninja/Makefile:1.8
--- pkgsrc/devel/py-ninja/Makefile:1.7  Sat Dec 27 22:17:02 2025
+++ pkgsrc/devel/py-ninja/Makefile      Tue Jan 27 12:59:15 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/12/27 22:17:02 adam Exp $
+# $NetBSD: Makefile,v 1.8 2026/01/27 12:59:15 mef Exp $
 
 DISTNAME=      ninja-1.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,9 @@ HOMEPAGE=     https://github.com/scikit-buil
 COMMENT=       Python bindings for the ninja build tool
 LICENSE=       apache-2.0
 
+# avoid conflict with devel/ninja-build
+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: pkgsrc/devel/py-ninja/distinfo
diff -u pkgsrc/devel/py-ninja/distinfo:1.5 pkgsrc/devel/py-ninja/distinfo:1.6
--- pkgsrc/devel/py-ninja/distinfo:1.5  Sat Dec 27 22:17:02 2025
+++ pkgsrc/devel/py-ninja/distinfo      Tue Jan 27 12:59:15 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2025/12/27 22:17:02 adam Exp $
+$NetBSD: distinfo,v 1.6 2026/01/27 12:59:15 mef 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