From owner-p4-projects@FreeBSD.ORG  Thu Jun 21 17:23:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8B3216A474; Thu, 21 Jun 2007 17:23:28 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F50716A46E
	for <perforce@freebsd.org>; Thu, 21 Jun 2007 17:23:28 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5584713C45E
	for <perforce@freebsd.org>; Thu, 21 Jun 2007 17:23:28 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5LHNR7t035657
	for <perforce@freebsd.org>; Thu, 21 Jun 2007 17:23:28 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LHNRfI035654
	for perforce@freebsd.org; Thu, 21 Jun 2007 17:23:27 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 21 Jun 2007 17:23:27 GMT
Message-Id: <200706211723.l5LHNRfI035654@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122102 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2007 17:23:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=122102

Change 122102 by gabor@gabor_server on 2007/06/21 17:22:52

	- Revert an accidentally submitted change
	- Use .TARGETS to pass the needed targets to the DESTDIR environment

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 (text+ko) ====

@@ -1093,14 +1093,10 @@
 # DESTDIR section to start a chrooted process if incoked with DESTDIR set
 #
 
-DESTDIR_LOCKFILE?=	/var/tmp/destdir.lock
-
-.if defined(DESTDIR) && !empty(DESTDIR) && !exists(${DESTDIR_LOCKFILE})
-_TARGET:=	${.TARGET}
+.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED)
 .BEGIN:
 	${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
-	${TOUCH} ${DESTDIR}${DESTDIR_LOCKFILE}
-	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} CHROOTED=YES ${_TARGET})"
+	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})"
 .else
 
 # Look for ${WRKSRC}/.../*.orig files, and (re-)create