Update to 10.10. Most important is Opera Unite included in this release. See

the changelog for detail:

	http://www.opera.com/docs/changelogs/unix/1010/

4 files changed, 19 insertions, 12 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 1348e07e1354..59c6a43aad1f 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -32,8 +32,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	10.01
-OPERA_BUILD=	4682
+OPERA_VER=	10.10
+OPERA_BUILD=	4742
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index c6697b83b6d0..e4d6ffcfc456 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = f2a140a59d886c69700fac1fea1fc6d8
-SHA256 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = c5540fdd5be76c7817d16c85e700d074e7bff215583806a31e7493a767df0b69
-SIZE (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = 13300483
+MD5 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 02cb0cec164bcf77639b97fbe69d13f4
+SHA256 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = bdec041032a798f4b8b492546269396d05987538376cc5d28acd9562849e8944
+SIZE (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 16529068
diff --git a/www/linux-opera/files/patch-pluginpath.ini b/www/linux-opera/files/patch-pluginpath.ini
index 96041bf159bf..ad844dd3e16d 100644
--- a/www/linux-opera/files/patch-pluginpath.ini
+++ b/www/linux-opera/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- usr/share/opera/defaults/pluginpath.ini.orig	2009-08-30 16:59:30.000000000 -0500
-+++ usr/share/opera/defaults/pluginpath.ini	2009-08-30 17:04:28.000000000 -0500
-@@ -2,71 +2,27 @@
+--- usr/share/opera/defaults/pluginpath.ini.orig	2009-11-24 20:26:57.000000000 -0600
++++ usr/share/opera/defaults/pluginpath.ini	2009-11-24 20:30:45.000000000 -0600
+@@ -2,74 +2,27 @@
  ; Do not edit this file while Opera is running
  ; This file is stored in UTF-8 encoding
  
@@ -60,6 +60,9 @@
 -/usr/lib/adobe-flashplugin=1
 -/usr/lib/flashplugin-installer=1
 -
+-; Moonlight
+-/usr/lib/moon/plugin=1
+-
 -; Netscape Plug-in Paths
 -$HOME/.netscape6/plugins=1
 -$HOME/.netscape/plugins=1
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 227f33b1e3bb..bb31e4bb40dc 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -41,7 +41,6 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/be/standard_speeddial.ini
 %%DATADIR%%/locale/bg/bg.lng
 %%DATADIR%%/locale/cs/cs.lng
-%%DATADIR%%/locale/da/bookmarks.adr
 %%DATADIR%%/locale/da/da.lng
 %%DATADIR%%/locale/de/bookmarks.adr
 %%DATADIR%%/locale/de/de.lng
@@ -132,7 +131,6 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/scripts/common.js
 %%DATADIR%%/scripts/substance.js
 %%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/styles/Inconsolata.otf
 %%DATADIR%%/styles/about.css
 %%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/certinfo.css
@@ -157,7 +155,6 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/header-expanded.png
 %%DATADIR%%/styles/images/header.png
-%%DATADIR%%/styles/images/info-header.png
 %%DATADIR%%/styles/images/opera.png
 %%DATADIR%%/styles/images/page-bot.png
 %%DATADIR%%/styles/images/red_center.png
@@ -204,9 +201,16 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/ui/standard_menu.ini
 %%DATADIR%%/ui/standard_mouse.ini
 %%DATADIR%%/ui/standard_toolbar.ini
-%%DATADIR%%/ui/standard_trusted_repositories.ini
 %%DATADIR%%/ui/unix_keyboard.ini
+%%DATADIR%%/unite/fileSharing.ua
+%%DATADIR%%/unite/fridge.ua
+%%DATADIR%%/unite/home.ua
+%%DATADIR%%/unite/mediaPlayer.ua
+%%DATADIR%%/unite/messenger.ua
+%%DATADIR%%/unite/photoSharing.ua
+%%DATADIR%%/unite/webserver.ua
 share/pixmaps/linux-opera.png
+@dirrm %%DATADIR%%/unite
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images