 @@ -1,14 +1,14 @@
-# $NetBSD: pkgformat-vars.mk,v 1.15 2024/01/26 03:24:58 riastradh Exp $
+# $NetBSD: pkgformat-vars.mk,v 1.16 2024/01/26 12:40:04 riastradh Exp $
+#
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
 # pkgformat.mk is included.
+#
 PKGSRC_MESSAGE_RECIPIENTS?=	# empty
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)
 USE_TOOLS+=	mail
 .endif
 .if defined(PKG_PRESERVE)
 @@ -31,27 +31,27 @@ PKG_DELETE_CMD?=	${PKG_TOOLS_BIN}/pkg_de
 PKG_INFO_CMD?=		${PKG_TOOLS_BIN}/pkg_info
 LINKFARM_CMD?=		${PKG_TOOLS_BIN}/linkfarm
 NATIVE_PKG_TOOLS_BIN?=		${PKG_TOOLS_BIN}
 NATIVE_PKG_ADD_CMD?=		${NATIVE_PKG_TOOLS_BIN}/pkg_add
 NATIVE_PKG_ADMIN_CMD?=		${NATIVE_PKG_TOOLS_BIN}/pkg_admin
 NATIVE_PKG_CREATE_CMD?=		${NATIVE_PKG_TOOLS_BIN}/pkg_create
 NATIVE_PKG_DELETE_CMD?=		${NATIVE_PKG_TOOLS_BIN}/pkg_delete
 NATIVE_PKG_INFO_CMD?=		${NATIVE_PKG_TOOLS_BIN}/pkg_info
 NATIVE_LINKFARM_CMD?=		${NATIVE_PKG_TOOLS_BIN}/linkfarm
 # Latest versions of tools required for correct pkgsrc operation.
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-PKGTOOLS_REQD=		20240125
+PKGTOOLS_REQD=		20240126
 .elif !empty(USE_PKG_ADMIN_DIGEST:M[Yy][Ee][Ss])
 PKGTOOLS_REQD=		20191008
 .else
 PKGTOOLS_REQD=		20100914
 .endif
 # Latest version of pkg_install required to extract packages
 PKGTOOLS_VERSION_REQD=	20091115
 # Environment used when invoking package tools.  This is used to pass
 # environment variables to the package install and deinstall scripts.
+#
 PKGTOOLS_ENV?=		# empty

 @@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.238 2024/01/03 12:32:59 gdt Exp $
+# $NetBSD: Makefile,v 1.239 2024/01/26 12:40:04 riastradh Exp $
 # Notes to package maintainers:
+#
 # Updating this package does not automatically necessitate bumping
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 PKGNAME=		pkg_install-${VERSION}
 PKGREVISION=		2
 CATEGORIES=		pkgtools
 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		https://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 LICENSE=		modified-bsd
 BOOTSTRAP_PKG=		yes
 SKIP_LICENSE_CHECK=	yes
 CONFLICTS+=		audit-packages-[0-9]*
 GNU_CONFIGURE=		yes

 @@ -1,50 +1,50 @@
-/*	$NetBSD: parse_cross.c,v 1.1 2024/01/26 03:24:49 riastradh Exp $	*/
+/*	$NetBSD: parse_cross.c,v 1.2 2024/01/26 12:40:04 riastradh Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: parse_cross.c,v 1.1 2024/01/26 03:24:49 riastradh Exp $");
+__RCSID("$NetBSD: parse_cross.c,v 1.2 2024/01/26 12:40:04 riastradh Exp $");
 #include "lib.h"
 #include "add.h"
 /*
  * ${OPSYS}/${MACHINE_ARCH} ${OS_VERSION}
+ *
  * or just
+ *
  * ${MACHINE_ARCH}
  */
 void
 parse_cross(const char *text, char **machine_arch, char **opsys,
     char **os_version)
+{
 	static const char safeset[] = /* XXX */
 	    "abcdefghijklmnopqrstuvwxyz"
 	    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	    "0123456789"
 	    "-._";
 	char *copy = xstrdup(text);
 	char *p = copy, *q, *r;
 	/*
 	 * If there's no /, treat it as a single MACHINE_ARCH.
 	 */
-	if (*(q = strchr(p, '/')) == '\0') {
+	if ((q = strchr(p, '/')) == NULL) {
 		*machine_arch = copy;
 		*opsys = NULL;
 		*os_version = NULL;
 	} else {
 		/*
 		 * NUL-terminate at the slash so p := text[0..slash)
 		 * is the OPSYS.
 		 */
 		*q++ = '\0';
 		/*
 		 * If there's no SPC, fail.
 		 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.190 2024/01/26 03:24:49 riastradh Exp $	*/
+/*	$NetBSD: version.h,v 1.191 2024/01/26 12:40:04 riastradh Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION 20240125
+#define PKGTOOLS_VERSION 20240126
 #endif /* _INST_LIB_VERSION_H_ */