From owner-p4-projects@FreeBSD.ORG  Sun Jul  9 18:06:11 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 9F5AE16A4DF; Sun,  9 Jul 2006 18:06:10 +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 7192716A4DA
	for <perforce@FreeBSD.org>; Sun,  9 Jul 2006 18:06:10 +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 D348543D45
	for <perforce@FreeBSD.org>; Sun,  9 Jul 2006 18:06:08 +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 k69I68No041848
	for <perforce@FreeBSD.org>; Sun, 9 Jul 2006 18:06:08 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k69I684C041845
	for perforce@freebsd.org; Sun, 9 Jul 2006 18:06:08 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Sun, 9 Jul 2006 18:06:08 GMT
Message-Id: <200607091806.k69I684C041845@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 101147 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: Sun, 09 Jul 2006 18:06:11 -0000

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

Change 101147 by gabor@gabor_spitfire on 2006/07/09 18:05:09

	When packages conflict with DESTDIR set, clarify that they conflict
	in ${DESTDIR} and you have to remove them from ${DESTDIR}.

Affected files ...

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

Differences ...

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

@@ -3559,13 +3559,13 @@
 	done; \
 	if [ -n "$${conflicts_with}" ]; then \
 		${ECHO_MSG}; \
-		${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s): "; \
+		${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s) in ${DESTDIR}: "; \
 		for entry in $${conflicts_with}; do \
 			${ECHO_MSG} "      $${entry}"; \
 		done; \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "      They install files into the same place."; \
-		${ECHO_MSG} "      Please remove them first with pkg_delete(1)."; \
+		${ECHO_MSG} "      Please remove them first with pkg_delete(1) from ${DESTDIR}."; \
 		exit 1; \
 	fi
 .endif