- update to 10.61

PR:		148294
PR:		148818
Sumitted by:	Arjan van Leeuwen

5 files changed, 246 insertions, 96 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 10c0b02d27e1..53c565156a4f 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -6,68 +6,100 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	2
+PORTVERSION=	${OPERA_VER}.${OPERA_BUILD}
 CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH} \
-		ftp://opera.inode.at/${MASTER_SITES_VER_PATH} \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/${MASTER_SITES_VER_PATH} \
-		http://ftp.ucr.ac.cr/WWW/opera/${MASTER_SITES_VER_PATH} \
-		http://www.microrpm.ca/pub/opera/${MASTER_SITES_VER_PATH} \
-		http://opera.eurenet.net/${MASTER_SITES_VER_PATH} \
-		ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH} \
-		http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH} \
-		ftp://ftp.wayne.edu/opera/${MASTER_SITES_VER_PATH} \
-		http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH} \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/${MASTER_SITES_VER_PATH} \
-		http://opera.nedmirror.nl/${MASTER_SITES_VER_PATH} \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/${MASTER_SITES_VER_PATH}&,} \
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH}/ \
+		ftp://opera.inode.at/${MASTER_SITES_VER_PATH}/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/${MASTER_SITES_VER_PATH}/ \
+		http://ftp.ucr.ac.cr/WWW/opera/${MASTER_SITES_VER_PATH}/ \
+		http://www.microrpm.ca/pub/opera/${MASTER_SITES_VER_PATH}/ \
+		http://opera.eurenet.net/${MASTER_SITES_VER_PATH}/ \
+		ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH}/ \
+		http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH}/ \
+		ftp://ftp.wayne.edu/opera/${MASTER_SITES_VER_PATH}/ \
+		http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH}/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/${MASTER_SITES_VER_PATH}/ \
+		http://opera.nedmirror.nl/${MASTER_SITES_VER_PATH}/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/${MASTER_SITES_VER_PATH}&,}/ \
 		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
-DISTNAME=	${PORTNAME}-${OPERA_VER}${OPERA_MINVER}-freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.${ARCH}.freebsd
 
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-OPERA_VER=	10.10
-OPERA_MINVER=
-OPERA_REL=	final
-OPERA_DATE=	20091120
-OPERA_BUILD=	4742
-OPERA_LIB=	shared
-MASTER_SITES_VER_PATH=	unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/
-WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		pcre.0:${PORTSDIR}/devel/pcre \
+		png.6:${PORTSDIR}/graphics/png \
+		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
+		streamanalyzer.0:${PORTSDIR}/deskutils/strigi \
+		streams.0:${PORTSDIR}/deskutils/strigi \
+		xcb-render-util.0:${PORTSDIR}/x11/xcb-util \
+		xcb-render.0:${PORTSDIR}/x11/libxcb \
+		xcb.2:${PORTSDIR}/x11/libxcb
 
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+LICENSE=	LGPL20
+
+OPERA_VER=	10.61
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
+USE_ICONV=	yes
+MANCOMPRESSED=	yes
+USE_XLIB=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \
+		xext xfixes xft xi xinerama xpm xrandr xrender xtst
+USE_GSTREAMER=	yes
+USE_GETTEXT=	yes
+OPERA_BUILD=	6430
+MASTER_SITES_VER_PATH=	unix/${OPERA_VER:S/.//}
 
 USE_BZIP2=	yes
-USE_QT_VER=	3
 
-MAN1=		${PORTNAME}.1
+MAN1=		${PORTNAME}-widget-manager.1 \
+		${PORTNAME}.1
 
 NO_BUILD=	yes
 
+OPTIONS=	GTK "Use GTK backend" off \
+		QT4 "Use Qt4 backend" off \
+		KDE4 "Use KDE4 backend" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GTK)
+USE_GNOME=	atk gtk20 glib20 pango libxml2
+USE_FPC=	cairo
+.endif
+
+.if defined(WITH_QT4)
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network svg xml
+.endif
+
+.if defined(WITH_KDE4)
+USE_KDE4=	kdelibs
+.endif
+
 .include <bsd.port.pre.mk>
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPERA_ARCH=	${ARCH:S,i386,intel,}
 
