From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 17:46:44 2006
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 774C116A4DF; Mon, 17 Jul 2006 17:46:44 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4E47216A4DD
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 17:46:44 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6C83E43D70
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 17:46:38 +0000 (GMT)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6HHkbhb022864
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 17:46:38 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HHkbrX022861
	for perforce@freebsd.org; Mon, 17 Jul 2006 17:46:37 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Mon, 17 Jul 2006 17:46:37 GMT
Message-Id: <200607171746.k6HHkbrX022861@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 101780 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: Mon, 17 Jul 2006 17:46:44 -0000

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

Change 101780 by gabor@gabor_spitfire on 2006/07/17 17:45:38

	Chroot a pkg_add command with -C if DESTDIR is set.

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#33 edit

Differences ...

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

@@ -4655,22 +4655,28 @@
 _DEPEND_ALWAYS=	0
 .endif
 
-### FIXME: that pkg_add should be fixed for DESTDIR
-
 _INSTALL_DEPENDS=	\
 		if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
 			subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
 			if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
-				${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
-				${PKG_ADD} $${subpkgfile}; \
+				if [ -z "${DESTDIR} ] ; then \
+					${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
+					${PKG_ADD} $${subpkgfile}; \
+				else \
+					${ECHO_MSG} "===>   Installing existing package $${subpkgfile} into ${DESTDIR}"; \
+					${PKG_ADD} -C ${DESTDIR} $${subpkgfile}; \
+				fi; \
 			else \
 			  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
 			fi; \
 		else \
 			(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-		fi ; \
-		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
-
+		fi; \
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+		else \
+			${ECHO_MSG} "===>   Returning to build of ${PKGNAME} for ${DESTDIR}"; \
+		fi
 
 .for deptype in EXTRACT PATCH FETCH BUILD RUN
 ${deptype:L}-depends: