From owner-p4-projects@FreeBSD.ORG  Mon Aug  7 08:31:45 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 59A7516A4DE; Mon,  7 Aug 2006 08:31:45 +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 34C8716A4DA
	for <perforce@FreeBSD.org>; Mon,  7 Aug 2006 08:31:45 +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 05EAD43DBD
	for <perforce@FreeBSD.org>; Mon,  7 Aug 2006 08:29:49 +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 k778SdMU023010
	for <perforce@FreeBSD.org>; Mon, 7 Aug 2006 08:28:39 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k778SdfS023007
	for perforce@freebsd.org; Mon, 7 Aug 2006 08:28:39 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Mon, 7 Aug 2006 08:28:39 GMT
Message-Id: <200608070828.k778SdfS023007@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 103370 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, 07 Aug 2006 08:31:45 -0000

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

Change 103370 by gabor@gabor_spitfire on 2006/08/07 08:28:35

	This change is to fix LDCONFIG_UNEXEC_CMD for DESTDIR.  When deinstalling,
	pkg_delete runs already chrooted, so chrooting the unexec ldconfig
	call was wrong.

Affected files ...

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

Differences ...

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

@@ -1392,21 +1392,22 @@
 .if defined(USE_LINUX_PREFIX)
 .if !defined(DESTDIR)
 LDCONFIG_CMD?=			${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
 LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
 .endif
-LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
 .if !defined(DESTDIR)
 LDCONFIG_CMD?=			${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG} -m ${LDCONFIG_PLIST}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
 .else
 LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 LDCONFIG_PLIST_EXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -R
 .endif
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
 .endif
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg