- Update to 8.0, see the changelog for details:

http://www.opera.com/linux/changelogs/800/ - Use DATADIR in plist. - To upgrade, please read in either pkg-descr or UPDATING for detail - The pkg-descr will be update when opera.com is in less traffic. - Copy pkg-message in UPDATING. As for www/opera maintainer/committer, you can just add 'www/opera' when it updates to 8.0.
author: mezz <mezz@FreeBSD.org> 2005-04-20 05:08:56 +0800
committer: mezz <mezz@FreeBSD.org> 2005-04-20 05:08:56 +0800
commit: 94a0ac6d3379bf320787208425c3157a6d836946 (patch)
tree: bd5d5a82aebeb419ce60bf7707294702abcd8860 /www
parent: aab5e0cc69a26e686322a91f6cdbc31036bbbb41 (diff)
download: freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.tar.gz
freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.tar.zst
freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.zip
18 files changed, 508 insertions, 1618 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 21aebf89291e..0c2d98cfecd4 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,18 +7,17 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u2/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
 
@@ -41,8 +40,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPERA_VER=	7.54
-OPERA_DATE=	20050131
+OPERA_VER=	8.0
+OPERA_DATE=	20050415
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 46a1a8615185..7372b0ebf00c 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = afc1819c0377da89174ba2a47924b867
-SIZE (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = 4863686
+MD5 (opera-8.0-20050415.1-static-qt.i386-en.tar.bz2) = 94d1d86f42d9aa912c288e47c4b3893f
+SIZE (opera-8.0-20050415.1-static-qt.i386-en.tar.bz2) = 5176406
diff --git a/www/linux-opera-devel/files/patch-config::opera6rc b/www/linux-opera-devel/files/patch-config::opera6rc
index 127fed639b50..63b2738f0be2 100644
--- a/www/linux-opera-devel/files/patch-config::opera6rc
+++ b/www/linux-opera-devel/files/patch-config::opera6rc
@@ -1,9 +1,10 @@
---- config/opera6rc.orig	Thu May 13 13:57:43 2004
-+++ config/opera6rc	Thu May 13 13:58:16 2004
-@@ -1,5 +1,5 @@
+--- 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-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
index 3a28727b8700..beb796f948cb 100644
--- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
@@ -1,73 +1,60 @@
---- ini/pluginpath.ini.orig	Fri Feb  4 17:45:25 2005
-+++ ini/pluginpath.ini	Fri Feb  4 17:45:53 2005
-@@ -1,44 +1,26 @@
--Opera Preferences version 2.0
--; Do not edit this file while Opera is running
--; This file is stored in UTF-8 encoding
--
--[Paths]
--$PWD/plugins=1
--$HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/local/lib/opera/plugins=1
--/opt/lib/opera/plugins=1
--/opt/opera/lib/opera/plugins=1
--
--; Adobe Acrobat
--/usr/local/Acrobat5/Browsers/intellinux=1
--/usr/local/Acrobat4/Browsers/intellinux=1
--/usr/lib/Acrobat5/Browsers/intellinux=1
--/usr/lib/Acrobat4/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
--/opt/Acrobat5/Browsers/intellinux=1
--/opt/Acrobat4/Browsers/intellinux=1
--/usr/Acrobat5/Browsers/intellinux=1
--/usr/Acrobat4/Browsers/intellinux=1
--
--; Realplayer
--/usr/lib/RealPlayer8/Plugins=1
--/usr/lib/realplay/plugins=1
--/usr/lib/RealPlayer8=1
--/usr/lib/realplay=1
--
--; Netscape Plug-in Paths
--$HOME/.netscape6/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
--
--; 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
-+Opera Preferences version 2.0
-+; Do not edit this file while Opera is running
-+; This file is stored in UTF-8 encoding
-+
-+[Paths]
+--- ini/pluginpath.ini.orig	Tue Mar  1 16:31:51 2005
++++ ini/pluginpath.ini	Tue Mar  1 16:33:00 2005
+@@ -3,46 +3,24 @@
+ ; This file is stored in UTF-8 encoding
+ 
+ [Paths]
+-$PWD/plugins=1
+-$HOME/.opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
+-/opt/opera/lib/opera/plugins=1
 +$HOME/.linux-opera/plugins=1
 +%%PREFIX%%/share/linux-opera/plugins=1
-+
-+; Adobe Acrobat
+ 
+ ; Adobe Acrobat
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +
 +; Flash player
 +%%LOCALBASE%%/lib/linux-flashplugin6=1
 +%%LOCALBASE%%/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
-+
-+; Netscape Plug-in Paths
-+$HOME/.netscape/plugins=1
+ 
+ ; Netscape Plug-in Paths
+-$HOME/.netscape6/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
-+
-+; Since Mozilla supports NS plugins, there might
-+; be some in the Mozilla plugin directory.
+ 
+ ; 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/lib/browser-plugins=1
+-
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index 9f81841695ff..cd797aa76587 100644
--- a/www/linux-opera-devel/files/patch-install.sh
+++ b/www/linux-opera-devel/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Mon Jan 31 09:19:45 2005
-+++ install.sh	Sun Feb 20 16:20:11 2005
+--- install.sh.orig	Tue Apr 19 13:21:58 2005
++++ install.sh	Tue Apr 19 13:36:51 2005
 @@ -761,10 +761,9 @@
      case "${machine}:${os}" in
  	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -45,7 +45,7 @@
          if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
      fi
  fi
-@@ -873,52 +876,16 @@
+@@ -873,53 +876,16 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -84,6 +84,7 @@
 -	j2se/1.3/jre \\
 -	j2se/jre \\
 -	jre1.3.1_15 \\
+-	jre1.3.1_04 \\
 -	jre1.3.1_02 \\
 -	jre1.3.1_01 \\
 -	j2re1.3.1 \\
@@ -106,7 +107,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
-@@ -967,11 +934,8 @@
+@@ -970,11 +936,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -120,7 +121,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1009,7 +973,7 @@
+@@ -1012,7 +975,7 @@
  };
  
  // Opera package classes get all permissions
@@ -129,7 +130,7 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1077,7 +1041,7 @@
+@@ -1080,7 +1043,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -138,7 +139,7 @@
  
      # Executable
  	debug_msg 1 "Executable"
-@@ -1112,7 +1076,7 @@
+@@ -1115,7 +1078,7 @@
  
  	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
  	generate_wrapper
@@ -147,7 +148,7 @@
  
      # Documentation
  	debug_msg 1 "Documentation"
-@@ -1214,27 +1178,6 @@
+@@ -1222,27 +1185,6 @@
  	mkdir $mkdirv $mkdirp $plugin_dir/
  	chmod $chmodv 755 $plugin_dir
  
@@ -175,7 +176,7 @@
  	if test -f plugins/operamotifwrapper-3
  	    then
  		cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
-@@ -1242,13 +1185,6 @@
+@@ -1250,13 +1192,6 @@
  		plugin_support='yes'
  	fi
  
@@ -189,28 +190,33 @@
  	if test -f plugins/libnpp.so
  	    then
  		cp $cpv $cpf plugins/libnpp.so $plugin_dir/
-@@ -1286,8 +1222,9 @@
+@@ -1293,36 +1228,13 @@
+ 
  	if test -z "${OPERADESTDIR}"; then
  
- 	# System wide configuration files
+-	# System wide configuration files
 -	config_dir="/etc"
-+	config_dir="$prefix/etc"
- 	if can_write_to "$config_dir"; then
-+if false; then # XXX
- 	    echo
- 	    echo "System wide configuration files:"
- 	    echo "  $config_dir/opera6rc"
-@@ -1299,6 +1236,7 @@
- 		cp $cpv $cpf config/opera6rc $config_dir
- 		cp $cpv $cpf config/opera6rc.fixed $config_dir
- 	    fi
-+fi # XXX
- 	else
- 	    echo
- 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1309,12 +1247,12 @@
- 	fi
- 
+-	if can_write_to "$config_dir"; then
+-	    echo
+-	    echo "System wide configuration files:"
+-	    echo "  $config_dir/opera6rc"
+-	    echo "  $config_dir/opera6rc.fixed"
+-	    echo " cannot be prefixed"
+-	    if con_firm "Do you want to install them"; 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
+-	    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"
+-	fi
+-
       # Shorcuts and Icons
 -	icons
 +#	icons
@@ -225,7 +231,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1359,15 +1297,16 @@
+@@ -1367,15 +1279,16 @@
  {
      # arg1 = location
  
@@ -247,16 +253,16 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1443,74 +1382,27 @@
+@@ -1451,74 +1364,26 @@
  
      debug_msg 1 "in gnome()"
  
 -    if test -d /opt/gnome/; then
--
--      # /opt/gnome share
--      if test -d /opt/gnome/share; then
 +    if test -d %%X11BASE%%/share/gnome/; then
  
+-      # /opt/gnome share
+-      if test -d /opt/gnome/share; then
+-
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
 -	  if test -w /opt/gnome/share; then
@@ -299,12 +305,7 @@
 +      # end %%X11BASE%%/share/gnome icon
  
 -    elif test -d /usr/share/gnome/; then
-+      # %%X11BASE%%/share/gnome link
-+      if test -d %%X11BASE%%/share/gnome/applications/; then
-+        generate_desktop %%X11BASE%%/share/gnome/applications
-+      fi
-+      # end %%X11BASE%%/share/gnome link
- 
+-
 -        # /usr/share/gnome icon
 -        if test ! -d /usr/share/gnome/pixmaps/; then
 -	  if test -w /usr/share/gnome; then
@@ -335,11 +336,16 @@
 -	# end /usr/share/gnome link
 -   fi
 -   # Add ximian here
++      # %%X11BASE%%/share/gnome link
++      if test -d %%X11BASE%%/share/gnome/applications/; then
++        generate_desktop %%X11BASE%%/share/gnome/applications
++      fi
++      # end %%X11BASE%%/share/gnome link
 +    fi
  }
  
  kde()
-@@ -1519,39 +1411,31 @@
+@@ -1527,39 +1392,31 @@
  
      debug_msg 1 "in kde()"
  
@@ -381,7 +387,7 @@
 +	if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
        fi
  
-     fi  
+-    fi  
 -    
 -    if test -d /usr/share/applnk/Networking; then
 -      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
@@ -390,6 +396,7 @@
 -      fi
 -      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
 -    fi
++    fi    
  }
  
  kde1()
diff --git a/www/linux-opera-devel/files/patch-locale::en::search.ini b/www/linux-opera-devel/files/patch-locale::en::search.ini
index 0e4ef12e4733..6a6fca908dd3 100644
--- a/www/linux-opera-devel/files/patch-locale::en::search.ini
+++ b/www/linux-opera-devel/files/patch-locale::en::search.ini
@@ -1,9 +1,9 @@
---- locale/en/search.ini.orig	Wed Aug  4 21:33:51 2004
-+++ locale/en/search.ini	Wed Aug  4 21:34:15 2004
-@@ -32,8 +32,8 @@
+--- locale/en/search.ini.orig	Tue Apr 19 13:13:17 2005
++++ locale/en/search.ini	Tue Apr 19 13:16:49 2005
+@@ -422,12 +422,38 @@
  Nameid=0
  
- [Search Engine 3]
+ [Search Engine 33]
 -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
@@ -11,10 +11,14 @@
  Query=
  Key=x
  Is post=0
-@@ -45,6 +45,32 @@
- Nameid=0
- 
- [Search Engine 4]
+ Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 34]
 +Name=FreeBSD &PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -27,272 +31,13 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 5]
++[Search Engine 35]
 +Name=FreshP&orts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=x
 +Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 6]
- Name=&Ebay.com
- URL=http://adfarm.mediaplex.com/ad/ck/711-1751-2978-58?loc=http%3A//www.qksrv.net/interactive%3FMfcISAPICommand%3DGetResult%26ht%3D1%26SortProperty%3DMetaEndSort%26query%3D%s%26pid%3D1458483%26url%3Dhttp%3A//search.ebay.com/search/search.dll%26aid%3D5319893
- Query=
-@@ -57,7 +83,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 5]
-+[Search Engine 7]
- Name=Price &Comparison
- URL=http://www.dealtime.com/GS2/GS2StatReDirect/?bParent=on&nFormID=0&nParentFormID=0&linkin_id=3005961&uid=1738108048&keyword=%s&submit=Search
- Query=
-@@ -70,7 +96,7 @@
- Position=14
- Nameid=0
- 
--[Search Engine 6]
-+[Search Engine 8]
- Name=Do&wnload.com
- URL=http://download.com.com/3120-20-0.html?qt=%s&tg=dl-2001&part=opera&subj=windows&tag=search
- Query=
-@@ -83,7 +109,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 7]
-+[Search Engine 9]
- Name=Google g&roups
- URL=http://groups.google.com/groups?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -96,7 +122,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 8]
-+[Search Engine 10]
- Name=Google &News
- URL=http://news.google.com/news?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -109,7 +135,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 9]
-+[Search Engine 11]
- Name=&Opera support
- URL=http://www.opera.com/support/supsearch/supsearch.cgi?options=complete&maxhits=0&platform=&name=%s
- Query=
-@@ -122,7 +148,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 10]
-+[Search Engine 12]
- Name=&Find in page
- URL=
- Query=
-@@ -135,7 +161,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 11]
-+[Search Engine 13]
- Name=Dictionary
- URL=http://opera.infoplease.com/search.php3?in=dictionary&query=%s
- Query=
-@@ -148,7 +174,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 12]
-+[Search Engine 14]
- Name=Encyclopedia
- URL=http://opera.infoplease.com/search.php3?in=encyclopedia&query=%s
- Query=
-@@ -161,7 +187,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 13]
-+[Search Engine 15]
- Name=Currency
- URL=http://ekit.lycos.com/ekit/Currency/?amount=%s&fromCurrency=%s&toCurrency=%s&action_convert.x=0&action_convert.y=0
- Query=
-@@ -174,7 +200,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 14]
-+[Search Engine 16]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_fr&partner=demo-Lycos2-en
- Query=
-@@ -187,7 +213,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 15]
-+[Search Engine 17]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_de&partner=demo-Lycos2-en
- Query=
-@@ -200,7 +226,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 16]
-+[Search Engine 18]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_it&partner=demo-Lycos2-en
- Query=
-@@ -213,7 +239,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 17]
-+[Search Engine 19]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_pt&partner=demo-Lycos2-en
- Query=
-@@ -226,7 +252,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 18]
-+[Search Engine 20]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_es&partner=demo-Lycos2-en
- Query=
-@@ -239,7 +265,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 19]
-+[Search Engine 21]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_en&partner=demo-Lycos2-en
- Query=
-@@ -252,7 +278,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 20]
-+[Search Engine 22]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_de&partner=demo-Lycos2-en
- Query=
-@@ -265,7 +291,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 21]
-+[Search Engine 23]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_it&partner=demo-Lycos2-en
- Query=
-@@ -278,7 +304,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 22]
-+[Search Engine 24]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_pt&partner=demo-Lycos2-en
- Query=
-@@ -291,7 +317,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 23]
-+[Search Engine 25]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_es&partner=demo-Lycos2-en
- Query=
-@@ -304,7 +330,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 24]
-+[Search Engine 26]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_en&partner=demo-Lycos2-en
- Query=
-@@ -317,7 +343,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 25]
-+[Search Engine 27]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_fr&partner=demo-Lycos2-en
- Query=
-@@ -330,7 +356,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 26]
-+[Search Engine 28]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_en&partner=demo-Lycos2-en
- Query=
-@@ -343,7 +369,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 27]
-+[Search Engine 29]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_fr&partner=demo-Lycos2-en
- Query=
-@@ -356,7 +382,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 28]
-+[Search Engine 30]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=pt_en&partner=demo-Lycos2-en
- Query=
-@@ -369,7 +395,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 29]
-+[Search Engine 31]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_en&partner=demo-Lycos2-en
- Query=
-@@ -382,7 +408,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 30]
-+[Search Engine 32]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_fr&partner=demo-Lycos2-en
- Query=
-@@ -395,7 +421,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 31]
-+[Search Engine 33]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=EJ&svp=OPER&pg=honyaku_t_inout.html
- Query=
-@@ -408,7 +434,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 32]
-+[Search Engine 34]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=JE&svp=OPER&pg=honyaku_t_inout.html
- Query=
++as endseparator=0
+ Encoding=utf-8
+ Search Type=0
+ Verbtext=17063
diff --git a/www/linux-opera-devel/files/patch-search.ini b/www/linux-opera-devel/files/patch-search.ini
index 4d4981c91837..b47cde6a4ea6 100644
--- a/www/linux-opera-devel/files/patch-search.ini
+++ b/www/linux-opera-devel/files/patch-search.ini
@@ -1,9 +1,9 @@
---- search.ini.orig	Wed Aug  4 21:33:15 2004
-+++ search.ini	Wed Aug  4 21:33:20 2004
-@@ -32,8 +32,8 @@
+--- search.ini.orig	Tue Apr 19 13:17:32 2005
++++ search.ini	Tue Apr 19 13:18:39 2005
+@@ -422,12 +422,38 @@
  Nameid=0
  
