diff options
| author | is <is@pkgsrc.org> | 2008-08-11 14:29:20 +0000 |
|---|---|---|
| committer | is <is@pkgsrc.org> | 2008-08-11 14:29:20 +0000 |
| commit | 6ba160b4515d2364d5160f12f4865383ff7367d0 (patch) | |
| tree | 38c145e9de59c813b45bc5d1c3432da0a53235ec /print/acroread7 | |
| parent | 279784a4556f1091b400cec04103155837f25905 (diff) | |
| download | pkgsrc-6ba160b4515d2364d5160f12f4865383ff7367d0.tar.gz | |
Protect against LD_LIBRARY_PATH forcing us to load NetBSD shared libraries.
Diffstat (limited to 'print/acroread7')
| -rw-r--r-- | print/acroread7/Makefile | 4 | ||||
| -rw-r--r-- | print/acroread7/files/acroread.diff | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile index 03e7afd59ed..001165ecea3 100644 --- a/print/acroread7/Makefile +++ b/print/acroread7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2008/06/12 02:14:43 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2008/08/11 14:29:20 is Exp $ DISTNAME= acroread7 # overridden below PKGNAME= acroread7-7.0.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/ diff --git a/print/acroread7/files/acroread.diff b/print/acroread7/files/acroread.diff index 305dcc819b6..02e9e4c9bc2 100644 --- a/print/acroread7/files/acroread.diff +++ b/print/acroread7/files/acroread.diff @@ -1,7 +1,20 @@ -$NetBSD: acroread.diff,v 1.5 2007/09/13 20:19:09 wiz Exp $ +$NetBSD: acroread.diff,v 1.6 2008/08/11 14:29:20 is Exp $ --- acroread.orig 2006-05-23 01:33:35.000000000 +0000 +++ acroread 2006-06-13 13:55:00.000000000 +0000 +@@ -1,6 +1,12 @@ + #!/bin/sh + # + ++case `/usr/bin/uname` in ++NetBSD) case `/usr/bin/uname -p` in ++ i386) LD_LIBRARY_PATH=""; export LD_LIBRARY_PATH;; ++ x86_64) LD_LIBRARY_PATH=""; export LD_LIBRARY_PATH;; ++ esac;; ++esac + + setLangENU() + { @@ -233,7 +233,7 @@ else ScriptDirectory="`/bin/pwd 2> /dev/null`" cd "$cwd" |