3 files changed, 93 insertions, 96 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index ea929560bc3c..65ec2ecbe54b 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
@@ -18,41 +17,28 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	A blazingly fast, full-featured, standards-compliant browser
-
-FORBIDDEN=	http://www.freshports.org/vuxml.php?vid=0925716f-34e2-11e2-aa75-003067c2616f|38daea4f-2851-11e2-9483-14dae938ec40|85f33a8d-492f-11e2-aa75-003067c2616f|cebed39d-9e6f-11e2-b3f5-003067c2616f|ea0f45e2-6c4b-11e2-98d9-003067c2616f
-IGNORE=		not staged, outdated version, vulnerable, use www/opera instead
+COMMENT=	Blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
-USE_XZ=		yes
 USE_LINUX=	yes
-USE_LINUX_APPS=	naslibs png xorglibs
+USE_LINUX_APPS=	gdkpixbuf gtk2 naslibs png sqlite3 xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
-USE_GNOME=	desktopfileutils
+USES=		desktop-file-utils shared-mime-info tar:xz
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 
 NO_BUILD=	yes
 
-OPERA_VER?=	11.62
-OPERA_BUILD?=	1347
+OPERA_VER?=	12.16
+OPERA_BUILD?=	1860
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
-MAN1=		linux-opera.1 linux-opera-widget-manager.1
-
-RENAME=		opera opera-widget-manager lib/opera \
+RENAME=		opera lib/opera \
 		share/applications/opera-browser.desktop \
-		share/applications/opera-widget-installer.desktop \
-		share/applications/opera-widget-manager.desktop \
 		share/doc/opera share/opera man/man1/opera.1 \
