 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.71 2022/05/09 15:35:31 nia Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.72 2022/06/07 10:04:25 jperkin Exp $
+#
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
 # Package-settable variables:
+#
 # USE_BSD_MAKEFILE
 #	Should be set to "yes" whenever a package uses a BSD-style
 #	Makefile. These Makefiles typically end with a line including
 #	<bsd.prog.mk>.
 # Keywords: bsd make bsd.prog.mk
 # USE_IMAKE
 @@ -99,13 +99,20 @@ PKG_SHLIBTOOL?=		${LOCALBASE}/bin/shlibt
 .endif
 LIBTOOL?=		${WRAPPER_BINDIR}/libtool
 SHLIBTOOL?=		${WRAPPER_BINDIR}/shlibtool
 .if defined(USE_LIBTOOL)
 LIBTOOL_REQD?=		2.4.2nb9
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 TOOL_DEPENDS+=		cross-libtool-base-${MACHINE_ARCH}>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../cross/cross-libtool-base
 .else
 TOOL_DEPENDS+=		libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
 .endif
 CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 .endif
 # PKGSRC_USE_MKTOOLS.  Cyclic dependencies prevent us from using mktools
 # when building cwrappers, so use the shell tools in that instance.
 .if ${_PKGSRC_USE_MKTOOLS} == "yes" && empty(PKGPATH:Mpkgtools/cwrappers)
 TOOL_DEPENDS+=		mktools-[0-9]*:../../pkgtools/mktools
 PKG_MKSYMLINKS?=	${LOCALBASE}/libexec/mktools/mk-buildlink-symlinks
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.421 2022/05/01 08:03:40 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.422 2022/06/07 10:04:25 jperkin Exp $
+#
 # This file includes the mk.conf file, which contains the user settings.
+#
 # Packages should include this file before any of the .if directives, as
 # well as before modifying variables like CFLAGS, LDFLAGS, and so on.
 # Otherwise the behavior may be unexpected.
+#
 # When mk.conf is included by this file, the following variables are
 # defined:
+#
 # ACCEPTABLE_LICENSES
 #	This variable is set to the list of Open Source licenses. See
 #	mk/license.mk for details.
 @@ -864,26 +864,34 @@ _PKGSRC_USE_CTF=	no
 # Enable cwrappers if not building the wrappers themselves, and if the user has
 # explicitly requested them, or if they haven't but the compiler/platform is
 # known to support them.
 .if empty(PKGPATH:Mpkgtools/cwrappers) && \
     (${USE_CWRAPPERS:tl} == "yes" || \
     (${USE_CWRAPPERS:tl} == "auto" && \
      ${_OPSYS_SUPPORTS_CWRAPPERS:Uno} == "yes"))
 _USE_CWRAPPERS=		yes
 .else
 _USE_CWRAPPERS=		no
 .endif
 # Use C-based tools to speed up pkgsrc infrastructure tasks.
 .if empty(PKGPATH:Mpkgtools/mktools) && \
     ${PKGSRC_USE_MKTOOLS:tl} == "yes"
 _PKGSRC_USE_MKTOOLS=	yes
 .else
 _PKGSRC_USE_MKTOOLS=	no
 .endif
 # Wrapper framework definitions
 .include "wrapper/wrapper-defs.mk"
 # Binary emulator framework definitions
 .if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
 .  include "emulator/emulator-vars.mk"
 .endif
 # System features framework
 .include "features/features-vars.mk"
 .if ${_USE_NEW_PKGINSTALL:Uno} != "no"
 # Init services framework

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.247 2021/06/08 10:10:02 bouyer Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.248 2022/06/07 10:04:25 jperkin Exp $
+#
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # 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
 @@ -650,49 +650,90 @@ BUILDLINK_FILES_CMD.${_pkg_}?=						\
 # _BLNK_FILES_CMD.<pkg> combines BUILDLINK_FILES_CMD.<pkg> and
 # BUILDLINK_FILES.<pkg> into one command that outputs all of the files
 # for <pkg> relative to ${BUILDLINK_PREFIX.<pkg>}.
+#
 _BLNK_FILES_CMD.${_pkg_}=	(
 _BLNK_FILES_CMD.${_pkg_}+=	${BUILDLINK_FILES_CMD.${_pkg_}};
 .for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}}
 _BLNK_FILES_CMD.${_pkg_}+=	${LS} -1 ${_filepattern_} 2>/dev/null || ${TRUE};
 .endfor
 _BLNK_FILES_CMD.${_pkg_}+=	)
 _BLNK_FILES_CMD.${_pkg_}+=	| ${SORT} -u
 ${_BLNK_COOKIE.${_pkg_}}:
-	${RUN}					\
+	${RUN}								\
 	case "${BUILDLINK_PREFIX.${_pkg_}}" in				\
 	*not_found)							\
 		${ERROR_MSG} "${BUILDLINK_API_DEPENDS.${_pkg_}} is not installed; can't buildlink files."; \
 		exit 1;							\
 		;;							\
 	esac
 	${RUN} [ ${X11BASE:Q}"" ] || {					\
 		${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \
 		exit 1;							\
+	}
 .if ${_PKGSRC_USE_MKTOOLS} == "yes"
 	${RUN}								\
 	case "${BUILDLINK_PREFIX.${_pkg_}}" in				\
 	${LOCALBASE})   buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;		\
 	*)              buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	esac;								\
 	[ -z "${BUILDLINK_PREFIX.${_pkg_}:Q}" ] ||			\
 	cd ${BUILDLINK_PREFIX.${_pkg_}} &&				\
 	${_BLNK_FILES_CMD.${_pkg_}} |					\
 	while read file; do						\
 		src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \
 		[ -f "$$src" ] || continue;				\
 		dest="$$buildlink_dir/$$file";				\
 		if [ -n "${BUILDLINK_FNAME_TRANSFORM.${_pkg_}:Q}" ]; then \
 			dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_FNAME_TRANSFORM.${_pkg_}}`; \
 		fi;							\
 		case "$$src" in						\
 		*.la)							\
 			dir="$${dest%/*}";				\
 			if [ ! -d "$$dir" ]; then			\
 				${MKDIR} "$$dir";			\
 			fi;						\
 			${_BLNK_LT_ARCHIVE_FILTER.${_pkg_}}		\
 				"$$src" > "$$dest";			\
 			;;						\
 		*)							\
 			${ECHO} "$$dest -> $$src" >>${.TARGET};		\
 			;;						\
 		esac;							\
 	done;								\
 	if [ -f ${.TARGET} ]; then					\
 		${PKG_MKSYMLINKS} < ${.TARGET} || {			\
 			${ECHO} "Removing ${.TARGET}";			\
 			${RM} -f ${.TARGET};				\
 			exit 1;						\
 		}							\
 	else								\
 		${TOUCH} ${TOUCH_FLAGS} ${.TARGET};			\
 	fi
 .else
 	${RUN}								\
 	case "${BUILDLINK_PREFIX.${_pkg_}}" in				\
 	${LOCALBASE})   buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;		\
 	*)              buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	esac;								\
 	[ -z "${BUILDLINK_PREFIX.${_pkg_}:Q}" ] ||			\
 	cd ${BUILDLINK_PREFIX.${_pkg_}} &&				\
 	${_BLNK_FILES_CMD.${_pkg_}} |					\
 	while read file; do						\
-		src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file";		\
+		src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \
-		if [ ! -f "$$src" ]; then					\
+		if [ ! -f "$$src" ]; then				\
 			msg="$$src: not found";				\
 		else							\
 			if [ -z "${BUILDLINK_FNAME_TRANSFORM.${_pkg_}:Q}" ]; then \
 				dest="$$buildlink_dir/$$file";		\
 				msg="$$src";				\
 			else						\
 				dest="$$buildlink_dir/$$file";		\
 				dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_FNAME_TRANSFORM.${_pkg_}}`; \
 				msg="$$src -> $$dest";			\
 			fi;						\
 			dir=`${DIRNAME} "$$dest"`;			\
 			if [ ! -d "$$dir" ]; then			\
 				${MKDIR} "$$dir";			\
 @@ -703,26 +744,27 @@ ${_BLNK_COOKIE.${_pkg_}}:
 			case "$$src" in					\
 			*.la)						\
 				${_BLNK_LT_ARCHIVE_FILTER.${_pkg_}}	\
 					"$$src" > "$$dest";		\
 				msg="$$msg (created)";			\
 				;;					\
 			*)						\
 				${LN} -sf "$$src" "$$dest";		\
 				;;					\
 			esac;						\
 		fi;							\
 		${ECHO} "$$msg" >> ${.TARGET};				\
 	done
 .endif
 # _BLNK_LT_ARCHIVE_FILTER.${_pkg_} is a command-line filter used in
 # the previous target for transforming libtool archives (*.la) to
 # allow libtool to properly interact with buildlink at link time by
 # linking against the libraries pointed to by symlinks in ${BUILDLINK_DIR}.
+#
 _BLNK_LT_ARCHIVE_FILTER.${_pkg_}=	\
 	${SED} ${_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}}
 _BLNK_SEP=	\ \`\"':;,
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}=	# empty
+#
 # Modify the dependency_libs line by changing all full paths to other *.la

 @@ -1,37 +1,46 @@
-# $NetBSD: mk.conf,v 1.333 2022/06/07 09:35:15 wiz Exp $
+# $NetBSD: mk.conf,v 1.334 2022/06/07 10:04:25 jperkin Exp $
+#
 # This file provides default values for variables that may be overridden
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 USE_CWRAPPERS?=	auto
 # Build packages using the newer pkgtools/cwrappers infrastructure, which can
 # significantly speed up builds and use fewer resources.  Some compiler and
 # platform combinations are not currently handled by cwrappers, so currently
 # the default is "auto" which enables cwrappers automatically if the platform
 # _OPSYS_SUPPORTS_CWRAPPERS variable is set to "yes".
+#
 # Possible: yes, no, auto
 # Default: auto (automatic detection, see above)
 PKGSRC_USE_MKTOOLS?=	no
 # Use C-based tools for various parts of the infrastructure instead of the
 # slower shell-based constructs.  Significantly improves performance, but
 # not enabled by default until portability across all platforms has been
 # confirmed.
+#
 # Possible: yes, no
 # Default: no
 USE_PKG_ADMIN_DIGEST?=	no
 # Record file digests instead of extracing the NetBSD RCS ID from files.
+#
 # Possible: yes, no
 # Default: no
 #ALLOW_VULNERABLE_PACKAGES=
 # allow the user to build packages which are known to be vulnerable to
 # security exploits
 # Possible: yes, no
 # Default: yes
 #AUDIT_PACKAGES_FLAGS=