From fc76be6cb20ebee523ae5049a2dd6fb259f1694d Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 27 Nov 2001 01:10:46 +0000
Subject: Oops, previous revision didn't set OPERA_DIR correctly.

---
 www/linux-opera7/files/patch-aa | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'www/linux-opera7/files')

diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 0dad53b..db78da6 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,5 +1,5 @@
---- install.sh.orig	Tue Nov 27 00:56:59 2001
-+++ install.sh	Tue Nov 27 01:01:20 2001
+--- install.sh.orig	Thu Nov 22 12:38:09 2001
++++ install.sh	Tue Nov 27 02:05:55 2001
 @@ -228,7 +228,16 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
@@ -18,19 +18,33 @@
  	;;
  
  	i[3456]86:Linux)
+@@ -477,10 +486,10 @@
+ 
+ # Opera enviroment
+ if test \"\${OPERA_DIR}\" = '' ; then 
+-  if test -d /usr/share/opera ; then 
+-    OPERA_DIR=/usr/share/opera
++  if test -d %%DATADIR%% ; then 
++    OPERA_DIR=%%DATADIR%%
+   else
+-    echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\"
++    echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\"
+     exit 1
+   fi
+ fi
 @@ -491,18 +500,11 @@
  for DIR in \\
      \"\${HOME}/.opera/plugins\" \\
      ${plugin_dir} \\
 -    /usr/lib/opera/plugins \\
 -    /usr/local/Acrobat4/Browsers/intellinux \\
-+    %%PREFIX%%/lib/opera/plugins \\
-+    %%PREFIX%%/Acrobat4/Browsers/intellinux \\
 -    /usr/java/jre1.3.1/plugin/i386/ns4 \\
 -    /usr/lib/RealPlayer8/Plugins \\
 -    /usr/lib/realplay/plugins \\
 -    /usr/lib/RealPlayer8 \\
 -    /usr/lib/realplay \\
++    %%PREFIX%%/lib/opera/plugins \\
++    %%PREFIX%%/Acrobat4/Browsers/intellinux \\
 +    %%PREFIX%%/java/linux-*jdk*/jre/plugin/i386/ns4 \\
      \"\${HOME}/.netscape/plugins\" \\
 -    /opt/netscape/plugins \\
-- 
cgit v1.1