From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 11:20:14 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 84A3616A4F0; Mon, 17 Jul 2006 11:20:14 +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 2D84B16A4E8
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:20:14 +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 A46A143D78
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:20:10 +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 k6HBKABf076486
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:20:10 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HBKAA4076483
	for perforce@freebsd.org; Mon, 17 Jul 2006 11:20:10 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Mon, 17 Jul 2006 11:20:10 GMT
Message-Id: <200607171120.k6HBKAA4076483@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 101750 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 11:20:14 -0000

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

Change 101750 by gabor@gabor_spitfire on 2006/07/17 11:19:49

	Chroot pkg_info when checking if the port is already installed.

Affected files ...

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

Differences ...

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

@@ -3708,10 +3708,10 @@
 .if !target(check-already-installed)
 check-already-installed:
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
-		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed"
-		@${MKDIR} ${PKG_DBDIR}
 .if !defined(DESTDIR)
-		@already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
+		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed"; \
+		${MKDIR} ${PKG_DBDIR}; \
+		already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 		if [ -n "$${already_installed}" ]; then \
 				for p in $${already_installed}; do \
 						prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
@@ -3723,7 +3723,23 @@
 								fi; \
 						fi; \
 				done; \
-		fi;
+		fi
+.else
+		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed in ${DESTDIR}"; \
+		${MKDIR} ${PKG_DBDIR}; \
+		already_installed=`${CHROOT} ${DESTDIR} ${PKG_INFO} -q -O ${PKGORIGIN}`; \
+		if [ -n "$${already_installed}" ]; then \
+				for p in $${already_installed}; do \
+						prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
+						if [ "x${PREFIX}" = "x$${prfx}" ]; then \
+								df=`${CHROOT} ${DESTDIR} ${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \
+								if [ -n "$${df}" ]; then \
+										found_package=$${p}; \
+										break; \
+								fi; \
+						fi; \
+				done; \
+		fi
 .endif
 		@if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
 				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \