CVS commit: pkgsrc/pkgtools

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jan  3 12:32:59 UTC 2024

Modified Files:
        pkgsrc/pkgtools/pkg_install: Makefile
        pkgsrc/pkgtools/pkg_rolling-replace/files: pkg_rolling-replace.sh
        pkgsrc/pkgtools/pkgchkxx: Makefile
        pkgsrc/pkgtools/pkgin: Makefile

Log Message:
pkgtools/*: revbump for libfetch

libfetch's recent behavior change can be viewed as a bugfix or as an
ABI change.  pkg_install vendors libfetch from the sources, for
bootstrapping reasons and thus needs a revbump.  For consistency and
to reduce confusion, also bump the other two packages that depend on
it.


To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 pkgsrc/pkgtools/pkg_install/Makefile
cvs rdiff -u -r1.45 -r1.46 \
    pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/pkgchkxx/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/pkgtools/pkgin/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/pkg_install/Makefile
diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.237 pkgsrc/pkgtools/pkg_install/Makefile:1.238
--- pkgsrc/pkgtools/pkg_install/Makefile:1.237  Tue Oct 24 22:10:40 2023
+++ pkgsrc/pkgtools/pkg_install/Makefile        Wed Jan  3 12:32:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.237 2023/10/24 22:10:40 wiz Exp $
+# $NetBSD: Makefile,v 1.238 2024/01/03 12:32:59 gdt Exp $
 
 # Notes to package maintainers:
 #
@@ -7,7 +7,7 @@
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 
 PKGNAME=               pkg_install-${VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            pkgtools
 
 MAINTAINER=            agc%NetBSD.org@localhost

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.45 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.46
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.45       Mon Jun 28 19:33:23 2021
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Wed Jan  3 12:32:59 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.45 2021/06/28 19:33:23 mcf Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.46 2024/01/03 12:32:59 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -162,7 +162,7 @@ check_packages_mismatched()
         for word in $line; do
             if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then
                if [ -z "$opt_F" ]; then
-                   ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || {
+                   sudo ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || {
                        if [ -z "$warned_once" ]; then
                            echo 1>&2 "$OPC WARNING: mismatch variable not set due to permissions;"
                            echo 1>&2 "$OPC          mismatch status will not persist."

Index: pkgsrc/pkgtools/pkgchkxx/Makefile
diff -u pkgsrc/pkgtools/pkgchkxx/Makefile:1.1 pkgsrc/pkgtools/pkgchkxx/Makefile:1.2
--- pkgsrc/pkgtools/pkgchkxx/Makefile:1.1       Mon Jan  1 13:39:04 2024
+++ pkgsrc/pkgtools/pkgchkxx/Makefile   Wed Jan  3 12:32:59 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/01/01 13:39:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/03 12:32:59 gdt Exp $
 
 DISTNAME=      pkgchkxx-0.1.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    pkgtools
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=depressed-pho/}
 GITHUB_RELEASE=        ${DISTNAME}

Index: pkgsrc/pkgtools/pkgin/Makefile
diff -u pkgsrc/pkgtools/pkgin/Makefile:1.128 pkgsrc/pkgtools/pkgin/Makefile:1.129
--- pkgsrc/pkgtools/pkgin/Makefile:1.128        Wed Nov  8 13:20:39 2023
+++ pkgsrc/pkgtools/pkgin/Makefile      Wed Jan  3 12:32:59 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2023/11/08 13:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2024/01/03 12:32:59 gdt Exp $
 
 DISTNAME=              pkgin-23.8.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            pkgtools
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=NetBSDfr/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}