summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrauch <mrauch@pkgsrc.org>2005-10-10 20:08:49 +0000
committermrauch <mrauch@pkgsrc.org>2005-10-10 20:08:49 +0000
commit86c7c4c7643f1abb001f5af304cce35999e8198d (patch)
tree5c128264fbf2cb74618b8c6ae21cfba4230e7705
parent0a927698c409bde9a953fea4d5804632bb3e244a (diff)
downloadpkgsrc-86c7c4c7643f1abb001f5af304cce35999e8198d.tar.gz
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.
-rw-r--r--misc/openoffice2-bin/Makefile3
-rw-r--r--misc/openoffice2-bin/files/soffice7
2 files changed, 3 insertions, 7 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 85e8f7ed040..84cfdc5aea5 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:39:53 mrauch Exp $
+# $NetBSD: Makefile,v 1.2 2005/10/10 20:08:49 mrauch Exp $
PKGNAME= openoffice2-bin-2.0.0rc2
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=contrib/rc/2.0.0rc2/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/misc/openoffice2-bin/files/soffice b/misc/openoffice2-bin/files/soffice
index b3ebbd0606c..a7212b438b3 100644
--- a/misc/openoffice2-bin/files/soffice
+++ b/misc/openoffice2-bin/files/soffice
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: soffice,v 1.1.1.1 2005/10/09 13:39:53 mrauch Exp $
+# $NetBSD: soffice,v 1.2 2005/10/10 20:08:49 mrauch Exp $
#
SOINST=@@PREFIX@@/openoffice.org@@OO_VER@@
@@ -20,9 +20,4 @@ fi
# default data seg size is too small for java
ulimit -d `ulimit -H -d`
-
-# Let the standard pkgsrc libraries be found by dlopen()
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@@PREFIX@@/lib
-export LD_LIBRARY_PATH
-
exec ${SOINST}/program/soffice "$@"