[pkgsrc/trunk]: pkgsrc/misc/openoffice-bin Adding the pkgsrc library path is ...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96a795370d26
branches:  trunk
changeset: 500603:96a795370d26
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Mon Oct 10 20:08:09 2005 +0000

description:
Adding the pkgsrc library path is useful only for a native version. This can
lead to native libraries being found instead of the required emulation ones
which in turn prevents startup of the program.
Noted by Geert Hendrickx in private mail.

diffstat:

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

diffs (32 lines):

diff -r 8233b04b0358 -r 96a795370d26 misc/openoffice-bin/Makefile
--- a/misc/openoffice-bin/Makefile      Mon Oct 10 20:04:26 2005 +0000
+++ b/misc/openoffice-bin/Makefile      Mon Oct 10 20:08:09 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/03 16:09:43 mrauch Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/10 20:08:09 mrauch Exp $
 
 PKGNAME=               openoffice-bin-${OO_VER}
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
diff -r 8233b04b0358 -r 96a795370d26 misc/openoffice-bin/files/soffice
--- a/misc/openoffice-bin/files/soffice Mon Oct 10 20:04:26 2005 +0000
+++ b/misc/openoffice-bin/files/soffice Mon Oct 10 20:08:09 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: soffice,v 1.3 2005/10/03 15:53:34 mrauch Exp $
+#      $NetBSD: soffice,v 1.4 2005/10/10 20:08:09 mrauch Exp $
 #
 SOINST=@@PREFIX@@/OpenOffice.org@@OO_VER@@
 [ "X$SOFFICE" = "X" ] && SOFFICE=$HOME/OpenOffice.org@@OO_VER@@
@@ -62,8 +62,4 @@
 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 "$@"