Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2016 17:10:15 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411998 - head/lang/rust/files
Message-ID:  <201603271710.u2RHAFkY005013@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603271710.u2RHAFkY005013>