From 91f228411ea3017dd445aa3834c29fe970cfd94f Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <saper@saper.info>
Date: Tue, 25 Sep 2012 01:48:27 +0200
Subject: [PATCH] FreeBSD: Add /usr/dt/lib to runtime linker

Create $LOCALBASE/libdata/ldconfig/cde
which points the runtime linker to /usr/dt/lib

There is no need to invoke ldconfig manually
after this.
---
 cde/admin/IntegTools/post_install/freebsd/configShlibs.src | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cde/admin/IntegTools/post_install/freebsd/configShlibs.src b/cde/admin/IntegTools/post_install/freebsd/configShlibs.src
index 3807af30c..101ca50d2 100755
--- a/cde/admin/IntegTools/post_install/freebsd/configShlibs.src
+++ b/cde/admin/IntegTools/post_install/freebsd/configShlibs.src
@@ -78,6 +78,8 @@ FILESET=CDE-SHLIBS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
 CDE_CONF_TOP=CDE_CONFIGURATION_TOP
+LOCALBASE=/usr/local
+LDCONFIGFILE="${LOCALBASE}/libdata/ldconfig/cde"
 
   HandleOption $*
 
@@ -88,6 +90,7 @@ CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
     RemoveShlibFiles
 
+    rm -rf $LDCONFIGFILE
     /sbin/ldconfig -R
 
     VerifyInstalledFiles
@@ -97,7 +100,8 @@ CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
     MakeTheLink
 
-    /sbin/ldconfig -m "${DT_TOP}/lib"
+    echo "${DT_OPT}/lib" > $LDCONFIGFILE
+    /sbin/ldconfig -R
 
   elif [ "$OPERATION" = "verify" ]
   then