CVS commit: pkgsrc/pkgtools/revbump

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 19 07:58:05 UTC 2025

Modified Files:
        pkgsrc/pkgtools/revbump: Makefile
        pkgsrc/pkgtools/revbump/files: revbump.py

Log Message:
revbump: include (hacky) support for mk/krb5.buildlink3.mk

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/pkgtools/revbump/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/revbump/files/revbump.py

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

Modified files:

Index: pkgsrc/pkgtools/revbump/Makefile
diff -u pkgsrc/pkgtools/revbump/Makefile:1.59 pkgsrc/pkgtools/revbump/Makefile:1.60
--- pkgsrc/pkgtools/revbump/Makefile:1.59       Mon Nov 11 12:59:31 2024
+++ pkgsrc/pkgtools/revbump/Makefile    Sat Apr 19 07:58:05 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2024/11/11 12:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2025/04/19 07:58:05 wiz Exp $
 
-PKGNAME=               revbump-3.6
+PKGNAME=               revbump-3.7
 CATEGORIES=            pkgtools
 
 MAINTAINER=            wiz%NetBSD.org@localhost
@@ -13,8 +13,6 @@ USE_LANGUAGES=                # empty
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 REPLACE_PYTHON+=       revbump.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 post-extract:
        ${CP} ${FILESDIR}/revbump.py ${WRKSRC}
 

Index: pkgsrc/pkgtools/revbump/files/revbump.py
diff -u pkgsrc/pkgtools/revbump/files/revbump.py:1.8 pkgsrc/pkgtools/revbump/files/revbump.py:1.9
--- pkgsrc/pkgtools/revbump/files/revbump.py:1.8        Mon Nov 11 12:59:31 2024
+++ pkgsrc/pkgtools/revbump/files/revbump.py    Sat Apr 19 07:58:05 2025
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# $NetBSD: revbump.py,v 1.8 2024/11/11 12:59:31 wiz Exp $
+# $NetBSD: revbump.py,v 1.9 2025/04/19 07:58:05 wiz Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,7 +40,7 @@ import subprocess
 import sys
 
 # only accept includes with ../../ or in the current directory
-bl3_include_re = re.compile(r'\s*\.\s*include\s+"(\.\./\.\./[^/]*/[^/]*/|)([^/]*)"')
+bl3_include_re = re.compile(r'\s*\.\s*include\s+"(\.\./\.\./[^/]*/[^/]*/?|)([^/]*)"')
 abi_depends_re = re.compile(r'^(BUILDLINK_ABI_DEPENDS.+=[ \t]+)')
 bldir_re = re.compile(r'^BUILDLINK_PKGSRCDIR(.*=[ \t]+)')
 pkgrevision_re = re.compile(r'PKGREVISION=([ \t]+)([0-9]+)$')
@@ -163,7 +163,8 @@ def extract_includes(path):
             if m := bl3_include_re.match(entry):
                 file_path = m.group(1)
                 file_name = m.group(2)
-                if file_path.find('/mk/') != -1:
+                if file_path.find('/mk/') != -1 and file_path.find('/mk/krb5.buildlink3.mk') == -1:
+                    print(f'skipping {file_path}')
                     continue
                 if len(file_path) == 0:
                     file_path = '../../' + relative[:relative.rfind('/')+1]
@@ -209,6 +210,8 @@ if not args.recursive:
 
 if args.package == 'lang/go':
     searchlist = ['lang/go/version.mk']
+elif args.package == 'mk/krb5.buildlink3.mk':
+    searchlist = ['mk/krb5.buildlink3.mk']
 else:
     if not pathlib.Path(args.pkgsrcdir + '/' + args.package.rstrip('/')).exists():
         print(f'directory {args.package} does not exist or is not a pkgsrc directory')