diff options
| author | mrauch <mrauch> | 2005-10-10 20:08:09 +0000 |
|---|---|---|
| committer | mrauch <mrauch> | 2005-10-10 20:08:09 +0000 |
| commit | 359cbd18a3c570aada54a9c1476f3b81c21451ce (patch) | |
| tree | c7650db8c95b29ac6ccd502bb0540de615e412ee /misc | |
| parent | b1bc487d594d3643bad99ea98b52d1fdfe961506 (diff) | |
| download | pkgsrc-359cbd18a3c570aada54a9c1476f3b81c21451ce.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.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice-bin/Makefile | 3 | ||||
| -rwxr-xr-x | misc/openoffice-bin/files/soffice | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index e8bfc054c70..3652c54f89c 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -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 --git a/misc/openoffice-bin/files/soffice b/misc/openoffice-bin/files/soffice index b1ad5950735..7d32b97e5d6 100755 --- a/misc/openoffice-bin/files/soffice +++ b/misc/openoffice-bin/files/soffice @@ -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 @@ 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 "$@" |