-.if ${OSVERSION} >= 700000
-OPERA_TYPE=	7
-.else
-OPERA_TYPE=	6
+.if ${OSVERSION} < 700000
+IGNORE=		Only for FreeBSD 7.x and higher
 .endif
 
 do-install:
-	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins)
-	@${CP} ${DATADIR}/bin/operapluginwrapper ${DATADIR}/bin/operapluginwrapper.freebsd
-	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${DATADIR}/bin
-	@${INSTALL_DATA} ${WRKSRC}/usr/local/share/opera/defaults/pluginpath.ini ${DATADIR}/defaults
+	@${MV} ${WRKSRC}/share/man ${WRKSRC}/man
+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1.gz ${MANPREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}-widget-manager.1.gz ${MANPREFIX}/man/man1/
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/install
+	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/install
+	@(cd ${WRKSRC} && ./install --text --system --unattended)
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera|g' \
 		${DATADIR}/defaults/pluginpath.ini
 	@${RM} ${DATADIR}/defaults/pluginpath.ini.bak
 
 .include <bsd.port.post.mk>
-
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 111440bf6525..157a15deca36 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,12 +1,6 @@
-MD5 (opera-10.10-freebsd7-shared-qt3.i386.tar.bz2) = a48c2a6360a247f2fccfa1a71f27031e
-SHA256 (opera-10.10-freebsd7-shared-qt3.i386.tar.bz2) = be8d7cbf7e542ac8720213f69ffddd94d524db03273fd4ed43078bffddbec2a7
-SIZE (opera-10.10-freebsd7-shared-qt3.i386.tar.bz2) = 11611506
-MD5 (opera-10.10-freebsd6-shared-qt3.i386.tar.bz2) = f47609c6e683b82e06840467e66ec12f
-SHA256 (opera-10.10-freebsd6-shared-qt3.i386.tar.bz2) = c172293dfa97c1018e14640f32b78ed6b5166d0d3288a565664f0d23db2ddbb4
-SIZE (opera-10.10-freebsd6-shared-qt3.i386.tar.bz2) = 11613063
-MD5 (opera-10.10-freebsd6-shared-qt3.amd64.tar.bz2) = c0dbbe1f4689291ebe5e99fbb27338c0
-SHA256 (opera-10.10-freebsd6-shared-qt3.amd64.tar.bz2) = 0f495d067c0d6b98d23f760f68a5b214ba7b77752c5fa5510905863c87c3553c
-SIZE (opera-10.10-freebsd6-shared-qt3.amd64.tar.bz2) = 12390276
-MD5 (opera-10.10-freebsd7-shared-qt3.amd64.tar.bz2) = 529a5b7375ee807065174420e8093c71
-SHA256 (opera-10.10-freebsd7-shared-qt3.amd64.tar.bz2) = 436e5b2b8038dd166c2aedd03eee25b7aadba4262ff1c2d1c64fe8f53bbb826d
-SIZE (opera-10.10-freebsd7-shared-qt3.amd64.tar.bz2) = 12390632
+MD5 (opera-10.61-6430.i386.freebsd.tar.bz2) = a4331980412a5762778c21749d4ed857
+SHA256 (opera-10.61-6430.i386.freebsd.tar.bz2) = 1b67b2c21c86413028f63d7bb9c3d3cf34191262e035b17453f7dfb71085b026
+SIZE (opera-10.61-6430.i386.freebsd.tar.bz2) = 12736017
+MD5 (opera-10.61-6430.amd64.freebsd.tar.bz2) = 2178a766f0e18e05d6afa7618cb02835
+SHA256 (opera-10.61-6430.amd64.freebsd.tar.bz2) = 37babe1ae39eb8ff106129a71876e7c14c8a3c9d912410185677460cf1e502f8
+SIZE (opera-10.61-6430.amd64.freebsd.tar.bz2) = 13660935
diff --git a/www/opera/files/operapluginwrapper b/www/opera/files/operapluginwrapper
index a2fe27759164..fcec17e85d80 100644
--- a/www/opera/files/operapluginwrapper
+++ b/www/opera/files/operapluginwrapper
@@ -13,8 +13,6 @@ WRAPPER="freebsd"
 case "${ELFTYPE}" in
 	*SVR4*|*Linux*)
 		if [ -x "$0.linux" ]; then
