CVS commit: pkgsrc/devel/gyp

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jul  4 06:39:26 UTC 2026

Modified Files:
        pkgsrc/devel/gyp: Makefile distinfo
Added Files:
        pkgsrc/devel/gyp/patches: patch-pylib_gyp_input.py

Log Message:
devel/gyp: fix a few problems

* Remove git repository since it bad interaction when git is installed.

        fatal: detected dubious ownership in repository at "$WRKSRC/default/gyp"

* Remove warnings at install stage.

        => Generating pre-install file lists
        /usr/pkg/lib/python3.13/site-packages/gyp/input.py:1186: SyntaxWarning: "is" with 'str' literal. Did you mean "=="?
        /usr/pkg/lib/python3.13/site-packages/gyp/input.py:1186: SyntaxWarning: "is" with 'str' literal. Did you mean "=="?

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/gyp/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/gyp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gyp/patches/patch-pylib_gyp_input.py

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.30 pkgsrc/devel/gyp/Makefile:1.31
--- pkgsrc/devel/gyp/Makefile:1.30      Wed Feb  4 00:06:54 2026
+++ pkgsrc/devel/gyp/Makefile   Sat Jul  4 06:39:26 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2026/02/04 00:06:54 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/07/04 06:39:26 taca Exp $
 
 GIT_VERSION=   20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4
 DIST_VERSION=  0.1
+PKGREVISION=   1
 DISTNAME=      gyp-${DIST_VERSION}pre${GIT_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:C/.[^.]*$//}
 CATEGORIES=    devel
@@ -40,6 +41,9 @@ USE_TOOLS+=   bash:run
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c c++
 
+pre-configure:
+       cd ${WRKSRC}; rm -fr .git
+
 do-test:
        ${RUN}cd ${WRKSRC}; LANG=C ${SETENV} ${TEST_ENV} ${PYTHONBIN} gyptest.py -a -f make --passed
 

Index: pkgsrc/devel/gyp/distinfo
diff -u pkgsrc/devel/gyp/distinfo:1.15 pkgsrc/devel/gyp/distinfo:1.16
--- pkgsrc/devel/gyp/distinfo:1.15      Wed Feb  4 00:06:54 2026
+++ pkgsrc/devel/gyp/distinfo   Sat Jul  4 06:39:26 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2026/02/04 00:06:54 wiz Exp $
+$NetBSD: distinfo,v 1.16 2026/07/04 06:39:26 taca Exp $
 
 BLAKE2s (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = aded0d09e94f3ea4002f9a6b4e9784bb2961e096bd68a444f7fc84dc3c9c0c85
 SHA512 (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = 
df55eaf8d62f8e847673cb8ef40d502673847abbfa45567f2edb531f9a1135f832f13c8cecd8fcfbbbd8a2489463678f4b629aad7744e6afaf423ed5a8746988
@@ -6,6 +6,7 @@ Size (gyp-0.1pre20240206.1615ec326858f8c
 SHA1 (patch-gyptest.py) = b5580c82be8f93b50bfc66e094ae092bf8571202
 SHA1 (patch-pylib_gyp_common.py) = 161ceeed274a95908d678a01a80e31918b6c7ac3
 SHA1 (patch-pylib_gyp_generator_make.py) = 1feb43b650a4dd8514e74e0c2bda41bde2243e03
+SHA1 (patch-pylib_gyp_input.py) = 25b3aeab9feda0c42f218ad314fa4bc9af4dba79
 SHA1 (patch-test_library__dirs_subdir_test.gyp) = 9eb3b39f0bdbf54df6b45a3c613d83e9dfb68d8f
 SHA1 (patch-test_module_src_module.gyp) = 8016db83cce1244f17295d3dfd725f75ff78cb28
 SHA1 (patch-test_module_src_program.c) = 90850bbf561d70948f798c385b051df8b1b994b1

Added files:

Index: pkgsrc/devel/gyp/patches/patch-pylib_gyp_input.py
diff -u /dev/null pkgsrc/devel/gyp/patches/patch-pylib_gyp_input.py:1.1
--- /dev/null   Sat Jul  4 06:39:26 2026
+++ pkgsrc/devel/gyp/patches/patch-pylib_gyp_input.py   Sat Jul  4 06:39:26 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-pylib_gyp_input.py,v 1.1 2026/07/04 06:39:26 taca Exp $
+
+Stop SyntaxWarning: "is" with 'str' literal.
+
+--- pylib/gyp/input.py.orig    2026-02-04 00:01:38.000000000 +0000
++++ pylib/gyp/input.py
+@@ -1183,7 +1183,7 @@ def LoadVariablesFromVariablesDict(varia
+       if variable_name in variables:
+         # If the variable is already set, don't set it.
+         continue
+-      if the_dict_key is 'variables' and variable_name in the_dict:
++      if the_dict_key == 'variables' and variable_name in the_dict:
+         # If the variable is set without a % in the_dict, and the_dict is a
+         # variables dict (making |variables| a varaibles sub-dict of a
+         # variables dict), use the_dict's definition.