From owner-svn-ports-all@FreeBSD.ORG  Fri Jul  5 12:29:35 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 AABB46B2;
 Fri,  5 Jul 2013 12:29:35 +0000 (UTC)
 (envelope-from bdrewery@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 9C8AD1A2E;
 Fri,  5 Jul 2013 12:29:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65CTZpg021415;
 Fri, 5 Jul 2013 12:29:35 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65CTZaW021414;
 Fri, 5 Jul 2013 12:29:35 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201307051229.r65CTZaW021414@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 5 Jul 2013 12:29:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322320 - 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: Fri, 05 Jul 2013 12:29:35 -0000

Author: bdrewery
Date: Fri Jul  5 12:29:35 2013
New Revision: 322320
URL: http://svnweb.freebsd.org/changeset/ports/322320

Log:
  - Fix pkg2ng due to UID/ID not being defined.
    Pkg-1.1.4 will define UID=0 when sourcing bsd.pkgng.mk directly.
    This extra defined(UID) can eventually be removed, but is needed
    for backwards compatibility for now.
  
  Reported by:	uqs
  Reviewed by:	bapt
  With hat:	portmgr

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Fri Jul  5 12:07:16 2013	(r322319)
+++ head/Mk/bsd.pkgng.mk	Fri Jul  5 12:29:35 2013	(r322320)
@@ -36,12 +36,6 @@ ACTUAL-PACKAGE-DEPENDS?= \
 		${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
 	fi
 
-# Redefine. pkg2ng calls directly 'make -f bsd.pkgng.mk' which needs UID to be defined
-
-.if !defined(UID)
-UID!=	${ID} -u
-.endif
-
 .if !target(fake-pkg)
 fake-pkg:
 .if !defined(NO_PKG_REGISTER)
@@ -267,7 +261,7 @@ check-already-installed:
 
 .if !target(deinstall)
 deinstall:
-.if ${UID} != 0 && !defined(INSTALL_AS_USER)
+.if defined(UID) && ${UID} != 0 && !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
 	@cd ${.CURDIR} && \
 		${SU_CMD} "${MAKE} ${.TARGET}"