From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 11:42:51 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 B3D6316A4E2; Mon, 17 Jul 2006 11:42:51 +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 75E5016A4E0
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:42:51 +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 30EF643D6A
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:42:51 +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 k6HBgpFa079771
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:42:51 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HBgo0m079768
	for perforce@freebsd.org; Mon, 17 Jul 2006 11:42:50 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Mon, 17 Jul 2006 11:42:50 GMT
Message-Id: <200607171142.k6HBgo0m079768@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 101754 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:42:52 -0000

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

Change 101754 by gabor@gabor_spitfire on 2006/07/17 11:42:06

	Deinstall-all works now with chrooted pkg_info and pkg_delete.

Affected files ...

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

Differences ...

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

@@ -4270,6 +4270,7 @@
 		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
 .else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN}"
 	@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 	if [ -n "$${deinstall_names}" ]; then \
@@ -4280,6 +4281,18 @@
 	else \
 		${ECHO_MSG} "===>   ${PKGORIGIN} not installed, skipping"; \
 	fi
+.else
+	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN} from ${DESTDIR}"
+	@deinstall_names=`${CHROOT} ${DESTDIR} ${PKG_INFO} -q -O ${PKGORIGIN}`; \
+	if [ -n "$${deinstall_names}" ]; then \
+		for d in $${deinstall_names}; do \
+			${ECHO_MSG} "===>   Deinstalling $${d} from ${DESTDIR}"; \
+			${CHROOT} ${DESTDIR} ${PKG_DELETE} -f $${d}; \
+		done; \
+	else \
+		${ECHO_MSG} "===>   ${PKGORIGIN} not installed in ${DESTDIR}, skipping"; \
+	fi
+.endif
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
 .endif