Upgrade to 6.01.

PR:		ports/38611
Submitted by:	Øyvind Kolbu <oyvind@kebab.gaffel.nu>

9 files changed, 30 insertions, 33 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 64a59feb7fe8..01d8b3ca2731 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.0.20020510
+PORTVERSION=	6.01.20020523
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/final/en/qt_static/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/final/en/qt_static/
+MASTER_SITES=	http://opera.online.no/linux/601/final/en/qt_static/ \
+		ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
 		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
 
-#FORBIDDEN=	Known javascript-related security hole
-
 USE_BZIP2=	yes
 USE_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 9a3b284a2e5c..7a05f1c0eba7 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = 8d7a88ea7be88032594e12ca85f744b8
+MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
index 34aa63f55aa6..ac0e3d9a46af 100644
--- a/www/linux-opera-devel/files/patch-aa
+++ b/www/linux-opera-devel/files/patch-aa
@@ -1,12 +1,13 @@
---- install.sh.orig	Fri Apr 12 14:01:42 2002
-+++ install.sh	Fri Apr 26 13:41:08 2002
-@@ -727,6 +727,15 @@
+--- install.sh.orig	Thu May 23 13:34:04 2002
++++ install.sh	Mon May 27 14:25:51 2002
+@@ -737,6 +737,16 @@
      /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
  	;;
  
 +	i386:FreeBSD)
 +	    wrapper_plugin_paths="
 +    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/lib/RealPlayer8/Plugins \\
 +    %%PREFIX%%/lib/netscape-linux/plugins \\
 +    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
 +    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
@@ -16,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -783,7 +792,7 @@
+@@ -799,7 +809,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 64a59feb7fe8..01d8b3ca2731 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.0.20020510
+PORTVERSION=	6.01.20020523
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/final/en/qt_static/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/final/en/qt_static/
+MASTER_SITES=	http://opera.online.no/linux/601/final/en/qt_static/ \
+		ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
 		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
 
-#FORBIDDEN=	Known javascript-related security hole
-
 USE_BZIP2=	yes
 USE_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 9a3b284a2e5c..7a05f1c0eba7 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = 8d7a88ea7be88032594e12ca85f744b8
+MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
index 34aa63f55aa6..ac0e3d9a46af 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/files/patch-aa
@@ -1,12 +1,13 @@
---- install.sh.orig	Fri Apr 12 14:01:42 2002
-+++ install.sh	Fri Apr 26 13:41:08 2002
-@@ -727,6 +727,15 @@
+--- install.sh.orig	Thu May 23 13:34:04 2002
++++ install.sh	Mon May 27 14:25:51 2002
+@@ -737,6 +737,16 @@
      /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
  	;;
  
 +	i386:FreeBSD)
 +	    wrapper_plugin_paths="
 +    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/lib/RealPlayer8/Plugins \\
 +    %%PREFIX%%/lib/netscape-linux/plugins \\
 +    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
 +    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
@@ -16,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -783,7 +792,7 @@
+@@ -799,7 +809,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 64a59feb7fe8..01d8b3ca2731 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.0.20020510
+PORTVERSION=	6.01.20020523
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/final/en/qt_static/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/final/en/qt_static/
+MASTER_SITES=	http://opera.online.no/linux/601/final/en/qt_static/ \
+		ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
 		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
 
-#FORBIDDEN=	Known javascript-related security hole
-
 USE_BZIP2=	yes
 USE_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index 9a3b284a2e5c..7a05f1c0eba7 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = 8d7a88ea7be88032594e12ca85f744b8
+MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 34aa63f55aa6..ac0e3d9a46af 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,12 +1,13 @@
---- install.sh.orig	Fri Apr 12 14:01:42 2002
-+++ install.sh	Fri Apr 26 13:41:08 2002
-@@ -727,6 +727,15 @@
+--- install.sh.orig	Thu May 23 13:34:04 2002
++++ install.sh	Mon May 27 14:25:51 2002
+@@ -737,6 +737,16 @@
      /usr/lib/j2re1.3/plugin/i386/netscape4 \\"
  	;;
  
 +	i386:FreeBSD)
 +	    wrapper_plugin_paths="
 +    %%PREFIX%%/Acrobat[45]/bin \\
++    %%PREFIX%%/lib/RealPlayer8/Plugins \\
 +    %%PREFIX%%/lib/netscape-linux/plugins \\
 +    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
 +    %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\
@@ -16,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -783,7 +792,7 @@
+@@ -799,7 +809,7 @@
  
  # Acrobat Reader
  for BINDIR in \\