From 5258906cca0e9bfad8733c448d803495b41d5b71 Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Wed, 21 May 2003 10:56:11 +0000
Subject: [PATCH] Fix for the linux-sun-java&linux-blackdown-java 1.3.1
 plugins.

PR:		ports/52503
Submitted by:	Mezz <mezz7@cox.net> (maintainer)
---
 www/linux-opera7/Makefile               |  1 +
 www/linux-opera7/files/patch-install.sh | 29 ++++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index f8530abf4336..8a59044a8a16 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	7.11.20030515
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/711/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
diff --git a/www/linux-opera7/files/patch-install.sh b/www/linux-opera7/files/patch-install.sh
index c52ebe7bd184..e1ecec30a68f 100644
--- a/www/linux-opera7/files/patch-install.sh
+++ b/www/linux-opera7/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Mon May 19 17:50:30 2003
-+++ install.sh	Mon May 19 19:00:08 2003
+--- install.sh.orig	Thu May 15 11:36:54 2003
++++ install.sh	Tue May 20 18:11:25 2003
 @@ -712,27 +712,17 @@
  
      wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
@@ -52,7 +52,7 @@
  
      wrapper_file="${wrapper_dir}/opera"
      
-@@ -839,28 +823,11 @@
+@@ -839,28 +823,13 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -79,12 +79,14 @@
 -	j2re1.3.1 \\
 -	jre1.3.1 \\
 -	j2re1.3 \\
-+	linux-blackdown-jdk1.[34].1/jre \\
-+	linux-sun-jdk1.[34].1/jre \\
++	linux-blackdown-jdk1.3.1/jre \\
++	linux-blackdown-jdk1.4.1/jre \\
++	linux-sun-jdk1.3.1/jre \\
++	linux-sun-jdk1.4.1/jre \\
  	; do
  	for PREFIX in \${PREFIXES}; do
  	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -905,11 +872,7 @@
+@@ -905,11 +874,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -93,11 +95,12 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat[45]/bin \\
++    %%LOCALBASE%%/Acrobat4/bin \\
++    %%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1106,8 +1069,9 @@
+@@ -1106,8 +1072,9 @@
          chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
  
       # System wide configuration files
@@ -108,7 +111,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1134,6 +1098,7 @@
+@@ -1134,6 +1101,7 @@
  			;;
  		esac
  	    done
@@ -116,7 +119,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1238,22 +1203,22 @@
+@@ -1238,22 +1206,22 @@
  
      debug_msg 0 "in icons()"
  
@@ -151,7 +154,7 @@
      fi
    
      if test ! -d /etc/X11/wmconfig/; then
-@@ -1319,36 +1284,36 @@
+@@ -1319,36 +1287,36 @@
        fi
        # end /opt/gnome share
  
@@ -210,7 +213,7 @@
     fi
     # Add ximian here
  }
-@@ -1385,12 +1350,12 @@
+@@ -1385,12 +1353,12 @@
  
      fi  
      
@@ -228,7 +231,7 @@
      fi
  }
  
-@@ -1414,8 +1379,8 @@
+@@ -1414,8 +1382,8 @@
        fi
        if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi