CVS commit: pkgsrc/devel/gyp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb  4 00:06:54 UTC 2026

Modified Files:
        pkgsrc/devel/gyp: Makefile PLIST distinfo
        pkgsrc/devel/gyp/patches: patch-pylib_gyp_common.py
            patch-test_module_src_program.c

Log Message:
py-gyp: update to 0.1pre20240206.

Switch to wheel.mk, remove git hash from version number.

Three years of changes, but it's only around 10 commits.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/gyp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gyp/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/gyp/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gyp/patches/patch-test_module_src_program.c

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

Modified files:

Index: pkgsrc/devel/gyp/Makefile
diff -u pkgsrc/devel/gyp/Makefile:1.29 pkgsrc/devel/gyp/Makefile:1.30
--- pkgsrc/devel/gyp/Makefile:1.29      Mon Aug 14 05:24:09 2023
+++ pkgsrc/devel/gyp/Makefile   Wed Feb  4 00:06:54 2026
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2023/08/14 05:24:09 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2026/02/04 00:06:54 wiz Exp $
 
-GIT_VERSION=   20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376
+GIT_VERSION=   20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4
 DIST_VERSION=  0.1
 DISTNAME=      gyp-${DIST_VERSION}pre${GIT_VERSION}
-PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:C/.[^.]*$//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -13,13 +12,11 @@ HOMEPAGE=   https://gyp.gsrc.io/
 COMMENT=       GYP can Generate Your Projects
 LICENSE=       modified-bsd
 
-WRKSRC=                ${WRKDIR}
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-EGG_NAME=      gyp-${DIST_VERSION}
+WRKSRC=                ${WRKDIR}/gyp
 
-USE_PKG_RESOURCES=     yes
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+WHEEL_NAME=    gyp-${DIST_VERSION}
 
 # REPLACE_PYTHON settings farmed out due to size...
 .include "replace-python.mk"
@@ -46,7 +43,7 @@ USE_LANGUAGES=        c c++
 do-test:
        ${RUN}cd ${WRKSRC}; LANG=C ${SETENV} ${TEST_ENV} ${PYTHONBIN} gyptest.py -a -f make --passed
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gyp/PLIST
diff -u pkgsrc/devel/gyp/PLIST:1.5 pkgsrc/devel/gyp/PLIST:1.6
--- pkgsrc/devel/gyp/PLIST:1.5  Mon Feb 15 14:52:23 2021
+++ pkgsrc/devel/gyp/PLIST      Wed Feb  4 00:06:54 2026
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2021/02/15 14:52:23 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2026/02/04 00:06:54 wiz Exp $
 bin/gyp
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/AUTHORS
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/gyp/MSVSNew.py
 ${PYSITELIB}/gyp/MSVSNew.pyc
 ${PYSITELIB}/gyp/MSVSNew.pyo

Index: pkgsrc/devel/gyp/distinfo
diff -u pkgsrc/devel/gyp/distinfo:1.14 pkgsrc/devel/gyp/distinfo:1.15
--- pkgsrc/devel/gyp/distinfo:1.14      Thu Jan 27 18:42:15 2022
+++ pkgsrc/devel/gyp/distinfo   Wed Feb  4 00:06:54 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2022/01/27 18:42:15 wiz Exp $
+$NetBSD: distinfo,v 1.15 2026/02/04 00:06:54 wiz Exp $
 
