-Update to 9.5, be sure to read in UPDATING.

-Add Java 6 support for plugins, untest.
-Remove pkg-message, we have UPDATING.

Changelog: http://www.opera.com/docs/changelogs/linux/950/

17 files changed, 1018 insertions, 606 deletions

diff --git a/UPDATING b/UPDATING
index ebacd38e6669..923f2534056d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,34 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20080612:
+  AFFECTS: users of www/linux-opera
+  AUTHOR: mezz@FreeBSD.org
+
+  The Opera has been updated from 9.2x to 9.5x. A lot of things have been
+  changed such as keyboard shortcuts[1]; new storage and indexing formats
+  mail and feeds; new search.ini; probably more that I have missed. I do
+  not know if the keyboard shortcuts and search.ini will be overwrite. The
+  mail and feeds will be asked to convert to new format in start up.
+  Warning there is no way to downgrade back to old format. Be sure to view
+  the Changelog[2].
+
+  [1] http://www.opera.com/support/search/view/884/
+  [2] http://www.opera.com/docs/changelogs/linux/950/
+
+  It is probably best for you to back up your linux-opera directory in
+  case until you have no problem with new Opera for a while. Also, you
+  might have to re-configure search and keyboard shortcuts if these are
+  overwrote.
+
+  # cp -Rp ~/.linux-opera ~/.linux-opera-bak
+
+  If you are seeing an error of undefined symbol related with GTK+. It is
+  because it needs newer linux-gtk2 that ports doesn't have. You can enter
+  'opera:config#FileSelector|DialogToolkit' in the address bar and change
+  from 0 to 1 in 'Dialog Toolkit' if it annoys you. 0 = auto detection,
+  1 = QT and 2 = GTK+.
+
 20080609:
   AFFECTS: users of devel/pear-Date_Holidays
   AUTHOR: tabthorpe@FreeBSD.org
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index c65a88750519..2a153a521747 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+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/ \
@@ -19,14 +19,14 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i3
 		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/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -34,18 +34,24 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.27
