PERFORCE change 101147 for review

[Gabor Kovesdan]

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

Change 101147 by gabor at 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