11 files changed, 184 insertions, 240 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 32c2cfd50bb6..7e0345c09796 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -8,25 +8,24 @@
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 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/.//}0/final/en/i386/static/ \
+		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en-344
 
 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 \
-		${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/linux-openmotif
+		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
@@ -36,11 +35,13 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	8.54
-OPERA_DATE=	20060330
+OPERA_VER=	9.0
+OPERA_DATE=	20060616
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
+MAN1=		linux-opera.1
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier}!=""
@@ -58,8 +59,7 @@ PLIST_SUB+=	KDE:="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index e49e84de80f6..d0efba350023 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-8.54-20060330.1-static-qt.i386-en.tar.bz2) = 22599f524665b84f564796353fcf67cf
-SHA256 (opera-8.54-20060330.1-static-qt.i386-en.tar.bz2) = d8fbc860c882092c558570b19ebdfd4539f04bf56d7d3f4417780dc9e34e81e2
-SIZE (opera-8.54-20060330.1-static-qt.i386-en.tar.bz2) = 5812590
+MD5 (opera-9.0-20060616.1-static-qt.i386-en-344.tar.bz2) = d027d3e52853ee69362ef0240487bc13
+SHA256 (opera-9.0-20060616.1-static-qt.i386-en-344.tar.bz2) = f55c65910320a30690850d8bae7e53b1a64b0c99fa8f58e94fdf4c9f40a4e449
+SIZE (opera-9.0-20060616.1-static-qt.i386-en-344.tar.bz2) = 6694612
diff --git a/www/linux-opera/files/patch-config::opera6rc b/www/linux-opera/files/patch-config::opera6rc
deleted file mode 100644
index 63b2738f0be2..000000000000
--- a/www/linux-opera/files/patch-config::opera6rc
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/opera6rc.orig	Tue Mar  1 16:28:54 2005
-+++ config/opera6rc	Tue Mar  1 16:29:04 2005
-@@ -1,6 +1,6 @@
- ; Put any default settings here that are overridable by users
- 
- [User Prefs]
--Language Files Directory=/usr/share/opera/locale/
-+Language Files Directory=%%PREFIX%%/share/linux-opera/locale/
- Force DPI=96
- 
diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-ini::pluginpath.ini
index 121d96a941bb..92f82b90579b 100644
--- a/www/linux-opera/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera/files/patch-ini::pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig	Tue Sep 20 14:13:09 2005
-+++ ini/pluginpath.ini	Tue Sep 20 14:14:28 2005
-@@ -3,56 +3,31 @@
+--- ini/pluginpath.ini.orig	Tue Jun 20 13:25:34 2006
++++ ini/pluginpath.ini	Tue Jun 20 13:26:59 2006
+@@ -3,57 +3,31 @@
  ; This file is stored in UTF-8 encoding
  
  [Paths]
@@ -37,41 +37,44 @@
 -/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +%%X11BASE%%/Acrobat5/Browsers/intellinux=1
-+
-+; Flash player
-+%%LOCALBASE%%/lib/linux-flashplugin6=1
-+%%LOCALBASE%%/lib/linux-flashplugin7=1
-+%%X11BASE%%/lib/linux-flashplugin6=1
-+%%X11BASE%%/lib/linux-flashplugin7=1
  
- ; Realplayer
+-; Realplayer
 -/usr/lib/RealPlayer8/Plugins=1
 -/usr/lib/realplay/plugins=1
 -/usr/lib/RealPlayer8=1
 -/usr/lib/realplay=1
-+%%LOCALBASE%%/lib/RealPlayer=1
-+%%LOCALBASE%%/lib/RealPlayer/plugins=1
-+%%X11BASE%%/lib/RealPlayer=1
-+%%X11BASE%%/lib/RealPlayer/plugins=1
++; Flash player
++%%LOCALBASE%%/lib/linux-flashplugin6=1
++%%LOCALBASE%%/lib/linux-flashplugin7=1
++%%X11BASE%%/lib/linux-flashplugin6=1
++%%X11BASE%%/lib/linux-flashplugin7=1
  
- ; Netscape Plug-in Paths
+-; Netscape Plug-in Paths
 -$HOME/.netscape6/plugins=1
- $HOME/.netscape/plugins=1
+-$HOME/.netscape/plugins=1
 -/opt/netscape/plugins=1
 -/usr/lib/netscape/plugins=1
 -/usr/local/netscape/plugins=1
 -/usr/local/lib/netscape/plugins=1
 -$HOME/.kde/.konqueror/nsplugins=1
-+%%LOCALBASE%%/lib/netscape-linux/plugins=1
-+%%X11BASE%%/lib/netscape-linux/plugins=1
++; Realplayer
++%%LOCALBASE%%/lib/RealPlayer=1
++%%LOCALBASE%%/lib/RealPlayer/plugins=1
++%%X11BASE%%/lib/RealPlayer=1
++%%X11BASE%%/lib/RealPlayer/plugins=1
  
  ; Since Mozilla supports NS plugins, there might
  ; be some in the Mozilla plugin directory.
 -/usr/lib/mozilla/plugins=1
 -/usr/X11R6/lib/mozilla/plugins=1
+-/usr/lib64/browser-plugins=1
 -/usr/lib/browser-plugins=1
--
--[KDE]
--plugins=$HOME/.kde/share/config/kcmnspluginrc
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
 +%%X11BASE%%/lib/linux-mozilla/plugins=1
+ 
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
++; Global plugins path in FreeBSD. Need this for
++; the Adobe Acrobat7 and other plugins too.
++%%LOCALBASE%%/lib/browser_linux_plugins=1
++%%X11BASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera/files/patch-ini::spellcheck.ini b/www/linux-opera/files/patch-ini::spellcheck.ini
deleted file mode 100644
index d9cc18a328a8..000000000000
--- a/www/linux-opera/files/patch-ini::spellcheck.ini
+++ /dev/null
@@ -1,9 +0,0 @@
---- ini/spellcheck.ini.orig	Thu May 13 13:51:43 2004
-+++ ini/spellcheck.ini	Thu May 13 13:52:00 2004
-@@ -3,5 +3,6 @@
- ; This file is stored in UTF-8 encoding
- 
- [Spell Check]
-+Spell Check Engine=%%PREFIX%%/share/linux-opera/bin/spellcheck.so
- Default Language=en
- Default Encoding=iso8859-1
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index c132ee12c5bf..476acc66cbd6 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,28 +1,8 @@
---- install.sh.orig	Thu Mar 30 05:34:56 2006
-+++ install.sh	Wed Apr  5 16:30:49 2006
-@@ -397,7 +397,7 @@
- 	    mvv=''    # SunOS mv (no -v verbose option)
- 	;;
- 
--	i[3456]86:FreeBSD|i[3456]86:NetBSD)
-+	i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD)
- 		cpf='-f'
- 		if test "$verbose" -gt '1'
- 		then
-@@ -617,7 +617,6 @@
-       echo " Plugins        : ${plugin_dir}"
-       echo " Shared files   : ${share_dir}"
-       echo " Documentation  : ${doc_dir}"
--      echo " Manual page    : ${man_dir}"
-       echo "-----------------------------------------------------------"
-       if con_firm "Is this correct" "cancel"
-       then return 0
-@@ -789,12 +788,11 @@
-     debug_msg 0 "in generate_wrapper()"
- 
+--- install.sh.orig	Tue Jun 20 14:02:51 2006
++++ install.sh	Tue Jun 20 14:24:28 2006
+@@ -805,10 +805,9 @@
      case "${machine}:${os}" in
--	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
-+	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
  	    wrapper_ibmjava="
 -	    IBMJava2-142/jre \\
 -	    IBMJava2-141/jre \\
@@ -34,7 +14,7 @@
  	    wrapper_sunjava_machine="i386"
  	;;
  
-@@ -824,7 +822,7 @@
+@@ -838,7 +837,7 @@
  		error 'os'
  	;;
      esac
@@ -43,7 +23,7 @@
  
      wrapper_contain="#!/bin/sh
  
-@@ -887,6 +885,10 @@
+@@ -901,6 +900,10 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -54,7 +34,7 @@
  # Native Java enviroment
  if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
      INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -894,8 +896,8 @@
+@@ -908,8 +911,8 @@
  fi
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
@@ -65,7 +45,7 @@
          if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
      fi
  fi