-OPERA_DATE=	20080331
-OPERA_BUILD=	709
+OPERA_VER=	9.50
+OPERA_BUILD=	2042
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
+post-extract:
+	@${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
+		${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini
+			${WRKSRC}/install.sh \
+			${WRKSRC}/usr/share/opera/ini/pluginpath.ini
+	@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
+		${WRKSRC}/Manifest.md5
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
@@ -57,7 +63,4 @@ do-install:
 			--exec_prefix=${DATADIR}/bin \
 			--plugindir=${DATADIR}/plugins)
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 18e7155c228d..4f11aa59ef1c 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = dbf6bae423a897e92c0fcf1f4752bd9a
-SHA256 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
-SIZE (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 6813669
+MD5 (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 9f7fae56a5a1d2489469a6df6b8b1846
+SHA256 (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 106be838f10a5750c64aa320b3d18eed294d4683e40cbe5d72411a8c8d926b10
+SIZE (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 8907173
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index cbdf7d7e25e7..5ddc56c923b3 100644
--- a/www/linux-opera-devel/files/patch-install.sh
+++ b/www/linux-opera-devel/files/patch-install.sh
@@ -1,8 +1,8 @@
---- install.sh.orig	Thu May 10 12:01:53 2007
-+++ install.sh	Fri May 25 12:47:45 2007
-@@ -805,10 +805,9 @@
+--- install.sh.orig	2008-06-11 15:33:00.000000000 -0500
++++ install.sh	2008-06-12 21:04:22.000000000 -0500
+@@ -832,10 +832,9 @@
      case "${machine}:${os}" in
- 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
+ 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
  	    wrapper_ibmjava="
 -	    IBMJava2-142/jre \\
 -	    IBMJava2-141/jre \\
@@ -14,7 +14,7 @@
  	    wrapper_sunjava_machine="i386"
  	;;
  
-@@ -838,10 +837,19 @@
+@@ -865,10 +864,19 @@
  		error 'os'
  	;;
      esac
@@ -35,7 +35,7 @@
  # Required for Session Management
  case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
  export OPERA_SCRIPT_PATH
-@@ -901,6 +909,10 @@
+@@ -928,8 +936,12 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -44,23 +44,15 @@
 +export OPERA_PERSONALDIR
 +
  # Native Java enviroment
- if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-     INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -908,8 +920,8 @@
- fi
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
--    if test -f \"\${HOME}/.opera/javapath.txt\"; then
--        INIJAVA=\`cat \${HOME}/.opera/javapath.txt\`
-+    if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-+        INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-         if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
-     fi
- fi
-@@ -924,69 +936,16 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
- 
+-for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
++for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.linux-opera\"
+ do if test -f \"\$d/javapath.txt\"
+    then
+       INIJAVA=\`cat \"\$d/javapath.txt\"\`
+@@ -950,85 +962,17 @@
+ 
+ if test ! \"\${OPERA_JAVA_DIR}\"
+ then
 -    PREFIXES=\"
 -	/usr
 -	/usr/java
@@ -70,16 +62,25 @@
 +    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	java-6-sun \\
+-	java-6-sun-1.6.0.00 \\
+-	java-1.5.0-sun \\
+-	java-1.5.0-sun-1.5.0.09 \\
+-	java-1.5.0-sun-1.5.0.09/jre \\
+-	java-1.5.0-sun-1.5.0.08 \\
+-	java-1.5.0-sun-1.5.0.08/jre \\
+-	java-1.5.0-sun-1.5.0.07 \\
+-	java-1.5.0-sun-1.5.0.07/jre \\
 -	java-1.5.0-sun-1.5.0.06 \\
 -	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_06 \\
 -	jdk1.5.0_06/jre \\
+-	java-1.5.0-sun-1.5.0.05 \\
+-	java-1.5.0-sun-1.5.0.05/jre \\
 -	jre1.5.0_05 \\
 -	jdk1.5.0_05/jre \\
+-	java-1.5.0-sun-1.5.0.04 \\
+-	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_04 \\
 -	jdk1.5.0_04/jre \\
 -	jre1.5.0_03 \\
@@ -88,6 +89,7 @@
 -	jdk1.5.0_02/jre \\
 -	jre1.5.0_01 \\
 -	jdk1.5.0_01/jre \\
+-	jdk1.5.0/jre \\
 -	j2re1.4.2_06 \\
 -	j2sdk1.4.2_06/jre \\
 -	j2re1.4.2_04 \\
@@ -125,6 +127,12 @@
 -	jdk1.2/jre \\
 -	jre \\
 -	java \\
+-	jdk1.3.1/jre \\
+-	jdk1.4.2/jre \\
+-	jdk1.5.0/jre \\
+-	jdk1.6.0/jre \\
+-	diablo-jre1.5.0 \\
+-	diablo-jdk1.5.0/jre \\
 +	linux-blackdown-jdk1.3.1/jre \\
 +	linux-blackdown-jdk1.4.1/jre \\
 +	linux-blackdown-jdk1.4.2/jre \\
@@ -132,10 +140,11 @@
 +	linux-sun-jdk1.4.1/jre \\
 +	linux-sun-jdk1.4.2/jre \\
 +	linux-sun-jdk1.5.0/jre \\
++	linux-sun-jdk1.6.0/jre \\
  	; do
- 	for PREFIX in \${PREFIXES}; do
- 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1037,11 +996,7 @@
+ 	for PREFIX in \${PREFIXES}
+ 	do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
+@@ -1082,11 +1026,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -148,7 +157,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1063,13 +1018,6 @@
+@@ -1108,13 +1048,6 @@
  done"
  
  case "${os}" in
@@ -162,7 +171,7 @@
      SunOS)
  wrapper_contain="${wrapper_contain}
  
-@@ -1098,7 +1046,7 @@
+@@ -1143,7 +1076,7 @@
  };
  
  // Opera package classes get all permissions
@@ -171,158 +180,166 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1167,7 +1115,7 @@
+@@ -1260,12 +1193,12 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
+-    md5check Manifest.md5
++    #md5check Manifest.md5
+     part_install "`manifest_path operapluginwrapper`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-native && part_install "`manifest_path operapluginwrapper-native`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-ia32-linux && part_install "`manifest_path operapluginwrapper-ia32-linux`" "$exec_dir" Binaries
+     part_install "`manifest_path LICENSE`" "$doc_dir" Documentation
+-    part_install "`manifest_path man1/opera.1`" "$man_dir" "Manual page"
++    part_install "`manifest_path man1/linux-opera.1`" "$man_dir" "Manual page"
+ 
+     share_src="`manifest_path 'html40_entities\.dtd'`"
+     part_install "$share_src" "$share_dir" "Shared resources"
+@@ -1274,76 +1207,20 @@
+     mkdir $mkdirv $mkdirp $plugin_dir/
+ 
+     # Wrapper
 -    backup ${wrapper_dir}/opera opera
 +    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1201,7 +1149,7 @@
+     debug_msg 1 "Wrapper"
+     mkdir $mkdirv $mkdirp $wrapper_dir/
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
 -    chmod $chmodv 755 $wrapper_dir/opera
 +    chmod $chmodv 755 $wrapper_dir/linux-opera
  
-     # Manual page
-     debug_msg 1 "Manual page"
-@@ -1210,7 +1158,7 @@
-     chmod $chmodv 755 ${man_dir}
-     mkdir $mkdirv $mkdirp ${man_dir}/man1
-     chmod $chmodv 755 ${man_dir}/man1
--    cp $cpv $cpf man/opera.1 ${man_dir}/man1
-+    cp $cpv $cpf man/opera.1 ${man_dir}/man1/linux-opera.1
- 
-     # Documentation
-     debug_msg 1 "Documentation"
-@@ -1242,13 +1190,6 @@
- 	mkdir $mkdirv $mkdirp $share_dir/ini/
- 	chmod $chmodv 755 $share_dir/ini
- 	cp $cpv $cpf $cpR ini/* $share_dir/ini/
--	if test -f $share_dir/ini/pluginpath.ini
--	then (
--	    echo
--	    echo '; locally installed:'
--	    echo "${str_localdirplugin}=1"
--	    ) >> $share_dir/ini/pluginpath.ini
--	fi
-     fi
- 
-     mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1340,43 +1281,11 @@
- 
-     if test -z "${OPERADESTDIR}"
+     if test -z "$OPERADESTDIR"
      then
 -	# System wide configuration files
--	config_dir="/etc"
+-	case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
+-	# TODO: work out what's going on here and replace with something that sets OPERA_ROOTPREFS to where they went !
 -	if can_write_to "$config_dir"
 -	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
+-	    warn
+-	    warn "System wide configuration files:"
+-	    warn "  $config_dir/opera6rc"
+-	    warn "  $config_dir/opera6rc.fixed"
+-	    warn " would be ignored if installed with the prefix \"$prefix\"."
+-	    bool_config=1
+-	    if [ "$flag_mode" = '--interactive' ]
+-	    then con_firm "Do you want to install them in $config_dir" || bool_config=0
+-	    else warn "Installing in default location $config_dir instead."
+-	    fi
+-
+-	    if [ $bool_config -eq 1 ]
 -	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
+-		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
 -	    fi
 -	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
+-	    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 " were not installed."
 -	fi
 -
  	# Shorcuts and Icons
  	bool_icons=1 # install icons by default
- 
 -	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
 -	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
+-	    warn
+-	    warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
+-	    if [ "$flag_mode" = "--force" ]
+-	    then warn "Installing them in default locations."
+-	    else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
+-	    fi
 -	fi
 -
- 	if test "${bool_icons}" -ne 0
+ 	if test "$bool_icons" -ne 0
 -	then xdg
 +	then icons
  	fi
  
      fi # OPERADESTDIR
-@@ -1428,19 +1337,19 @@
-     # arg1 = location
-     # arg2 = type
- 
--    desktop_file="${1}/opera.desktop"
-+    desktop_file="${1}/linux-opera.desktop"
-     desktop_contain='[Desktop Entry]'
- 
-     if test ${2}; then
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
+@@ -1392,21 +1269,21 @@
+     echo '[Desktop Entry]'
+     if test -z "$1"
+     then cat <<EOF
+-Name=Opera
+-Exec=opera
+-Icon=opera.xpm
++Name=Opera (linux version)
++Exec=linux-opera
++Icon=linux-opera.xpm
+ Terminal=false
+ EOF
+     else
+ 	if test "$1" = "xdg"
+ 	then cat <<EOF
  Version=1.0
--TryExec=opera"
-+TryExec=linux-opera"
+-TryExec=opera
++TryExec=linux-opera
+ EOF
  	fi
- 
- 	desktop_contain="${desktop_contain}
+ 	cat <<EOF
  Encoding=UTF-8
 -Name=Opera
 +Name=Opera (linux version)
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1464,7 +1373,7 @@
+@@ -1430,7 +1307,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
 -Exec=opera %u
 +Exec=linux-opera %u
- Terminal=false"
+ Terminal=false
+ EOF
  
- # Application is not a category, according to
-@@ -1479,25 +1388,26 @@
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
+@@ -1446,15 +1323,16 @@
+ 	if test "$1" = "xdg"
+ 	then cat <<EOF
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
--Icon=opera.png"
-+Icon=linux-opera.png"
- 	else
- 	    desktop_contain="${desktop_contain}
--Icon=opera"
-+Icon=linux-opera"
- 	fi
- 
- 	desktop_contain="${desktop_contain}
- MimeType=text/html;text/xml;application/xhtml+xml"
-     else
- 	desktop_contain="${desktop_contain}
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera (linux version)
-+Exec=linux-opera
+-Icon=opera.png
 +Icon=linux-opera.png
- Terminal=0"
+ EOF
+-	else echo 'Icon=opera'
++	else echo 'Icon=linux-opera'
+ 	fi
+ 	echo 'MimeType=text/html;text/xml;application/xhtml+xml'
      fi
- 
-     desktop_contain="${desktop_contain}
+     cat <<EOF
  Comment=Web Browser
--Type=Application"
-+Type=Application
-+Categories=Application;Network;WebBrowser;"
+ Type=Application
++Categories=Application;Network;WebBrowser;
+ EOF
+ }
  
-     echo "${desktop_contain}" > ${desktop_file}
-     chmod $chmodv 644 ${desktop_file}
-@@ -1528,55 +1438,28 @@
+@@ -1462,7 +1340,7 @@
+ {
+     # arg1 = location
+     # arg2 = type
+-    desktop_content $2 > "$1/opera.desktop" && chmod $chmodv 644 "$1/opera.desktop"
++    desktop_content $2 > "$1/linux-opera.desktop" && chmod $chmodv 644 "$1/linux-opera.desktop"
+ }
+ 
+ generate_mdk_menu()
+@@ -1487,51 +1365,26 @@
  
      debug_msg 0 "in icons()"
  
@@ -331,60 +348,54 @@
 -	if test -w /usr/share
 -	then
 -	    mkdir $mkdirv $mkdirp /usr/share/icons/
--	    chmod $chmodv 755 /usr/share/icons
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -	fi
 -    elif test -w /usr/share/icons
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -    fi
 -
 -    if test ! -d /usr/share/pixmaps
--    then
++    if test ! -d %%LOCALBASE%%/share/pixmaps/
+     then
 -	if test -w /usr/share
--	then
++	if test -w %%LOCALBASE%%/share
+ 	then
 -	    mkdir $mkdirv $mkdirp /usr/share/pixmaps/
--	    chmod $chmodv 755 /usr/share/pixmaps
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--	fi
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++	    cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+ 	fi
 -    elif test -w /usr/share/pixmaps/
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--    fi
--
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w %%LOCALBASE%%/share/pixmaps/
++    then cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+     fi
+ 
 -    if test ! -d /etc/X11/wmconfig/
-+    if test ! -d %%LOCALBASE%%/share/pixmaps/
++    if test ! -d %%LOCALBASE%%/share/applications/
      then
 -	if test -w /etc/X11
 +	if test -w %%LOCALBASE%%/share
  	then
 -	    mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
--	    chmod $chmodv 755 /etc/X11/wmconfig
 -	    generate_wmconfig /etc/X11/wmconfig
-+	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
-+	    chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
-+	    cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- 	fi
+-	fi
 -    elif test -w /etc/X11/wmconfig/
 -    then generate_wmconfig /etc/X11/wmconfig
-+    elif test -w %%LOCALBASE%%/share/pixmaps/
-+    then cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
-     fi
- 
+-    fi
+-
 -    if test -d /etc/X11/applnk/
-+    if test ! -d %%LOCALBASE%%/share/applications/
-     then
+-    then
 -	if test ! -d /etc/X11/applnk/Internet/
-+	if test -w %%LOCALBASE%%/share
- 	then
+-	then
 -	    if test -w /etc/X11/applnk
 -	    then
 -		mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
--		chmod $chmodv 755 /etc/X11/applnk/Internet
 -		generate_desktop /etc/X11/applnk/Internet
 -	    fi
 -	elif test -w /etc/X11/applnk/Internet
 -	then generate_desktop /etc/X11/applnk/Internet
 +	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
-+	    chmod $chmodv 755 %%LOCALBASE%%/share/applications
 +	    generate_desktop %%LOCALBASE%%/share/applications
  	fi
 +    elif test -w %%LOCALBASE%%/share/applications
diff --git a/www/linux-opera-devel/files/patch-locale::en::search.ini b/www/linux-opera-devel/files/patch-locale::en::search.ini
deleted file mode 100644
index 72820c714048..000000000000
--- a/www/linux-opera-devel/files/patch-locale::en::search.ini
+++ /dev/null
@@ -1,67 +0,0 @@
---- locale/en/search.ini.orig	Wed Apr 11 12:54:55 2007
-+++ locale/en/search.ini	Wed Apr 11 12:55:41 2007
-@@ -154,7 +154,7 @@
- Query=
- Key=o
- Is post=0
--Has endseparator=0
-+Has endseparator=-1
- Encoding=utf-8
- Search Type=11
- Verbtext=0
-@@ -446,3 +446,55 @@
- Verbtext=0
- Position=-1
- Nameid=291960
-+
-+[Search Engine 35]
-+Name=Google BS&D
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=d
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=FreeBSD &mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
-+Query=
-+Key=m
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=p
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 38]
-+Name=FreshPor&ts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=t
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
diff --git a/www/linux-opera-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-pluginpath.ini
index dfe5782ead26..576796bc1b01 100644
--- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig	Thu May 10 12:01:53 2007
-+++ ini/pluginpath.ini	Fri May 25 12:46:15 2007
-@@ -2,62 +2,26 @@
+--- 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 @@
  ; Do not edit this file while Opera is running
  ; This file is stored in UTF-8 encoding
  
@@ -9,8 +9,7 @@
 -
  [Paths]
 -$PWD/plugins=1
--$HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
+-$OPERA_PERSONALDIR/plugins=1
 -/usr/lib/opera/plugins=1
 -/usr/local/lib/opera/plugins=1
 -/opt/lib/opera/plugins=1
@@ -19,40 +18,45 @@
 +%%PREFIX%%/share/linux-opera/plugins=1
  
  ; Adobe Acrobat
+-/usr/local/Adobe/Reader8/Browser/intellinux=1
 -/usr/local/Acrobat7.0/Browsers/intellinux=1
 -/usr/local/Acrobat7/Browsers/intellinux=1
 -/usr/local/Acrobat5/Browsers/intellinux=1
 -/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Adobe/Reader8/Browser/intellinux=1
 -/usr/lib/Acrobat7.0/Browsers/intellinux=1
 -/usr/lib/Acrobat7/Browsers/intellinux=1
 -/usr/lib/Acrobat5/Browsers/intellinux=1
 -/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Adobe/Reader8/Browser/intellinux=1
 -/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Adobe/Reader8/Browser/intellinux=1
 -/opt/Acrobat7.0/Browsers/intellinux=1
 -/opt/Acrobat7/Browsers/intellinux=1
 -/opt/Acrobat5/Browsers/intellinux=1
 -/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Adobe/Reader8/Browser/intellinux=1
 -/usr/Acrobat7.0/Browsers/intellinux=1
 -/usr/Acrobat7/Browsers/intellinux=1
 -/usr/Acrobat5/Browsers/intellinux=1
 -/usr/Acrobat4/Browsers/intellinux=1
--
--; Realplayer
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+ 
+ ; Realplayer
 -/usr/lib/RealPlayer8/Plugins=1
 -/usr/lib/realplay/plugins=1
 -/usr/lib/RealPlayer8=1
 -/usr/lib/realplay=1
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%LOCALBASE%%/lib/RealPlayer=1
++%%LOCALBASE%%/lib/RealPlayer/plugins=1
  
  ; Flash
 -/usr/lib/flash-plugin=1
 -/usr/lib/flashplugin-nonfree=1
-+%%LOCALBASE%%/lib/linux-flashplugin6=1
-+%%LOCALBASE%%/lib/linux-flashplugin7=1
- 
+-
 -; Netscape Plug-in Paths
 -$HOME/.netscape6/plugins=1
 -$HOME/.netscape/plugins=1
@@ -61,9 +65,8 @@
 -/usr/local/netscape/plugins=1
 -/usr/local/lib/netscape/plugins=1
 -$HOME/.kde/.konqueror/nsplugins=1
-+; Realplayer
-+%%LOCALBASE%%/lib/RealPlayer=1
-+%%LOCALBASE%%/lib/RealPlayer/plugins=1
++%%LOCALBASE%%/lib/linux-flashplugin6=1
++%%LOCALBASE%%/lib/linux-flashplugin7=1
  
  ; Since Mozilla supports NS plugins, there might
  ; be some in the Mozilla plugin directory.
diff --git a/www/linux-opera-devel/files/patch-search.ini b/www/linux-opera-devel/files/patch-search.ini
index 7ceb2bcbbe49..e0f2bd05ecbf 100644
--- a/www/linux-opera-devel/files/patch-search.ini
+++ b/www/linux-opera-devel/files/patch-search.ini
@@ -1,21 +1,21 @@
---- search.ini.orig	Wed Apr 11 12:53:11 2007
-+++ search.ini	Wed Apr 11 12:54:29 2007
-@@ -154,7 +154,7 @@
+--- 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 @@
  Query=
- Key=o
+ Key=f
  Is post=0
 -Has endseparator=0
 +Has endseparator=-1
- Encoding=utf-8
- Search Type=11
+ Encoding=
+ Search Type=12
  Verbtext=0
-@@ -446,3 +446,55 @@
+@@ -444,3 +444,68 @@
  Verbtext=0
  Position=-1
  Nameid=291960
 +
-+[Search Engine 35]
-+Name=Google BS&D
++[Search Engine 32]
++Name=Google BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Query=
 +Key=d
@@ -27,8 +27,88 @@
 +Position=-1
 +Nameid=0
 +
++[Search Engine 33]
++Name=FreeBSD mail archives
++URL=http://freebsd.rambler.ru/srch?words=%s
++Query=
++Key=m
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 34]
++Name=FreeBSD PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=p
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 35]
++Name=FreshPorts
++URL=http://www.freshports.org/search.php?query=%s
++Query=
++Key=t
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
 +[Search Engine 36]
-+Name=FreeBSD &mail archives
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++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 @@
+ Query=
+ Key=f
+ Is post=0
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=
+ Search Type=12
+ Verbtext=0
+@@ -444,3 +444,68 @@
+ Verbtext=0
+ Position=-1
+ Nameid=291960
++
++[Search Engine 32]
++Name=Google BSD
++URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
++Query=
++Key=d
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 33]
++Name=FreeBSD mail archives
 +URL=http://freebsd.rambler.ru/srch?words=%s
 +Query=
 +Key=m
@@ -40,8 +120,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 37]
-+Name=FreeBSD &PRs
++[Search Engine 34]
++Name=FreeBSD PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
 +Key=p
@@ -53,8 +133,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 38]
-+Name=FreshPor&ts
++[Search Engine 35]
++Name=FreshPorts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=t
@@ -65,3 +145,16 @@
 +Verbtext=0
 +Position=-1
 +Nameid=0
++
++[Search Engine 36]
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
deleted file mode 100644
index 3183f6bb1e2b..000000000000
--- a/www/linux-opera-devel/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-Changelog for 9.27 Final: http://www.opera.com/docs/changelogs/linux/927/
-
-If you are upgrade from version 7.x or below, it is recommend for you to
-backup your personal "~/.linux-opera" directory and remove it. As for the
-version 8.x, it is not need but it is a good idea to do a backup. It can be
-done following from the command line:
-
-	# cp -Rp ~/.linux-opera ~/.linux-opera-bak
-	# rm -rf ~/.linux-opera/*
-
-After that, you can put your bookmark, email, contacts and etc back in
-~/.linux-opera/. The bookmark is ~/.linux-opera/opera6.adr and the email is
-~/.linux-opera/mail as you can figure out by view in ~/.linux-opera/. It is
-probably not good idea to put opera6.ini, userstyle.ini, search.ini,
-pluginpath.ini and other non-personal stuff back in ~/.linux-opera/. The
-non-personal stuff should be re-configure on new stuff by either Opera
-preferences in GUI or hand (manual) in your editor.
-##
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 0059bb151815..16968d15a7ac 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,24 +1,23 @@
 bin/linux-opera
 share/applications/linux-opera.desktop
+%%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
+%%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/encoding.bin
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
 %%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/standard_keyboard.ini
+%%DATADIR%%/ini/standard_keyboard_compat.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
 %%DATADIR%%/ini/standard_toolbar.ini
@@ -27,14 +26,143 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
+%%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/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/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/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/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/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/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/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/tr/license.txt
+%%DATADIR%%/locale/tr/opera6.adr
+%%DATADIR%%/locale/tr/search.ini
+%%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/zh-cn/chinese_simp.lng
+%%DATADIR%%/locale/zh-cn/license.txt
+%%DATADIR%%/locale/zh-cn/opera6.adr
+%%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%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/plugins/operapluginwrapper
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
@@ -44,22 +172,31 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/config.css
 %%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
 %%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/bar.png
 %%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/opera.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/section.png
+%%DATADIR%%/styles/images/smartGroup.png
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/mathml.css
+%%DATADIR%%/styles/message.css
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/altdebugger.css
 %%DATADIR%%/styles/user/classid.css
@@ -90,12 +227,43 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/locale/zh-tw
+@dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/tr
+@dirrm %%DATADIR%%/locale/sv
+@dirrm %%DATADIR%%/locale/ru
+@dirrm %%DATADIR%%/locale/pt-BR
+@dirrm %%DATADIR%%/locale/pt
+@dirrm %%DATADIR%%/locale/pl
+@dirrm %%DATADIR%%/locale/nn
+@dirrm %%DATADIR%%/locale/nl
+@dirrm %%DATADIR%%/locale/nb
+@dirrm %%DATADIR%%/locale/mk
+@dirrm %%DATADIR%%/locale/lt
+@dirrm %%DATADIR%%/locale/ko
+@dirrm %%DATADIR%%/locale/ka
+@dirrm %%DATADIR%%/locale/ja
+@dirrm %%DATADIR%%/locale/it
+@dirrm %%DATADIR%%/locale/hu
+@dirrm %%DATADIR%%/locale/hr
+@dirrm %%DATADIR%%/locale/hi
+@dirrm %%DATADIR%%/locale/fy
+@dirrm %%DATADIR%%/locale/fr-CA
+@dirrm %%DATADIR%%/locale/fr
+@dirrm %%DATADIR%%/locale/fi
+@dirrm %%DATADIR%%/locale/es-LA
+@dirrm %%DATADIR%%/locale/es-ES
+@dirrm %%DATADIR%%/locale/en-GB
 @dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale/el
+@dirrm %%DATADIR%%/locale/de
+@dirrm %%DATADIR%%/locale/da
+@dirrm %%DATADIR%%/locale/cs
+@dirrm %%DATADIR%%/locale/bg
+@dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index c65a88750519..2a153a521747 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+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/ \
@@ -19,14 +19,14 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i3
 		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/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -34,18 +34,24 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.27
-OPERA_DATE=	20080331
-OPERA_BUILD=	709
+OPERA_VER=	9.50
+OPERA_BUILD=	2042
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
+post-extract:
+	@${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
+		${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini
+			${WRKSRC}/install.sh \
+			${WRKSRC}/usr/share/opera/ini/pluginpath.ini
+	@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
+		${WRKSRC}/Manifest.md5
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
@@ -57,7 +63,4 @@ do-install:
 			--exec_prefix=${DATADIR}/bin \
 			--plugindir=${DATADIR}/plugins)
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 18e7155c228d..4f11aa59ef1c 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = dbf6bae423a897e92c0fcf1f4752bd9a
-SHA256 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
-SIZE (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 6813669
+MD5 (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 9f7fae56a5a1d2489469a6df6b8b1846
+SHA256 (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 106be838f10a5750c64aa320b3d18eed294d4683e40cbe5d72411a8c8d926b10
+SIZE (opera-9.50.gcc4-static-qt3.i386.tar.bz2) = 8907173
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index cbdf7d7e25e7..5ddc56c923b3 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,8 +1,8 @@
---- install.sh.orig	Thu May 10 12:01:53 2007
-+++ install.sh	Fri May 25 12:47:45 2007
-@@ -805,10 +805,9 @@
+--- install.sh.orig	2008-06-11 15:33:00.000000000 -0500
++++ install.sh	2008-06-12 21:04:22.000000000 -0500
+@@ -832,10 +832,9 @@
      case "${machine}:${os}" in
- 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
+ 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
  	    wrapper_ibmjava="
 -	    IBMJava2-142/jre \\
 -	    IBMJava2-141/jre \\
@@ -14,7 +14,7 @@
  	    wrapper_sunjava_machine="i386"
  	;;
  
-@@ -838,10 +837,19 @@
+@@ -865,10 +864,19 @@
  		error 'os'
  	;;
      esac
@@ -35,7 +35,7 @@
  # Required for Session Management
  case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
  export OPERA_SCRIPT_PATH
-@@ -901,6 +909,10 @@
+@@ -928,8 +936,12 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -44,23 +44,15 @@
 +export OPERA_PERSONALDIR
 +
  # Native Java enviroment
- if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-     INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -908,8 +920,8 @@
- fi
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
--    if test -f \"\${HOME}/.opera/javapath.txt\"; then
--        INIJAVA=\`cat \${HOME}/.opera/javapath.txt\`
-+    if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-+        INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-         if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
-     fi
- fi
-@@ -924,69 +936,16 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
- 
+-for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
++for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.linux-opera\"
+ do if test -f \"\$d/javapath.txt\"
+    then
+       INIJAVA=\`cat \"\$d/javapath.txt\"\`
+@@ -950,85 +962,17 @@
+ 
+ if test ! \"\${OPERA_JAVA_DIR}\"
+ then
 -    PREFIXES=\"
 -	/usr
 -	/usr/java
@@ -70,16 +62,25 @@
 +    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	java-6-sun \\
+-	java-6-sun-1.6.0.00 \\
+-	java-1.5.0-sun \\
+-	java-1.5.0-sun-1.5.0.09 \\
+-	java-1.5.0-sun-1.5.0.09/jre \\
+-	java-1.5.0-sun-1.5.0.08 \\
+-	java-1.5.0-sun-1.5.0.08/jre \\
+-	java-1.5.0-sun-1.5.0.07 \\
+-	java-1.5.0-sun-1.5.0.07/jre \\
 -	java-1.5.0-sun-1.5.0.06 \\
 -	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_06 \\
 -	jdk1.5.0_06/jre \\
+-	java-1.5.0-sun-1.5.0.05 \\
+-	java-1.5.0-sun-1.5.0.05/jre \\
 -	jre1.5.0_05 \\
 -	jdk1.5.0_05/jre \\
+-	java-1.5.0-sun-1.5.0.04 \\
+-	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_04 \\
 -	jdk1.5.0_04/jre \\
 -	jre1.5.0_03 \\
@@ -88,6 +89,7 @@
 -	jdk1.5.0_02/jre \\
 -	jre1.5.0_01 \\
 -	jdk1.5.0_01/jre \\
+-	jdk1.5.0/jre \\
 -	j2re1.4.2_06 \\
 -	j2sdk1.4.2_06/jre \\
 -	j2re1.4.2_04 \\
@@ -125,6 +127,12 @@
 -	jdk1.2/jre \\
 -	jre \\
 -	java \\
+-	jdk1.3.1/jre \\
+-	jdk1.4.2/jre \\
+-	jdk1.5.0/jre \\
+-	jdk1.6.0/jre \\
+-	diablo-jre1.5.0 \\
+-	diablo-jdk1.5.0/jre \\
 +	linux-blackdown-jdk1.3.1/jre \\
 +	linux-blackdown-jdk1.4.1/jre \\
 +	linux-blackdown-jdk1.4.2/jre \\
@@ -132,10 +140,11 @@
 +	linux-sun-jdk1.4.1/jre \\
 +	linux-sun-jdk1.4.2/jre \\
 +	linux-sun-jdk1.5.0/jre \\
++	linux-sun-jdk1.6.0/jre \\
  	; do
- 	for PREFIX in \${PREFIXES}; do
- 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1037,11 +996,7 @@
+ 	for PREFIX in \${PREFIXES}
+ 	do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
+@@ -1082,11 +1026,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -148,7 +157,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1063,13 +1018,6 @@
+@@ -1108,13 +1048,6 @@
  done"
  
  case "${os}" in
@@ -162,7 +171,7 @@
      SunOS)
  wrapper_contain="${wrapper_contain}
  
-@@ -1098,7 +1046,7 @@
+@@ -1143,7 +1076,7 @@
  };
  
  // Opera package classes get all permissions
@@ -171,158 +180,166 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1167,7 +1115,7 @@
+@@ -1260,12 +1193,12 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
+-    md5check Manifest.md5
++    #md5check Manifest.md5
+     part_install "`manifest_path operapluginwrapper`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-native && part_install "`manifest_path operapluginwrapper-native`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-ia32-linux && part_install "`manifest_path operapluginwrapper-ia32-linux`" "$exec_dir" Binaries
+     part_install "`manifest_path LICENSE`" "$doc_dir" Documentation
+-    part_install "`manifest_path man1/opera.1`" "$man_dir" "Manual page"
++    part_install "`manifest_path man1/linux-opera.1`" "$man_dir" "Manual page"
+ 
+     share_src="`manifest_path 'html40_entities\.dtd'`"
+     part_install "$share_src" "$share_dir" "Shared resources"
+@@ -1274,76 +1207,20 @@
+     mkdir $mkdirv $mkdirp $plugin_dir/
+ 
+     # Wrapper
 -    backup ${wrapper_dir}/opera opera
 +    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1201,7 +1149,7 @@
+     debug_msg 1 "Wrapper"
+     mkdir $mkdirv $mkdirp $wrapper_dir/
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
 -    chmod $chmodv 755 $wrapper_dir/opera
 +    chmod $chmodv 755 $wrapper_dir/linux-opera
  
-     # Manual page
-     debug_msg 1 "Manual page"
-@@ -1210,7 +1158,7 @@
-     chmod $chmodv 755 ${man_dir}
-     mkdir $mkdirv $mkdirp ${man_dir}/man1
-     chmod $chmodv 755 ${man_dir}/man1
--    cp $cpv $cpf man/opera.1 ${man_dir}/man1
-+    cp $cpv $cpf man/opera.1 ${man_dir}/man1/linux-opera.1
- 
-     # Documentation
-     debug_msg 1 "Documentation"
-@@ -1242,13 +1190,6 @@
- 	mkdir $mkdirv $mkdirp $share_dir/ini/
- 	chmod $chmodv 755 $share_dir/ini
- 	cp $cpv $cpf $cpR ini/* $share_dir/ini/
--	if test -f $share_dir/ini/pluginpath.ini
--	then (
--	    echo
--	    echo '; locally installed:'
--	    echo "${str_localdirplugin}=1"
--	    ) >> $share_dir/ini/pluginpath.ini
--	fi
-     fi
- 
-     mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1340,43 +1281,11 @@
- 
-     if test -z "${OPERADESTDIR}"
+     if test -z "$OPERADESTDIR"
      then
 -	# System wide configuration files
--	config_dir="/etc"
+-	case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
+-	# TODO: work out what's going on here and replace with something that sets OPERA_ROOTPREFS to where they went !
 -	if can_write_to "$config_dir"
 -	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
+-	    warn
+-	    warn "System wide configuration files:"
+-	    warn "  $config_dir/opera6rc"
+-	    warn "  $config_dir/opera6rc.fixed"
+-	    warn " would be ignored if installed with the prefix \"$prefix\"."
+-	    bool_config=1
+-	    if [ "$flag_mode" = '--interactive' ]
+-	    then con_firm "Do you want to install them in $config_dir" || bool_config=0
+-	    else warn "Installing in default location $config_dir instead."
+-	    fi
+-
+-	    if [ $bool_config -eq 1 ]
 -	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
+-		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
 -	    fi
 -	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
+-	    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 " were not installed."
 -	fi
 -
  	# Shorcuts and Icons
  	bool_icons=1 # install icons by default
- 
 -	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
 -	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
+-	    warn
+-	    warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
+-	    if [ "$flag_mode" = "--force" ]
+-	    then warn "Installing them in default locations."
+-	    else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
+-	    fi
 -	fi
 -
- 	if test "${bool_icons}" -ne 0
+ 	if test "$bool_icons" -ne 0
 -	then xdg
 +	then icons
  	fi
  
      fi # OPERADESTDIR
-@@ -1428,19 +1337,19 @@
-     # arg1 = location
-     # arg2 = type
- 
--    desktop_file="${1}/opera.desktop"
-+    desktop_file="${1}/linux-opera.desktop"
-     desktop_contain='[Desktop Entry]'
- 
-     if test ${2}; then
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
+@@ -1392,21 +1269,21 @@
+     echo '[Desktop Entry]'
+     if test -z "$1"
+     then cat <<EOF
+-Name=Opera
+-Exec=opera
+-Icon=opera.xpm
++Name=Opera (linux version)
++Exec=linux-opera
++Icon=linux-opera.xpm
+ Terminal=false
+ EOF
+     else
+ 	if test "$1" = "xdg"
+ 	then cat <<EOF
  Version=1.0
--TryExec=opera"
-+TryExec=linux-opera"
+-TryExec=opera
++TryExec=linux-opera
+ EOF
  	fi
- 
- 	desktop_contain="${desktop_contain}
+ 	cat <<EOF
  Encoding=UTF-8
 -Name=Opera
 +Name=Opera (linux version)
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1464,7 +1373,7 @@
+@@ -1430,7 +1307,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
 -Exec=opera %u
 +Exec=linux-opera %u
- Terminal=false"
+ Terminal=false
+ EOF
  
- # Application is not a category, according to
-@@ -1479,25 +1388,26 @@
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
+@@ -1446,15 +1323,16 @@
+ 	if test "$1" = "xdg"
+ 	then cat <<EOF
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
--Icon=opera.png"
-+Icon=linux-opera.png"
- 	else
- 	    desktop_contain="${desktop_contain}
--Icon=opera"
-+Icon=linux-opera"
- 	fi
- 
- 	desktop_contain="${desktop_contain}
- MimeType=text/html;text/xml;application/xhtml+xml"
-     else
- 	desktop_contain="${desktop_contain}
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera (linux version)
-+Exec=linux-opera
+-Icon=opera.png
 +Icon=linux-opera.png
- Terminal=0"
+ EOF
+-	else echo 'Icon=opera'
++	else echo 'Icon=linux-opera'
+ 	fi
+ 	echo 'MimeType=text/html;text/xml;application/xhtml+xml'
      fi
- 
-     desktop_contain="${desktop_contain}
+     cat <<EOF
  Comment=Web Browser
--Type=Application"
-+Type=Application
-+Categories=Application;Network;WebBrowser;"
+ Type=Application
++Categories=Application;Network;WebBrowser;
+ EOF
+ }
  
-     echo "${desktop_contain}" > ${desktop_file}
-     chmod $chmodv 644 ${desktop_file}
-@@ -1528,55 +1438,28 @@
+@@ -1462,7 +1340,7 @@
+ {
+     # arg1 = location
+     # arg2 = type
+-    desktop_content $2 > "$1/opera.desktop" && chmod $chmodv 644 "$1/opera.desktop"
++    desktop_content $2 > "$1/linux-opera.desktop" && chmod $chmodv 644 "$1/linux-opera.desktop"
+ }
+ 
+ generate_mdk_menu()
+@@ -1487,51 +1365,26 @@
  
      debug_msg 0 "in icons()"
  
@@ -331,60 +348,54 @@
 -	if test -w /usr/share
 -	then
 -	    mkdir $mkdirv $mkdirp /usr/share/icons/
--	    chmod $chmodv 755 /usr/share/icons
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -	fi
 -    elif test -w /usr/share/icons
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -    fi
 -
 -    if test ! -d /usr/share/pixmaps
--    then
++    if test ! -d %%LOCALBASE%%/share/pixmaps/
+     then
 -	if test -w /usr/share
--	then
++	if test -w %%LOCALBASE%%/share
+ 	then
 -	    mkdir $mkdirv $mkdirp /usr/share/pixmaps/
--	    chmod $chmodv 755 /usr/share/pixmaps
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--	fi
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++	    cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+ 	fi
 -    elif test -w /usr/share/pixmaps/
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--    fi
--
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w %%LOCALBASE%%/share/pixmaps/
++    then cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+     fi
+ 
 -    if test ! -d /etc/X11/wmconfig/
-+    if test ! -d %%LOCALBASE%%/share/pixmaps/
++    if test ! -d %%LOCALBASE%%/share/applications/
      then
 -	if test -w /etc/X11
 +	if test -w %%LOCALBASE%%/share
  	then
 -	    mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
--	    chmod $chmodv 755 /etc/X11/wmconfig
 -	    generate_wmconfig /etc/X11/wmconfig
-+	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
-+	    chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
-+	    cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- 	fi
+-	fi
 -    elif test -w /etc/X11/wmconfig/
 -    then generate_wmconfig /etc/X11/wmconfig
-+    elif test -w %%LOCALBASE%%/share/pixmaps/
-+    then cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
-     fi
- 
+-    fi
+-
 -    if test -d /etc/X11/applnk/
-+    if test ! -d %%LOCALBASE%%/share/applications/
-     then
+-    then
 -	if test ! -d /etc/X11/applnk/Internet/
-+	if test -w %%LOCALBASE%%/share
- 	then
+-	then
 -	    if test -w /etc/X11/applnk
 -	    then
 -		mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
--		chmod $chmodv 755 /etc/X11/applnk/Internet
 -		generate_desktop /etc/X11/applnk/Internet
 -	    fi
 -	elif test -w /etc/X11/applnk/Internet
 -	then generate_desktop /etc/X11/applnk/Internet
 +	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
-+	    chmod $chmodv 755 %%LOCALBASE%%/share/applications
 +	    generate_desktop %%LOCALBASE%%/share/applications
  	fi
 +    elif test -w %%LOCALBASE%%/share/applications
diff --git a/www/linux-opera/files/patch-locale::en::search.ini b/www/linux-opera/files/patch-locale::en::search.ini
deleted file mode 100644
index 72820c714048..000000000000
--- a/www/linux-opera/files/patch-locale::en::search.ini
+++ /dev/null
@@ -1,67 +0,0 @@
---- locale/en/search.ini.orig	Wed Apr 11 12:54:55 2007
-+++ locale/en/search.ini	Wed Apr 11 12:55:41 2007
-@@ -154,7 +154,7 @@
- Query=
- Key=o
- Is post=0
--Has endseparator=0
-+Has endseparator=-1
- Encoding=utf-8
- Search Type=11
- Verbtext=0
-@@ -446,3 +446,55 @@
- Verbtext=0
- Position=-1
- Nameid=291960
-+
-+[Search Engine 35]
-+Name=Google BS&D
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=d
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=FreeBSD &mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
-+Query=
-+Key=m
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=p
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 38]
-+Name=FreshPor&ts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=t
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-pluginpath.ini
index dfe5782ead26..576796bc1b01 100644
--- a/www/linux-opera/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig	Thu May 10 12:01:53 2007
-+++ ini/pluginpath.ini	Fri May 25 12:46:15 2007
-@@ -2,62 +2,26 @@
+--- 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 @@
  ; Do not edit this file while Opera is running
  ; This file is stored in UTF-8 encoding
  
@@ -9,8 +9,7 @@
 -
  [Paths]
 -$PWD/plugins=1
--$HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
+-$OPERA_PERSONALDIR/plugins=1
 -/usr/lib/opera/plugins=1
 -/usr/local/lib/opera/plugins=1
 -/opt/lib/opera/plugins=1
@@ -19,40 +18,45 @@
 +%%PREFIX%%/share/linux-opera/plugins=1
  
  ; Adobe Acrobat
+-/usr/local/Adobe/Reader8/Browser/intellinux=1
 -/usr/local/Acrobat7.0/Browsers/intellinux=1
 -/usr/local/Acrobat7/Browsers/intellinux=1
 -/usr/local/Acrobat5/Browsers/intellinux=1
 -/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Adobe/Reader8/Browser/intellinux=1
 -/usr/lib/Acrobat7.0/Browsers/intellinux=1
 -/usr/lib/Acrobat7/Browsers/intellinux=1
 -/usr/lib/Acrobat5/Browsers/intellinux=1
 -/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Adobe/Reader8/Browser/intellinux=1
 -/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
 -/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Adobe/Reader8/Browser/intellinux=1
 -/opt/Acrobat7.0/Browsers/intellinux=1
 -/opt/Acrobat7/Browsers/intellinux=1
 -/opt/Acrobat5/Browsers/intellinux=1
 -/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Adobe/Reader8/Browser/intellinux=1
 -/usr/Acrobat7.0/Browsers/intellinux=1
 -/usr/Acrobat7/Browsers/intellinux=1
 -/usr/Acrobat5/Browsers/intellinux=1
 -/usr/Acrobat4/Browsers/intellinux=1
--
--; Realplayer
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+ 
+ ; Realplayer
 -/usr/lib/RealPlayer8/Plugins=1
 -/usr/lib/realplay/plugins=1
 -/usr/lib/RealPlayer8=1
 -/usr/lib/realplay=1
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%LOCALBASE%%/lib/RealPlayer=1
++%%LOCALBASE%%/lib/RealPlayer/plugins=1
  
  ; Flash
 -/usr/lib/flash-plugin=1
 -/usr/lib/flashplugin-nonfree=1
-+%%LOCALBASE%%/lib/linux-flashplugin6=1
-+%%LOCALBASE%%/lib/linux-flashplugin7=1
- 
+-
 -; Netscape Plug-in Paths
 -$HOME/.netscape6/plugins=1
 -$HOME/.netscape/plugins=1
@@ -61,9 +65,8 @@
 -/usr/local/netscape/plugins=1
 -/usr/local/lib/netscape/plugins=1
 -$HOME/.kde/.konqueror/nsplugins=1
-+; Realplayer
-+%%LOCALBASE%%/lib/RealPlayer=1
-+%%LOCALBASE%%/lib/RealPlayer/plugins=1
++%%LOCALBASE%%/lib/linux-flashplugin6=1
++%%LOCALBASE%%/lib/linux-flashplugin7=1
  
  ; Since Mozilla supports NS plugins, there might
  ; be some in the Mozilla plugin directory.
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
index 7ceb2bcbbe49..e0f2bd05ecbf 100644
--- a/www/linux-opera/files/patch-search.ini
+++ b/www/linux-opera/files/patch-search.ini
@@ -1,21 +1,21 @@
---- search.ini.orig	Wed Apr 11 12:53:11 2007
-+++ search.ini	Wed Apr 11 12:54:29 2007
-@@ -154,7 +154,7 @@
+--- 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 @@
  Query=
- Key=o
+ Key=f
  Is post=0
 -Has endseparator=0
 +Has endseparator=-1
- Encoding=utf-8
- Search Type=11
+ Encoding=
+ Search Type=12
  Verbtext=0
-@@ -446,3 +446,55 @@
+@@ -444,3 +444,68 @@
  Verbtext=0
  Position=-1
  Nameid=291960
 +
-+[Search Engine 35]
-+Name=Google BS&D
++[Search Engine 32]
++Name=Google BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Query=
 +Key=d
@@ -27,8 +27,88 @@
 +Position=-1
 +Nameid=0
 +
++[Search Engine 33]
++Name=FreeBSD mail archives
++URL=http://freebsd.rambler.ru/srch?words=%s
++Query=
++Key=m
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 34]
++Name=FreeBSD PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=p
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 35]
++Name=FreshPorts
++URL=http://www.freshports.org/search.php?query=%s
++Query=
++Key=t
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
 +[Search Engine 36]
-+Name=FreeBSD &mail archives
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++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 @@
+ Query=
+ Key=f
+ Is post=0
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=
+ Search Type=12
+ Verbtext=0
+@@ -444,3 +444,68 @@
+ Verbtext=0
+ Position=-1
+ Nameid=291960
++
++[Search Engine 32]
++Name=Google BSD
++URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
++Query=
++Key=d
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 33]
++Name=FreeBSD mail archives
 +URL=http://freebsd.rambler.ru/srch?words=%s
 +Query=
 +Key=m
@@ -40,8 +120,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 37]
-+Name=FreeBSD &PRs
++[Search Engine 34]
++Name=FreeBSD PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
 +Key=p
@@ -53,8 +133,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 38]
-+Name=FreshPor&ts
++[Search Engine 35]
++Name=FreshPorts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=t
@@ -65,3 +145,16 @@
 +Verbtext=0
 +Position=-1
 +Nameid=0
++
++[Search Engine 36]
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
deleted file mode 100644
index 3183f6bb1e2b..000000000000
--- a/www/linux-opera/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-Changelog for 9.27 Final: http://www.opera.com/docs/changelogs/linux/927/
-
-If you are upgrade from version 7.x or below, it is recommend for you to
-backup your personal "~/.linux-opera" directory and remove it. As for the
-version 8.x, it is not need but it is a good idea to do a backup. It can be
-done following from the command line:
-
-	# cp -Rp ~/.linux-opera ~/.linux-opera-bak
-	# rm -rf ~/.linux-opera/*
-
-After that, you can put your bookmark, email, contacts and etc back in
-~/.linux-opera/. The bookmark is ~/.linux-opera/opera6.adr and the email is
-~/.linux-opera/mail as you can figure out by view in ~/.linux-opera/. It is
-probably not good idea to put opera6.ini, userstyle.ini, search.ini,
-pluginpath.ini and other non-personal stuff back in ~/.linux-opera/. The
-non-personal stuff should be re-configure on new stuff by either Opera
-preferences in GUI or hand (manual) in your editor.
-##
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 0059bb151815..16968d15a7ac 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,24 +1,23 @@
 bin/linux-opera
 share/applications/linux-opera.desktop
+%%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
+%%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/encoding.bin
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
 %%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/standard_keyboard.ini
+%%DATADIR%%/ini/standard_keyboard_compat.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
 %%DATADIR%%/ini/standard_toolbar.ini
@@ -27,14 +26,143 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
+%%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/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/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/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/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/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/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/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/tr/license.txt
+%%DATADIR%%/locale/tr/opera6.adr
+%%DATADIR%%/locale/tr/search.ini
+%%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/zh-cn/chinese_simp.lng
+%%DATADIR%%/locale/zh-cn/license.txt
+%%DATADIR%%/locale/zh-cn/opera6.adr
+%%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%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/plugins/operapluginwrapper
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
@@ -44,22 +172,31 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/config.css
 %%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
 %%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/bar.png
 %%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/opera.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/section.png
+%%DATADIR%%/styles/images/smartGroup.png
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/mathml.css
+%%DATADIR%%/styles/message.css
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/altdebugger.css
 %%DATADIR%%/styles/user/classid.css
@@ -90,12 +227,43 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/locale/zh-tw
+@dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/tr
+@dirrm %%DATADIR%%/locale/sv
+@dirrm %%DATADIR%%/locale/ru
+@dirrm %%DATADIR%%/locale/pt-BR
+@dirrm %%DATADIR%%/locale/pt
+@dirrm %%DATADIR%%/locale/pl
+@dirrm %%DATADIR%%/locale/nn
+@dirrm %%DATADIR%%/locale/nl
+@dirrm %%DATADIR%%/locale/nb
+@dirrm %%DATADIR%%/locale/mk
+@dirrm %%DATADIR%%/locale/lt
+@dirrm %%DATADIR%%/locale/ko
+@dirrm %%DATADIR%%/locale/ka
+@dirrm %%DATADIR%%/locale/ja
+@dirrm %%DATADIR%%/locale/it
+@dirrm %%DATADIR%%/locale/hu
+@dirrm %%DATADIR%%/locale/hr
+@dirrm %%DATADIR%%/locale/hi
+@dirrm %%DATADIR%%/locale/fy
+@dirrm %%DATADIR%%/locale/fr-CA
+@dirrm %%DATADIR%%/locale/fr
+@dirrm %%DATADIR%%/locale/fi
+@dirrm %%DATADIR%%/locale/es-LA
+@dirrm %%DATADIR%%/locale/es-ES
+@dirrm %%DATADIR%%/locale/en-GB
 @dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale/el
+@dirrm %%DATADIR%%/locale/de
+@dirrm %%DATADIR%%/locale/da
+@dirrm %%DATADIR%%/locale/cs
+@dirrm %%DATADIR%%/locale/bg
+@dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%