- Update to 7.54. See the changelog for detail:

	o http://www.opera.com/freebsd/changelogs/754/
	o http://www.opera.com/linux/changelogs/754/
- Tweak the search.ini: [1]
	o Change Google Linux to Google BSD.
	o Add FreeBSD PR and FreshPorts search in the list.

Suggested by:	Volker Stolz <vs@FreeBSD.org> [1]

14 files changed, 1802 insertions, 14 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index e4c8012d6754..9688fa70dad4 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -35,8 +35,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPERA_VER=	7.53
-OPERA_DATE=	20040716
+OPERA_VER=	7.54
+OPERA_DATE=	20040803
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index a47366f79101..afdf6d6cef45 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 293ae0b0fb87a5b5fac7ef5572795dc8
-SIZE (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 4870722
+MD5 (opera-7.54-20040803.1-static-qt.i386-en.tar.bz2) = 0a7e933ef593d4b7a897041c9f87bba2
+SIZE (opera-7.54-20040803.1-static-qt.i386-en.tar.bz2) = 4872070
diff --git a/www/linux-opera-devel/files/patch-locale::en::search.ini b/www/linux-opera-devel/files/patch-locale::en::search.ini
new file mode 100644
index 000000000000..61e6194ff3c3
--- /dev/null
+++ b/www/linux-opera-devel/files/patch-locale::en::search.ini
@@ -0,0 +1,298 @@
+--- 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 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=
diff --git a/www/linux-opera-devel/files/patch-search.ini b/www/linux-opera-devel/files/patch-search.ini
new file mode 100644
index 000000000000..2fac1442a15d
--- /dev/null
+++ b/www/linux-opera-devel/files/patch-search.ini
@@ -0,0 +1,298 @@
+--- search.ini.orig	Wed Aug  4 21:33:15 2004
++++ search.ini	Wed Aug  4 21:33:20 2004
+@@ -32,8 +32,8 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
index ad2d2e6dac4c..6fe16bd0c671 100644
--- a/www/linux-opera-devel/pkg-message
+++ b/www/linux-opera-devel/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 7.53 Final: http://www.opera.com/linux/changelogs/753/
+Changelog for 7.54 Final: http://www.opera.com/linux/changelogs/754/
 
 The name of the the binary, data directory, personal "~/.opera" directory,
 etc., have been renamed from "opera" to "linux-opera." This means that
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index e4c8012d6754..9688fa70dad4 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -35,8 +35,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPERA_VER=	7.53
-OPERA_DATE=	20040716
+OPERA_VER=	7.54
+OPERA_DATE=	20040803
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index a47366f79101..afdf6d6cef45 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 293ae0b0fb87a5b5fac7ef5572795dc8
-SIZE (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 4870722
+MD5 (opera-7.54-20040803.1-static-qt.i386-en.tar.bz2) = 0a7e933ef593d4b7a897041c9f87bba2
+SIZE (opera-7.54-20040803.1-static-qt.i386-en.tar.bz2) = 4872070
diff --git a/www/linux-opera/files/patch-locale::en::search.ini b/www/linux-opera/files/patch-locale::en::search.ini
new file mode 100644
index 000000000000..61e6194ff3c3
--- /dev/null
+++ b/www/linux-opera/files/patch-locale::en::search.ini
@@ -0,0 +1,298 @@
+--- 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 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
new file mode 100644
index 000000000000..2fac1442a15d
--- /dev/null
+++ b/www/linux-opera/files/patch-search.ini
@@ -0,0 +1,298 @@
+--- search.ini.orig	Wed Aug  4 21:33:15 2004
++++ search.ini	Wed Aug  4 21:33:20 2004
+@@ -32,8 +32,8 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index ad2d2e6dac4c..6fe16bd0c671 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 7.53 Final: http://www.opera.com/linux/changelogs/753/
+Changelog for 7.54 Final: http://www.opera.com/linux/changelogs/754/
 
 The name of the the binary, data directory, personal "~/.opera" directory,
 etc., have been renamed from "opera" to "linux-opera." This means that
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 6ad180137869..6bde8fa0f48c 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -29,9 +29,9 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	7.53
+OPERA_VER=	7.54
 OPERA_REL=	final
-OPERA_DATE=	20040716
+OPERA_DATE=	20040803
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
diff --git a/www/opera/distinfo b/www/opera/distinfo
index c760bd99706a..a27654a7999b 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.53-20040716.1-static-qt.i386.freebsd-en.tar.bz2) = 6f5c6c3ff7ad33d088bcdc45d6177d7e
-SIZE (opera-7.53-20040716.1-static-qt.i386.freebsd-en.tar.bz2) = 4771308
+MD5 (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = e9c38837138db091b1a54ddc11c34364
+SIZE (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = 4772388
diff --git a/www/opera/files/patch-locale::en::search.ini b/www/opera/files/patch-locale::en::search.ini
new file mode 100644
index 000000000000..017aea849788
--- /dev/null
+++ b/www/opera/files/patch-locale::en::search.ini
@@ -0,0 +1,298 @@
+--- locale/en/search.ini.orig	Wed Aug  4 21:46:59 2004
++++ locale/en/search.ini	Wed Aug  4 21:47:32 2004
+@@ -32,8 +32,8 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=
diff --git a/www/opera/files/patch-search.ini b/www/opera/files/patch-search.ini
new file mode 100644
index 000000000000..ace36e3cfee0
--- /dev/null
+++ b/www/opera/files/patch-search.ini
@@ -0,0 +1,298 @@
+--- search.ini.orig	Wed Aug  4 21:45:31 2004
++++ search.ini	Wed Aug  4 21:46:17 2004
+@@ -32,8 +32,8 @@
+ Nameid=0
+ 
+ [Search Engine 3]
+-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
+ Query=
+ Key=x
+ Is post=0
+@@ -45,6 +45,32 @@
+ Nameid=0
+ 
+ [Search Engine 4]
++Name=FreBSD &PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=17063
++Position=-1
++Nameid=0
++
++[Search Engine 5]
++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=