- [Search Engine 3]
+ [Search Engine 33]
 -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
@@ -11,10 +11,14 @@
  Query=
  Key=x
  Is post=0
-@@ -45,6 +45,32 @@
- Nameid=0
- 
- [Search Engine 4]
+ Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 34]
 +Name=FreeBSD &PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -27,272 +31,13 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 5]
++[Search Engine 35]
 +Name=FreshP&orts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=x
 +Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 6]
- Name=&Ebay.com
- URL=http://adfarm.mediaplex.com/ad/ck/711-1751-2978-58?loc=http%3A//www.qksrv.net/interactive%3FMfcISAPICommand%3DGetResult%26ht%3D1%26SortProperty%3DMetaEndSort%26query%3D%s%26pid%3D1458483%26url%3Dhttp%3A//search.ebay.com/search/search.dll%26aid%3D5319893
- Query=
-@@ -57,7 +83,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 5]
-+[Search Engine 7]
- Name=Price &Comparison
- URL=http://www.dealtime.com/GS2/GS2StatReDirect/?bParent=on&nFormID=0&nParentFormID=0&linkin_id=3005961&uid=1738108048&keyword=%s&submit=Search
- Query=
-@@ -70,7 +96,7 @@
- Position=14
- Nameid=0
- 
--[Search Engine 6]
-+[Search Engine 8]
- Name=Do&wnload.com
- URL=http://download.com.com/3120-20-0.html?qt=%s&tg=dl-2001&part=opera&subj=windows&tag=search
- Query=
-@@ -83,7 +109,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 7]
-+[Search Engine 9]
- Name=Google g&roups
- URL=http://groups.google.com/groups?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -96,7 +122,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 8]
-+[Search Engine 10]
- Name=Google &News
- URL=http://news.google.com/news?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -109,7 +135,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 9]
-+[Search Engine 11]
- Name=&Opera support
- URL=http://www.opera.com/support/supsearch/supsearch.cgi?options=complete&maxhits=0&platform=&name=%s
- Query=
-@@ -122,7 +148,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 10]
-+[Search Engine 12]
- Name=&Find in page
- URL=
- Query=
-@@ -135,7 +161,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 11]
-+[Search Engine 13]
- Name=Dictionary
- URL=http://opera.infoplease.com/search.php3?in=dictionary&query=%s
- Query=
-@@ -148,7 +174,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 12]
-+[Search Engine 14]
- Name=Encyclopedia
- URL=http://opera.infoplease.com/search.php3?in=encyclopedia&query=%s
- Query=
-@@ -161,7 +187,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 13]
-+[Search Engine 15]
- Name=Currency
- URL=http://ekit.lycos.com/ekit/Currency/?amount=%s&fromCurrency=%s&toCurrency=%s&action_convert.x=0&action_convert.y=0
- Query=
-@@ -174,7 +200,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 14]
-+[Search Engine 16]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_fr&partner=demo-Lycos2-en
- Query=
-@@ -187,7 +213,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 15]
-+[Search Engine 17]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_de&partner=demo-Lycos2-en
- Query=
-@@ -200,7 +226,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 16]
-+[Search Engine 18]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_it&partner=demo-Lycos2-en
- Query=
-@@ -213,7 +239,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 17]
-+[Search Engine 19]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_pt&partner=demo-Lycos2-en
- Query=
-@@ -226,7 +252,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 18]
-+[Search Engine 20]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_es&partner=demo-Lycos2-en
- Query=
-@@ -239,7 +265,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 19]
-+[Search Engine 21]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_en&partner=demo-Lycos2-en
- Query=
-@@ -252,7 +278,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 20]
-+[Search Engine 22]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_de&partner=demo-Lycos2-en
- Query=
-@@ -265,7 +291,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 21]
-+[Search Engine 23]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_it&partner=demo-Lycos2-en
- Query=
-@@ -278,7 +304,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 22]
-+[Search Engine 24]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_pt&partner=demo-Lycos2-en
- Query=
-@@ -291,7 +317,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 23]
-+[Search Engine 25]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_es&partner=demo-Lycos2-en
- Query=
-@@ -304,7 +330,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 24]
-+[Search Engine 26]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_en&partner=demo-Lycos2-en
- Query=
-@@ -317,7 +343,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 25]
-+[Search Engine 27]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_fr&partner=demo-Lycos2-en
- Query=
-@@ -330,7 +356,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 26]
-+[Search Engine 28]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_en&partner=demo-Lycos2-en
- Query=
-@@ -343,7 +369,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 27]
-+[Search Engine 29]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_fr&partner=demo-Lycos2-en
- Query=
-@@ -356,7 +382,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 28]
-+[Search Engine 30]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=pt_en&partner=demo-Lycos2-en
- Query=
-@@ -369,7 +395,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 29]
-+[Search Engine 31]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_en&partner=demo-Lycos2-en
- Query=
-@@ -382,7 +408,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 30]
-+[Search Engine 32]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_fr&partner=demo-Lycos2-en
- Query=
-@@ -395,7 +421,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 31]
-+[Search Engine 33]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=EJ&svp=OPER&pg=honyaku_t_inout.html
- Query=
-@@ -408,7 +434,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 32]
-+[Search Engine 34]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=JE&svp=OPER&pg=honyaku_t_inout.html
- Query=
++as endseparator=0
+ Encoding=utf-8
+ Search Type=0
+ Verbtext=17063
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
index 03ab1a4cb044..65250f0903d3 100644
--- a/www/linux-opera-devel/pkg-message
+++ b/www/linux-opera-devel/pkg-message
@@ -1,23 +1,18 @@
 ##
-Changelog for 7.54u2 Final: http://www.opera.com/linux/changelogs/754u2/
+Changelog for 8.0 Final: http://www.opera.com/linux/changelogs/800/
 
-The name of the the binary, data directory, personal "~/.opera" directory,
-etc., have been renamed from "opera" to "linux-opera." This means that
-www/linux-opera and www/opera no longer conflict, and can be installed and
-can run at the same time. Bookmarks and mail can be preserved by copying
-~/.opera/mail and ~/.opera/opera6.adr into ~/.linux-opera. Configurations for
-toolbars, options, etc., have changed from previous versions, and are not
-recommend to transferred from the old configuration. The mail format will be
-converted to the new format automatically when the new linux-opera is run for
-the first time.
+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:
 
-*** IMPORTANT: users with custom search.ini ***
+	# cp -Rp ~/.linux-opera ~/.linux-opera-bak
+	# rm -rf ~/.linux-opera/*
 
-If you have a custom search.ini and you've used opera 7.51 or an earlier
-version before this upgrade, edit ~/.linux-opera/search.ini _before_ running
-the upgraded Opera for the first time, and change the file version to 4. It
-should look like this:
-
-[Version]
-File Version=4
+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 6629447c2188..430a37724d05 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,133 +1,99 @@
 bin/linux-opera
 %%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/help
 %%GNOME:%%share/gnome/applications/linux-opera.desktop
 %%GNOME:%%share/gnome/pixmaps/linux-opera.xpm
-share/linux-opera/bin/missingsyms.so
-share/linux-opera/bin/opera
-share/linux-opera/bin/spellcheck.so
-share/linux-opera/bin/works
-share/linux-opera/chartables.bin
-share/linux-opera/config/opera6rc
-share/linux-opera/config/opera6rc.fixed
-share/linux-opera/help/advertising.html
-share/linux-opera/help/background.png
-share/linux-opera/help/chat.html
-share/linux-opera/help/dialogs.html
-share/linux-opera/help/filetypes.html
-share/linux-opera/help/fonts.html
-share/linux-opera/help/glossary.html
-share/linux-opera/help/help.css
-share/linux-opera/help/history.html
-share/linux-opera/help/index.html
-share/linux-opera/help/input.html
-share/linux-opera/help/keyboard.html
-share/linux-opera/help/languages.html
-share/linux-opera/help/layout.html
-share/linux-opera/help/license.txt
-share/linux-opera/help/m2.html
-share/linux-opera/help/mail.html
-share/linux-opera/help/menus.html
-share/linux-opera/help/mouse.html
-share/linux-opera/help/multimedia.html
-share/linux-opera/help/network.html
-share/linux-opera/help/page.html
-share/linux-opera/help/panels.html
-share/linux-opera/help/paths.html
-share/linux-opera/help/personal.html
-share/linux-opera/help/preferences.html
-share/linux-opera/help/privacy.html
-share/linux-opera/help/search.html
-share/linux-opera/help/security.html
-share/linux-opera/help/skin.html
-share/linux-opera/help/sounds.html
-share/linux-opera/help/start.html
-share/linux-opera/help/toc.html
-share/linux-opera/help/toolbars.html
-share/linux-opera/help/windows.html
-share/linux-opera/hhd.ssr
-share/linux-opera/html40_entities.dtd
-share/linux-opera/images/background.gif
-share/linux-opera/images/blank.gif
-share/linux-opera/images/drive.gif
-share/linux-opera/images/file.gif
-share/linux-opera/images/folder.gif
-share/linux-opera/images/link.gif
-share/linux-opera/images/opera.xpm
-share/linux-opera/images/opera_16x16.png
-share/linux-opera/images/opera_22x22.png
-share/linux-opera/images/opera_32x32.png
-share/linux-opera/images/opera_48x48.png
-share/linux-opera/images/operabanner.png
-share/linux-opera/images/shared.gif
-share/linux-opera/images/splash.png
-share/linux-opera/images/startup1.png
-share/linux-opera/images/startup2.png
-share/linux-opera/ini/dialog.ini
-share/linux-opera/ini/fastforward.ini
-share/linux-opera/ini/filehandler.ini
-share/linux-opera/ini/pluginpath.ini
-share/linux-opera/ini/spellcheck.ini
-share/linux-opera/ini/standard_keyboard.ini
-share/linux-opera/ini/standard_menu.ini
-share/linux-opera/ini/standard_mouse.ini
-share/linux-opera/ini/standard_toolbar.ini
-share/linux-opera/ini/unix_keyboard.ini
-share/linux-opera/java/opera.jar
-share/linux-opera/java/opera.policy
-share/linux-opera/jsconsole.html
-share/linux-opera/lngcode.txt
-share/linux-opera/locale/en/default.adr
-share/linux-opera/locale/en/lngcode.txt
-share/linux-opera/locale/en/search.ini
-share/linux-opera/locale/english.lng
-share/linux-opera/opera6.adr
-share/linux-opera/plugins/libnpp.so
-share/linux-opera/plugins/operamotifwrapper-3
-share/linux-opera/plugins/operaplugincleaner
-share/linux-opera/search.ini
-share/linux-opera/skin/standard_skin.zip
-share/linux-opera/skin/windows_skin.zip
-share/linux-opera/styles/OPF.css
-share/linux-opera/styles/about.css
-share/linux-opera/styles/cache.css
-share/linux-opera/styles/csr.css
-share/linux-opera/styles/dir.css
-share/linux-opera/styles/drives.css
-share/linux-opera/styles/email.css
-share/linux-opera/styles/history.css
-share/linux-opera/styles/im.css
-share/linux-opera/styles/info.css
-share/linux-opera/styles/mime.css
-share/linux-opera/styles/mimehead.css
-share/linux-opera/styles/opf.css
-share/linux-opera/styles/plugins.css
-share/linux-opera/styles/user/accessibility.css
-share/linux-opera/styles/user/contrastbw.css
-share/linux-opera/styles/user/contrastwb.css
-share/linux-opera/styles/user/debugwithoutline.css
-share/linux-opera/styles/user/disabletables.css
-share/linux-opera/styles/user/hidecertainsizes.css
-share/linux-opera/styles/user/hidenonlinkimages.css
-share/linux-opera/styles/user/imageandlinkonly.css
-share/linux-opera/styles/user/nostalgia.css
-share/linux-opera/styles/user/showstructure.css
-share/linux-opera/styles/user/textonly.css
-share/linux-opera/styles/user/userstyle.ini
-share/linux-opera/styles/wml.css
-@dirrm share/linux-opera/styles/user
-@dirrm share/linux-opera/styles
-@dirrm share/linux-opera/skin
-@dirrm share/linux-opera/plugins
-@dirrm share/linux-opera/locale/en
-@dirrm share/linux-opera/locale
-@dirrm share/linux-opera/java
-@dirrm share/linux-opera/ini
-@dirrm share/linux-opera/images
-@dirrm share/linux-opera/help
-@dirrm share/linux-opera/config
-@dirrm share/linux-opera/bin
-@dirrm share/linux-opera
+%%DATADIR%%/bin/missingsyms.so
+%%DATADIR%%/bin/opera
+%%DATADIR%%/bin/spellcheck.so
+%%DATADIR%%/bin/works
+%%DATADIR%%/chartables.bin
+%%DATADIR%%/config/opera6rc
+%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/hhd.ssr
+%%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%%/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%%/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/dir.css
+%%DATADIR%%/styles/drives.css
+%%DATADIR%%/styles/email.css
+%%DATADIR%%/styles/history.css
+%%DATADIR%%/styles/im.css
+%%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
+%%DATADIR%%/svg-sa.dat
+%%DATADIR%%/svg-sabd.dat
+%%DATADIR%%/svg-se.dat
+%%DATADIR%%/svg-sebd.dat
+@dirrm %%DATADIR%%/styles/user
+@dirrm %%DATADIR%%/styles
+@dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale
+@dirrm %%DATADIR%%/java
+@dirrm %%DATADIR%%/ini
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 
 %%KDE:%%@cwd %%LOCALBASE%%
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 21aebf89291e..0c2d98cfecd4 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,18 +7,17 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u2/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
 
@@ -41,8 +40,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPERA_VER=	7.54
-OPERA_DATE=	20050131
+OPERA_VER=	8.0
+OPERA_DATE=	20050415
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 46a1a8615185..7372b0ebf00c 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = afc1819c0377da89174ba2a47924b867
-SIZE (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = 4863686
+MD5 (opera-8.0-20050415.1-static-qt.i386-en.tar.bz2) = 94d1d86f42d9aa912c288e47c4b3893f
+SIZE (opera-8.0-20050415.1-static-qt.i386-en.tar.bz2) = 5176406
diff --git a/www/linux-opera/files/patch-config::opera6rc b/www/linux-opera/files/patch-config::opera6rc
index 127fed639b50..63b2738f0be2 100644
--- a/www/linux-opera/files/patch-config::opera6rc
+++ b/www/linux-opera/files/patch-config::opera6rc
@@ -1,9 +1,10 @@
---- config/opera6rc.orig	Thu May 13 13:57:43 2004
-+++ config/opera6rc	Thu May 13 13:58:16 2004
-@@ -1,5 +1,5 @@
+--- 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 3a28727b8700..beb796f948cb 100644
--- a/www/linux-opera/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera/files/patch-ini::pluginpath.ini
@@ -1,73 +1,60 @@
---- ini/pluginpath.ini.orig	Fri Feb  4 17:45:25 2005
-+++ ini/pluginpath.ini	Fri Feb  4 17:45:53 2005
-@@ -1,44 +1,26 @@
--Opera Preferences version 2.0
--; Do not edit this file while Opera is running
--; This file is stored in UTF-8 encoding
--
--[Paths]
--$PWD/plugins=1
--$HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/local/lib/opera/plugins=1
--/opt/lib/opera/plugins=1
--/opt/opera/lib/opera/plugins=1
--
--; Adobe Acrobat
--/usr/local/Acrobat5/Browsers/intellinux=1
--/usr/local/Acrobat4/Browsers/intellinux=1
--/usr/lib/Acrobat5/Browsers/intellinux=1
--/usr/lib/Acrobat4/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
--/opt/Acrobat5/Browsers/intellinux=1
--/opt/Acrobat4/Browsers/intellinux=1
--/usr/Acrobat5/Browsers/intellinux=1
--/usr/Acrobat4/Browsers/intellinux=1
--
--; Realplayer
--/usr/lib/RealPlayer8/Plugins=1
--/usr/lib/realplay/plugins=1
--/usr/lib/RealPlayer8=1
--/usr/lib/realplay=1
--
--; Netscape Plug-in Paths
--$HOME/.netscape6/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
--
--; 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
-+Opera Preferences version 2.0
-+; Do not edit this file while Opera is running
-+; This file is stored in UTF-8 encoding
-+
-+[Paths]
+--- ini/pluginpath.ini.orig	Tue Mar  1 16:31:51 2005
++++ ini/pluginpath.ini	Tue Mar  1 16:33:00 2005
+@@ -3,46 +3,24 @@
+ ; This file is stored in UTF-8 encoding
+ 
+ [Paths]
+-$PWD/plugins=1
+-$HOME/.opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
+-/opt/opera/lib/opera/plugins=1
 +$HOME/.linux-opera/plugins=1
 +%%PREFIX%%/share/linux-opera/plugins=1
-+
-+; Adobe Acrobat
+ 
+ ; Adobe Acrobat
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +
 +; Flash player
 +%%LOCALBASE%%/lib/linux-flashplugin6=1
 +%%LOCALBASE%%/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
-+
-+; Netscape Plug-in Paths
-+$HOME/.netscape/plugins=1
+ 
+ ; Netscape Plug-in Paths
+-$HOME/.netscape6/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
-+
-+; Since Mozilla supports NS plugins, there might
-+; be some in the Mozilla plugin directory.
+ 
+ ; 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/lib/browser-plugins=1
+-
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index 9f81841695ff..cd797aa76587 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Mon Jan 31 09:19:45 2005
-+++ install.sh	Sun Feb 20 16:20:11 2005
+--- install.sh.orig	Tue Apr 19 13:21:58 2005
++++ install.sh	Tue Apr 19 13:36:51 2005
 @@ -761,10 +761,9 @@
      case "${machine}:${os}" in
  	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -45,7 +45,7 @@
          if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
      fi
  fi
-@@ -873,52 +876,16 @@
+@@ -873,53 +876,16 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -84,6 +84,7 @@
 -	j2se/1.3/jre \\
 -	j2se/jre \\
 -	jre1.3.1_15 \\
+-	jre1.3.1_04 \\
 -	jre1.3.1_02 \\
 -	jre1.3.1_01 \\
 -	j2re1.3.1 \\
@@ -106,7 +107,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
-@@ -967,11 +934,8 @@
+@@ -970,11 +936,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -120,7 +121,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1009,7 +973,7 @@
+@@ -1012,7 +975,7 @@
  };
  
  // Opera package classes get all permissions
@@ -129,7 +130,7 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1077,7 +1041,7 @@
+@@ -1080,7 +1043,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -138,7 +139,7 @@
  
      # Executable
  	debug_msg 1 "Executable"
-@@ -1112,7 +1076,7 @@
+@@ -1115,7 +1078,7 @@
  
  	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
  	generate_wrapper
@@ -147,7 +148,7 @@
  
      # Documentation
  	debug_msg 1 "Documentation"
-@@ -1214,27 +1178,6 @@
+@@ -1222,27 +1185,6 @@
  	mkdir $mkdirv $mkdirp $plugin_dir/
  	chmod $chmodv 755 $plugin_dir
  
@@ -175,7 +176,7 @@
  	if test -f plugins/operamotifwrapper-3
  	    then
  		cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
-@@ -1242,13 +1185,6 @@
+@@ -1250,13 +1192,6 @@
  		plugin_support='yes'
  	fi
  
@@ -189,28 +190,33 @@
  	if test -f plugins/libnpp.so
  	    then
  		cp $cpv $cpf plugins/libnpp.so $plugin_dir/
-@@ -1286,8 +1222,9 @@
+@@ -1293,36 +1228,13 @@
+ 
  	if test -z "${OPERADESTDIR}"; then
  
- 	# System wide configuration files
+-	# System wide configuration files
 -	config_dir="/etc"
-+	config_dir="$prefix/etc"
- 	if can_write_to "$config_dir"; then
-+if false; then # XXX
- 	    echo
- 	    echo "System wide configuration files:"
- 	    echo "  $config_dir/opera6rc"
-@@ -1299,6 +1236,7 @@
- 		cp $cpv $cpf config/opera6rc $config_dir
- 		cp $cpv $cpf config/opera6rc.fixed $config_dir
- 	    fi
-+fi # XXX
- 	else
- 	    echo
- 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1309,12 +1247,12 @@
- 	fi
- 
+-	if can_write_to "$config_dir"; then
+-	    echo
+-	    echo "System wide configuration files:"
+-	    echo "  $config_dir/opera6rc"
+-	    echo "  $config_dir/opera6rc.fixed"
+-	    echo " cannot be prefixed"
+-	    if con_firm "Do you want to install them"; 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
+-	    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"
+-	fi
+-
       # Shorcuts and Icons
 -	icons
 +#	icons
