From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 25 12:24:11 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 57EAD6B9;
 Tue, 25 Jun 2013 12:24:11 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 49C48182E;
 Tue, 25 Jun 2013 12:24:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PCOBZQ097667;
 Tue, 25 Jun 2013 12:24:11 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5PCOATs097662;
 Tue, 25 Jun 2013 12:24:10 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306251224.r5PCOATs097662@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 25 Jun 2013 12:24:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321737 - 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jun 2013 12:24:11 -0000

Author: bapt
Date: Tue Jun 25 12:24:10 2013
New Revision: 321737
URL: http://svnweb.freebsd.org/changeset/ports/321737

Log:
  Define UID earlier so that it can be used inside bsd.pkng.mk
  Allow make deinstall to prompt for su if run as a user if using pkgng
  
  Reported by:	jhb, dim
  Submitted by:	jhb

Modified:
  head/Mk/bsd.pkgng.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Tue Jun 25 12:10:02 2013	(r321736)
+++ head/Mk/bsd.pkgng.mk	Tue Jun 25 12:24:10 2013	(r321737)
@@ -262,6 +262,12 @@ check-already-installed:
 
 .if !target(deinstall)
 deinstall:
+.if ${UID} != 0 && !defined(INSTALL_AS_USER)
+	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
+	@cd ${.CURDIR} && \
+		${SU_CMD} "${MAKE} ${.TARGET}"
+	@${ECHO_MSG} "===>  Returning to user credentials"
+.else
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN}"
 	@if ${PKG_INFO} -e ${PKGORIGIN}; then \
 		p=`${PKG_INFO} -q ${PKGORIGIN}`; \
@@ -272,5 +278,6 @@ deinstall:
 	fi
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
+.endif
 
 .endif # defined(_POSTMKINCLUDED)

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Jun 25 12:10:02 2013	(r321736)
+++ head/Mk/bsd.port.mk	Tue Jun 25 12:24:10 2013	(r321737)
@@ -1628,6 +1628,10 @@ PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:
 .endif
 .endif
 
+.if !defined(UID)
+UID!=	${ID} -u
+.endif
+
 # Check the compatibility layer for amd64/ia64
 
 .if ${ARCH} == "amd64" || ${ARCH} =="ia64"
@@ -2308,9 +2312,6 @@ MTREE_ARGS?=	-U ${MTREE_FOLLOWS_SYMLINKS
 READLINK_CMD?=	/usr/bin/readlink
 
 # Determine whether or not we can use rootly owner/group functions.
-.if !defined(UID)
-UID!=	${ID} -u
-.endif
 .if ${UID} == 0
 _BINOWNGRP=	-o ${BINOWN} -g ${BINGRP}
 _SHROWNGRP=	-o ${SHAREOWN} -g ${SHAREGRP}