From owner-p4-projects@FreeBSD.ORG  Thu Jun 22 22:53: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 097C116A6F6; Thu, 22 Jun 2006 22:53: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 CA5A416A6E9
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 22:53:13 +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 2114044F40
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 22:00:17 +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 k5MM0HfJ014960
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 22:00:17 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5MM0GSZ014957
	for perforce@freebsd.org; Thu, 22 Jun 2006 22:00:16 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Thu, 22 Jun 2006 22:00:16 GMT
Message-Id: <200606222200.k5MM0GSZ014957@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 99832 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, 22 Jun 2006 22:53:14 -0000

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

Change 99832 by gabor@spitfire on 2006/06/22 21:59:16

	Fix my previous submit.  That one only checked PKG_DBDIR if DESTDIR was
	set and only used pkg_info otherwise to determine if the given port
	is already installed, but in this case both method should be used.

Affected files ...

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

Differences ...

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

@@ -3648,7 +3648,7 @@
 						fi; \
 				done; \
 		fi;
-.else
+.endif
 		@if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
 				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
 						${ECHO_CMD} "===>   ${PKGNAME} is already installed"; \
@@ -3662,7 +3662,6 @@
 				${ECHO_CMD} "      in your environment or the \"make install\" command line."; \
 				exit 1; \
 		fi
-.endif
 .else
 	@${DO_NADA}
 .endif