CVS commit: pkgsrc/pkgtools/revbump/files

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec 29 21:23:40 UTC 2023

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

Log Message:
revbump: fix for systems with bmake


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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/files/revbump.py
diff -u pkgsrc/pkgtools/revbump/files/revbump.py:1.5 pkgsrc/pkgtools/revbump/files/revbump.py:1.6
--- pkgsrc/pkgtools/revbump/files/revbump.py:1.5        Mon Aug 14 05:12:15 2023
+++ pkgsrc/pkgtools/revbump/files/revbump.py    Fri Dec 29 21:23:40 2023
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# $NetBSD: revbump.py,v 1.5 2023/08/14 05:12:15 wiz Exp $
+# $NetBSD: revbump.py,v 1.6 2023/12/29 21:23:40 adam Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,6 +35,7 @@ import glob
 import os
 import pathlib
 import re
+import shutil
 import subprocess
 import sys
 
@@ -57,7 +58,8 @@ def bl3bump(path):
         return
     new_path = old_path + '.modified'
 
-    version_process = subprocess.run(['make', 'show-var', 'VARNAME=PKGNAME'],
+    make_bin = shutil.which('bmake') or shutil.which('make')
+    version_process = subprocess.run([make_bin, 'show-var', 'VARNAME=PKGNAME'],
                                      capture_output=True,
                                      check=True,
                                      cwd=args.pkgsrcdir + '/' + path,