@@ -225,7 +231,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1359,15 +1297,16 @@
+@@ -1367,15 +1279,16 @@
  {
      # arg1 = location
  
@@ -247,16 +253,16 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1443,74 +1382,27 @@
+@@ -1451,74 +1364,26 @@
  
      debug_msg 1 "in gnome()"
  
 -    if test -d /opt/gnome/; then
--
--      # /opt/gnome share
--      if test -d /opt/gnome/share; then
 +    if test -d %%X11BASE%%/share/gnome/; then
  
+-      # /opt/gnome share
+-      if test -d /opt/gnome/share; then
+-
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
 -	  if test -w /opt/gnome/share; then
@@ -299,12 +305,7 @@
 +      # end %%X11BASE%%/share/gnome icon
  
 -    elif test -d /usr/share/gnome/; then
-+      # %%X11BASE%%/share/gnome link
-+      if test -d %%X11BASE%%/share/gnome/applications/; then
-+        generate_desktop %%X11BASE%%/share/gnome/applications
-+      fi
-+      # end %%X11BASE%%/share/gnome link
- 
+-
 -        # /usr/share/gnome icon
 -        if test ! -d /usr/share/gnome/pixmaps/; then
 -	  if test -w /usr/share/gnome; then
@@ -335,11 +336,16 @@
 -	# end /usr/share/gnome link
 -   fi
 -   # Add ximian here
++      # %%X11BASE%%/share/gnome link
++      if test -d %%X11BASE%%/share/gnome/applications/; then
++        generate_desktop %%X11BASE%%/share/gnome/applications
++      fi
++      # end %%X11BASE%%/share/gnome link
 +    fi
  }
  
  kde()
-@@ -1519,39 +1411,31 @@
+@@ -1527,39 +1392,31 @@
  
      debug_msg 1 "in kde()"
  
@@ -381,7 +387,7 @@
 +	if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
        fi
  
-     fi  
+-    fi  
 -    
 -    if test -d /usr/share/applnk/Networking; then
 -      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
@@ -390,6 +396,7 @@
 -      fi
 -      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
 -    fi
++    fi    
  }
  
  kde1()
diff --git a/www/linux-opera/files/patch-locale::en::search.ini b/www/linux-opera/files/patch-locale::en::search.ini
index 0e4ef12e4733..6a6fca908dd3 100644
--- a/www/linux-opera/files/patch-locale::en::search.ini
+++ b/www/linux-opera/files/patch-locale::en::search.ini
@@ -1,9 +1,9 @@
---- locale/en/search.ini.orig	Wed Aug  4 21:33:51 2004
-+++ locale/en/search.ini	Wed Aug  4 21:34:15 2004
-@@ -32,8 +32,8 @@
+--- locale/en/search.ini.orig	Tue Apr 19 13:13:17 2005
++++ locale/en/search.ini	Tue Apr 19 13:16:49 2005
+@@ -422,12 +422,38 @@
  Nameid=0
  
- [Search Engine 3]
+ [Search Engine 33]
 -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
@@ -11,10 +11,14 @@
  Query=
  Key=x
  Is post=0
-@@ -45,6 +45,32 @@
- Nameid=0
- 
- [Search Engine 4]
+ Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 34]
 +Name=FreeBSD &PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -27,272 +31,13 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 5]
++[Search Engine 35]
 +Name=FreshP&orts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=x
 +Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 6]
- Name=&Ebay.com
- URL=http://adfarm.mediaplex.com/ad/ck/711-1751-2978-58?loc=http%3A//www.qksrv.net/interactive%3FMfcISAPICommand%3DGetResult%26ht%3D1%26SortProperty%3DMetaEndSort%26query%3D%s%26pid%3D1458483%26url%3Dhttp%3A//search.ebay.com/search/search.dll%26aid%3D5319893
- Query=
-@@ -57,7 +83,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 5]
-+[Search Engine 7]
- Name=Price &Comparison
- URL=http://www.dealtime.com/GS2/GS2StatReDirect/?bParent=on&nFormID=0&nParentFormID=0&linkin_id=3005961&uid=1738108048&keyword=%s&submit=Search
- Query=
-@@ -70,7 +96,7 @@
- Position=14
- Nameid=0
- 
--[Search Engine 6]
-+[Search Engine 8]
- Name=Do&wnload.com
- URL=http://download.com.com/3120-20-0.html?qt=%s&tg=dl-2001&part=opera&subj=windows&tag=search
- Query=
-@@ -83,7 +109,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 7]
-+[Search Engine 9]
- Name=Google g&roups
- URL=http://groups.google.com/groups?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -96,7 +122,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 8]
-+[Search Engine 10]
- Name=Google &News
- URL=http://news.google.com/news?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -109,7 +135,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 9]
-+[Search Engine 11]
- Name=&Opera support
- URL=http://www.opera.com/support/supsearch/supsearch.cgi?options=complete&maxhits=0&platform=&name=%s
- Query=
-@@ -122,7 +148,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 10]
-+[Search Engine 12]
- Name=&Find in page
- URL=
- Query=
-@@ -135,7 +161,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 11]
-+[Search Engine 13]
- Name=Dictionary
- URL=http://opera.infoplease.com/search.php3?in=dictionary&query=%s
- Query=
-@@ -148,7 +174,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 12]
-+[Search Engine 14]
- Name=Encyclopedia
- URL=http://opera.infoplease.com/search.php3?in=encyclopedia&query=%s
- Query=
-@@ -161,7 +187,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 13]
-+[Search Engine 15]
- Name=Currency
- URL=http://ekit.lycos.com/ekit/Currency/?amount=%s&fromCurrency=%s&toCurrency=%s&action_convert.x=0&action_convert.y=0
- Query=
-@@ -174,7 +200,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 14]
-+[Search Engine 16]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_fr&partner=demo-Lycos2-en
- Query=
-@@ -187,7 +213,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 15]
-+[Search Engine 17]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_de&partner=demo-Lycos2-en
- Query=
-@@ -200,7 +226,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 16]
-+[Search Engine 18]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_it&partner=demo-Lycos2-en
- Query=
-@@ -213,7 +239,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 17]
-+[Search Engine 19]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_pt&partner=demo-Lycos2-en
- Query=
-@@ -226,7 +252,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 18]
-+[Search Engine 20]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_es&partner=demo-Lycos2-en
- Query=
-@@ -239,7 +265,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 19]
-+[Search Engine 21]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_en&partner=demo-Lycos2-en
- Query=
-@@ -252,7 +278,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 20]
-+[Search Engine 22]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_de&partner=demo-Lycos2-en
- Query=
-@@ -265,7 +291,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 21]
-+[Search Engine 23]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_it&partner=demo-Lycos2-en
- Query=
-@@ -278,7 +304,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 22]
-+[Search Engine 24]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_pt&partner=demo-Lycos2-en
- Query=
-@@ -291,7 +317,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 23]
-+[Search Engine 25]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_es&partner=demo-Lycos2-en
- Query=
-@@ -304,7 +330,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 24]
-+[Search Engine 26]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_en&partner=demo-Lycos2-en
- Query=
-@@ -317,7 +343,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 25]
-+[Search Engine 27]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_fr&partner=demo-Lycos2-en
- Query=
-@@ -330,7 +356,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 26]
-+[Search Engine 28]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_en&partner=demo-Lycos2-en
- Query=
-@@ -343,7 +369,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 27]
-+[Search Engine 29]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_fr&partner=demo-Lycos2-en
- Query=
-@@ -356,7 +382,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 28]
-+[Search Engine 30]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=pt_en&partner=demo-Lycos2-en
- Query=
-@@ -369,7 +395,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 29]
-+[Search Engine 31]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_en&partner=demo-Lycos2-en
- Query=
-@@ -382,7 +408,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 30]
-+[Search Engine 32]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_fr&partner=demo-Lycos2-en
- Query=
-@@ -395,7 +421,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 31]
-+[Search Engine 33]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=EJ&svp=OPER&pg=honyaku_t_inout.html
- Query=
-@@ -408,7 +434,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 32]
-+[Search Engine 34]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=JE&svp=OPER&pg=honyaku_t_inout.html
- Query=
++as endseparator=0
+ Encoding=utf-8
+ Search Type=0
+ Verbtext=17063
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
index 4d4981c91837..b47cde6a4ea6 100644
--- a/www/linux-opera/files/patch-search.ini
+++ b/www/linux-opera/files/patch-search.ini
@@ -1,9 +1,9 @@
---- search.ini.orig	Wed Aug  4 21:33:15 2004
-+++ search.ini	Wed Aug  4 21:33:20 2004
-@@ -32,8 +32,8 @@
+--- search.ini.orig	Tue Apr 19 13:17:32 2005
++++ search.ini	Tue Apr 19 13:18:39 2005
+@@ -422,12 +422,38 @@
  Nameid=0
  
