Upgrade to 6.12.

15 files changed, 42 insertions, 63 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 627a5163107c..3f1088cd7931 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.11.20021129
+PORTVERSION=	6.12.20030305
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/611/final/en/i386/static/ \
-		ftp://ftp.opera.com/pub/opera/linux/611/final/en/i386/static/
+MASTER_SITES=	http://opera.online.no/linux/612/final/en/i386/static/ \
+		ftp://ftp.opera.com/pub/opera/linux/612/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index fa29346579c2..345f5aa38964 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.11-20021129.1-static-qt.i386.tar.bz2) = 2d6a3301f9d83902543a26ec33615ad8
+MD5 (opera-6.12-20030305.1-static-qt.i386.tar.bz2) = 1f9f677dabeefbcf1195248ffc9095e5
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
index 8e4845dfb289..d926c7bdc415 100644
--- a/www/linux-opera-devel/files/patch-aa
+++ b/www/linux-opera-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Fri Nov 29 12:19:46 2002
-+++ install.sh	Sun Dec 15 09:33:47 2002
-@@ -762,6 +762,16 @@
+--- install.sh.orig	Wed Mar  5 19:07:59 2003
++++ install.sh	Tue Mar 11 18:37:28 2003
+@@ -765,6 +765,16 @@
  	    wrapper_sunjava_machine="sparc"
  	;;
  
@@ -17,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -887,7 +897,7 @@
+@@ -890,7 +900,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -26,7 +26,7 @@
      /usr/lib/Acrobat[45]/bin \\
      /usr/X11R6/lib/Acrobat[45]/bin \\
      /opt/Acrobat[45]/bin \\
-@@ -1081,8 +1091,9 @@
+@@ -1100,8 +1110,9 @@
  	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
  
       # System wide configuration files
@@ -37,7 +37,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1109,6 +1120,7 @@
+@@ -1128,6 +1139,7 @@
  			;;
  		esac
  	    done
@@ -45,7 +45,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1119,10 +1131,10 @@
+@@ -1138,10 +1150,10 @@
  	fi
  
       # Shorcuts and Icons
diff --git a/www/linux-opera-devel/files/patch-ab b/www/linux-opera-devel/files/patch-ab
deleted file mode 100644
index e210b2693d17..000000000000
--- a/www/linux-opera-devel/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- runme.sh.orig	Tue Aug 13 17:08:25 2002
-+++ runme.sh	Tue Aug 27 11:48:18 2002
-@@ -55,4 +55,4 @@
- export OPERA_DIR OPERA_PLUGIN_PATH
- 
- # Running Opera
--$OPERA "$@"
-+exec $OPERA "$@"
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index d5e6600a1f17..63ae767fff58 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -4,7 +4,6 @@ share/doc/opera/help
 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
@@ -362,6 +362,7 @@ share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/plugins/operaplugincleaner
+share/opera/search.ini
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 627a5163107c..3f1088cd7931 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.11.20021129
+PORTVERSION=	6.12.20030305
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/611/final/en/i386/static/ \
-		ftp://ftp.opera.com/pub/opera/linux/611/final/en/i386/static/
+MASTER_SITES=	http://opera.online.no/linux/612/final/en/i386/static/ \
+		ftp://ftp.opera.com/pub/opera/linux/612/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index fa29346579c2..345f5aa38964 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.11-20021129.1-static-qt.i386.tar.bz2) = 2d6a3301f9d83902543a26ec33615ad8
+MD5 (opera-6.12-20030305.1-static-qt.i386.tar.bz2) = 1f9f677dabeefbcf1195248ffc9095e5
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
index 8e4845dfb289..d926c7bdc415 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Fri Nov 29 12:19:46 2002
-+++ install.sh	Sun Dec 15 09:33:47 2002
-@@ -762,6 +762,16 @@
+--- install.sh.orig	Wed Mar  5 19:07:59 2003
++++ install.sh	Tue Mar 11 18:37:28 2003
+@@ -765,6 +765,16 @@
  	    wrapper_sunjava_machine="sparc"
  	;;
  
@@ -17,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -887,7 +897,7 @@
+@@ -890,7 +900,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -26,7 +26,7 @@
      /usr/lib/Acrobat[45]/bin \\
      /usr/X11R6/lib/Acrobat[45]/bin \\
      /opt/Acrobat[45]/bin \\
-@@ -1081,8 +1091,9 @@
+@@ -1100,8 +1110,9 @@
  	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
  
       # System wide configuration files
@@ -37,7 +37,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1109,6 +1120,7 @@
+@@ -1128,6 +1139,7 @@
  			;;
  		esac
  	    done
@@ -45,7 +45,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1119,10 +1131,10 @@
+@@ -1138,10 +1150,10 @@
  	fi
  
       # Shorcuts and Icons
diff --git a/www/linux-opera/files/patch-ab b/www/linux-opera/files/patch-ab
deleted file mode 100644
index e210b2693d17..000000000000
--- a/www/linux-opera/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- runme.sh.orig	Tue Aug 13 17:08:25 2002
-+++ runme.sh	Tue Aug 27 11:48:18 2002
-@@ -55,4 +55,4 @@
- export OPERA_DIR OPERA_PLUGIN_PATH
- 
- # Running Opera
--$OPERA "$@"
-+exec $OPERA "$@"
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index d5e6600a1f17..63ae767fff58 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -4,7 +4,6 @@ share/doc/opera/help
 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
@@ -362,6 +362,7 @@ share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/plugins/operaplugincleaner
+share/opera/search.ini
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 627a5163107c..3f1088cd7931 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.11.20021129
+PORTVERSION=	6.12.20030305
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/611/final/en/i386/static/ \
-		ftp://ftp.opera.com/pub/opera/linux/611/final/en/i386/static/
+MASTER_SITES=	http://opera.online.no/linux/612/final/en/i386/static/ \
+		ftp://ftp.opera.com/pub/opera/linux/612/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index fa29346579c2..345f5aa38964 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-6.11-20021129.1-static-qt.i386.tar.bz2) = 2d6a3301f9d83902543a26ec33615ad8
+MD5 (opera-6.12-20030305.1-static-qt.i386.tar.bz2) = 1f9f677dabeefbcf1195248ffc9095e5
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 8e4845dfb289..d926c7bdc415 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Fri Nov 29 12:19:46 2002
-+++ install.sh	Sun Dec 15 09:33:47 2002
-@@ -762,6 +762,16 @@
+--- install.sh.orig	Wed Mar  5 19:07:59 2003
++++ install.sh	Tue Mar 11 18:37:28 2003
+@@ -765,6 +765,16 @@
  	    wrapper_sunjava_machine="sparc"
  	;;
  
@@ -17,7 +17,7 @@
  	mips*:Linux)
  	    wrapper_plugin_paths=''
  	;;
-@@ -887,7 +897,7 @@
+@@ -890,7 +900,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -26,7 +26,7 @@
      /usr/lib/Acrobat[45]/bin \\
      /usr/X11R6/lib/Acrobat[45]/bin \\
      /opt/Acrobat[45]/bin \\
-@@ -1081,8 +1091,9 @@
+@@ -1100,8 +1110,9 @@
  	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
  
       # System wide configuration files
@@ -37,7 +37,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1109,6 +1120,7 @@
+@@ -1128,6 +1139,7 @@
  			;;
  		esac
  	    done
@@ -45,7 +45,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1119,10 +1131,10 @@
+@@ -1138,10 +1150,10 @@
  	fi
  
       # Shorcuts and Icons
diff --git a/www/linux-opera7/files/patch-ab b/www/linux-opera7/files/patch-ab
deleted file mode 100644
index e210b2693d17..000000000000
--- a/www/linux-opera7/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- runme.sh.orig	Tue Aug 13 17:08:25 2002
-+++ runme.sh	Tue Aug 27 11:48:18 2002
-@@ -55,4 +55,4 @@
- export OPERA_DIR OPERA_PLUGIN_PATH
- 
- # Running Opera
--$OPERA "$@"
-+exec $OPERA "$@"
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index d5e6600a1f17..63ae767fff58 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -4,7 +4,6 @@ share/doc/opera/help
 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
@@ -362,6 +362,7 @@ share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.8
 share/opera/plugins/operamotifwrapper
 share/opera/plugins/operaplugincleaner
+share/opera/search.ini
 share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css