-@@ -910,69 +912,16 @@
+@@ -924,69 +927,16 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -143,7 +123,7 @@
  	; 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
-@@ -1023,11 +972,8 @@
+@@ -1037,11 +987,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -157,7 +137,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1084,7 +1030,7 @@
+@@ -1098,7 +1045,7 @@
  };
  
  // Opera package classes get all permissions
@@ -166,7 +146,7 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1153,7 +1099,7 @@
+@@ -1167,7 +1114,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -175,25 +155,25 @@
  
      # Executable
      debug_msg 1 "Executable"
-@@ -1191,16 +1137,7 @@
+@@ -1198,7 +1145,7 @@
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
 -    chmod $chmodv 755 $wrapper_dir/opera
--
--    # Manual page
--    debug_msg 1 "Manual page"
--
--    mkdir $mkdirv $mkdirp ${man_dir}
--    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
 +    chmod $chmodv 755 $wrapper_dir/linux-opera
  
+     # Manual page
+     debug_msg 1 "Manual page"
+@@ -1207,7 +1154,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"
-@@ -1241,9 +1178,6 @@
+@@ -1239,9 +1186,6 @@
  	mkdir $mkdirv $mkdirp $share_dir/ini/
  	chmod $chmodv 755 $share_dir/ini
  	cp $cpv $cpf $cpR ini/* $share_dir/ini/
@@ -202,44 +182,8 @@
 -	fi
      fi
  
-     # Support old way
-@@ -1313,35 +1247,11 @@
- 	chmod $chmodv 755 $plugin_dir/operapluginwrapper
- 	plugin_support='yes'
-     else
--	if test -f plugins/operamotifwrapper; then
--	    cp $cpv $cpf plugins/operamotifwrapper $plugin_dir/
--	    chmod $chmodv 755 $plugin_dir/operamotifwrapper
--	    plugin_support='yes'
--	fi
--
--	if test -f plugins/operamotifwrapper-1; then
--	    cp $cpv $cpf plugins/operamotifwrapper-1 $plugin_dir/
--	    chmod $chmodv 755 $plugin_dir/operamotifwrapper-1
--	    plugin_support='yes'
--	fi
--
--	if test -f plugins/operamotifwrapper-2; then
--	    cp $cpv $cpf plugins/operamotifwrapper-2 $plugin_dir/
--	    chmod $chmodv 755 $plugin_dir/operamotifwrapper-2
--	    plugin_support='yes'
--	fi
--
- 	if test -f plugins/operamotifwrapper-3; then
- 	    cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
- 	    chmod $chmodv 755 $plugin_dir/operamotifwrapper-3
- 	    plugin_support='yes'
- 	fi
--
--	if test -f plugins/operamotifwrapper-4; then
--	    cp $cpv $cpf plugins/operamotifwrapper-4 $plugin_dir/
--	    chmod $chmodv 755 $plugin_dir/operamotifwrapper-4
--	    plugin_support='yes'
--	fi
-     fi # operapluginwrapper
- 
-     if test -f plugins/libnpp.so
-@@ -1377,44 +1287,13 @@
+     mkdir $mkdirv $mkdirp $share_dir/locale/
+@@ -1328,43 +1272,13 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -279,24 +223,14 @@
 -	fi
 -
  	if test "${bool_icons}" -ne 0
- 	then
--	    xdg
+-	then xdg
++	then
 +	    gnome
 +	    kde 3
  	fi
  
      fi # OPERADESTDIR
-@@ -1439,8 +1318,7 @@
- 	    fi
- 	fi
- 	echo "Be sure to include $wrapper_dir in your PATH or invoke it as"
--	echo "$wrapper_dir/opera or ./opera; and include $man_path in your MANPATH"
--	echo "to make 'man opera' work, or invoke 'man -M $man_path opera'"
-+	echo "$wrapper_dir/opera or ./opera"
-     fi # ver_bose
- }
- 
-@@ -1466,19 +1344,19 @@
+@@ -1416,19 +1330,19 @@
      # arg1 = location
      # arg2 = type
  
@@ -319,7 +253,7 @@
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1502,7 +1380,7 @@
+@@ -1452,7 +1366,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -328,7 +262,7 @@
  Terminal=false"
  
  # Application is not a category, according to
-@@ -1517,25 +1395,26 @@
+@@ -1467,25 +1381,26 @@
  	if test "${2}" = "xdg"; then
  	    desktop_contain="${desktop_contain}
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -361,7 +295,7 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1623,88 +1502,26 @@
+@@ -1573,88 +1488,26 @@
      # This function searches for common gnome icon paths.
      debug_msg 1 "in gnome()"
  
@@ -469,7 +403,7 @@
  }
  
  kde()
-@@ -1712,58 +1529,46 @@
+@@ -1662,58 +1515,46 @@
      # This function searches for common kde2 and kde 3 icon paths.
      debug_msg 1 "in kde()"
  
diff --git a/www/linux-opera/files/patch-locale::en::search.ini b/www/linux-opera/files/patch-locale::en::search.ini
index 8a75dd80eec6..9af1baf989d7 100644
--- a/www/linux-opera/files/patch-locale::en::search.ini
+++ b/www/linux-opera/files/patch-locale::en::search.ini
@@ -1,46 +1,67 @@
---- locale/en/search.ini.orig	Tue Nov 22 13:43:48 2005
-+++ locale/en/search.ini	Tue Nov 22 13:45:19 2005
-@@ -435,8 +435,8 @@
- Nameid=0
- 
- [Search Engine 34]
--Name=Google Linu&x
--URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Name=Google &BSD
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+--- locale/en/search.ini.orig	Fri Jun 16 06:18:52 2006
++++ locale/en/search.ini	Tue Jun 20 22:47:11 2006
+@@ -154,7 +154,7 @@
  Query=
- Key=x
+ Key=o
  Is post=0
-@@ -445,4 +445,30 @@
- Search Type=0
- Verbtext=17063
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=iso-8859-1
+ Search Type=11
+ Verbtext=0
+@@ -446,3 +446,55 @@
+ Verbtext=0
  Position=-1
--Nameid=0
-\ No newline at end of file
-+Nameid=0
+ 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=x
++Key=p
 +Is post=0
 +Has endseparator=0
 +Encoding=utf-8
 +Search Type=0
-+Verbtext=17063
++Verbtext=0
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 36]
-+Name=FreshP&orts
++[Search Engine 38]
++Name=FreshPor&ts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
-+Key=x
++Key=t
 +Is post=0
 +Has endseparator=0
 +Encoding=utf-8
 +Search Type=0
-+Verbtext=17063
++Verbtext=0
 +Position=-1
 +Nameid=0
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
index 0d02a763d7a2..487a7414556d 100644
--- a/www/linux-opera/files/patch-search.ini
+++ b/www/linux-opera/files/patch-search.ini
@@ -1,46 +1,67 @@
---- search.ini.orig	Tue Nov 22 13:46:14 2005
-+++ search.ini	Tue Nov 22 13:47:20 2005
-@@ -435,8 +435,8 @@
- Nameid=0
- 
- [Search Engine 34]
--Name=Google Linu&x
--URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Name=Google &BSD
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+--- search.ini.orig	Fri Jun 16 06:18:52 2006
++++ search.ini	Tue Jun 20 22:45:10 2006
+@@ -154,7 +154,7 @@
  Query=
- Key=x
+ Key=o
  Is post=0
-@@ -445,4 +445,30 @@
- Search Type=0
- Verbtext=17063
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=iso-8859-1
+ Search Type=11
+ Verbtext=0
+@@ -446,3 +446,55 @@
+ Verbtext=0
  Position=-1
--Nameid=0
-\ No newline at end of file
-+Nameid=0
+ 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=x
++Key=p
 +Is post=0
 +Has endseparator=0
 +Encoding=utf-8
 +Search Type=0
-+Verbtext=17063
++Verbtext=0
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 36]
-+Name=FreshP&orts
++[Search Engine 38]
++Name=FreshPor&ts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
-+Key=x
++Key=t
 +Is post=0
 +Has endseparator=0
 +Encoding=utf-8
 +Search Type=0
-+Verbtext=17063
++Verbtext=0
 +Position=-1
 +Nameid=0
diff --git a/www/linux-opera/pkg-descr b/www/linux-opera/pkg-descr
index 1a8ab89d79fd..8542cd6006d2 100644
--- a/www/linux-opera/pkg-descr
+++ b/www/linux-opera/pkg-descr
@@ -1,18 +1,7 @@
-Opera 7 is a substantial upgrade, with code rewritten from the rendering engine
-and up, resulting in the fastest, smallest, most full-featured desktop browser
-ever released.
-
--New rendering engine
-Opera's new rendering engine supports W3C's DOM (Document Object Model) level 2,
-non-standard dynamic HTML (DHTML), CSS1 and CSS2, ECMAScript, and has improved
-HTML 4.01 support, as well as complete support for WML 1.3 and 2.0. It is
-faster, smaller and can dynamically change documents through DOM.
-
--M2 -- new e-mail client
-Opera's new e-mail client, M2, automatically categorizes and sorts e-mail
-messages by contact and has an integrated spam filter. Innovative features such
-as QuickReply and QuickFind lets users answer or find e-mails at unrivalled
-speed. M2 supports POP3, IMAP, ESMTP, and threaded display of mailing lists.
-In addition, M2 supports news servers with password authentication.
+Opera Software ASA is an industry leader in the development of Web browsers
+for the desktop, device and mobile markets. The Opera browser has received
+international recognition from end-users and the industry press for being
+faster, smaller and more standards-compliant than other browsers, and it has
+gathered a cult following on the net.
 
 WWW: http://www.opera.com/
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index 5aad03c5c155..d3b57790713a 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,9 +1,10 @@
 ##
-Changelog for 8.54 Final: http://www.opera.com/docs/changelogs/linux/854/
+Changelog for 9.0 Final: http://www.opera.com/docs/changelogs/linux/900/
 
 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. It can be done
-following from the command line:
+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/*
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index bc56927bfa3a..02430bf20c86 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -10,70 +10,64 @@ bin/linux-opera
 %%DATADIR%%/config/opera6rc
 %%DATADIR%%/config/opera6rc.fixed
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/blank.gif
-%%DATADIR%%/images/drive.gif
-%%DATADIR%%/images/file.gif
-%%DATADIR%%/images/folder.gif
-%%DATADIR%%/images/link.gif
 %%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%%/images/operabanner.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
 %%DATADIR%%/ini/filehandler.ini
 %%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/spellcheck.ini
 %%DATADIR%%/ini/standard_keyboard.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%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/en/default.adr
 %%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/lngcode.txt
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/english.lng
 %%DATADIR%%/opera6.adr
 %%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operamotifwrapper-3
 %%DATADIR%%/plugins/operaplugincleaner
+%%DATADIR%%/plugins/operapluginwrapper
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/styles/OPF.css
 %%DATADIR%%/styles/about.css
 %%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/certinfo.css
-%%DATADIR%%/styles/csr.css
+%%DATADIR%%/styles/config.css
+%%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/email.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/opera.png
+%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/mimehead.css
-%%DATADIR%%/styles/opf.css
 %%DATADIR%%/styles/plugins.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/contrastbw.css
 %%DATADIR%%/styles/user/contrastwb.css
 %%DATADIR%%/styles/user/debugwithoutline.css
 %%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/hidecertainsizes.css
 %%DATADIR%%/styles/user/hidenonlinkimages.css
 %%DATADIR%%/styles/user/imageandlinkonly.css
 %%DATADIR%%/styles/user/nostalgia.css
 %%DATADIR%%/styles/user/showstructure.css
 %%DATADIR%%/styles/user/textonly.css
-%%DATADIR%%/styles/user/userstyle.ini
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-mo.dat
 %%DATADIR%%/svg-mobd.dat
@@ -82,6 +76,7 @@ bin/linux-opera
 %%DATADIR%%/svg-se.dat
 %%DATADIR%%/svg-sebd.dat
 @dirrm %%DATADIR%%/styles/user
+@dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
@@ -94,7 +89,6 @@ bin/linux-opera
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-
 %%KDE:%%@cwd %%LOCALBASE%%
 %%KDE:%%share/applnk/Internet/linux-opera.desktop
 %%KDE:%%share/icons/hicolor/22x22/apps/linux-opera.png