-BLAKE2s (gyp-0.1pre20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376.tar.gz) = d5356f8c4d185dc267d39085794be4f8cc3737e1dca2d2ca125ee8532b6b90b4
-SHA512 (gyp-0.1pre20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376.tar.gz) = 
3eae598943b463ddc7d7ed0a3d6a5fe91a12205f0ada1787fd24e2d0162556398f7241d374ee8efca76318b158cd165af0d42ed6058689e92486fa2b18bf2ce6
-Size (gyp-0.1pre20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376.tar.gz) = 627436 bytes
+BLAKE2s (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = aded0d09e94f3ea4002f9a6b4e9784bb2961e096bd68a444f7fc84dc3c9c0c85
+SHA512 (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = 
df55eaf8d62f8e847673cb8ef40d502673847abbfa45567f2edb531f9a1135f832f13c8cecd8fcfbbbd8a2489463678f4b629aad7744e6afaf423ed5a8746988
+Size (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = 13327419 bytes
 SHA1 (patch-gyptest.py) = b5580c82be8f93b50bfc66e094ae092bf8571202
-SHA1 (patch-pylib_gyp_common.py) = 218efae2b4761b17f40c8465ae3a3b91bb0f93eb
+SHA1 (patch-pylib_gyp_common.py) = 161ceeed274a95908d678a01a80e31918b6c7ac3
 SHA1 (patch-pylib_gyp_generator_make.py) = 1feb43b650a4dd8514e74e0c2bda41bde2243e03
 SHA1 (patch-test_library__dirs_subdir_test.gyp) = 9eb3b39f0bdbf54df6b45a3c613d83e9dfb68d8f
 SHA1 (patch-test_module_src_module.gyp) = 8016db83cce1244f17295d3dfd725f75ff78cb28
-SHA1 (patch-test_module_src_program.c) = ab55d357d9855f79f6fdfb151767f0521a217871
+SHA1 (patch-test_module_src_program.c) = 90850bbf561d70948f798c385b051df8b1b994b1

Index: pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py
diff -u pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.5 pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.6
--- pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.5      Thu Jan 27 18:42:15 2022
+++ pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py  Wed Feb  4 00:06:54 2026
@@ -1,19 +1,9 @@
-$NetBSD: patch-pylib_gyp_common.py,v 1.5 2022/01/27 18:42:15 wiz Exp $
+$NetBSD: patch-pylib_gyp_common.py,v 1.6 2026/02/04 00:06:54 wiz Exp $
 
-* Python 3.10 support
 * Add NetBSD support
 
 --- pylib/gyp/common.py.orig   2022-01-27 18:36:11.000000000 +0000
 +++ pylib/gyp/common.py
-@@ -4,7 +4,7 @@
- 
- from __future__ import with_statement
- 
--import collections
-+import collections.abc as collections
- import errno
- import filecmp
- import os.path
 @@ -445,6 +445,7 @@ def CopyTool(flavor, out_path, generator
    prefix = {
        'aix': 'flock',

Index: pkgsrc/devel/gyp/patches/patch-test_module_src_program.c
diff -u pkgsrc/devel/gyp/patches/patch-test_module_src_program.c:1.1 pkgsrc/devel/gyp/patches/patch-test_module_src_program.c:1.2
--- pkgsrc/devel/gyp/patches/patch-test_module_src_program.c:1.1        Thu Aug 21 14:49:43 2014
+++ pkgsrc/devel/gyp/patches/patch-test_module_src_program.c    Wed Feb  4 00:06:54 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-test_module_src_program.c,v 1.1 2014/08/21 14:49:43 he Exp $
+$NetBSD: patch-test_module_src_program.c,v 1.2 2026/02/04 00:06:54 wiz Exp $
 
 Treat other targets than Windows the same,
 don't require explicit platform code here.
 
---- test/module/src/program.c.orig     2014-07-14 14:19:50.000000000 +0000
+--- test/module/src/program.c.orig     2026-02-04 00:01:38.000000000 +0000
 +++ test/module/src/program.c
 @@ -3,7 +3,7 @@
  
@@ -14,17 +14,18 @@ don't require explicit platform code her
  #include <dlfcn.h>
  #include <libgen.h>
  #include <string.h>
-@@ -13,9 +13,7 @@
+@@ -13,10 +13,8 @@
  
  #if defined(PLATFORM_WIN)
  #define MODULE_SUFFIX ".dll"
 -#elif defined(PLATFORM_MAC)
--#define MODULE_SUFFIX ".so"
--#elif defined(PLATFORM_LINUX)
 +#else
  #define MODULE_SUFFIX ".so"
+-#elif defined(PLATFORM_LINUX)
+-#define MODULE_SUFFIX ".so"
  #endif
  
+ typedef void (*module_symbol)(void);
 @@ -56,7 +54,7 @@ void CallModule(const char* module) {
    funcptr();