Upgrade to 6.0 Beta 2. I've only tested it cursorily, but it seems about

an order of magnitude faster than Beta 1, and doesn't crash in situations
where Beta 1 used to.

12 files changed, 108 insertions, 90 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 5d0f2718e148..1f3a61f66e56 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20020218
+OPERAVERSION=	6.0-20020412
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/beta1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/beta1/
+MASTER_SITES=	http://opera.online.no/linux/600/beta2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/beta2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index fa0127a5841f..b07e03f4a9b9 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020218.1-static-qt.i386.tar.gz) = 96bda7f08059881e2895ed0272c665be
+MD5 (opera-6.0-20020412.1-static-qt.i386.tar.gz) = a06666ffab302a02cbd4965f43656c68
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
index 47e0499bc5eb..6ba642547d46 100644
--- a/www/linux-opera-devel/files/patch-aa
+++ b/www/linux-opera-devel/files/patch-aa
@@ -1,25 +1,26 @@
---- install.sh.orig	Thu Dec  6 12:19:52 2001
-+++ install.sh	Wed Jan  9 13:33:42 2002
-@@ -683,18 +692,11 @@
- for DIR in \\
-     \"\${HOME}/.opera/plugins\" \\
-     ${plugin_dir} \\
--    /usr/lib/opera/plugins \\
--    /usr/local/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%%/linux-*jdk*/jre/plugin/i386/ns4 \\
-     \"\${HOME}/.netscape/plugins\" \\
--    /opt/netscape/plugins \\
--    /usr/lib/netscape/plugins \\
--    /usr/local/netscape/plugins \\
--    /usr/local/lib/netscape/plugins \\
-+    %%PREFIX%%/lib/netscape-linux/plugins \\
-     ; do
-     if test -d \${DIR} ; then 
- 	OPERA_PLUGIN_PATH=\"\${OPERA_PLUGIN_PATH}\":\"\${DIR}\"
+--- install.sh.orig	Fri Apr 12 14:01:42 2002
++++ install.sh	Sat Apr 20 16:50:05 2002
+@@ -727,6 +727,14 @@
+     /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
+ 	;;
+ 
++	i386:FreeBSD)
++	    wrapper_plugin_paths="
++    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
++    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
++    %%PREFIX%%/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
++	    ;;
++
+ 	mips*:Linux)
+ 	    wrapper_plugin_paths=''
+ 	;;
+@@ -783,7 +791,7 @@
+ 
+ # Acrobat Reader
+ for BINDIR in \\
+-    /usr/local/Acrobat[45]/bin \\
++    %%PREFIX%%/Acrobat[45]/bin \\
+     /usr/lib/Acrobat[45]/bin \\
+     /usr/X11R6/lib/Acrobat[45]/bin \\
+     /opt/Acrobat[45]/bin \\
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 0063fee77d67..3d138a7aacad 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -317,6 +317,7 @@ share/opera/help/interface.html
 share/opera/help/keyboard.html
 share/opera/help/languages.html
 share/opera/help/layout.html
+share/opera/help/license.txt
 share/opera/help/look.html
 share/opera/help/menus.html
 share/opera/help/mouse.html
@@ -332,6 +333,7 @@ share/opera/help/search.html
 share/opera/help/security.html
 share/opera/help/sounds.html
 share/opera/help/start.html
+share/opera/help/startup.txt
 share/opera/help/tipday.txt
 share/opera/help/windows.html
 share/opera/images/background.gif
@@ -348,11 +350,13 @@ share/opera/images/opera_48x48.png
 share/opera/images/operabanner.png
 share/opera/images/shared.gif
 share/opera/images/splash.png
+share/opera/images/startup1.png
+share/opera/images/startup2.png
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
-share/opera/plugins/libnpp.so.0.1.7
+share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
@@ -373,6 +377,7 @@ share/opera/unicode.dat
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
+@dirrm share/opera/locale
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 5d0f2718e148..1f3a61f66e56 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20020218
+OPERAVERSION=	6.0-20020412
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/beta1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/beta1/
+MASTER_SITES=	http://opera.online.no/linux/600/beta2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/beta2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index fa0127a5841f..b07e03f4a9b9 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020218.1-static-qt.i386.tar.gz) = 96bda7f08059881e2895ed0272c665be
+MD5 (opera-6.0-20020412.1-static-qt.i386.tar.gz) = a06666ffab302a02cbd4965f43656c68
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
index 47e0499bc5eb..6ba642547d46 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/files/patch-aa
@@ -1,25 +1,26 @@
---- install.sh.orig	Thu Dec  6 12:19:52 2001
-+++ install.sh	Wed Jan  9 13:33:42 2002
-@@ -683,18 +692,11 @@
- for DIR in \\
-     \"\${HOME}/.opera/plugins\" \\
-     ${plugin_dir} \\
--    /usr/lib/opera/plugins \\
--    /usr/local/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%%/linux-*jdk*/jre/plugin/i386/ns4 \\
-     \"\${HOME}/.netscape/plugins\" \\
--    /opt/netscape/plugins \\
--    /usr/lib/netscape/plugins \\
--    /usr/local/netscape/plugins \\
--    /usr/local/lib/netscape/plugins \\
-+    %%PREFIX%%/lib/netscape-linux/plugins \\
-     ; do
-     if test -d \${DIR} ; then 
- 	OPERA_PLUGIN_PATH=\"\${OPERA_PLUGIN_PATH}\":\"\${DIR}\"
+--- install.sh.orig	Fri Apr 12 14:01:42 2002
++++ install.sh	Sat Apr 20 16:50:05 2002
+@@ -727,6 +727,14 @@
+     /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
+ 	;;
+ 
++	i386:FreeBSD)
++	    wrapper_plugin_paths="
++    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
++    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
++    %%PREFIX%%/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
++	    ;;
++
+ 	mips*:Linux)
+ 	    wrapper_plugin_paths=''
+ 	;;
+@@ -783,7 +791,7 @@
+ 
+ # Acrobat Reader
+ for BINDIR in \\
+-    /usr/local/Acrobat[45]/bin \\
++    %%PREFIX%%/Acrobat[45]/bin \\
+     /usr/lib/Acrobat[45]/bin \\
+     /usr/X11R6/lib/Acrobat[45]/bin \\
+     /opt/Acrobat[45]/bin \\
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 0063fee77d67..3d138a7aacad 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -317,6 +317,7 @@ share/opera/help/interface.html
 share/opera/help/keyboard.html
 share/opera/help/languages.html
 share/opera/help/layout.html
+share/opera/help/license.txt
 share/opera/help/look.html
 share/opera/help/menus.html
 share/opera/help/mouse.html
@@ -332,6 +333,7 @@ share/opera/help/search.html
 share/opera/help/security.html
 share/opera/help/sounds.html
 share/opera/help/start.html
+share/opera/help/startup.txt
 share/opera/help/tipday.txt
 share/opera/help/windows.html
 share/opera/images/background.gif
@@ -348,11 +350,13 @@ share/opera/images/opera_48x48.png
 share/opera/images/operabanner.png
 share/opera/images/shared.gif
 share/opera/images/splash.png
+share/opera/images/startup1.png
+share/opera/images/startup2.png
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
-share/opera/plugins/libnpp.so.0.1.7
+share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
@@ -373,6 +377,7 @@ share/opera/unicode.dat
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
+@dirrm share/opera/locale
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 5d0f2718e148..1f3a61f66e56 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20020218
+OPERAVERSION=	6.0-20020412
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/beta1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/beta1/
+MASTER_SITES=	http://opera.online.no/linux/600/beta2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/beta2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index fa0127a5841f..b07e03f4a9b9 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020218.1-static-qt.i386.tar.gz) = 96bda7f08059881e2895ed0272c665be
+MD5 (opera-6.0-20020412.1-static-qt.i386.tar.gz) = a06666ffab302a02cbd4965f43656c68
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 47e0499bc5eb..6ba642547d46 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,25 +1,26 @@
---- install.sh.orig	Thu Dec  6 12:19:52 2001
-+++ install.sh	Wed Jan  9 13:33:42 2002
-@@ -683,18 +692,11 @@
- for DIR in \\
-     \"\${HOME}/.opera/plugins\" \\
-     ${plugin_dir} \\
--    /usr/lib/opera/plugins \\
--    /usr/local/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%%/linux-*jdk*/jre/plugin/i386/ns4 \\
-     \"\${HOME}/.netscape/plugins\" \\
--    /opt/netscape/plugins \\
--    /usr/lib/netscape/plugins \\
--    /usr/local/netscape/plugins \\
--    /usr/local/lib/netscape/plugins \\
-+    %%PREFIX%%/lib/netscape-linux/plugins \\
-     ; do
-     if test -d \${DIR} ; then 
- 	OPERA_PLUGIN_PATH=\"\${OPERA_PLUGIN_PATH}\":\"\${DIR}\"
+--- install.sh.orig	Fri Apr 12 14:01:42 2002
++++ install.sh	Sat Apr 20 16:50:05 2002
+@@ -727,6 +727,14 @@
+     /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
+ 	;;
+ 
++	i386:FreeBSD)
++	    wrapper_plugin_paths="
++    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
++    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
++    %%PREFIX%%/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
++	    ;;
++
+ 	mips*:Linux)
+ 	    wrapper_plugin_paths=''
+ 	;;
+@@ -783,7 +791,7 @@
+ 
+ # Acrobat Reader
+ for BINDIR in \\
+-    /usr/local/Acrobat[45]/bin \\
++    %%PREFIX%%/Acrobat[45]/bin \\
+     /usr/lib/Acrobat[45]/bin \\
+     /usr/X11R6/lib/Acrobat[45]/bin \\
+     /opt/Acrobat[45]/bin \\
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index 0063fee77d67..3d138a7aacad 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -317,6 +317,7 @@ share/opera/help/interface.html
 share/opera/help/keyboard.html
 share/opera/help/languages.html
 share/opera/help/layout.html
+share/opera/help/license.txt
 share/opera/help/look.html
 share/opera/help/menus.html
 share/opera/help/mouse.html
@@ -332,6 +333,7 @@ share/opera/help/search.html
 share/opera/help/security.html
 share/opera/help/sounds.html
 share/opera/help/start.html
+share/opera/help/startup.txt
 share/opera/help/tipday.txt
 share/opera/help/windows.html
 share/opera/images/background.gif
@@ -348,11 +350,13 @@ share/opera/images/opera_48x48.png
 share/opera/images/operabanner.png
 share/opera/images/shared.gif
 share/opera/images/splash.png
+share/opera/images/startup1.png
+share/opera/images/startup2.png
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
-share/opera/plugins/libnpp.so.0.1.7
+share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
@@ -373,6 +377,7 @@ share/opera/unicode.dat
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
+@dirrm share/opera/locale
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config