Upgrade to 6.12. Highly recommended as it fixes a security problem

for users who have disabled redirects.

Submitted by:	Hideyuki KURASHINA <rushani@jp.FreeBSD.org>
PR:		ports/49098

8 files changed, 22 insertions, 20 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index a20a27c9b18a..45038f6abe76 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.11.20021129
+PORTVERSION=	6.12.20030305
 CATEGORIES=	www
-MASTER_SITES=	http://opera.online.no/unix/freebsd/611/final/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/611/final/en/static/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
+MASTER_SITES=	http://opera.online.no/unix/freebsd/612/final/en/static/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/612/final/en/static/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index 20501c5bc961..911ecf3349a4 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.11-20021129.1-static-qt.i386.freebsd.tar.bz2) = 22ae9d276d28fa7d6b435d061c79f287
+MD5 (opera-6.12-20030305.1-static-qt.i386.freebsd.tar.bz2) = 1c1b2e5e7cadf849a87adb4805472da8
diff --git a/www/opera-devel/files/patch-aa b/www/opera-devel/files/patch-aa
index c47e455c137e..f96c76adbe95 100644
--- a/www/opera-devel/files/patch-aa
+++ b/www/opera-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Tue Oct 29 16:31:24 2002
-+++ install.sh	Mon Nov 11 19:34:42 2002
-@@ -1065,16 +1065,10 @@
+--- install.sh.orig	Tue Mar 11 15:29:39 2003
++++ install.sh	Tue Mar 11 15:30:46 2003
+@@ -1092,16 +1092,10 @@
  	mkdir $mkdirv $mkdirp $plugin_dir/
  	chmod $chmodv 755 $plugin_dir
  
@@ -19,7 +19,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1101,6 +1095,7 @@
+@@ -1128,6 +1122,7 @@
  			;;
  		esac
  	    done
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index f738b580de75..7facf0dc5090 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -4,7 +4,6 @@ bin/opera
 share/opera/bin/opera
 share/opera/buttons/DefSmall
 share/opera/buttons/Default
-share/opera/buttons/ReadMe.txt
 share/opera/buttons/default/abc.gif
 share/opera/buttons/default/buttons.ini
 share/opera/buttons/default/cascade.gif
@@ -146,6 +145,7 @@ share/opera/buttons/examples/example_big.ini
 share/opera/buttons/examples/example_small.ini
 share/opera/buttons/examples/opera_22x22.png
 share/opera/buttons/examples/opera_32x32.png
+share/opera/buttons/readme.txt
 share/opera/buttons/standard/addressbar_high_security.png
 share/opera/buttons/standard/addressbar_html.png
 share/opera/buttons/standard/addressbar_html_alt2.png
@@ -356,6 +356,7 @@ share/opera/java/lc.jar
 share/opera/java/opera.jar
 share/opera/java/opera.policy
 share/opera/opera6.adr
+share/opera/search.ini
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
diff --git a/www/opera/Makefile b/www/opera/Makefile
index a20a27c9b18a..45038f6abe76 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.11.20021129
+PORTVERSION=	6.12.20030305
 CATEGORIES=	www
-MASTER_SITES=	http://opera.online.no/unix/freebsd/611/final/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/611/final/en/static/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
+MASTER_SITES=	http://opera.online.no/unix/freebsd/612/final/en/static/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/612/final/en/static/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 20501c5bc961..911ecf3349a4 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.11-20021129.1-static-qt.i386.freebsd.tar.bz2) = 22ae9d276d28fa7d6b435d061c79f287
+MD5 (opera-6.12-20030305.1-static-qt.i386.freebsd.tar.bz2) = 1c1b2e5e7cadf849a87adb4805472da8
diff --git a/www/opera/files/patch-aa b/www/opera/files/patch-aa
index c47e455c137e..f96c76adbe95 100644
--- a/www/opera/files/patch-aa
+++ b/www/opera/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Tue Oct 29 16:31:24 2002
-+++ install.sh	Mon Nov 11 19:34:42 2002
-@@ -1065,16 +1065,10 @@
+--- install.sh.orig	Tue Mar 11 15:29:39 2003
++++ install.sh	Tue Mar 11 15:30:46 2003
+@@ -1092,16 +1092,10 @@
  	mkdir $mkdirv $mkdirp $plugin_dir/
  	chmod $chmodv 755 $plugin_dir
  
@@ -19,7 +19,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1101,6 +1095,7 @@
+@@ -1128,6 +1122,7 @@
  			;;
  		esac
  	    done
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index f738b580de75..7facf0dc5090 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -4,7 +4,6 @@ bin/opera
 share/opera/bin/opera
 share/opera/buttons/DefSmall
 share/opera/buttons/Default
-share/opera/buttons/ReadMe.txt
 share/opera/buttons/default/abc.gif
 share/opera/buttons/default/buttons.ini
 share/opera/buttons/default/cascade.gif
@@ -146,6 +145,7 @@ share/opera/buttons/examples/example_big.ini
 share/opera/buttons/examples/example_small.ini
 share/opera/buttons/examples/opera_22x22.png
 share/opera/buttons/examples/opera_32x32.png
+share/opera/buttons/readme.txt
 share/opera/buttons/standard/addressbar_high_security.png
 share/opera/buttons/standard/addressbar_html.png
 share/opera/buttons/standard/addressbar_html_alt2.png
@@ -356,6 +356,7 @@ share/opera/java/lc.jar
 share/opera/java/opera.jar
 share/opera/java/opera.policy
 share/opera/opera6.adr
+share/opera/search.ini
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css