-			LD_LIBRARY_PATH=
-			export LD_LIBRARY_PATH
 			WRAPPER="linux"
 		fi
 	;;
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 2691c97855db..e69de29bb2d1 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -1,19 +0,0 @@
---- install.sh.orig	2008-06-17 14:57:32.206032200 +0200
-+++ install.sh	2008-06-17 14:58:16.609863511 +0200
-@@ -1274,7 +1274,6 @@
-     mkdir $mkdirv $mkdirp $plugin_dir/
- 
-     # Wrapper
--    backup ${wrapper_dir}/opera opera
-     debug_msg 1 "Wrapper"
-     mkdir $mkdirv $mkdirp $wrapper_dir/
- 
-@@ -1282,7 +1281,7 @@
-     generate_wrapper
-     chmod $chmodv 755 $wrapper_dir/opera
- 
--    if test -z "$OPERADESTDIR"
-+    if false
-     then
- 	# System wide configuration files
- 	case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 5a483fdc708d..481c94281863 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -1,18 +1,59 @@
-
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/operaplugincleaner
-%%DATADIR%%/bin/operapluginwrapper
-%%DATADIR%%/bin/operapluginwrapper.freebsd
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
+bin/opera
+bin/opera-widget-manager
+bin/uninstall-opera
+lib/opera/gstreamer/LGPL.txt
+lib/opera/gstreamer/README.txt
+lib/opera/gstreamer/plugins/libgstoperamatroska.so
+lib/opera/gstreamer/plugins/libgstoperavp8.so
+lib/opera/liboperagtk.so
+lib/opera/liboperakde4.so
+lib/opera/opera
+lib/opera/operaplugincleaner
+lib/opera/operapluginwrapper
+lib/opera/plugins/README
+%%DOCSDIR%%/LGPL-2
+%%DOCSDIR%%/LICENSE
+share/applications/opera-browser.desktop
+share/applications/opera-widget-installer.desktop
+share/applications/opera-widget-manager.desktop
+share/icons/hicolor/128x128/apps/opera-browser.png
+share/icons/hicolor/128x128/apps/opera-widget-manager.png
+share/icons/hicolor/128x128/mimetypes/opera-unite-application.png
+share/icons/hicolor/128x128/mimetypes/opera-widget.png
+share/icons/hicolor/16x16/apps/opera-browser.png
+share/icons/hicolor/16x16/apps/opera-widget-manager.png
+share/icons/hicolor/16x16/mimetypes/opera-unite-application.png
+share/icons/hicolor/16x16/mimetypes/opera-widget.png
+share/icons/hicolor/22x22/apps/opera-browser.png
+share/icons/hicolor/22x22/apps/opera-widget-manager.png
+share/icons/hicolor/22x22/mimetypes/opera-unite-application.png
+share/icons/hicolor/22x22/mimetypes/opera-widget.png
+share/icons/hicolor/24x24/apps/opera-browser.png
+share/icons/hicolor/24x24/apps/opera-widget-manager.png
+share/icons/hicolor/24x24/mimetypes/opera-unite-application.png
+share/icons/hicolor/32x32/apps/opera-browser.png
+share/icons/hicolor/32x32/apps/opera-widget-manager.png
+share/icons/hicolor/32x32/mimetypes/opera-unite-application.png
+share/icons/hicolor/32x32/mimetypes/opera-widget.png
+share/icons/hicolor/48x48/apps/opera-browser.png
+share/icons/hicolor/48x48/apps/opera-widget-manager.png
+share/icons/hicolor/48x48/mimetypes/opera-unite-application.png
+share/icons/hicolor/48x48/mimetypes/opera-widget.png
+share/icons/hicolor/scalable/apps/opera-browser.svg
+share/icons/hicolor/scalable/apps/opera-widget-manager.svg
+share/icons/hicolor/scalable/apps/opera-widget.svg
+share/icons/hicolor/scalable/mimetypes/opera-unite-application.svg
+share/mime/packages/opera-unite-application.xml
+share/mime/packages/opera-widget.xml
 %%DATADIR%%/defaults/bookmarks.adr
 %%DATADIR%%/defaults/feedreaders.ini
 %%DATADIR%%/defaults/filehandler.ini
 %%DATADIR%%/defaults/font.ini
 %%DATADIR%%/defaults/license.txt
 %%DATADIR%%/defaults/mailproviders.xml
