Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1538078570230000"
MIME-Version: 1.0
Date: Thu, 27 Sep 2018 20:02:50 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/etcmanage/patches
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20180927200250.3E921FBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	gdt
Date:		Thu Sep 27 20:02:50 UTC 2018

Added Files:
	pkgsrc/sysutils/etcmanage/patches: patch-BUILD-NetBSD

Log Message:
etcmanage: belatedly commit patch already in distinfo


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/etcmanage/patches/patch-BUILD-NetBSD

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


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

Added files:

Index: pkgsrc/sysutils/etcmanage/patches/patch-BUILD-NetBSD
diff -u /dev/null pkgsrc/sysutils/etcmanage/patches/patch-BUILD-NetBSD:1.1
--- /dev/null	Thu Sep 27 20:02:50 2018
+++ pkgsrc/sysutils/etcmanage/patches/patch-BUILD-NetBSD	Thu Sep 27 20:02:50 2018
@@ -0,0 +1,34 @@
+$NetBSD: patch-BUILD-NetBSD,v 1.1 2018/09/27 20:02:50 gdt Exp $
+
+Export RELEASEMACHINEDIR, and default it to $arch, so that using
+evbearmv7hf-el results in that being the subdir in releasedir, so that
+6/7 don't overwrite each other.
+
+Upstream has been notified, but perhaps this belongs in in build.sh.
+
+--- BUILD-NetBSD.orig	2016-05-21 19:35:53.000000000 +0000
++++ BUILD-NetBSD
+@@ -193,6 +193,9 @@ fi
+ 
+ # Parse fixed arguments.
+ cmd=$1
++# Note that arch will typically be a "uname -m" value, in simple
++# cases, or an alias that defines a combination of uname -m and -p,
++# like evbearmv7hf-el which maps to evbarm and earmv7hf.
+ arch=$2
+ 
+ # Make first-cut decision about UNPRIV (UNPRIV if non-root)
+@@ -248,9 +251,12 @@ export OBJDIR="$BUILDBASE"/"$arch"
+ # Place all destdirs together, separated by architecture.
+ export DESTDIR="$BUILDBASE"/destdir/"$arch"
+ 
+-# Releasedir has $arch subdirs by default, so omit implied "/$arch".
++# Note that RELEASEDIR is the parent directory, in which there is /$arch.
+ export RELEASEDIR="$BUILDBASE"/releasedir
+ 
++# build.sh uses $arch by default
++export RELEASEMACHINEDIR=$arch
++
+ if [ "$cmd" = "" ]; then
+     cmd=all
+     log "Command omitted - assuming \"all\""


--_----------=_1538078570230000--