From owner-svn-src-user@FreeBSD.ORG  Sat Jun 12 05:16:37 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CEA51065673;
	Sat, 12 Jun 2010 05:16:37 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D7A28FC1C;
	Sat, 12 Jun 2010 05:16: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 o5C5Gbje099250;
	Sat, 12 Jun 2010 05:16:37 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5C5GbhJ099248;
	Sat, 12 Jun 2010 05:16:37 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201006120516.o5C5GbhJ099248@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 12 Jun 2010 05:16:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209088 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jun 2010 05:16:37 -0000

Author: dougb
Date: Sat Jun 12 05:16:37 2010
New Revision: 209088
URL: http://svn.freebsd.org/changeset/base/209088

Log:
  Apparently, in some circumstances it's necessary to run ldconfig -R when
  one moves shared libs from /usr/local/lib to /usr/local/lib/compat/pkg.
  So, add that to the -w code.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jun 12 04:41:13 2010	(r209087)
+++ user/dougb/portmaster/portmaster	Sat Jun 12 05:16:37 2010	(r209088)
@@ -3281,6 +3281,8 @@ if [ -n "$upg_port" -o -n "$ro_upg_port"
 
 			pm_sv Copying old shared libraries for -w
 			$PM_SU_CMD cp -p $temp ${LOCALBASE_COMPAT}/
+			pm_sv Running ldconfig
+			$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null
 		fi
 
 		pm_unlink $ldconfig_out ; unset ldconfig_out temp file