From 92ed427cab1859699d818aae74ad7a8f97a81a08 Mon Sep 17 00:00:00 2001
From: mrauch <mrauch@pkgsrc.org>
Date: Mon, 3 Oct 2005 15:53:34 +0000
Subject: Add the pkgsrc library path to LD_LIBRARY_PATH so shared libraries
 from other packages which are loaded during runtime via dlopen() can be
 found. This is necessary for fixing PR pkg/30473.

---
 misc/openoffice-bin/files/soffice | 6 +++++-
 misc/openoffice/files/soffice     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'misc')

diff --git a/misc/openoffice-bin/files/soffice b/misc/openoffice-bin/files/soffice
index 8295480eb57..b1ad5950735 100755
--- a/misc/openoffice-bin/files/soffice
+++ b/misc/openoffice-bin/files/soffice
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: soffice,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $
+#	$NetBSD: soffice,v 1.3 2005/10/03 15:53:34 mrauch Exp $
 #
 SOINST=@@PREFIX@@/OpenOffice.org@@OO_VER@@
 [ "X$SOFFICE" = "X" ] && SOFFICE=$HOME/OpenOffice.org@@OO_VER@@
@@ -62,4 +62,8 @@ PTHREAD_DIAGASSERT=AEL
 export PTHREAD_DIAGASSERT
 fi
 
+# Let the standard pkgsrc libraries be found by dlopen()
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@@PREFIX@@/lib
+export LD_LIBRARY_PATH
+
 exec ${SOFFICE}/soffice "$@"
diff --git a/misc/openoffice/files/soffice b/misc/openoffice/files/soffice
index fde43d8440a..928949b2d65 100755
--- a/misc/openoffice/files/soffice
+++ b/misc/openoffice/files/soffice
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: soffice,v 1.5 2005/01/06 15:52:20 mrauch Exp $
+#	$NetBSD: soffice,v 1.6 2005/10/03 15:53:34 mrauch Exp $
 #
 SOINST=@@PREFIX@@/@@OPENOFFICE_VERSION@@
 [ "$SOFFICE" = "" ] && SOFFICE=$HOME/@@OPENOFFICE_VERSION@@
@@ -50,4 +50,8 @@ PTHREAD_DIAGASSERT=AEL
 export PTHREAD_DIAGASSERT
 fi
 
+# Let the standard pkgsrc libraries be found by dlopen()
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@@PREFIX@@/lib
+export LD_LIBRARY_PATH
+
 exec ${SOFFICE}/soffice "$@"
-- 
cgit v1.2.3