Update to 10.00.

Tested by:	Gary Jennejohn <gary.jennejohn@freenet.de>

6 files changed, 229 insertions, 257 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 7490e33a5ea1..e46aae0ecabd 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -8,18 +8,18 @@
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-bundled-qt4.i386
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -27,13 +27,13 @@ COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_LINUX_APPS=	aspell xorglibs
+USE_LINUX_APPS=	aspell naslibs xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.64
-OPERA_BUILD=	2480
+OPERA_VER=	10.00
+OPERA_BUILD=	4585
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
@@ -48,7 +48,7 @@ post-patch:
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		s|%%LINUXBASE%%|${LINUXBASE}|g' \
 			${WRKSRC}/install.sh \
-			${WRKSRC}/usr/share/opera/ini/pluginpath.ini
+			${WRKSRC}/usr/share/opera/defaults/pluginpath.ini
 	@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
 		${WRKSRC}/Manifest.md5
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 76342246e9c7..cead668bb471 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.64.gcc4-static-qt3.i386.tar.bz2) = c8de130608f10a0afb569547e473fe9c
-SHA256 (opera-9.64.gcc4-static-qt3.i386.tar.bz2) = 056f3983497438878741c45ceade285387cd393d0b3469f0a8971223c1364dbf
-SIZE (opera-9.64.gcc4-static-qt3.i386.tar.bz2) = 9273212
+MD5 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = a9b938bce7fa3de0307712fb659add43
+SHA256 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 2983c89877dad49e6c11a9bed31ddb80a5144e699d8308ca993aad7e0cc8e9e0
+SIZE (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 13365053
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index 666235619dd2..e6d8de2ad7d3 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,8 +1,8 @@
---- install.sh.orig	2008-06-11 15:33:00.000000000 -0500
-+++ install.sh	2008-07-02 22:49:18.000000000 -0500
+--- install.sh.orig	2009-08-30 14:25:11.000000000 -0500
++++ install.sh	2009-08-30 16:51:54.000000000 -0500
 @@ -832,10 +832,9 @@
      case "${machine}:${os}" in
- 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
+ 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86_64:OpenBSD|x86:QNX)
  	    wrapper_ibmjava="
 -	    IBMJava2-142/jre \\
 -	    IBMJava2-141/jre \\
@@ -15,7 +15,7 @@
  	;;
  
 @@ -865,10 +864,19 @@
- 		error 'os'
+ 		error os
  	;;
      esac
 -    wrapper_file="${wrapper_dir}/opera"
