CVS commit: pkgsrc/sysutils/bacula

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Sun Sep  7 03:37:07 UTC 2025

Modified Files:
        pkgsrc/sysutils/bacula: Makefile buildlink3.mk
        pkgsrc/sysutils/bacula/files: chio-changer

Log Message:
pkgsrc: fix chio-changer script

Fix chio-changer script so that it will strip a trailing "ver. 0" from
voltags which my changer adds.

E-mail if you're changer does something else weird.  You can test with
chio-changer <changer dev> list


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/sysutils/bacula/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bacula/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bacula/files/chio-changer

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

Modified files:

Index: pkgsrc/sysutils/bacula/Makefile
diff -u pkgsrc/sysutils/bacula/Makefile:1.108 pkgsrc/sysutils/bacula/Makefile:1.109
--- pkgsrc/sysutils/bacula/Makefile:1.108       Tue Jun  3 11:36:47 2025
+++ pkgsrc/sysutils/bacula/Makefile     Sun Sep  7 03:37:07 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2025/06/03 11:36:47 markd Exp $
+# $NetBSD: Makefile,v 1.109 2025/09/07 03:37:07 jnemeth Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
+PKGREVISION= 1
 .include "options.mk"
 
 PLIST_SRC=             PLIST.common

Index: pkgsrc/sysutils/bacula/buildlink3.mk
diff -u pkgsrc/sysutils/bacula/buildlink3.mk:1.3 pkgsrc/sysutils/bacula/buildlink3.mk:1.4
--- pkgsrc/sysutils/bacula/buildlink3.mk:1.3    Wed Oct 12 20:56:41 2022
+++ pkgsrc/sysutils/bacula/buildlink3.mk        Sun Sep  7 03:37:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/10/12 20:56:41 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/09/07 03:37:07 jnemeth Exp $
 
 BUILDLINK_TREE+=       bacula
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        bacula
 BACULA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bacula+= {bacula,bacula-clientonly}>=3.0.1nb1
-BUILDLINK_ABI_DEPENDS.bacula?= {bacula,bacula-clientonly}>=13.0.1
+BUILDLINK_ABI_DEPENDS.bacula?= bacula>=15.0.3nb1
 BUILDLINK_PKGSRCDIR.bacula?=   ../../sysutils/bacula
 .endif # BACULA_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/bacula/files/chio-changer
diff -u pkgsrc/sysutils/bacula/files/chio-changer:1.3 pkgsrc/sysutils/bacula/files/chio-changer:1.4
--- pkgsrc/sysutils/bacula/files/chio-changer:1.3       Fri Oct  8 07:28:36 2021
+++ pkgsrc/sysutils/bacula/files/chio-changer   Sun Sep  7 03:37:07 2025
@@ -72,8 +72,8 @@ case $cmd in 
       ;;
 
    list) 
-      ${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2; gsub(\":$\", \"\", slot); slot++ }\
-               /Primary volume tag: [^ ] / { tag=\$4 }\
+      ${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2; gsub(\":$\", \"\", slot); slot++ }
+               /Primary volume tag:/ { sub(\" ver. 0$\", \"\"); tag=\$4 }
                /From:/ { printf \"%s:%s\n\", slot, tag }"
       ;;