CVS commit: pkgsrc/textproc/coccigrep

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Oct 13 16:38:37 UTC 2024

Modified Files:
        pkgsrc/textproc/coccigrep: Makefile distinfo
Added Files:
        pkgsrc/textproc/coccigrep/patches: patch-src_coccigrep.py

Log Message:
coccigrep: add support for Python 3.12+

>From upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/coccigrep/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/coccigrep/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/coccigrep/patches/patch-src_coccigrep.py

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

Modified files:

Index: pkgsrc/textproc/coccigrep/Makefile
diff -u pkgsrc/textproc/coccigrep/Makefile:1.21 pkgsrc/textproc/coccigrep/Makefile:1.22
--- pkgsrc/textproc/coccigrep/Makefile:1.21     Sun Oct 13 10:10:23 2024
+++ pkgsrc/textproc/coccigrep/Makefile  Sun Oct 13 16:38:37 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2024/10/13 10:10:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/10/13 16:38:37 wiz Exp $
 
 DISTNAME=      coccigrep-1.20
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=regit/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -18,8 +19,6 @@ USE_LANGUAGES=        # none
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1
 
-PYTHON_VERSIONS_ACCEPTED=      311 310
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/coccigrep.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

Index: pkgsrc/textproc/coccigrep/distinfo
diff -u pkgsrc/textproc/coccigrep/distinfo:1.9 pkgsrc/textproc/coccigrep/distinfo:1.10
--- pkgsrc/textproc/coccigrep/distinfo:1.9      Sun Oct 13 10:10:23 2024
+++ pkgsrc/textproc/coccigrep/distinfo  Sun Oct 13 16:38:37 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2024/10/13 10:10:23 wiz Exp $
+$NetBSD: distinfo,v 1.10 2024/10/13 16:38:37 wiz Exp $
 
 BLAKE2s (coccigrep-1.20.tar.gz) = 4dbfd55e5b2259a825573779fbb0bf95568fdcb1431052d5cfda3006292b08eb
 SHA512 (coccigrep-1.20.tar.gz) = 35d6a43b515c261ba025b876a72566581f892624eb9f47cde4121f16b2922ead8cd94e2c0ea6e00e4c64a3fe0cdcc4aeadc4c49900a8de8cfc0b589208ecae9c
 Size (coccigrep-1.20.tar.gz) = 33027 bytes
+SHA1 (patch-src_coccigrep.py) = 005b00eb098d1250d70c39a726043b13192f663f

Added files:

Index: pkgsrc/textproc/coccigrep/patches/patch-src_coccigrep.py
diff -u /dev/null pkgsrc/textproc/coccigrep/patches/patch-src_coccigrep.py:1.1
--- /dev/null   Sun Oct 13 16:38:37 2024
+++ pkgsrc/textproc/coccigrep/patches/patch-src_coccigrep.py    Sun Oct 13 16:38:37 2024
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_coccigrep.py,v 1.1 2024/10/13 16:38:37 wiz Exp $
+
+Fix Python 3.12 support.
+https://github.com/regit/coccigrep/commit/98a57cb9707b157d5f27d6f65c944437e7fcdee6
+
+--- src/coccigrep.py.orig      2020-05-05 07:56:05.000000000 +0000
++++ src/coccigrep.py
+@@ -15,9 +15,9 @@
+ # 02110-1301, USA.
+ 
+ try:
+-    from configparser import SafeConfigParser
++    from configparser import ConfigParser as PyConfigParser
+ except Exception:
+-    from ConfigParser import SafeConfigParser
++    from ConfigParser import SafeConfigParser as PyConfigParser
+ from os import unlink, path, listdir, getcwd
+ from string import Template
+ from subprocess import Popen, PIPE, STDOUT
+@@ -88,16 +88,16 @@ _CONF_FILES = tuple((path.join(dirname, 
+     (getcwd(), '.%s'))))
+ 
+ 
+-class CocciGrepConfig(SafeConfigParser):
++class CocciGrepConfig(PyConfigParser):
+     """
+     Configuration handling class
+ 
+     This class parses configuration and can be used to access to
+     configuration item via get operations. CocciGrepConfig is derived
+-    from SafeConfigParser
++    from ConfigParser
+     """
+     def __init__(self):
+-        SafeConfigParser.__init__(self)
++        PyConfigParser.__init__(self)
+         self._load_config()
+ 
+     def _load_config(self):