Permalink
Browse files

Protect against LD_LIBRARY_PATH forcing us to load NetBSD shared libr…

…aries.
  • Loading branch information...
1 parent 2500475 commit da543a099036890b62dbfe6fbe269b971b98ea6f is committed Aug 11, 2008
Showing with 16 additions and 3 deletions.
  1. +2 −2 print/acroread7/Makefile
  2. +14 −1 print/acroread7/files/acroread.diff
View
@@ -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/
@@ -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"

0 comments on commit da543a0

Please sign in to comment.