- [Search Engine 3]
+ [Search Engine 33]
 -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
@@ -11,10 +11,14 @@
  Query=
  Key=x
  Is post=0
-@@ -45,6 +45,32 @@
- Nameid=0
- 
- [Search Engine 4]
+ Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 34]
 +Name=FreeBSD &PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
@@ -27,272 +31,13 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 5]
++[Search Engine 35]
 +Name=FreshP&orts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=x
 +Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 6]
- Name=&Ebay.com
- URL=http://adfarm.mediaplex.com/ad/ck/711-1751-2978-58?loc=http%3A//www.qksrv.net/interactive%3FMfcISAPICommand%3DGetResult%26ht%3D1%26SortProperty%3DMetaEndSort%26query%3D%s%26pid%3D1458483%26url%3Dhttp%3A//search.ebay.com/search/search.dll%26aid%3D5319893
- Query=
-@@ -57,7 +83,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 5]
-+[Search Engine 7]
- Name=Price &Comparison
- URL=http://www.dealtime.com/GS2/GS2StatReDirect/?bParent=on&nFormID=0&nParentFormID=0&linkin_id=3005961&uid=1738108048&keyword=%s&submit=Search
- Query=
-@@ -70,7 +96,7 @@
- Position=14
- Nameid=0
- 
--[Search Engine 6]
-+[Search Engine 8]
- Name=Do&wnload.com
- URL=http://download.com.com/3120-20-0.html?qt=%s&tg=dl-2001&part=opera&subj=windows&tag=search
- Query=
-@@ -83,7 +109,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 7]
-+[Search Engine 9]
- Name=Google g&roups
- URL=http://groups.google.com/groups?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -96,7 +122,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 8]
-+[Search Engine 10]
- Name=Google &News
- URL=http://news.google.com/news?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
-@@ -109,7 +135,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 9]
-+[Search Engine 11]
- Name=&Opera support
- URL=http://www.opera.com/support/supsearch/supsearch.cgi?options=complete&maxhits=0&platform=&name=%s
- Query=
-@@ -122,7 +148,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 10]
-+[Search Engine 12]
- Name=&Find in page
- URL=
- Query=
-@@ -135,7 +161,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 11]
-+[Search Engine 13]
- Name=Dictionary
- URL=http://opera.infoplease.com/search.php3?in=dictionary&query=%s
- Query=
-@@ -148,7 +174,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 12]
-+[Search Engine 14]
- Name=Encyclopedia
- URL=http://opera.infoplease.com/search.php3?in=encyclopedia&query=%s
- Query=
-@@ -161,7 +187,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 13]
-+[Search Engine 15]
- Name=Currency
- URL=http://ekit.lycos.com/ekit/Currency/?amount=%s&fromCurrency=%s&toCurrency=%s&action_convert.x=0&action_convert.y=0
- Query=
-@@ -174,7 +200,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 14]
-+[Search Engine 16]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_fr&partner=demo-Lycos2-en
- Query=
-@@ -187,7 +213,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 15]
-+[Search Engine 17]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_de&partner=demo-Lycos2-en
- Query=
-@@ -200,7 +226,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 16]
-+[Search Engine 18]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_it&partner=demo-Lycos2-en
- Query=
-@@ -213,7 +239,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 17]
-+[Search Engine 19]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_pt&partner=demo-Lycos2-en
- Query=
-@@ -226,7 +252,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 18]
-+[Search Engine 20]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=en_es&partner=demo-Lycos2-en
- Query=
-@@ -239,7 +265,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 19]
-+[Search Engine 21]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_en&partner=demo-Lycos2-en
- Query=
-@@ -252,7 +278,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 20]
-+[Search Engine 22]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_de&partner=demo-Lycos2-en
- Query=
-@@ -265,7 +291,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 21]
-+[Search Engine 23]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_it&partner=demo-Lycos2-en
- Query=
-@@ -278,7 +304,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 22]
-+[Search Engine 24]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_pt&partner=demo-Lycos2-en
- Query=
-@@ -291,7 +317,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 23]
-+[Search Engine 25]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=fr_es&partner=demo-Lycos2-en
- Query=
-@@ -304,7 +330,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 24]
-+[Search Engine 26]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_en&partner=demo-Lycos2-en
- Query=
-@@ -317,7 +343,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 25]
-+[Search Engine 27]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=de_fr&partner=demo-Lycos2-en
- Query=
-@@ -330,7 +356,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 26]
-+[Search Engine 28]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_en&partner=demo-Lycos2-en
- Query=
-@@ -343,7 +369,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 27]
-+[Search Engine 29]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=it_fr&partner=demo-Lycos2-en
- Query=
-@@ -356,7 +382,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 28]
-+[Search Engine 30]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=pt_en&partner=demo-Lycos2-en
- Query=
-@@ -369,7 +395,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 29]
-+[Search Engine 31]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_en&partner=demo-Lycos2-en
- Query=
-@@ -382,7 +408,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 30]
-+[Search Engine 32]
- Name=Translation
- URL=http://r.lycos.com/r/opipreftrans/http://translation.lycos.com/lycos?urltext=%s&systran_lp=es_fr&partner=demo-Lycos2-en
- Query=
-@@ -395,7 +421,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 31]
-+[Search Engine 33]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=EJ&svp=OPER&pg=honyaku_t_inout.html
- Query=
-@@ -408,7 +434,7 @@
- Position=-1
- Nameid=0
- 
--[Search Engine 32]
-+[Search Engine 34]
- Name=Translation
- URL=http://www.infoseek.co.jp/Honyaku?tain=%s&to=JE&svp=OPER&pg=honyaku_t_inout.html
- Query=
++as endseparator=0
+ Encoding=utf-8
+ Search Type=0
+ Verbtext=17063
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index 03ab1a4cb044..65250f0903d3 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,23 +1,18 @@
 ##
-Changelog for 7.54u2 Final: http://www.opera.com/linux/changelogs/754u2/
+Changelog for 8.0 Final: http://www.opera.com/linux/changelogs/800/
 
-The name of the the binary, data directory, personal "~/.opera" directory,
-etc., have been renamed from "opera" to "linux-opera." This means that
-www/linux-opera and www/opera no longer conflict, and can be installed and
-can run at the same time. Bookmarks and mail can be preserved by copying
-~/.opera/mail and ~/.opera/opera6.adr into ~/.linux-opera. Configurations for
-toolbars, options, etc., have changed from previous versions, and are not
-recommend to transferred from the old configuration. The mail format will be
-converted to the new format automatically when the new linux-opera is run for
-the first time.
+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:
 
-*** IMPORTANT: users with custom search.ini ***
+	# cp -Rp ~/.linux-opera ~/.linux-opera-bak
+	# rm -rf ~/.linux-opera/*
 
