Received: by mail.netbsd.org (Postfix, from userid 605)
	id C701284EF9; Fri, 17 Apr 2020 12:35:12 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 4C46D84EE7
	for <pkgsrc-changes@NetBSD.org>; Fri, 17 Apr 2020 12:35:12 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id dRZ5QiKFb1_W for <pkgsrc-changes@netbsd.org>;
	Fri, 17 Apr 2020 12:35:11 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id CD5E084D86
	for <pkgsrc-changes@NetBSD.org>; Fri, 17 Apr 2020 12:35:11 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id CB2A2FB27; Fri, 17 Apr 2020 12:35:11 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_158712691191350"
MIME-Version: 1.0
Date: Fri, 17 Apr 2020 12:35:11 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: [pkgsrc-2020Q1] pkgsrc/mk/pkginstall
To: pkgsrc-changes@NetBSD.org
Reply-To: bsiegert@netbsd.org
X-Mailer: log_accum
Message-Id: <20200417123511.CB2A2FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_158712691191350
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Fri Apr 17 12:35:11 UTC 2020

Modified Files:
	pkgsrc/mk/pkginstall [pkgsrc-2020Q1]: files

Log Message:
Pullup ticket #6161 - requested by sborrill
mk/pkginstall: NetBSD 7 bugfix

Revisions pulled up:
- mk/pkginstall/files                                           1.11

---
   Module Name:	pkgsrc
   Committed By:	sborrill
   Date:		Wed Apr 15 13:33:32 UTC 2020

   Modified Files:
   	pkgsrc/mk/pkginstall: files

   Log Message:
   Work around a potential shell bug where "${FOO=${BAR%/*}}" does not work
   if quoted. Seen on NetBSD 7.

   #!/bin/sh
   in="/path/to/dir with space/file"

   : "${file=${in##*/}}"
   : "${dir=${in%/*}}"
   echo "dir:$dir"
   echo "file:$file"
   [ "$dir" = "$file" ] && echo "dir and file are same"

   Leads to errors when adding packages such as:
   ./+FILES: cannot create
   /var/db/pkg.refcount/files/etc/rc.d/xenguest//var/db/pkg/xe-guest-utilities-7.0.0:
   directory nonexistent


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 pkgsrc/mk/pkginstall/files

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


--_----------=_158712691191350
Content-Disposition: inline
Content-Length: 863
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/pkginstall/files
diff -u pkgsrc/mk/pkginstall/files:1.10 pkgsrc/mk/pkginstall/files:1.10.2.1
--- pkgsrc/mk/pkginstall/files:1.10	Tue Feb 11 01:21:25 2020
+++ pkgsrc/mk/pkginstall/files	Fri Apr 17 12:35:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.10 2020/02/11 01:21:25 rillig Exp $
+# $NetBSD: files,v 1.10.2.1 2020/04/17 12:35:11 bsiegert Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
@@ -98,8 +98,8 @@ esac
 
 CURDIR=`${PWD_CMD}`
 PKG_METADATA_DIR="${2-${CURDIR}}"
-: "${PKGNAME=${PKG_METADATA_DIR##*/}}"
-: "${PKG_DBDIR=${PKG_METADATA_DIR%/*}}"
+: ${PKGNAME="${PKG_METADATA_DIR##*/}"}
+: ${PKG_DBDIR="${PKG_METADATA_DIR%/*}"}
 : "${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}"
 PKG_REFCOUNT_FILES_DBDIR="${PKG_REFCOUNT_DBDIR}/files"
 


--_----------=_158712691191350--