From owner-svn-src-all@FreeBSD.ORG  Thu Feb 18 10:48:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AA9F106566B;
	Thu, 18 Feb 2010 10:48:37 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 591C28FC13;
	Thu, 18 Feb 2010 10:48:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1IAmbsc041165;
	Thu, 18 Feb 2010 10:48:37 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1IAmbw7041163;
	Thu, 18 Feb 2010 10:48:37 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201002181048.o1IAmbw7041163@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Thu, 18 Feb 2010 10:48:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204034 - stable/8/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 10:48:37 -0000

Author: brucec
Date: Thu Feb 18 10:48:37 2010
New Revision: 204034
URL: http://svn.freebsd.org/changeset/base/204034

Log:
  MFC r203690:
  
  Xorg isn't treated as a distribution, so /usr/X11R6/lib shouldn't be
  configured when running ldconfig.
  
  PR:	bin/138945
  Approved by:	rrs (mentor)

Modified:
  stable/8/usr.sbin/sysinstall/package.c
Directory Properties:
  stable/8/usr.sbin/sysinstall/   (props changed)

Modified: stable/8/usr.sbin/sysinstall/package.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/package.c	Thu Feb 18 10:46:25 2010	(r204033)
+++ stable/8/usr.sbin/sysinstall/package.c	Thu Feb 18 10:48:37 2010	(r204034)
@@ -139,7 +139,7 @@ package_extract(Device *dev, char *name,
 
     /* If necessary, initialize the ldconfig hints */
     if (!file_readable("/var/run/ld-elf.so.hints"))
-	vsystem("ldconfig /usr/lib /usr/lib/compat /usr/local/lib /usr/X11R6/lib");
+	vsystem("ldconfig /usr/lib /usr/lib/compat /usr/local/lib");
 
     /* Be initially optimistic */
     ret = DITEM_SUCCESS;