-If you have a custom search.ini and you've used opera 7.51 or an earlier
-version before this upgrade, edit ~/.linux-opera/search.ini _before_ running
-the upgraded Opera for the first time, and change the file version to 4. It
-should look like this:
-
-[Version]
-File Version=4
+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 6629447c2188..430a37724d05 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,133 +1,99 @@
 bin/linux-opera
 %%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/help
 %%GNOME:%%share/gnome/applications/linux-opera.desktop
 %%GNOME:%%share/gnome/pixmaps/linux-opera.xpm
-share/linux-opera/bin/missingsyms.so
-share/linux-opera/bin/opera
-share/linux-opera/bin/spellcheck.so
-share/linux-opera/bin/works
-share/linux-opera/chartables.bin
-share/linux-opera/config/opera6rc
-share/linux-opera/config/opera6rc.fixed
-share/linux-opera/help/advertising.html
-share/linux-opera/help/background.png
-share/linux-opera/help/chat.html
-share/linux-opera/help/dialogs.html
-share/linux-opera/help/filetypes.html
-share/linux-opera/help/fonts.html
-share/linux-opera/help/glossary.html
-share/linux-opera/help/help.css
-share/linux-opera/help/history.html
-share/linux-opera/help/index.html
-share/linux-opera/help/input.html
-share/linux-opera/help/keyboard.html
-share/linux-opera/help/languages.html
-share/linux-opera/help/layout.html
-share/linux-opera/help/license.txt
-share/linux-opera/help/m2.html
-share/linux-opera/help/mail.html
-share/linux-opera/help/menus.html
-share/linux-opera/help/mouse.html
-share/linux-opera/help/multimedia.html
-share/linux-opera/help/network.html
-share/linux-opera/help/page.html
-share/linux-opera/help/panels.html
-share/linux-opera/help/paths.html
-share/linux-opera/help/personal.html
-share/linux-opera/help/preferences.html
-share/linux-opera/help/privacy.html
-share/linux-opera/help/search.html
-share/linux-opera/help/security.html
-share/linux-opera/help/skin.html
-share/linux-opera/help/sounds.html
-share/linux-opera/help/start.html
-share/linux-opera/help/toc.html
-share/linux-opera/help/toolbars.html
-share/linux-opera/help/windows.html
-share/linux-opera/hhd.ssr
-share/linux-opera/html40_entities.dtd
-share/linux-opera/images/background.gif
-share/linux-opera/images/blank.gif
-share/linux-opera/images/drive.gif
-share/linux-opera/images/file.gif
-share/linux-opera/images/folder.gif
-share/linux-opera/images/link.gif
-share/linux-opera/images/opera.xpm
-share/linux-opera/images/opera_16x16.png
-share/linux-opera/images/opera_22x22.png
-share/linux-opera/images/opera_32x32.png
-share/linux-opera/images/opera_48x48.png
-share/linux-opera/images/operabanner.png
-share/linux-opera/images/shared.gif
-share/linux-opera/images/splash.png
-share/linux-opera/images/startup1.png
-share/linux-opera/images/startup2.png
-share/linux-opera/ini/dialog.ini
-share/linux-opera/ini/fastforward.ini
-share/linux-opera/ini/filehandler.ini
-share/linux-opera/ini/pluginpath.ini
-share/linux-opera/ini/spellcheck.ini
-share/linux-opera/ini/standard_keyboard.ini
-share/linux-opera/ini/standard_menu.ini
-share/linux-opera/ini/standard_mouse.ini
-share/linux-opera/ini/standard_toolbar.ini
-share/linux-opera/ini/unix_keyboard.ini
-share/linux-opera/java/opera.jar
-share/linux-opera/java/opera.policy
-share/linux-opera/jsconsole.html
-share/linux-opera/lngcode.txt
-share/linux-opera/locale/en/default.adr
-share/linux-opera/locale/en/lngcode.txt
-share/linux-opera/locale/en/search.ini
-share/linux-opera/locale/english.lng
-share/linux-opera/opera6.adr
-share/linux-opera/plugins/libnpp.so
-share/linux-opera/plugins/operamotifwrapper-3
-share/linux-opera/plugins/operaplugincleaner
-share/linux-opera/search.ini
-share/linux-opera/skin/standard_skin.zip
-share/linux-opera/skin/windows_skin.zip
-share/linux-opera/styles/OPF.css
-share/linux-opera/styles/about.css
-share/linux-opera/styles/cache.css
-share/linux-opera/styles/csr.css
-share/linux-opera/styles/dir.css
-share/linux-opera/styles/drives.css
-share/linux-opera/styles/email.css
-share/linux-opera/styles/history.css
-share/linux-opera/styles/im.css
-share/linux-opera/styles/info.css
-share/linux-opera/styles/mime.css
-share/linux-opera/styles/mimehead.css
-share/linux-opera/styles/opf.css
-share/linux-opera/styles/plugins.css
-share/linux-opera/styles/user/accessibility.css
-share/linux-opera/styles/user/contrastbw.css
-share/linux-opera/styles/user/contrastwb.css
-share/linux-opera/styles/user/debugwithoutline.css
-share/linux-opera/styles/user/disabletables.css
-share/linux-opera/styles/user/hidecertainsizes.css
-share/linux-opera/styles/user/hidenonlinkimages.css
-share/linux-opera/styles/user/imageandlinkonly.css
-share/linux-opera/styles/user/nostalgia.css
-share/linux-opera/styles/user/showstructure.css
-share/linux-opera/styles/user/textonly.css
-share/linux-opera/styles/user/userstyle.ini
-share/linux-opera/styles/wml.css
-@dirrm share/linux-opera/styles/user
-@dirrm share/linux-opera/styles
-@dirrm share/linux-opera/skin
-@dirrm share/linux-opera/plugins
-@dirrm share/linux-opera/locale/en
-@dirrm share/linux-opera/locale
-@dirrm share/linux-opera/java
-@dirrm share/linux-opera/ini
-@dirrm share/linux-opera/images
-@dirrm share/linux-opera/help
-@dirrm share/linux-opera/config
-@dirrm share/linux-opera/bin
-@dirrm share/linux-opera
+%%DATADIR%%/bin/missingsyms.so
+%%DATADIR%%/bin/opera
+%%DATADIR%%/bin/spellcheck.so
+%%DATADIR%%/bin/works
+%%DATADIR%%/chartables.bin
+%%DATADIR%%/config/opera6rc
+%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/hhd.ssr
+%%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%%/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%%/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/dir.css
+%%DATADIR%%/styles/drives.css
+%%DATADIR%%/styles/email.css
+%%DATADIR%%/styles/history.css
+%%DATADIR%%/styles/im.css
+%%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
+%%DATADIR%%/svg-sa.dat
+%%DATADIR%%/svg-sabd.dat
+%%DATADIR%%/svg-se.dat
+%%DATADIR%%/svg-sebd.dat
+@dirrm %%DATADIR%%/styles/user
+@dirrm %%DATADIR%%/styles
+@dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale
+@dirrm %%DATADIR%%/java
+@dirrm %%DATADIR%%/ini
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 
 %%KDE:%%@cwd %%LOCALBASE%%
author	mezz <mezz@FreeBSD.org>	2005-04-20 05:08:56 +0800
committer	mezz <mezz@FreeBSD.org>	2005-04-20 05:08:56 +0800
commit	94a0ac6d3379bf320787208425c3157a6d836946 (patch)
tree	bd5d5a82aebeb419ce60bf7707294702abcd8860 /www
parent	aab5e0cc69a26e686322a91f6cdbc31036bbbb41 (diff)
download	freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.tar.gz freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.tar.zst freebsd-ports-gnome-94a0ac6d3379bf320787208425c3157a6d836946.zip