Wed Jan 3 12:32:59 2024 UTC (145d)
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.


(gdt)
diff -r1.237 -r1.238 pkgsrc/pkgtools/pkg_install/Makefile
diff -r1.45 -r1.46 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -r1.1 -r1.2 pkgsrc/pkgtools/pkgchkxx/Makefile
diff -r1.128 -r1.129 pkgsrc/pkgtools/pkgin/Makefile

cvs diff -r1.237 -r1.238 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2023/10/24 22:10:40 1.237
+++ pkgsrc/pkgtools/pkg_install/Makefile 2024/01/03 12:32:59 1.238
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.237 2023/10/24 22:10:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.238 2024/01/03 12:32:59 gdt Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9PKGNAME= pkg_install-${VERSION} 9PKGNAME= pkg_install-${VERSION}
10PKGREVISION= 1 10PKGREVISION= 2
11CATEGORIES= pkgtools 11CATEGORIES= pkgtools
12 12
13MAINTAINER= agc@NetBSD.org 13MAINTAINER= agc@NetBSD.org
14HOMEPAGE= https://www.pkgsrc.org/ 14HOMEPAGE= https://www.pkgsrc.org/
15COMMENT= Package management and administration tools for pkgsrc 15COMMENT= Package management and administration tools for pkgsrc
16LICENSE= modified-bsd 16LICENSE= modified-bsd
17 17
18BOOTSTRAP_PKG= yes 18BOOTSTRAP_PKG= yes
19SKIP_LICENSE_CHECK= yes 19SKIP_LICENSE_CHECK= yes
20 20
21CONFLICTS+= audit-packages-[0-9]* 21CONFLICTS+= audit-packages-[0-9]*
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes

cvs diff -r1.45 -r1.46 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2021/06/28 19:33:23 1.45
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2024/01/03 12:32:59 1.46
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# $NetBSD: pkg_rolling-replace.sh,v 1.45 2021/06/28 19:33:23 mcf Exp $ 3# $NetBSD: pkg_rolling-replace.sh,v 1.46 2024/01/03 12:32:59 gdt Exp $
4#<license> 4#<license>
5# Copyright (c) 2006 BBN Technologies Corp. All rights reserved. 5# Copyright (c) 2006 BBN Technologies Corp. All rights reserved.
6# 6#
7# Redistribution and use in source and binary forms, with or without 7# Redistribution and use in source and binary forms, with or without
8# modification, are permitted provided that the following conditions 8# modification, are permitted provided that the following conditions
9# are met: 9# are met:
10# 1. Redistributions of source code must retain the above copyright 10# 1. Redistributions of source code must retain the above copyright
11# notice, this list of conditions and the following disclaimer. 11# notice, this list of conditions and the following disclaimer.
12# 2. Redistributions in binary form must reproduce the above copyright 12# 2. Redistributions in binary form must reproduce the above copyright
13# notice, this list of conditions and the following disclaimer in the 13# notice, this list of conditions and the following disclaimer in the
14# documentation and/or other materials provided with the distribution. 14# documentation and/or other materials provided with the distribution.
15# 3. Neither the name of BBN Technologies nor the names of its contributors 15# 3. Neither the name of BBN Technologies nor the names of its contributors
16# may be used to endorse or promote products derived from this software 16# may be used to endorse or promote products derived from this software
@@ -152,27 +152,27 @@ OPC='rr>' # continuation @@ -152,27 +152,27 @@ OPC='rr>' # continuation
152# supported. Newer versions may or may not work (patches welcome). 152# supported. Newer versions may or may not work (patches welcome).
153check_packages_mismatched() 153check_packages_mismatched()
154{ 154{
155 warned_once="" 155 warned_once=""
156 156
157 ${PKG_CHK} -u -q $opt_B | egrep -v missing | while read line; do 157 ${PKG_CHK} -u -q $opt_B | egrep -v missing | while read line; do
158 # duplicate output of pkg_chk to stderr (bypass $(...) or `...`) 158 # duplicate output of pkg_chk to stderr (bypass $(...) or `...`)
159 echo "${OPC} $line" 1>&2 159 echo "${OPC} $line" 1>&2
160 # Look for the first thing that looks like pkg-version rather 160 # Look for the first thing that looks like pkg-version rather
161 # than category/pkg and remove the version. 161 # than category/pkg and remove the version.
162 for word in $line; do 162 for word in $line; do
163 if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then 163 if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then
164 if [ -z "$opt_F" ]; then 164 if [ -z "$opt_F" ]; then
165 ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || { 165 sudo ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || {
166 if [ -z "$warned_once" ]; then 166 if [ -z "$warned_once" ]; then
167 echo 1>&2 "$OPC WARNING: mismatch variable not set due to permissions;" 167 echo 1>&2 "$OPC WARNING: mismatch variable not set due to permissions;"
168 echo 1>&2 "$OPC mismatch status will not persist." 168 echo 1>&2 "$OPC mismatch status will not persist."
169 warned_once=1 169 warned_once=1
170 fi 170 fi
171 } 171 }
172 fi 172 fi
173 echo $word | sed 's/-[0-9][^-]*$//' 173 echo $word | sed 's/-[0-9][^-]*$//'
174 break #done with this line 174 break #done with this line
175 fi 175 fi
176 done 176 done
177 done 177 done
178} 178}

cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/pkgchkxx/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgchkxx/Makefile 2024/01/01 13:39:04 1.1
+++ pkgsrc/pkgtools/pkgchkxx/Makefile 2024/01/03 12:32:59 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2024/01/01 13:39:04 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2024/01/03 12:32:59 gdt Exp $
2 2
3DISTNAME= pkgchkxx-0.1.6 3DISTNAME= pkgchkxx-0.1.6
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= ${MASTER_SITE_GITHUB:=depressed-pho/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=depressed-pho/}
7GITHUB_RELEASE= ${DISTNAME} 7GITHUB_RELEASE= ${DISTNAME}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/depressed-pho/pkgchkxx 10HOMEPAGE= https://github.com/depressed-pho/pkgchkxx
11COMMENT= Complete rewrite of pkg_chk and pkg_rolling-replace in C++ 11COMMENT= Complete rewrite of pkg_chk and pkg_rolling-replace in C++
12LICENSE= modified-bsd AND 2-clause-bsd 12LICENSE= modified-bsd AND 2-clause-bsd
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_CXX_FEATURES= c++17 filesystem unique_ptr 15USE_CXX_FEATURES= c++17 filesystem unique_ptr
16USE_TOOLS= gmake 16USE_TOOLS= gmake
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES

cvs diff -r1.128 -r1.129 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2023/11/08 13:20:39 1.128
+++ pkgsrc/pkgtools/pkgin/Makefile 2024/01/03 12:32:59 1.129
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.128 2023/11/08 13:20:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.129 2024/01/03 12:32:59 gdt Exp $
2 2
3DISTNAME= pkgin-23.8.1 3DISTNAME= pkgin-23.8.1
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= ${MASTER_SITE_GITHUB:=NetBSDfr/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=NetBSDfr/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= jperkin@pkgsrc.org 9MAINTAINER= jperkin@pkgsrc.org
10HOMEPAGE= http://pkgin.net/ 10HOMEPAGE= http://pkgin.net/
11COMMENT= Apt / yum like tool for managing pkgsrc binary packages 11COMMENT= Apt / yum like tool for managing pkgsrc binary packages
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14EGDIR= ${PREFIX}/share/examples/${PKGBASE} 14EGDIR= ${PREFIX}/share/examples/${PKGBASE}
15CONF_FILES= ${EGDIR}/repositories.conf.example \ 15CONF_FILES= ${EGDIR}/repositories.conf.example \
16 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 16 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
17 17