Update to 10.00.

Changelog (includes security advisories):
http://www.opera.com/docs/changelogs/freebsd/1000/

Fix operapluginwrapper's usage of LD_LIBRARY_PATH [1]

PR:		138449, 1375151 [1]
Submitted by:	maintainer, Lucius Windschuh [1]
Security:	http://www.vuxml.org/freebsd/80aa98e0-97b4-11de-b946-0030843d3802.html

4 files changed, 222 insertions, 275 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index afdb6cb120e..11fdbede5f1 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,49 +7,46 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/&,} \
+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/
-#		http://www.opera.mirroarrr.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_LIB}/ \
 DISTNAME=	${PORTNAME}-${OPERA_VER}${OPERA_MINVER}-freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-OPERA_VER=	9.64
+OPERA_VER=	10.00
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20090302
-OPERA_BUILD=	2480
+OPERA_DATE=	20090830
+OPERA_BUILD=	4585
 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}
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 USE_QT_VER=	3
 
-MAN1=		opera.1
+MAN1=		${PORTNAME}.1
 
 NO_BUILD=	yes
 
-OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on
-
 .include <bsd.port.pre.mk>
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -62,17 +59,17 @@ OPERA_TYPE=	7
 OPERA_TYPE=	6
 .endif
 
-.if !defined(WITHOUT_ASPELL)
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera|g' \
-		${WRKSRC}/usr/local/share/opera/ini/pluginpath.ini
+#post-patch:
+#	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/${PORTNAME}${PKGNAMESUFFIX}|g' \
+#		${WRKSRC}/usr/local/share/opera/defaults/pluginpath.ini
 
 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