@@ -49,7 +49,7 @@
  do if test -f \"\$d/javapath.txt\"
     then
        INIJAVA=\`cat \"\$d/javapath.txt\"\`
-@@ -950,85 +962,17 @@
+@@ -950,88 +962,17 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"
  then
@@ -133,6 +133,9 @@
 -	jdk1.6.0/jre \\
 -	diablo-jre1.5.0 \\
 -	diablo-jdk1.5.0/jre \\
+-	diablo-jre1.6.0 \\
+-	diablo-jdk1.6.0/jre \\
+-	openjdk6/jre \\
 +	linux-blackdown-jdk1.3.1/jre \\
 +	linux-blackdown-jdk1.4.1/jre \\
 +	linux-blackdown-jdk1.4.2/jre \\
@@ -144,7 +147,7 @@
  	; do
  	for PREFIX in \${PREFIXES}
  	do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
-@@ -1082,11 +1026,7 @@
+@@ -1085,11 +1026,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -153,11 +156,12 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat5/bin \\
++    %%LOCALBASE%%/Adobe/Reader8/ENU/Adobe/Reader8/Reader/intellinux/bin \\
++    %%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Reader/intellinux/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1099,8 +1039,7 @@
+@@ -1102,8 +1040,7 @@
  
  # Spellchecker needs to find libaspell.so.15
  for LIBASPELL_DIR in \\
@@ -167,7 +171,7 @@
  ; do
      if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
      then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-@@ -1108,13 +1047,6 @@
+@@ -1111,13 +1048,6 @@
  done"
  
  case "${os}" in
@@ -181,7 +185,7 @@
      SunOS)
  wrapper_contain="${wrapper_contain}
  
-@@ -1143,7 +1075,7 @@
+@@ -1146,7 +1076,7 @@
  };
  
  // Opera package classes get all permissions
@@ -190,7 +194,7 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1260,12 +1192,12 @@
+@@ -1263,12 +1193,12 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -205,7 +209,7 @@
  
      share_src="`manifest_path 'html40_entities\.dtd'`"
      part_install "$share_src" "$share_dir" "Shared resources"
-@@ -1274,76 +1206,20 @@
+@@ -1277,84 +1207,20 @@
      mkdir $mkdirv $mkdirp $plugin_dir/
  
      # Wrapper
@@ -228,8 +232,8 @@
 -	then
 -	    warn
 -	    warn "System wide configuration files:"
--	    warn "  $config_dir/opera6rc"
--	    warn "  $config_dir/opera6rc.fixed"
+-	    warn "  $config_dir/operaprefs_default.ini"
+-	    warn "  $config_dir/operaprefs_fixed.ini"
 -	    warn " would be ignored if installed with the prefix \"$prefix\"."
 -	    bool_config=1
 -	    if [ "$flag_mode" = '--interactive' ]
@@ -239,31 +243,39 @@
 -
 -	    if [ $bool_config -eq 1 ]
 -	    then
--		if [ -f "$config_dir/opera6rc" ]
--		then
--		    if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc exists: over-write it ?"
--		    then
--			backup $config_dir/opera6rc opera6rc config
--			cp $cpv $cpf etc/opera6rc $config_dir
--		    fi
--		else cp $cpv $cpf etc/opera6rc $config_dir
--		fi
--		if [ -f "$config_dir/opera6rc.fixed" ]
--		then
--		    if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc.fixed exists: over-write it ?"
--		    then
--			backup $config_dir/opera6rc.fixed opera6rc.fixed config
--			cp $cpv $cpf etc/opera6rc.fixed $config_dir
--		    fi
--		else cp $cpv $cpf etc/opera6rc.fixed $config_dir
--		fi
+-			if [ -f "$config_dir/opera6rc" ]
+-			then
+-				mv -f "$config_dir/opera6rc" "$config_dir/operaprefs_default.ini"
+-			fi
+-			if [ -f "$config_dir/opera6rc.fixed" ]
+-			then
+-				mv -f "$config_dir/opera6rc.fixed" "$config_dir/operaprefs_fixed.ini"
+-			fi
+-			if [ -f "$config_dir/operaprefs_default.ini" ]
+-			then
+-				if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_default.ini exists: over-write it ?"
+-				then
+-					backup $config_dir/operaprefs_default.ini operaprefs_default.ini config
+-					cp $cpv $cpf etc/operaprefs_default.ini $config_dir
+-				fi
+-			else cp $cpv $cpf etc/operaprefs_default.ini $config_dir
+-			fi
+-			if [ -f "$config_dir/operaprefs_fixed.ini" ]
+-			then
+-				if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_fixed.ini exists: over-write it ?"
+-				then
+-					backup $config_dir/operaprefs_fixed.ini operaprefs_fixed.ini config
+-					cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
+-				fi
+-			else cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
+-			fi
 -	    fi
 -	else
 -	    warn
 -	    warn "User \"${USERNAME}\" does not have write access to $config_dir"
 -	    warn " System wide configuration files:"
--	    warn "  $config_dir/opera6rc"
--	    warn "  $config_dir/opera6rc.fixed"
+-	    warn "  $config_dir/operaprefs_default.ini"
+-	    warn "  $config_dir/operaprefs_fixed.ini"
 -	    warn " were not installed."
 -	fi
 -
@@ -285,7 +297,7 @@
  	fi
  
      fi # OPERADESTDIR
-@@ -1392,21 +1268,21 @@
+@@ -1403,24 +1269,24 @@
      echo '[Desktop Entry]'
      if test -z "$1"
      then cat <<EOF
@@ -308,11 +320,17 @@
  	cat <<EOF
  Encoding=UTF-8
 -Name=Opera
+-Name[af]=opera
+-Name[eo]=Opero
+-Name[zu]=I Opera
 +Name=Opera (linux version)
- Name[af]=opera
- Name[eo]=Opero
- Name[zu]=I Opera
-@@ -1430,7 +1306,7 @@
++Name[af]=opera (linux version)
++Name[eo]=Opero (linux version)
++Name[zu]=I Opera (linux version)
+ GenericName=Web browser
+ GenericName[bs]=Web preglednik
+ GenericName[de]=Web-Browser
+@@ -1441,7 +1307,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -321,7 +339,7 @@
  Terminal=false
  EOF
  
-@@ -1446,15 +1322,16 @@
+@@ -1457,15 +1323,16 @@
  	if test "$1" = "xdg"
  	then cat <<EOF
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -340,7 +358,7 @@
  EOF
  }
  
-@@ -1462,7 +1339,7 @@
+@@ -1473,7 +1340,7 @@
  {
      # arg1 = location
      # arg2 = type
@@ -349,7 +367,7 @@
  }
  
  generate_mdk_menu()
-@@ -1487,51 +1364,26 @@
+@@ -1498,51 +1365,26 @@
  
      debug_msg 0 "in icons()"
  
diff --git a/www/linux-opera/files/patch-pluginpath.ini b/www/linux-opera/files/patch-pluginpath.ini
index 576796bc1b01..96041bf159bf 100644
--- a/www/linux-opera/files/patch-pluginpath.ini
+++ b/www/linux-opera/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- usr/share/opera/ini/pluginpath.ini.orig	2008-06-12 11:59:40.000000000 -0500
-+++ usr/share/opera/ini/pluginpath.ini	2008-06-12 12:02:35.000000000 -0500
-@@ -2,66 +2,26 @@
+--- 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 @@
  ; Do not edit this file while Opera is running
  ; This file is stored in UTF-8 encoding
  
@@ -43,7 +43,8 @@
 -/usr/Acrobat7/Browsers/intellinux=1
 -/usr/Acrobat5/Browsers/intellinux=1
 -/usr/Acrobat4/Browsers/intellinux=1
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%LOCALBASE%%/Adobe/Reader8/ENU/Adobe/Reader8/Browser/intellinux=1
++%%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Browser/intellinux=1
  
  ; Realplayer
 -/usr/lib/RealPlayer8/Plugins=1
@@ -56,6 +57,8 @@
  ; Flash
 -/usr/lib/flash-plugin=1
 -/usr/lib/flashplugin-nonfree=1
+-/usr/lib/adobe-flashplugin=1
+-/usr/lib/flashplugin-installer=1
 -
 -; Netscape Plug-in Paths
 -$HOME/.netscape6/plugins=1
@@ -75,7 +78,9 @@
 -/usr/lib64/browser-plugins=1
 -/usr/lib/browser-plugins=1
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
-+
+ 
+-; General path for gentoo
+-/usr/lib32/nsbrowser/plugins=1
 +; Global plugins path in FreeBSD. Need this for
 +; the Adobe Acrobat7 and other plugins too.
 +%%LOCALBASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
index e0f2bd05ecbf..8bf7183efc24 100644
--- a/www/linux-opera/files/patch-search.ini
+++ b/www/linux-opera/files/patch-search.ini
@@ -1,6 +1,6 @@
---- usr/share/opera/search.ini.orig	2008-06-12 17:38:53.000000000 -0500
-+++ usr/share/opera/search.ini	2008-06-12 17:40:57.000000000 -0500
-@@ -144,7 +144,7 @@
+--- usr/share/opera/defaults/search.ini.orig	2009-08-30 17:05:50.000000000 -0500
++++ usr/share/opera/defaults/search.ini	2009-08-30 17:09:42.000000000 -0500
+@@ -129,7 +129,7 @@
  Query=
  Key=f
  Is post=0
@@ -9,12 +9,11 @@
  Encoding=
  Search Type=12
  Verbtext=0
-@@ -444,3 +444,68 @@
- Verbtext=0
+@@ -430,3 +430,67 @@
  Position=-1
  Nameid=291960
-+
-+[Search Engine 32]
+ 
++[Search Engine 31]
 +Name=Google BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Query=
@@ -27,7 +26,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 33]
++[Search Engine 32]
 +Name=FreeBSD mail archives
 +URL=http://freebsd.rambler.ru/srch?words=%s
 +Query=
@@ -40,7 +39,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 34]
++[Search Engine 33]
 +Name=FreeBSD PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -53,7 +52,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 35]
++[Search Engine 34]
 +Name=FreshPorts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
@@ -66,7 +65,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 36]
++[Search Engine 35]
 +Name=FreeBSD.org
 +URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
 +Query=
@@ -78,9 +77,9 @@
 +Verbtext=0
 +Position=-1
 +Nameid=0
---- usr/share/opera/locale/en/search.ini.orig	2008-06-12 17:39:11.000000000 -0500
-+++ usr/share/opera/locale/en/search.ini	2008-06-12 17:41:48.000000000 -0500
-@@ -144,7 +144,7 @@
+--- usr/share/opera/locale/en/search.ini.orig	2009-08-30 17:10:08.000000000 -0500
++++ usr/share/opera/locale/en/search.ini	2009-08-30 17:12:24.000000000 -0500
+@@ -129,7 +129,7 @@
  Query=
  Key=f
  Is post=0
@@ -89,12 +88,12 @@
  Encoding=
  Search Type=12
  Verbtext=0
-@@ -444,3 +444,68 @@
+@@ -429,3 +429,68 @@
  Verbtext=0
  Position=-1
  Nameid=291960
 +
-+[Search Engine 32]
++[Search Engine 31]
 +Name=Google BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Query=
@@ -107,7 +106,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 33]
++[Search Engine 32]
 +Name=FreeBSD mail archives
 +URL=http://freebsd.rambler.ru/srch?words=%s
 +Query=
@@ -120,7 +119,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 34]
++[Search Engine 33]
 +Name=FreeBSD PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -133,7 +132,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 35]
++[Search Engine 34]
 +Name=FreshPorts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
@@ -146,7 +145,7 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 36]
++[Search Engine 35]
 +Name=FreeBSD.org
 +URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
 +Query=
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index d7609190e316..a28bb15c03de 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -2,209 +2,144 @@ bin/linux-opera
 share/applications/linux-opera.desktop
 %%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
+%%DATADIR%%/bin/libQtCore.so.4
+%%DATADIR%%/bin/libQtGui.so.4
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
 %%DATADIR%%/bin/operaplugincleaner
 %%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/spellcheck.so
 %%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%%/ini/dialog.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/font.ini
-%%DATADIR%%/ini/mailproviders.xml
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/speeddial_default.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/ini/standard_keyboard_compat.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/xmlentities.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/be/byelorussian.lng
-%%DATADIR%%/locale/be/license.txt
-%%DATADIR%%/locale/be/opera6.adr
-%%DATADIR%%/locale/be/search.ini
-%%DATADIR%%/locale/bg/bulgarian.lng
-%%DATADIR%%/locale/bg/license.txt
-%%DATADIR%%/locale/bg/opera6.adr
-%%DATADIR%%/locale/bg/search.ini
-%%DATADIR%%/locale/cs/czech.lng
-%%DATADIR%%/locale/cs/license.txt
-%%DATADIR%%/locale/cs/opera6.adr
-%%DATADIR%%/locale/cs/search.ini
-%%DATADIR%%/locale/da/dansk.lng
-%%DATADIR%%/locale/da/license.txt
-%%DATADIR%%/locale/da/opera6.adr
-%%DATADIR%%/locale/da/search.ini
-%%DATADIR%%/locale/de/deutsch.lng
-%%DATADIR%%/locale/de/license.txt
-%%DATADIR%%/locale/de/opera6.adr
+%%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/el/greek.lng
-%%DATADIR%%/locale/el/license.txt
-%%DATADIR%%/locale/el/opera6.adr
-%%DATADIR%%/locale/el/search.ini
-%%DATADIR%%/locale/en-GB/british.lng
-%%DATADIR%%/locale/en-GB/license.txt
-%%DATADIR%%/locale/en-GB/opera6.adr
-%%DATADIR%%/locale/en-GB/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/opera6.adr
 %%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/locale/es-ES/espanol-espana.lng
-%%DATADIR%%/locale/es-ES/license.txt
-%%DATADIR%%/locale/es-ES/opera6.adr
-%%DATADIR%%/locale/es-ES/search.ini
-%%DATADIR%%/locale/es-LA/espanol-america_latina.lng
-%%DATADIR%%/locale/es-LA/license.txt
-%%DATADIR%%/locale/es-LA/opera6.adr
-%%DATADIR%%/locale/es-LA/search.ini
-%%DATADIR%%/locale/et/eesti.lng
-%%DATADIR%%/locale/et/license.txt
-%%DATADIR%%/locale/et/opera6.adr
-%%DATADIR%%/locale/et/search.ini
-%%DATADIR%%/locale/fi/license.txt
-%%DATADIR%%/locale/fi/opera6.adr
-%%DATADIR%%/locale/fi/search.ini
-%%DATADIR%%/locale/fi/suomi.lng
-%%DATADIR%%/locale/fr-CA/francais-canadien.lng
-%%DATADIR%%/locale/fr-CA/license.txt
-%%DATADIR%%/locale/fr-CA/opera6.adr
-%%DATADIR%%/locale/fr-CA/search.ini
-%%DATADIR%%/locale/fr/francais.lng
-%%DATADIR%%/locale/fr/license.txt
-%%DATADIR%%/locale/fr/opera6.adr
-%%DATADIR%%/locale/fr/search.ini
-%%DATADIR%%/locale/fy/frisian.lng
-%%DATADIR%%/locale/fy/license.txt
-%%DATADIR%%/locale/fy/opera6.adr
-%%DATADIR%%/locale/fy/search.ini
-%%DATADIR%%/locale/hi/hindi.lng
-%%DATADIR%%/locale/hi/license.txt
-%%DATADIR%%/locale/hi/opera6.adr
-%%DATADIR%%/locale/hi/search.ini
-%%DATADIR%%/locale/hr/croatian.lng
-%%DATADIR%%/locale/hr/license.txt
-%%DATADIR%%/locale/hr/opera6.adr
-%%DATADIR%%/locale/hr/search.ini
-%%DATADIR%%/locale/hu/hungarian.lng
-%%DATADIR%%/locale/hu/license.txt
-%%DATADIR%%/locale/hu/opera6.adr
-%%DATADIR%%/locale/hu/search.ini
-%%DATADIR%%/locale/id/indonesian.lng
-%%DATADIR%%/locale/id/license.txt
-%%DATADIR%%/locale/id/opera6.adr
-%%DATADIR%%/locale/id/search.ini
-%%DATADIR%%/locale/it/italiano.lng
-%%DATADIR%%/locale/it/license.txt
-%%DATADIR%%/locale/it/opera6.adr
-%%DATADIR%%/locale/it/search.ini
-%%DATADIR%%/locale/ja/japanese.lng
+%%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/opera6.adr
 %%DATADIR%%/locale/ja/search.ini
-%%DATADIR%%/locale/ka/georgian.lng
-%%DATADIR%%/locale/ka/license.txt
-%%DATADIR%%/locale/ka/opera6.adr
-%%DATADIR%%/locale/ka/search.ini
-%%DATADIR%%/locale/ko/korean.lng
-%%DATADIR%%/locale/ko/license.txt
-%%DATADIR%%/locale/ko/opera6.adr
-%%DATADIR%%/locale/ko/search.ini
-%%DATADIR%%/locale/lt/license.txt
-%%DATADIR%%/locale/lt/lithuanian.lng
-%%DATADIR%%/locale/lt/opera6.adr
-%%DATADIR%%/locale/lt/search.ini
-%%DATADIR%%/locale/mk/license.txt
-%%DATADIR%%/locale/mk/macedonian.lng
-%%DATADIR%%/locale/mk/opera6.adr
-%%DATADIR%%/locale/mk/search.ini
-%%DATADIR%%/locale/nb/license.txt
-%%DATADIR%%/locale/nb/norsk.lng
-%%DATADIR%%/locale/nb/opera6.adr
-%%DATADIR%%/locale/nb/search.ini
-%%DATADIR%%/locale/nl/license.txt
-%%DATADIR%%/locale/nl/nederlands.lng
-%%DATADIR%%/locale/nl/opera6.adr
-%%DATADIR%%/locale/nl/search.ini
-%%DATADIR%%/locale/nn/license.txt
-%%DATADIR%%/locale/nn/nynorsk.lng
-%%DATADIR%%/locale/nn/opera6.adr
-%%DATADIR%%/locale/nn/search.ini
-%%DATADIR%%/locale/pl/license.txt
-%%DATADIR%%/locale/pl/opera6.adr
-%%DATADIR%%/locale/pl/polski.lng
+%%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/pt-BR/brazilportuguese.lng
-%%DATADIR%%/locale/pt-BR/license.txt
-%%DATADIR%%/locale/pt-BR/opera6.adr
-%%DATADIR%%/locale/pt-BR/search.ini
-%%DATADIR%%/locale/pt/license.txt
-%%DATADIR%%/locale/pt/opera6.adr
-%%DATADIR%%/locale/pt/portuguese.lng
-%%DATADIR%%/locale/pt/search.ini
-%%DATADIR%%/locale/ru/license.txt
-%%DATADIR%%/locale/ru/opera6.adr
-%%DATADIR%%/locale/ru/russian.lng
+%%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/sv/license.txt
-%%DATADIR%%/locale/sv/opera6.adr
-%%DATADIR%%/locale/sv/search.ini
-%%DATADIR%%/locale/sv/svenska.lng
-%%DATADIR%%/locale/ta/license.txt
-%%DATADIR%%/locale/ta/opera6.adr
-%%DATADIR%%/locale/ta/search.ini
-%%DATADIR%%/locale/ta/tamil.lng
-%%DATADIR%%/locale/te/license.txt
-%%DATADIR%%/locale/te/opera6.adr
-%%DATADIR%%/locale/te/search.ini
-%%DATADIR%%/locale/te/telugu.lng
-%%DATADIR%%/locale/tr/license.txt
-%%DATADIR%%/locale/tr/opera6.adr
-%%DATADIR%%/locale/tr/search.ini
-%%DATADIR%%/locale/tr/turkce.lng
-%%DATADIR%%/locale/uk/license.txt
-%%DATADIR%%/locale/uk/opera6.adr
-%%DATADIR%%/locale/uk/search.ini
-%%DATADIR%%/locale/uk/ukrainian.lng
-%%DATADIR%%/locale/zh-cn/chinese_simp.lng
-%%DATADIR%%/locale/zh-cn/license.txt
-%%DATADIR%%/locale/zh-cn/opera6.adr
+%%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-tw/chinese.lng
-%%DATADIR%%/locale/zh-tw/license.txt
-%%DATADIR%%/locale/zh-tw/opera6.adr
-%%DATADIR%%/locale/zh-tw/search.ini
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/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%%/skin/windows_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/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
+%%DATADIR%%/styles/images/Opera_256x256.png
 %%DATADIR%%/styles/images/bar.png
+%%DATADIR%%/styles/images/bullet.png
 %%DATADIR%%/styles/images/center.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/images/red_left.png
 %%DATADIR%%/styles/images/red_right.png
@@ -212,12 +147,17 @@ share/applications/linux-opera.desktop
 %%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/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
@@ -237,26 +177,35 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/warning.css
 %%DATADIR%%/styles/webfeeds.html
 %%DATADIR%%/styles/wml.css
-%%DATADIR%%/svg-mo.dat
-%%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-sa.dat
-%%DATADIR%%/svg-sabd.dat
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/svg-sebd.dat
+%%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
 share/pixmaps/linux-opera.png
+@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 +239,8 @@ share/pixmaps/linux-opera.png
 @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%%