+%%DATADIR%%/defaults/plugin-ignore.ini
 %%DATADIR%%/defaults/pluginpath.ini
+%%DATADIR%%/defaults/public_domains.dat
 %%DATADIR%%/defaults/search.ini
 %%DATADIR%%/defaults/standard_speeddial.ini
 %%DATADIR%%/defaults/standard_trusted_repositories.ini
@@ -28,23 +69,34 @@
 %%DATADIR%%/extra/svg-se.dat
 %%DATADIR%%/extra/svg-sebd.dat
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/be/be.lng
 %%DATADIR%%/locale/be/bookmarks.adr
+%%DATADIR%%/locale/be/license.txt
 %%DATADIR%%/locale/be/search.ini
 %%DATADIR%%/locale/be/standard_speeddial.ini
 %%DATADIR%%/locale/bg/bg.lng
+%%DATADIR%%/locale/bg/bookmarks.adr
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/bg/standard_speeddial.ini
+%%DATADIR%%/locale/cs/bookmarks.adr
 %%DATADIR%%/locale/cs/cs.lng
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/cs/standard_speeddial.ini
 %%DATADIR%%/locale/da/da.lng
+%%DATADIR%%/locale/da/license.txt
 %%DATADIR%%/locale/de/bookmarks.adr
 %%DATADIR%%/locale/de/de.lng
+%%DATADIR%%/locale/de/license.txt
 %%DATADIR%%/locale/de/search.ini
 %%DATADIR%%/locale/de/standard_speeddial.ini
 %%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/el/license.txt
 %%DATADIR%%/locale/en-GB/bookmarks.adr
 %%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/license.txt
 %%DATADIR%%/locale/en-GB/search.ini
 %%DATADIR%%/locale/en-GB/standard_speeddial.ini
 %%DATADIR%%/locale/en/bookmarks.adr
@@ -55,26 +107,38 @@
 %%DATADIR%%/locale/en/standard_speeddial.ini
 %%DATADIR%%/locale/es-ES/bookmarks.adr
 %%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-ES/license.txt
 %%DATADIR%%/locale/es-ES/search.ini
 %%DATADIR%%/locale/es-ES/standard_speeddial.ini
 %%DATADIR%%/locale/es-LA/es-LA.lng
+%%DATADIR%%/locale/es-LA/license.txt
 %%DATADIR%%/locale/et/et.lng
+%%DATADIR%%/locale/et/license.txt
 %%DATADIR%%/locale/fi/fi.lng
+%%DATADIR%%/locale/fi/license.txt
 %%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr-CA/license.txt
 %%DATADIR%%/locale/fr/bookmarks.adr
 %%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fr/license.txt
 %%DATADIR%%/locale/fr/search.ini
 %%DATADIR%%/locale/fr/standard_speeddial.ini
 %%DATADIR%%/locale/fy/fy.lng
+%%DATADIR%%/locale/fy/license.txt
 %%DATADIR%%/locale/hi/hi.lng
-%%DATADIR%%/locale/hi/standard_speeddial.ini
+%%DATADIR%%/locale/hi/license.txt
 %%DATADIR%%/locale/hr/hr.lng
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hu/bookmarks.adr
 %%DATADIR%%/locale/hu/hu.lng
