From owner-svn-ports-head@freebsd.org  Sun Mar 27 17:10:16 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5F2CADF8F7;
 Sun, 27 Mar 2016 17:10:16 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A5DC91397;
 Sun, 27 Mar 2016 17:10:16 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2RHAFBi005014;
 Sun, 27 Mar 2016 17:10:15 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2RHAFkY005013;
 Sun, 27 Mar 2016 17:10:15 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201603271710.u2RHAFkY005013@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 27 Mar 2016 17:10:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411998 - head/lang/rust/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Mar 2016 17:10:17 -0000

Author: riggs
Date: Sun Mar 27 17:10:15 2016
New Revision: 411998
URL: https://svnweb.freebsd.org/changeset/ports/411998

Log:
  Fix staging error on systems where security/sudo is present
  
  PR:		207930
  Reported by:	pete@hayes.id.au, kib (via mail)

Added:
  head/lang/rust/files/patch-mk_install.mk   (contents, props changed)

Added: head/lang/rust/files/patch-mk_install.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/rust/files/patch-mk_install.mk	Sun Mar 27 17:10:15 2016	(r411998)
@@ -0,0 +1,28 @@
+--- mk/install.mk.orig	2016-03-01 19:18:54 UTC
++++ mk/install.mk
+@@ -15,12 +15,7 @@ RUN_INSTALLER = cd tmp/empty_dir && \
+ 		--mandir="$(DESTDIR)$(CFG_MANDIR)"
+ 
+ install:
+-ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
+-# Build the dist as the original user
+-	$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_install
+-else
+ 	$(Q)$(MAKE) prepare_install
+-endif
+ ifeq ($(CFG_DISABLE_DOCS),)
+ 	$(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --disable-ldconfig
+ endif
+@@ -33,12 +28,7 @@ endif
+ prepare_install: dist-tar-bins | tmp/empty_dir
+ 
+ uninstall:
+-ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
+-# Build the dist as the original user
+-	$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_uninstall
+-else
+ 	$(Q)$(MAKE) prepare_uninstall
+-endif
+ ifeq ($(CFG_DISABLE_DOCS),)
+ 	$(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --uninstall
+ endif