-		man/man1/opera-widget-manager.1 \
-		share/mime/packages/opera-extension.xml \
-		share/mime/packages/opera-unite-application.xml \
-		share/mime/packages/opera-widget.xml
-
-NO_STAGE=	yes
+		share/mime/packages/opera-extension.xml
 
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/share/man/man1/*.gz
@@ -121,6 +107,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	@(cd ${WRKSRC} && ./install --system --quiet --force)
+	@(cd ${WRKSRC} && ./install --repackage ${STAGEDIR}${PREFIX} --system --quiet --force)
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 358075b3a80c..f537806c73e2 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opera-11.62-1347.i386.linux.tar.xz) = 22a35dc437a2d50dbd1cf0e49aa2b52c76d4fbec3ab5af4de5fe6455d3cda9b5
-SIZE (opera-11.62-1347.i386.linux.tar.xz) = 11496852
+SHA256 (opera-12.16-1860.i386.linux.tar.xz) = df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d
+SIZE (opera-12.16-1860.i386.linux.tar.xz) = 13154668
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 2bddb04c3511..9783e4033e07 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,63 +1,34 @@
 bin/linux-opera
-bin/linux-opera-widget-manager
 lib/linux-opera/gstreamer/plugins/libgstoperamatroska.so
 lib/linux-opera/gstreamer/plugins/libgstoperavp8.so
-lib/linux-opera/liboperakde4.so
 lib/linux-opera/liboperagtk2.so
-lib/linux-opera/liboperagtk3.so
+lib/linux-opera/liboperakde4.so
 lib/linux-opera/opera
-lib/linux-opera/operaplugincleaner
-lib/linux-opera/operapluginwrapper
+lib/linux-opera/opera_autoupdatechecker
 lib/linux-opera/plugins/README
+lib/linux-opera/pluginwrapper/operapluginwrapper
+lib/linux-opera/pluginwrapper/operapluginwrapper-native
+man/man1/linux-opera.1.gz
 share/applications/linux-opera-browser.desktop
-share/applications/linux-opera-widget-installer.desktop
-share/applications/linux-opera-widget-manager.desktop
-%%DOCSDIR%%/LGPL-2
-%%DOCSDIR%%/LGPL-3
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README.gstreamer
+%%PORTDOCS%%%%DOCSDIR%%/LGPL-2
+%%PORTDOCS%%%%DOCSDIR%%/LGPL-3
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.gstreamer
 share/icons/hicolor/128x128/apps/linux-opera-browser.png
-share/icons/hicolor/128x128/apps/linux-opera-widget-manager.png
-share/icons/hicolor/128x128/apps/linux-opera-widget.png
 share/icons/hicolor/128x128/mimetypes/linux-opera-extension.png
-share/icons/hicolor/128x128/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/128x128/mimetypes/linux-opera-widget.png
 share/icons/hicolor/16x16/apps/linux-opera-browser.png
-share/icons/hicolor/16x16/apps/linux-opera-widget-manager.png
-share/icons/hicolor/16x16/apps/linux-opera-widget.png
 share/icons/hicolor/16x16/mimetypes/linux-opera-extension.png
-share/icons/hicolor/16x16/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/16x16/mimetypes/linux-opera-widget.png
 share/icons/hicolor/22x22/apps/linux-opera-browser.png
-share/icons/hicolor/22x22/apps/linux-opera-widget-manager.png
-share/icons/hicolor/22x22/apps/linux-opera-widget.png
 share/icons/hicolor/22x22/mimetypes/linux-opera-extension.png
-share/icons/hicolor/22x22/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/22x22/mimetypes/linux-opera-widget.png
 share/icons/hicolor/24x24/apps/linux-opera-browser.png
-share/icons/hicolor/24x24/apps/linux-opera-widget-manager.png
-share/icons/hicolor/24x24/apps/linux-opera-widget.png
 share/icons/hicolor/24x24/mimetypes/linux-opera-extension.png
-share/icons/hicolor/24x24/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/24x24/mimetypes/linux-opera-widget.png
+share/icons/hicolor/256x256/apps/linux-opera-browser.png
 share/icons/hicolor/32x32/apps/linux-opera-browser.png
-share/icons/hicolor/32x32/apps/linux-opera-widget-manager.png
-share/icons/hicolor/32x32/apps/linux-opera-widget.png
 share/icons/hicolor/32x32/mimetypes/linux-opera-extension.png
-share/icons/hicolor/32x32/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/32x32/mimetypes/linux-opera-widget.png
 share/icons/hicolor/48x48/apps/linux-opera-browser.png
-share/icons/hicolor/48x48/apps/linux-opera-widget-manager.png
-share/icons/hicolor/48x48/apps/linux-opera-widget.png
 share/icons/hicolor/48x48/mimetypes/linux-opera-extension.png
-share/icons/hicolor/48x48/mimetypes/linux-opera-unite-application.png
-share/icons/hicolor/48x48/mimetypes/linux-opera-widget.png
-share/icons/hicolor/scalable/apps/linux-opera-browser.svg
-share/icons/hicolor/scalable/apps/linux-opera-widget-manager.svg
-share/icons/hicolor/scalable/apps/linux-opera-widget.svg
 share/icons/hicolor/scalable/mimetypes/linux-opera-extension.svg
-share/icons/hicolor/scalable/mimetypes/linux-opera-unite-application.svg
-share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
+%%DATADIR%%/cert.pem
 %%DATADIR%%/defaults/bookmarks.adr
 %%DATADIR%%/defaults/dictionaries.xml
 %%DATADIR%%/defaults/feedreaders.ini
@@ -83,12 +54,14 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/extra/svg-sabd.dat
 %%DATADIR%%/extra/svg-se.dat
 %%DATADIR%%/extra/svg-sebd.dat
+%%DATADIR%%/extra/unix-opengl.blocklist.json
 %%DATADIR%%/files.sig
 %%DATADIR%%/files_old.sig
-%%DATADIR%%/html5_entity_init.dat
 %%DATADIR%%/html40_entities.dtd
+%%DATADIR%%/html5_entity_init.dat
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/af/af.lng
+%%DATADIR%%/locale/ar/ar.lng
 %%DATADIR%%/locale/az/az.lng
 %%DATADIR%%/locale/be/be.lng
 %%DATADIR%%/locale/be/bookmarks.adr
@@ -119,6 +92,7 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/locale/es-ES/standard_speeddial.ini
 %%DATADIR%%/locale/es-LA/es-LA.lng
 %%DATADIR%%/locale/et/et.lng
+%%DATADIR%%/locale/fa/fa.lng
 %%DATADIR%%/locale/fi/fi.lng
 %%DATADIR%%/locale/fr-CA/fr-CA.lng
 %%DATADIR%%/locale/fr/bookmarks.adr
@@ -127,6 +101,7 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/locale/fr/standard_speeddial.ini
 %%DATADIR%%/locale/fy/fy.lng
 %%DATADIR%%/locale/gd/gd.lng
+%%DATADIR%%/locale/he/he.lng
 %%DATADIR%%/locale/hi/hi.lng
 %%DATADIR%%/locale/hr/hr.lng
 %%DATADIR%%/locale/hu/bookmarks.adr
@@ -143,8 +118,10 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/locale/ja/search.ini
 %%DATADIR%%/locale/ja/standard_speeddial.ini
 %%DATADIR%%/locale/ka/ka.lng
+%%DATADIR%%/locale/kk/kk.lng
 %%DATADIR%%/locale/ko/ko.lng
 %%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/lv/lv.lng
 %%DATADIR%%/locale/me/me.lng
 %%DATADIR%%/locale/mk/mk.lng
 %%DATADIR%%/locale/ms/ms.lng
@@ -194,9 +171,11 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/locale/uk/search.ini
 %%DATADIR%%/locale/uk/standard_speeddial.ini
 %%DATADIR%%/locale/uk/uk.lng
+%%DATADIR%%/locale/ur/ur.lng
 %%DATADIR%%/locale/uz/uz.lng
 %%DATADIR%%/locale/vi/vi.lng
 %%DATADIR%%/locale/zh-cn/bookmarks.adr
+%%DATADIR%%/locale/zh-cn/operaprefs_locale.ini
 %%DATADIR%%/locale/zh-cn/search.ini
 %%DATADIR%%/locale/zh-cn/standard_speeddial.ini
 %%DATADIR%%/locale/zh-cn/zh-cn.lng
@@ -204,18 +183,12 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/locale/zu/zu.lng
 %%DATADIR%%/mathml.dtd
 %%DATADIR%%/package-id.ini
-%%DATADIR%%/package/lib/binprint.sh
-%%DATADIR%%/package/lib/layout_common.sh
-%%DATADIR%%/package/lib/layout_deb.sh
-%%DATADIR%%/package/lib/layout_tar.sh
-%%DATADIR%%/package/lib/main.sh
-%%DATADIR%%/package/lib/normalize.sh
-%%DATADIR%%/package/lib/package_deb.sh
-%%DATADIR%%/package/lib/package_rpm.sh
-%%DATADIR%%/package/lib/package_tar.sh
-%%DATADIR%%/package/lib/xml.sh
-%%DATADIR%%/package/main.sh
 %%DATADIR%%/pubsuffix.xml
+%%DATADIR%%/region/ar/bookmarks.adr
+%%DATADIR%%/region/ar/search.ini
+%%DATADIR%%/region/ar/standard_speeddial.ini
+%%DATADIR%%/region/au/bookmarks.adr
+%%DATADIR%%/region/au/standard_speeddial.ini
 %%DATADIR%%/region/cis/en/bookmarks.adr
 %%DATADIR%%/region/cis/en/search.ini
 %%DATADIR%%/region/cis/en/standard_speeddial.ini
@@ -227,6 +200,9 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/region/cn/en/search.ini
 %%DATADIR%%/region/cn/en/standard_speeddial.ini
 %%DATADIR%%/region/cn/turbosettings.xml
+%%DATADIR%%/region/eg/bookmarks.adr
+%%DATADIR%%/region/eg/search.ini
+%%DATADIR%%/region/eg/standard_speeddial.ini
 %%DATADIR%%/region/gb/bookmarks.adr
 %%DATADIR%%/region/gb/search.ini
 %%DATADIR%%/region/gb/standard_speeddial.ini
@@ -238,13 +214,34 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/region/in/bookmarks.adr
 %%DATADIR%%/region/in/search.ini
 %%DATADIR%%/region/in/standard_speeddial.ini
+%%DATADIR%%/region/ke/bookmarks.adr
+%%DATADIR%%/region/ke/standard_speeddial.ini
+%%DATADIR%%/region/kz/bookmarks.adr
+%%DATADIR%%/region/kz/search.ini
+%%DATADIR%%/region/kz/standard_speeddial.ini
 %%DATADIR%%/region/latin_america/bookmarks.adr
 %%DATADIR%%/region/latin_america/search.ini
 %%DATADIR%%/region/latin_america/standard_speeddial.ini
 %%DATADIR%%/region/middle_east/bookmarks.adr
 %%DATADIR%%/region/middle_east/search.ini
 %%DATADIR%%/region/middle_east/standard_speeddial.ini
+%%DATADIR%%/region/mx/bookmarks.adr
+%%DATADIR%%/region/mx/search.ini
+%%DATADIR%%/region/mx/standard_speeddial.ini
+%%DATADIR%%/region/my/bookmarks.adr
+%%DATADIR%%/region/my/standard_speeddial.ini
+%%DATADIR%%/region/ng/bookmarks.adr
+%%DATADIR%%/region/ng/standard_speeddial.ini
+%%DATADIR%%/region/ph/bookmarks.adr
+%%DATADIR%%/region/ph/standard_speeddial.ini
+%%DATADIR%%/region/pk/bookmarks.adr
+%%DATADIR%%/region/pk/standard_speeddial.ini
 %%DATADIR%%/region/region.ini
+%%DATADIR%%/region/ru/bookmarks.adr
+%%DATADIR%%/region/ru/search.ini
+%%DATADIR%%/region/ru/standard_speeddial.ini
+%%DATADIR%%/region/se/bookmarks.adr
+%%DATADIR%%/region/se/standard_speeddial.ini
 %%DATADIR%%/region/tw/browser.js
 %%DATADIR%%/region/tw/turbosettings.xml
 %%DATADIR%%/region/ua/ru/bookmarks.adr
@@ -253,6 +250,10 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/region/us/bookmarks.adr
 %%DATADIR%%/region/us/search.ini
 %%DATADIR%%/region/us/standard_speeddial.ini
+%%DATADIR%%/region/vn/bookmarks.adr
+%%DATADIR%%/region/vn/standard_speeddial.ini
+%%DATADIR%%/region/za/bookmarks.adr
+%%DATADIR%%/region/za/standard_speeddial.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/unix_skin.zip
 %%DATADIR%%/styles/about.css
@@ -260,10 +261,12 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/styles/certinfo.css
 %%DATADIR%%/styles/config.css
 %%DATADIR%%/styles/contentblock.css
+%%DATADIR%%/styles/cpu.css
 %%DATADIR%%/styles/debug.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/feed.css
+%%DATADIR%%/styles/gpu.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
@@ -330,54 +333,59 @@ share/icons/hicolor/scalable/mimetypes/linux-opera-widget.svg
 %%DATADIR%%/styles/webstorage.css
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/ui/dialog.ini
-%%DATADIR%%/ui/dialogs.yaml
+%%DATADIR%%/ui/dialogs.yml
 %%DATADIR%%/ui/fastforward.ini
 %%DATADIR%%/ui/standard_keyboard.ini
 %%DATADIR%%/ui/standard_keyboard_compat.ini
 %%DATADIR%%/ui/standard_menu.ini
 %%DATADIR%%/ui/standard_mouse.ini
 %%DATADIR%%/ui/standard_toolbar.ini
-%%DATADIR%%/ui/widgets.yaml
 %%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
+%%DATADIR%%/ui/widgets.yml
 share/mime/packages/linux-opera-extension.xml
-share/mime/packages/linux-opera-unite-application.xml
-share/mime/packages/linux-opera-widget.xml
-@dirrm %%DATADIR%%/unite
+@dirrm share/mime/packages
+@dirrm share/mime
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/region/za
+@dirrm %%DATADIR%%/region/vn
 @dirrm %%DATADIR%%/region/us
 @dirrm %%DATADIR%%/region/ua/ru
 @dirrm %%DATADIR%%/region/ua
 @dirrm %%DATADIR%%/region/tw
+@dirrm %%DATADIR%%/region/se
+@dirrm %%DATADIR%%/region/ru
+@dirrm %%DATADIR%%/region/pk
+@dirrm %%DATADIR%%/region/ph
+@dirrm %%DATADIR%%/region/ng
+@dirrm %%DATADIR%%/region/my
+@dirrm %%DATADIR%%/region/mx
 @dirrm %%DATADIR%%/region/middle_east
 @dirrm %%DATADIR%%/region/latin_america
+@dirrm %%DATADIR%%/region/kz
+@dirrm %%DATADIR%%/region/ke
 @dirrm %%DATADIR%%/region/in
 @dirrm %%DATADIR%%/region/id
 @dirrm %%DATADIR%%/region/hk
 @dirrm %%DATADIR%%/region/gb
+@dirrm %%DATADIR%%/region/eg
 @dirrm %%DATADIR%%/region/cn/en
 @dirrm %%DATADIR%%/region/cn
 @dirrm %%DATADIR%%/region/cis/ru
 @dirrm %%DATADIR%%/region/cis/en
 @dirrm %%DATADIR%%/region/cis
+@dirrm %%DATADIR%%/region/au
+@dirrm %%DATADIR%%/region/ar
 @dirrm %%DATADIR%%/region
-@dirrm %%DATADIR%%/package/lib
-@dirrm %%DATADIR%%/package
 @dirrm %%DATADIR%%/locale/zu
 @dirrm %%DATADIR%%/locale/zh-tw
 @dirrm %%DATADIR%%/locale/zh-cn
 @dirrm %%DATADIR%%/locale/vi
 @dirrm %%DATADIR%%/locale/uz
+@dirrm %%DATADIR%%/locale/ur
 @dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
 @dirrm %%DATADIR%%/locale/tl
@@ -400,8 +408,10 @@ share/mime/packages/linux-opera-widget.xml
 @dirrm %%DATADIR%%/locale/ms
 @dirrm %%DATADIR%%/locale/mk
 @dirrm %%DATADIR%%/locale/me
+@dirrm %%DATADIR%%/locale/lv
 @dirrm %%DATADIR%%/locale/lt
 @dirrm %%DATADIR%%/locale/ko
+@dirrm %%DATADIR%%/locale/kk
 @dirrm %%DATADIR%%/locale/ka
 @dirrm %%DATADIR%%/locale/ja
 @dirrm %%DATADIR%%/locale/it
@@ -409,11 +419,13 @@ share/mime/packages/linux-opera-widget.xml
 @dirrm %%DATADIR%%/locale/hu
 @dirrm %%DATADIR%%/locale/hr
 @dirrm %%DATADIR%%/locale/hi
+@dirrm %%DATADIR%%/locale/he
 @dirrm %%DATADIR%%/locale/gd
 @dirrm %%DATADIR%%/locale/fy
 @dirrm %%DATADIR%%/locale/fr-CA
 @dirrm %%DATADIR%%/locale/fr
 @dirrm %%DATADIR%%/locale/fi
+@dirrm %%DATADIR%%/locale/fa
 @dirrm %%DATADIR%%/locale/et
 @dirrm %%DATADIR%%/locale/es-LA
 @dirrm %%DATADIR%%/locale/es-ES
@@ -427,13 +439,13 @@ share/mime/packages/linux-opera-widget.xml
 @dirrm %%DATADIR%%/locale/bg
 @dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale/az
+@dirrm %%DATADIR%%/locale/ar
 @dirrm %%DATADIR%%/locale/af
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/extra
 @dirrm %%DATADIR%%/defaults
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/scalable/mimetypes
-@dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48/mimetypes
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -441,6 +453,8 @@ share/mime/packages/linux-opera-widget.xml
 @dirrmtry share/icons/hicolor/32x32/mimetypes
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
 @dirrmtry share/icons/hicolor/24x24/mimetypes
 @dirrmtry share/icons/hicolor/24x24/apps
 @dirrmtry share/icons/hicolor/24x24
@@ -455,12 +469,9 @@ share/mime/packages/linux-opera-widget.xml
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/linux-opera/pluginwrapper
 @dirrm lib/linux-opera/plugins
 @dirrm lib/linux-opera/gstreamer/plugins
 @dirrm lib/linux-opera/gstreamer
 @dirrm lib/linux-opera
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true