From owner-svn-ports-all@FreeBSD.ORG Mon May 4 08:55:05 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 954C710A; Mon, 4 May 2015 08:55:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6A2861138; Mon, 4 May 2015 08:55:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t448t5e9075082; Mon, 4 May 2015 08:55:05 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t448t5Db075081; Mon, 4 May 2015 08:55:05 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201505040855.t448t5Db075081@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 4 May 2015 08:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385385 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2015 08:55:05 -0000 Author: bapt Date: Mon May 4 08:55:04 2015 New Revision: 385385 URL: https://svnweb.freebsd.org/changeset/ports/385385 Log: Remove unintended change from r385384 those will come later Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon May 4 08:53:20 2015 (r385384) +++ head/Mk/bsd.port.mk Mon May 4 08:55:04 2015 (r385385) @@ -2146,21 +2146,32 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS READLINK_CMD?= /usr/bin/readlink +# Determine whether or not we can use rootly owner/group functions. +.if ${UID} == 0 +_BINOWNGRP= -o ${BINOWN} -g ${BINGRP} +_SHROWNGRP= -o ${SHAREOWN} -g ${SHAREGRP} +_MANOWNGRP= -o ${MANOWN} -g ${MANGRP} +.else +_BINOWNGRP= +_SHROWNGRP= +_MANOWNGRP= +.endif + _SHAREMODE?= 0644 # A few aliases for *-install targets INSTALL_PROGRAM= \ - ${INSTALL} ${COPY} ${STRIP} -m ${BINMODE} + ${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m ${BINMODE} INSTALL_KLD= \ - ${INSTALL} ${COPY} -m ${BINMODE} + ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} INSTALL_LIB= \ - ${INSTALL} ${COPY} ${STRIP} -m ${SHAREMODE} + ${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE} INSTALL_SCRIPT= \ - ${INSTALL} ${COPY} -m ${BINMODE} + ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} INSTALL_DATA= \ - ${INSTALL} ${COPY} -m ${_SHAREMODE} + ${INSTALL} ${COPY} ${_SHROWNGRP} -m ${_SHAREMODE} INSTALL_MAN= \ - ${INSTALL} ${COPY} -m ${MANMODE} + ${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE} INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ BSD_INSTALL_LIB="${INSTALL_LIB}" \ @@ -3392,7 +3403,7 @@ do-configure: if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ - INSTALL="/usr/bin/install -c " \ + INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_LIB="${INSTALL_LIB}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \