3 files changed, 60 insertions, 17 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 0f691c1b3319..019f51886117 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -26,8 +26,8 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
 RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
-OPERA_VER?=	11.52
-OPERA_BUILD?=	1100
+OPERA_VER?=	11.60
+OPERA_BUILD?=	1185
 MASTER_SITES_VER_PATH=	unix/${OPERA_VER:S/.//}
 
 USE_XZ=		yes
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 13161b471fb8..12b0f38d76a8 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,4 +1,4 @@
-SHA256 (opera-11.52-1100.i386.freebsd.tar.xz) = ae90c802ba9f1f487df71dddfb538af08265421341cc3146ac80ddfaa6b452d3
-SIZE (opera-11.52-1100.i386.freebsd.tar.xz) = 11116644
-SHA256 (opera-11.52-1100.amd64.freebsd.tar.xz) = 7de626a029d7423b437c42057037d6446b8b56e0d4244d87d5e60392b185ff5a
-SIZE (opera-11.52-1100.amd64.freebsd.tar.xz) = 11625908
+SHA256 (opera-11.60-1185.i386.freebsd.tar.xz) = eb38671f9b5e06ba7b905bd9ff22262e9ef335c37414bbb0ea4234aa2b2ba46d
+SIZE (opera-11.60-1185.i386.freebsd.tar.xz) = 11537236
+SHA256 (opera-11.60-1185.amd64.freebsd.tar.xz) = 8776de45f3ff16507d47125a930c46b98835643f5031788b1fe40ad78125cca6
+SIZE (opera-11.60-1185.amd64.freebsd.tar.xz) = 12095468
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index d6ab645e159b..fe1db32e9efa 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -3,7 +3,7 @@ bin/opera-widget-manager
 bin/uninstall-opera
 lib/opera/gstreamer/plugins/libgstoperamatroska.so
 lib/opera/gstreamer/plugins/libgstoperavp8.so
-lib/opera/liboperagtk.so
+lib/opera/liboperagtk2.so
 lib/opera/liboperakde4.so
 lib/opera/opera
 lib/opera/operaplugincleaner
@@ -62,8 +62,10 @@ share/mime/packages/opera-extension.xml
 share/mime/packages/opera-unite-application.xml
 share/mime/packages/opera-widget.xml
 %%DATADIR%%/defaults/bookmarks.adr
+%%DATADIR%%/defaults/dictionaries.xml
 %%DATADIR%%/defaults/feedreaders.ini
 %%DATADIR%%/defaults/filehandler.ini
+%%DATADIR%%/defaults/handlers-ignore.ini
 %%DATADIR%%/defaults/license.txt
 %%DATADIR%%/defaults/mailproviders.xml
 %%DATADIR%%/defaults/plugin-ignore.ini
@@ -87,6 +89,7 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/files.sig
 %%DATADIR%%/files_old.sig
 %%DATADIR%%/html40_entities.dtd
+%%DATADIR%%/html5_entity_init.dat
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/af/af.lng
 %%DATADIR%%/locale/az/az.lng
@@ -109,10 +112,7 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/locale/de/search.ini
 %%DATADIR%%/locale/de/standard_speeddial.ini
 %%DATADIR%%/locale/el/el.lng
-%%DATADIR%%/locale/en-GB/bookmarks.adr
 %%DATADIR%%/locale/en-GB/en-GB.lng
-%%DATADIR%%/locale/en-GB/search.ini
-%%DATADIR%%/locale/en-GB/standard_speeddial.ini
 %%DATADIR%%/locale/en/bookmarks.adr
 %%DATADIR%%/locale/en/en.lng
 %%DATADIR%%/locale/en/en.zip
@@ -206,13 +206,9 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/locale/uz/uz.lng
 %%DATADIR%%/locale/vi/vi.lng
 %%DATADIR%%/locale/zh-cn/bookmarks.adr
-%%DATADIR%%/locale/zh-cn/browser.js
 %%DATADIR%%/locale/zh-cn/search.ini
 %%DATADIR%%/locale/zh-cn/standard_speeddial.ini
-%%DATADIR%%/locale/zh-cn/turbosettings.xml
 %%DATADIR%%/locale/zh-cn/zh-cn.lng
-%%DATADIR%%/locale/zh-tw/browser.js
-%%DATADIR%%/locale/zh-tw/turbosettings.xml
 %%DATADIR%%/locale/zh-tw/zh-tw.lng
 %%DATADIR%%/locale/zu/zu.lng
 %%DATADIR%%/mathml.dtd
@@ -228,6 +224,38 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/package/lib/package_tar.sh
 %%DATADIR%%/package/lib/xml.sh
 %%DATADIR%%/package/main.sh
+%%DATADIR%%/pubsuffix.xml
+%%DATADIR%%/region/cis/en/bookmarks.adr
+%%DATADIR%%/region/cis/en/search.ini
+%%DATADIR%%/region/cis/en/standard_speeddial.ini
+%%DATADIR%%/region/cn/browser.js
+%%DATADIR%%/region/cn/en/bookmarks.adr
+%%DATADIR%%/region/cn/en/search.ini
+%%DATADIR%%/region/cn/en/standard_speeddial.ini
+%%DATADIR%%/region/cn/turbosettings.xml
+%%DATADIR%%/region/gb/bookmarks.adr
+%%DATADIR%%/region/gb/search.ini
+%%DATADIR%%/region/gb/standard_speeddial.ini
+%%DATADIR%%/region/hk/browser.js
+%%DATADIR%%/region/hk/turbosettings.xml
+%%DATADIR%%/region/id/bookmarks.adr
+%%DATADIR%%/region/id/search.ini
+%%DATADIR%%/region/id/standard_speeddial.ini
+%%DATADIR%%/region/in/bookmarks.adr
+%%DATADIR%%/region/in/search.ini
+%%DATADIR%%/region/in/standard_speeddial.ini
+%%DATADIR%%/region/middle_east/bookmarks.adr
+%%DATADIR%%/region/middle_east/search.ini
+%%DATADIR%%/region/middle_east/standard_speeddial.ini
+%%DATADIR%%/region/region.ini
+%%DATADIR%%/region/tw/browser.js
+%%DATADIR%%/region/tw/turbosettings.xml
+%%DATADIR%%/region/ua/ru/bookmarks.adr
+%%DATADIR%%/region/ua/ru/search.ini
+%%DATADIR%%/region/ua/ru/standard_speeddial.ini
+%%DATADIR%%/region/us/bookmarks.adr
+%%DATADIR%%/region/us/search.ini
+%%DATADIR%%/region/us/standard_speeddial.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/unix_skin.zip
 %%DATADIR%%/styles/about.css
@@ -238,17 +266,18 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/styles/debug.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/error.css
+%%DATADIR%%/styles/feed.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/Opera_256x256.png
+%%DATADIR%%/styles/images/arrow.png
 %%DATADIR%%/styles/images/bar.png
 %%DATADIR%%/styles/images/bkgd-rev.png
 %%DATADIR%%/styles/images/bkgd.png
 %%DATADIR%%/styles/images/bullet.png
 %%DATADIR%%/styles/images/center.png
 %%DATADIR%%/styles/images/container.png
-%%DATADIR%%/styles/images/corner.png
 %%DATADIR%%/styles/images/customize.gif
 %%DATADIR%%/styles/images/darkBox.png
 %%DATADIR%%/styles/images/defaultFavicon.png
@@ -257,8 +286,6 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/styles/images/flag.png
 %%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/hanger.png
-%%DATADIR%%/styles/images/header-expanded.png
-%%DATADIR%%/styles/images/header.png
 %%DATADIR%%/styles/images/opera-icon-red.png
 %%DATADIR%%/styles/images/opera.png
 %%DATADIR%%/styles/images/page-bot.png
@@ -273,6 +300,7 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/images/warning.png
 %%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/m2_upgrade_1160.mbs
 %%DATADIR%%/styles/m2_welcome_message.mbs
 %%DATADIR%%/styles/mail.css
 %%DATADIR%%/styles/mathml.css
@@ -313,6 +341,7 @@ share/mime/packages/opera-widget.xml
 %%DATADIR%%/ui/standard_mouse.ini
 %%DATADIR%%/ui/standard_toolbar.ini
 %%DATADIR%%/ui/unix_keyboard.ini
+%%DATADIR%%/ui/widgets.yaml
 %%DATADIR%%/unite/fileSharing.ua
 %%DATADIR%%/unite/fridge.ua
 %%DATADIR%%/unite/home.ua
@@ -326,6 +355,20 @@ share/mime/packages/opera-widget.xml
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/region/us
+@dirrm %%DATADIR%%/region/ua/ru
+@dirrm %%DATADIR%%/region/ua
+@dirrm %%DATADIR%%/region/tw
+@dirrm %%DATADIR%%/region/middle_east
+@dirrm %%DATADIR%%/region/in
+@dirrm %%DATADIR%%/region/id
+@dirrm %%DATADIR%%/region/hk
+@dirrm %%DATADIR%%/region/gb
+@dirrm %%DATADIR%%/region/cn/en
+@dirrm %%DATADIR%%/region/cn
+@dirrm %%DATADIR%%/region/cis/en
+@dirrm %%DATADIR%%/region/cis
+@dirrm %%DATADIR%%/region
 @dirrm %%DATADIR%%/package/lib
 @dirrm %%DATADIR%%/package
 @dirrm %%DATADIR%%/locale/zu