-%%DATADIR%%/locale/id/bookmarks.adr
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/hu/standard_speeddial.ini
 %%DATADIR%%/locale/id/id.lng
-%%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/id/license.txt
 %%DATADIR%%/locale/it/bookmarks.adr
 %%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/it/license.txt
 %%DATADIR%%/locale/it/search.ini
 %%DATADIR%%/locale/it/standard_speeddial.ini
 %%DATADIR%%/locale/ja/bookmarks.adr
@@ -83,38 +147,69 @@
 %%DATADIR%%/locale/ja/search.ini
 %%DATADIR%%/locale/ja/standard_speeddial.ini
 %%DATADIR%%/locale/ka/ka.lng
+%%DATADIR%%/locale/ka/license.txt
 %%DATADIR%%/locale/ko/ko.lng
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/lt/license.txt
 %%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/mk/license.txt
 %%DATADIR%%/locale/mk/mk.lng
 %%DATADIR%%/locale/nb/bookmarks.adr
+%%DATADIR%%/locale/nb/license.txt
 %%DATADIR%%/locale/nb/nb.lng
 %%DATADIR%%/locale/nb/search.ini
 %%DATADIR%%/locale/nb/standard_speeddial.ini
+%%DATADIR%%/locale/nl/license.txt
 %%DATADIR%%/locale/nl/nl.lng
+%%DATADIR%%/locale/nn/license.txt
 %%DATADIR%%/locale/nn/nn.lng
 %%DATADIR%%/locale/pl/bookmarks.adr
+%%DATADIR%%/locale/pl/license.txt
 %%DATADIR%%/locale/pl/pl.lng
 %%DATADIR%%/locale/pl/search.ini
 %%DATADIR%%/locale/pl/standard_speeddial.ini
+%%DATADIR%%/locale/pt-BR/license.txt
 %%DATADIR%%/locale/pt-BR/pt-BR.lng
+%%DATADIR%%/locale/pt/license.txt
 %%DATADIR%%/locale/pt/pt.lng
+%%DATADIR%%/locale/ro/bookmarks.adr
+%%DATADIR%%/locale/ro/license.txt
 %%DATADIR%%/locale/ro/ro.lng
+%%DATADIR%%/locale/ro/search.ini
+%%DATADIR%%/locale/ro/standard_speeddial.ini
 %%DATADIR%%/locale/ru/bookmarks.adr
+%%DATADIR%%/locale/ru/license.txt
 %%DATADIR%%/locale/ru/ru.lng
 %%DATADIR%%/locale/ru/search.ini
 %%DATADIR%%/locale/ru/standard_speeddial.ini
+%%DATADIR%%/locale/sk/bookmarks.adr
+%%DATADIR%%/locale/sk/license.txt
+%%DATADIR%%/locale/sk/search.ini
 %%DATADIR%%/locale/sk/sk.lng
+%%DATADIR%%/locale/sk/standard_speeddial.ini
+%%DATADIR%%/locale/sr/bookmarks.adr
+%%DATADIR%%/locale/sr/license.txt
+%%DATADIR%%/locale/sr/search.ini
 %%DATADIR%%/locale/sr/sr.lng
+%%DATADIR%%/locale/sr/standard_speeddial.ini
+%%DATADIR%%/locale/sv/license.txt
 %%DATADIR%%/locale/sv/sv.lng
+%%DATADIR%%/locale/ta/license.txt
 %%DATADIR%%/locale/ta/ta.lng
+%%DATADIR%%/locale/te/license.txt
 %%DATADIR%%/locale/te/te.lng
+%%DATADIR%%/locale/tr/license.txt
 %%DATADIR%%/locale/tr/tr.lng
 %%DATADIR%%/locale/uk/bookmarks.adr
+%%DATADIR%%/locale/uk/license.txt
 %%DATADIR%%/locale/uk/search.ini
 %%DATADIR%%/locale/uk/standard_speeddial.ini
 %%DATADIR%%/locale/uk/uk.lng