+	@${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 48bebdae190..9b71effb5eb 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,12 +1,12 @@
-MD5 (opera-9.64-freebsd6-shared-qt3.i386.tar.bz2) = 037ffa4739d40a323418b74e11f86577
-SHA256 (opera-9.64-freebsd6-shared-qt3.i386.tar.bz2) = 592907a3d300aa3582ea1108ba4ac069b58fc1801e1310a63645eaec5cc1c316
-SIZE (opera-9.64-freebsd6-shared-qt3.i386.tar.bz2) = 7497854
-MD5 (opera-9.64-freebsd6-shared-qt3.amd64.tar.bz2) = 543c9ae7affbd41e936ec48c3ad2c6d6
-SHA256 (opera-9.64-freebsd6-shared-qt3.amd64.tar.bz2) = b458319d2ae6163e9b4d348c851d89525d48ee3161f6399253b13e33a425a859
-SIZE (opera-9.64-freebsd6-shared-qt3.amd64.tar.bz2) = 8002494
-MD5 (opera-9.64-freebsd7-shared-qt3.i386.tar.bz2) = eef0b6d5e0239d6dd3a68683477c8305
-SHA256 (opera-9.64-freebsd7-shared-qt3.i386.tar.bz2) = 0b64565d4e52d8c63356d900ccc30379366d403f9591b920f82cfb079bfcabe4
-SIZE (opera-9.64-freebsd7-shared-qt3.i386.tar.bz2) = 7366483
-MD5 (opera-9.64-freebsd7-shared-qt3.amd64.tar.bz2) = 0ed4093090f818fe4530f07f53ac3c7f
-SHA256 (opera-9.64-freebsd7-shared-qt3.amd64.tar.bz2) = 8995af18209bcf94d6ec0c5a123616e38480eff8ce48287d355377a7018f62f1
-SIZE (opera-9.64-freebsd7-shared-qt3.amd64.tar.bz2) = 7892618
+MD5 (opera-10.00-freebsd6-shared-qt3.amd64.tar.bz2) = 24dd607ec68adca4961910042f0b33c2
+SHA256 (opera-10.00-freebsd6-shared-qt3.amd64.tar.bz2) = 16f889ff2774a03d7823a3744d8e7b1fd99c2f5d4e98f4218417495a1f182ac6
+SIZE (opera-10.00-freebsd6-shared-qt3.amd64.tar.bz2) = 9305107
+MD5 (opera-10.00-freebsd6-shared-qt3.i386.tar.bz2) = 4ba649254dfde639a11e57b5f0baef21
+SHA256 (opera-10.00-freebsd6-shared-qt3.i386.tar.bz2) = ce1d26ffad5521a1f9eb1a2d4e31d49466dbc83db5c73640d5323f816facb471
+SIZE (opera-10.00-freebsd6-shared-qt3.i386.tar.bz2) = 8764410
+MD5 (opera-10.00-freebsd7-shared-qt3.amd64.tar.bz2) = 6a4552c27c1e7d5278faa23712af77fb
+SHA256 (opera-10.00-freebsd7-shared-qt3.amd64.tar.bz2) = addfa0097d378e7b70b0a3ce63736a08bb7c29d4e848c32b5e04db35610b48dc
+SIZE (opera-10.00-freebsd7-shared-qt3.amd64.tar.bz2) = 9189288
+MD5 (opera-10.00-freebsd7-shared-qt3.i386.tar.bz2) = 7c4e21c719c58fc7499b5f3f911c3ed7
+SHA256 (opera-10.00-freebsd7-shared-qt3.i386.tar.bz2) = e54f3cb47bc67f461e37ecfea1cc7a0a919ec2c3df7b98972f859710134e41b1
+SIZE (opera-10.00-freebsd7-shared-qt3.i386.tar.bz2) = 8603919
diff --git a/www/opera/files/operapluginwrapper b/www/opera/files/operapluginwrapper
index fcec17e85d8..a2fe2775916 100644
--- a/www/opera/files/operapluginwrapper
+++ b/www/opera/files/operapluginwrapper
@@ -13,6 +13,8 @@ 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/pkg-plist b/www/opera/pkg-plist
index 54fbce1d68b..3396fca3894 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -1,262 +1,210 @@
-bin/opera
-%%DATADIR%%/svg-mo.dat
-%%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/svg-sebd.dat
-%%DATADIR%%/java/opera.policy
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/bin/works
+
+%%DATADIR%%/bin/missingsyms.so
+%%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
 %%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/operapluginwrapper.freebsd
-%%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/operaplugincleaner
-%%DATADIR%%/bin/opera
-%%DATADIR%%/styles/im.css
-%%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/warning.css
+%%DATADIR%%/bin/works
+%%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/pluginpath.ini
+%%DATADIR%%/defaults/search.ini
+%%DATADIR%%/defaults/standard_speeddial.ini
+%%DATADIR%%/defaults/standard_trusted_repositories.ini
+%%DATADIR%%/defaults/webmailproviders.ini
+%%DATADIR%%/defaults/xmlentities.ini
+%%DATADIR%%/encoding.bin
+%%DATADIR%%/extra/missingplugin.svg
+%%DATADIR%%/extra/missingpluginhover.svg
+%%DATADIR%%/extra/svg-mo.dat
+%%DATADIR%%/extra/svg-mobd.dat
+%%DATADIR%%/extra/svg-sa.dat
+%%DATADIR%%/extra/svg-sabd.dat
+%%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/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
+%%DATADIR%%/locale/de/search.ini
+%%DATADIR%%/locale/de/standard_speeddial.ini
+%%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/standard_speeddial.ini
+%%DATADIR%%/locale/en/bookmarks.adr
+%%DATADIR%%/locale/en/en.lng
+%%DATADIR%%/locale/en/en.zip
+%%DATADIR%%/locale/en/license.txt
+%%DATADIR%%/locale/en/search.ini
+%%DATADIR%%/locale/en/standard_speeddial.ini
+%%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-LA/es-LA.lng
+%%DATADIR%%/locale/et/et.lng
+%%DATADIR%%/locale/fi/fi.lng
+%%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fy/fy.lng
+%%DATADIR%%/locale/hi/hi.lng
+%%DATADIR%%/locale/hi/standard_speeddial.ini
+%%DATADIR%%/locale/hr/hr.lng
+%%DATADIR%%/locale/hu/hu.lng
+%%DATADIR%%/locale/id/bookmarks.adr
+%%DATADIR%%/locale/id/id.lng
+%%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/ja/bookmarks.adr
+%%DATADIR%%/locale/ja/ja.lng
+%%DATADIR%%/locale/ja/license.txt
+%%DATADIR%%/locale/ja/search.ini
+%%DATADIR%%/locale/ja/standard_speeddial.ini
+%%DATADIR%%/locale/ka/ka.lng
+%%DATADIR%%/locale/ko/ko.lng
+%%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/mk/mk.lng
+%%DATADIR%%/locale/nb/nb.lng
+%%DATADIR%%/locale/nl/nl.lng
+%%DATADIR%%/locale/nn/nn.lng
+%%DATADIR%%/locale/pl/bookmarks.adr
+%%DATADIR%%/locale/pl/pl.lng
+%%DATADIR%%/locale/pl/search.ini
+%%DATADIR%%/locale/pl/standard_speeddial.ini
+%%DATADIR%%/locale/pt-BR/pt-BR.lng
+%%DATADIR%%/locale/pt/pt.lng
+%%DATADIR%%/locale/ro/ro.lng
+%%DATADIR%%/locale/ru/bookmarks.adr
+%%DATADIR%%/locale/ru/ru.lng
+%%DATADIR%%/locale/ru/search.ini
+%%DATADIR%%/locale/ru/standard_speeddial.ini
+%%DATADIR%%/locale/sk/sk.lng
+%%DATADIR%%/locale/sr/sr.lng
+%%DATADIR%%/locale/sv/sv.lng
+%%DATADIR%%/locale/ta/ta.lng
+%%DATADIR%%/locale/te/te.lng
+%%DATADIR%%/locale/tr/tr.lng
+%%DATADIR%%/locale/uk/uk.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-hk/browser.js
+%%DATADIR%%/locale/zh-hk/turbosettings.xml
+%%DATADIR%%/locale/zh-tw/browser.js
+%%DATADIR%%/locale/zh-tw/turbosettings.xml
+%%DATADIR%%/locale/zh-tw/zh-tw.lng
+%%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
+%%DATADIR%%/styles/config.css
+%%DATADIR%%/styles/contentblock.css
+%%DATADIR%%/styles/debug.css
+%%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/error.css
-%%DATADIR%%/styles/cache.css
-%%DATADIR%%/styles/plugins.css
-%%DATADIR%%/styles/user/toc.css
-%%DATADIR%%/styles/user/disableforms.css
-%%DATADIR%%/styles/user/disablebreaks.css
-%%DATADIR%%/styles/user/disablepositioning.css
-%%DATADIR%%/styles/user/disablefloats.css
-%%DATADIR%%/styles/user/altdebugger.css
-%%DATADIR%%/styles/user/structuretables.css
-%%DATADIR%%/styles/user/classid.css
-%%DATADIR%%/styles/user/structureblock.css
-%%DATADIR%%/styles/user/outline.css
-%%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/tablelayout.css
-%%DATADIR%%/styles/user/structureinline.css
-%%DATADIR%%/styles/user/contrastbw.css
-%%DATADIR%%/styles/user/accessibility.css
-%%DATADIR%%/styles/webfeeds.html
-%%DATADIR%%/styles/wml.css
 %%DATADIR%%/styles/history.css
-%%DATADIR%%/styles/images/red_right.png
-%%DATADIR%%/styles/images/flag.png
-%%DATADIR%%/styles/images/defaultFavicon.png
-%%DATADIR%%/styles/images/root.png
-%%DATADIR%%/styles/images/folder.png
-%%DATADIR%%/styles/images/red_left.png
-%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/im.css
+%%DATADIR%%/styles/image.css
+%%DATADIR%%/styles/images/Opera_256x256.png
 %%DATADIR%%/styles/images/bar.png
-%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/bullet.png
 %%DATADIR%%/styles/images/center.png
-%%DATADIR%%/styles/images/top.png
-%%DATADIR%%/styles/images/section.png
 %%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/error.png
+%%DATADIR%%/styles/images/file.png
+%%DATADIR%%/styles/images/flag.png
+%%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
-%%DATADIR%%/styles/config.css
-%%DATADIR%%/styles/search.css
-%%DATADIR%%/styles/message.css
-%%DATADIR%%/styles/dir.css
+%%DATADIR%%/styles/images/red_left.png
+%%DATADIR%%/styles/images/red_right.png
+%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/section.png
+%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/top.png
+%%DATADIR%%/styles/images/warning.png
 %%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/m2_welcome_message.mbs
+%%DATADIR%%/styles/mail.css
 %%DATADIR%%/styles/mathml.css
-%%DATADIR%%/styles/contentblock.css
-%%DATADIR%%/styles/about.css
-%%DATADIR%%/styles/image.css
-%%DATADIR%%/encoding.bin
-%%DATADIR%%/lngcode.txt
-%%DATADIR%%/ini/xmlentities.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/font.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/standard_keyboard_compat.ini
-%%DATADIR%%/ini/mailproviders.xml
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/dialog.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/speeddial_default.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/svg-sa.dat
-%%DATADIR%%/search.ini
-%%DATADIR%%/locale/et/eesti.lng
-%%DATADIR%%/locale/et/license.txt
-%%DATADIR%%/locale/et/search.ini
-%%DATADIR%%/locale/et/opera6.adr
-%%DATADIR%%/locale/te/opera6.adr
-%%DATADIR%%/locale/te/license.txt
-%%DATADIR%%/locale/te/search.ini
-%%DATADIR%%/locale/te/telugu.lng
-%%DATADIR%%/locale/ta/tamil.lng
-%%DATADIR%%/locale/ta/opera6.adr
-%%DATADIR%%/locale/ta/search.ini
-%%DATADIR%%/locale/ta/license.txt
-%%DATADIR%%/locale/nl/search.ini
-%%DATADIR%%/locale/nl/nederlands.lng
-%%DATADIR%%/locale/nl/opera6.adr
-%%DATADIR%%/locale/nl/license.txt
-%%DATADIR%%/locale/fr/search.ini
-%%DATADIR%%/locale/fr/francais.lng
-%%DATADIR%%/locale/fr/license.txt
-%%DATADIR%%/locale/fr/opera6.adr
-%%DATADIR%%/locale/en-GB/license.txt
-%%DATADIR%%/locale/en-GB/opera6.adr
-%%DATADIR%%/locale/en-GB/british.lng
-%%DATADIR%%/locale/en-GB/search.ini
-%%DATADIR%%/locale/lt/search.ini
-%%DATADIR%%/locale/lt/lithuanian.lng
-%%DATADIR%%/locale/lt/license.txt
-%%DATADIR%%/locale/lt/opera6.adr
-%%DATADIR%%/locale/cs/opera6.adr
-%%DATADIR%%/locale/cs/czech.lng
-%%DATADIR%%/locale/cs/search.ini
-%%DATADIR%%/locale/cs/license.txt
-%%DATADIR%%/locale/pl/search.ini
-%%DATADIR%%/locale/pl/opera6.adr
-%%DATADIR%%/locale/pl/polski.lng
-%%DATADIR%%/locale/pl/license.txt
-%%DATADIR%%/locale/zh-cn/license.txt
-%%DATADIR%%/locale/zh-cn/search.ini
-%%DATADIR%%/locale/zh-cn/opera6.adr
-%%DATADIR%%/locale/zh-cn/chinese_simp.lng
-%%DATADIR%%/locale/hu/license.txt
-%%DATADIR%%/locale/hu/search.ini
-%%DATADIR%%/locale/hu/hungarian.lng
-%%DATADIR%%/locale/hu/opera6.adr
-%%DATADIR%%/locale/hr/search.ini
-%%DATADIR%%/locale/hr/license.txt
-%%DATADIR%%/locale/hr/opera6.adr
-%%DATADIR%%/locale/hr/croatian.lng
-%%DATADIR%%/locale/bg/opera6.adr
-%%DATADIR%%/locale/bg/search.ini
-%%DATADIR%%/locale/bg/license.txt
-%%DATADIR%%/locale/bg/bulgarian.lng
-%%DATADIR%%/locale/id/indonesian.lng
-%%DATADIR%%/locale/id/license.txt
-%%DATADIR%%/locale/id/opera6.adr
-%%DATADIR%%/locale/id/search.ini
-%%DATADIR%%/locale/nb/opera6.adr
-%%DATADIR%%/locale/nb/license.txt
-%%DATADIR%%/locale/nb/norsk.lng
-%%DATADIR%%/locale/nb/search.ini
-%%DATADIR%%/locale/pt-BR/opera6.adr
-%%DATADIR%%/locale/pt-BR/brazilportuguese.lng
-%%DATADIR%%/locale/pt-BR/search.ini
-%%DATADIR%%/locale/pt-BR/license.txt
-%%DATADIR%%/locale/es-LA/espanol-america_latina.lng
-%%DATADIR%%/locale/es-LA/search.ini
-%%DATADIR%%/locale/es-LA/license.txt
-%%DATADIR%%/locale/es-LA/opera6.adr
-%%DATADIR%%/locale/zh-tw/search.ini
-%%DATADIR%%/locale/zh-tw/license.txt
-%%DATADIR%%/locale/zh-tw/opera6.adr
-%%DATADIR%%/locale/zh-tw/chinese.lng
-%%DATADIR%%/locale/da/dansk.lng
-%%DATADIR%%/locale/da/search.ini
-%%DATADIR%%/locale/da/opera6.adr
-%%DATADIR%%/locale/da/license.txt
-%%DATADIR%%/locale/tr/opera6.adr
-%%DATADIR%%/locale/tr/license.txt
-%%DATADIR%%/locale/tr/turkce.lng
-%%DATADIR%%/locale/tr/search.ini
-%%DATADIR%%/locale/be/search.ini
-%%DATADIR%%/locale/be/opera6.adr
-%%DATADIR%%/locale/be/byelorussian.lng
-%%DATADIR%%/locale/be/license.txt
-%%DATADIR%%/locale/ka/search.ini
-%%DATADIR%%/locale/ka/georgian.lng
-%%DATADIR%%/locale/ka/opera6.adr
-%%DATADIR%%/locale/ka/license.txt
-%%DATADIR%%/locale/fr-CA/license.txt
-%%DATADIR%%/locale/fr-CA/opera6.adr
-%%DATADIR%%/locale/fr-CA/search.ini
-%%DATADIR%%/locale/fr-CA/francais-canadien.lng
-%%DATADIR%%/locale/fy/license.txt
-%%DATADIR%%/locale/fy/search.ini
-%%DATADIR%%/locale/fy/frisian.lng
-%%DATADIR%%/locale/fy/opera6.adr
-%%DATADIR%%/locale/hi/license.txt
-%%DATADIR%%/locale/hi/opera6.adr
-%%DATADIR%%/locale/hi/search.ini
-%%DATADIR%%/locale/hi/hindi.lng
-%%DATADIR%%/locale/es-ES/espanol-espana.lng
-%%DATADIR%%/locale/es-ES/search.ini
-%%DATADIR%%/locale/es-ES/license.txt
-%%DATADIR%%/locale/es-ES/opera6.adr
-%%DATADIR%%/locale/it/search.ini
-%%DATADIR%%/locale/it/italiano.lng
-%%DATADIR%%/locale/it/license.txt
-%%DATADIR%%/locale/it/opera6.adr
-%%DATADIR%%/locale/ru/opera6.adr
-%%DATADIR%%/locale/ru/russian.lng
-%%DATADIR%%/locale/ru/search.ini
-%%DATADIR%%/locale/ru/license.txt
-%%DATADIR%%/locale/mk/opera6.adr
-%%DATADIR%%/locale/mk/macedonian.lng
-%%DATADIR%%/locale/mk/search.ini
-%%DATADIR%%/locale/mk/license.txt
-%%DATADIR%%/locale/sv/opera6.adr
-%%DATADIR%%/locale/sv/svenska.lng
-%%DATADIR%%/locale/sv/search.ini
-%%DATADIR%%/locale/sv/license.txt
-%%DATADIR%%/locale/fi/license.txt
-%%DATADIR%%/locale/fi/opera6.adr
-%%DATADIR%%/locale/fi/search.ini
-%%DATADIR%%/locale/fi/suomi.lng
-%%DATADIR%%/locale/pt/portuguese.lng
-%%DATADIR%%/locale/pt/opera6.adr
-%%DATADIR%%/locale/pt/search.ini
-%%DATADIR%%/locale/pt/license.txt
-%%DATADIR%%/locale/ko/korean.lng
-%%DATADIR%%/locale/ko/opera6.adr
-%%DATADIR%%/locale/ko/search.ini
-%%DATADIR%%/locale/ko/license.txt
-%%DATADIR%%/locale/el/opera6.adr
-%%DATADIR%%/locale/el/greek.lng
-%%DATADIR%%/locale/el/search.ini
-%%DATADIR%%/locale/el/license.txt
-%%DATADIR%%/locale/ja/opera6.adr
-%%DATADIR%%/locale/ja/license.txt
-%%DATADIR%%/locale/ja/japanese.lng
-%%DATADIR%%/locale/ja/search.ini
-%%DATADIR%%/locale/de/search.ini
-%%DATADIR%%/locale/de/license.txt
-%%DATADIR%%/locale/de/deutsch.lng
-%%DATADIR%%/locale/de/opera6.adr
-%%DATADIR%%/locale/nn/opera6.adr
-%%DATADIR%%/locale/nn/nynorsk.lng
-%%DATADIR%%/locale/nn/license.txt
-%%DATADIR%%/locale/nn/search.ini
-%%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/opera6.adr
-%%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/uk/opera6.adr
-%%DATADIR%%/locale/uk/license.txt
-%%DATADIR%%/locale/uk/ukrainian.lng
-%%DATADIR%%/locale/uk/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-sabd.dat
+%%DATADIR%%/styles/message.css
+%%DATADIR%%/styles/mime.css
+%%DATADIR%%/styles/opera.css
+%%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
+%%DATADIR%%/styles/unstyledxml.css
+%%DATADIR%%/styles/user/accessibility.css
+%%DATADIR%%/styles/user/altdebugger.css
+%%DATADIR%%/styles/user/classid.css
+%%DATADIR%%/styles/user/contrastbw.css
+%%DATADIR%%/styles/user/contrastwb.css
+%%DATADIR%%/styles/user/disablebreaks.css
+%%DATADIR%%/styles/user/disablefloats.css
+%%DATADIR%%/styles/user/disableforms.css
+%%DATADIR%%/styles/user/disablepositioning.css
+%%DATADIR%%/styles/user/disabletables.css
+%%DATADIR%%/styles/user/outline.css
+%%DATADIR%%/styles/user/structureblock.css
+%%DATADIR%%/styles/user/structureinline.css
+%%DATADIR%%/styles/user/structuretables.css
+%%DATADIR%%/styles/user/tablelayout.css
+%%DATADIR%%/styles/user/toc.css
+%%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
+%%DATADIR%%/styles/wml.css
+%%DATADIR%%/ui/dialog.ini
+%%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/standard_trusted_repositories.ini
+%%DATADIR%%/ui/unix_keyboard.ini
 %%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
-
+bin/opera
+@dirrm %%DOCSDIR%%
+@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%%/locale/zh-tw
+@dirrm %%DATADIR%%/locale/zh-hk
 @dirrm %%DATADIR%%/locale/zh-cn
 @dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
 @dirrm %%DATADIR%%/locale/te
 @dirrm %%DATADIR%%/locale/ta
 @dirrm %%DATADIR%%/locale/sv
+@dirrm %%DATADIR%%/locale/sr
+@dirrm %%DATADIR%%/locale/sk
 @dirrm %%DATADIR%%/locale/ru
+@dirrm %%DATADIR%%/locale/ro
 @dirrm %%DATADIR%%/locale/pt-BR
 @dirrm %%DATADIR%%/locale/pt
 @dirrm %%DATADIR%%/locale/pl
@@ -290,7 +238,7 @@ bin/opera
 @dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
-@dirrm %%DATADIR%%/ini
+@dirrm %%DATADIR%%/extra
+@dirrm %%DATADIR%%/defaults
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%