+%%DATADIR%%/locale/vi/license.txt
+%%DATADIR%%/locale/vi/vi.lng
 %%DATADIR%%/locale/zh-cn/bookmarks.adr
 %%DATADIR%%/locale/zh-cn/browser.js
+%%DATADIR%%/locale/zh-cn/license.txt
 %%DATADIR%%/locale/zh-cn/search.ini
 %%DATADIR%%/locale/zh-cn/standard_speeddial.ini
 %%DATADIR%%/locale/zh-cn/turbosettings.xml
@@ -122,11 +217,24 @@
 %%DATADIR%%/locale/zh-hk/browser.js
 %%DATADIR%%/locale/zh-hk/turbosettings.xml
 %%DATADIR%%/locale/zh-tw/browser.js
+%%DATADIR%%/locale/zh-tw/license.txt
 %%DATADIR%%/locale/zh-tw/turbosettings.xml
 %%DATADIR%%/locale/zh-tw/zh-tw.lng
-%%DATADIR%%/scripts/common.js
-%%DATADIR%%/scripts/substance.js
+%%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%%/skin/standard_skin.zip
+%%DATADIR%%/skin/unix_skin.zip
 %%DATADIR%%/styles/about.css
 %%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/certinfo.css
@@ -140,8 +248,11 @@
 %%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/Opera_256x256.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/corner.png
 %%DATADIR%%/styles/images/customize.gif
 %%DATADIR%%/styles/images/darkBox.png
 %%DATADIR%%/styles/images/defaultFavicon.png
@@ -149,16 +260,21 @@
 %%DATADIR%%/styles/images/file.png
 %%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-icon-white.png
 %%DATADIR%%/styles/images/opera.png
 %%DATADIR%%/styles/images/page-bot.png
 %%DATADIR%%/styles/images/red_center.png
 %%DATADIR%%/styles/images/red_left.png
 %%DATADIR%%/styles/images/red_right.png
 %%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/search.png
 %%DATADIR%%/styles/images/section.png
 %%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/tooltiptail.png
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/images/warning.png
 %%DATADIR%%/styles/info.css
@@ -169,6 +285,7 @@
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/opera.css
 %%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/private.css
 %%DATADIR%%/styles/search.css
 %%DATADIR%%/styles/unstyledxml.css
 %%DATADIR%%/styles/user/accessibility.css
@@ -189,6 +306,7 @@
 %%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/warning.css
 %%DATADIR%%/styles/webfeeds.html
+%%DATADIR%%/styles/webstorage.css
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/ui/dialog.ini
 %%DATADIR%%/ui/fastforward.ini
@@ -198,27 +316,25 @@
 %%DATADIR%%/ui/standard_mouse.ini
 %%DATADIR%%/ui/standard_toolbar.ini
 %%DATADIR%%/ui/unix_keyboard.ini
+%%DATADIR%%/unite/fileSharing.ua
 %%DATADIR%%/unite/fridge.ua
+%%DATADIR%%/unite/home.ua
 %%DATADIR%%/unite/mediaPlayer.ua
-%%DATADIR%%/unite/photoSharing.ua
 %%DATADIR%%/unite/messenger.ua
-%%DATADIR%%/unite/fileSharing.ua
-%%DATADIR%%/unite/home.ua
+%%DATADIR%%/unite/photoSharing.ua
 %%DATADIR%%/unite/webserver.ua
-%%DOCSDIR%%/LICENSE
-bin/opera
-@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/unite
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/package/lib
+@dirrm %%DATADIR%%/package
 @dirrm %%DATADIR%%/locale/zh-tw
 @dirrm %%DATADIR%%/locale/zh-hk
 @dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/vi
 @dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
 @dirrm %%DATADIR%%/locale/te
@@ -260,8 +376,37 @@ bin/opera
 @dirrm %%DATADIR%%/locale/bg
 @dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/extra
 @dirrm %%DATADIR%%/defaults
-@dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@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
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/mimetypes
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/mimetypes
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/mimetypes
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrm lib/opera/plugins
+@dirrm lib/opera/gstreamer/plugins
+@dirrm lib/opera/gstreamer
+@dirrm lib/opera