From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 20 11:50:23 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D518916A4CE for ; Wed, 20 Apr 2005 11:50:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18AB443D66 for ; Wed, 20 Apr 2005 11:50:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3KBoNvO065510 for ; Wed, 20 Apr 2005 11:50:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3KBoNAa065509; Wed, 20 Apr 2005 11:50:23 GMT (envelope-from gnats) Resent-Date: Wed, 20 Apr 2005 11:50:23 GMT Resent-Message-Id: <200504201150.j3KBoNAa065509@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Arjan van Leeuwen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F1DA16A4D2 for ; Wed, 20 Apr 2005 11:45:19 +0000 (GMT) Received: from gimp.piwebs.com (82-197-201-59.dsl.cambrium.nl [82.197.201.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D2F743D60 for ; Wed, 20 Apr 2005 11:45:05 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: (qmail 6007 invoked from network); 20 Apr 2005 11:43:37 -0000 Received: from winston.piwebs.com (192.168.0.98) by gimp.piwebs.com with SMTP; 20 Apr 2005 11:43:37 -0000 Message-Id: <1113997413.0@winston.piwebs.com> Date: Wed, 20 Apr 2005 13:43:33 +0200 From: "Arjan van Leeuwen" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.4 Subject: ports/80142: Update www/opera to version 8.0 final (20050415) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 11:50:24 -0000 >Number: 80142 >Category: ports >Synopsis: Update www/opera to version 8.0 final (20050415) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 20 11:50:22 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 6.0-CURRENT #: Thu Apr 14 16:57:37 CEST 2005 root@winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON >Description: This patch updates www/opera to version 8.0 final (20050415). This port deprecates www/opera-devel. Changelog: http://www.opera.com/freebsd/changelogs/800/ /usr/ports/UPDATING should get a notice similar to the one for linux-opera, like this: AFFECTS: users of www/opera-devel Opera 8.0 final has been released and can be installed by installing the www/opera port. The opera-devel port is now deprecated. If you want to continue using the personal settings you used with www/opera-devel, issue this command: # mv ~/.opera-devel ~/.opera AFFECTS: users of www/opera Opera has been updated to 8.0. If are upgrading from version 7.x or below, it is recommend that you backup your personal "~/.opera" directory and remove it, like this: # cp -Rp ~/.opera ~/.opera-bak # rm -rf ~/.opera/* After that, you can put your bookmarks, email, contacts, etc. back in ~/.opera/. The most important files are your bookmarks (~/.opera/opera6.adr) and your emails (~/.opera/mail). It is not a good idea to put opera6.ini, userstyle.ini, search.ini, pluginpath.ini and other non-personal stuff back in ~/.opera/. If you need custom settings, reconfigure Opera from the preferences pane or edit the files by hand. >How-To-Repeat: >Fix: --- opera.diff begins here --- diff -urN /usr/ports/www/opera/Makefile opera/Makefile --- /usr/ports/www/opera/Makefile Wed Feb 9 13:57:08 2005 +++ opera/Makefile Wed Apr 20 13:11:56 2005 @@ -28,10 +28,10 @@ MAINTAINER= avleeuwen@piwebs.com COMMENT= A blazingly fast, full-featured, standards-compliant browser -OPERA_VER= 7.54 -OPERA_MINVER= u2 +OPERA_VER= 8.0 +OPERA_MINVER= 0 OPERA_REL= final -OPERA_DATE= 20050131 +OPERA_DATE= 20050415 DATADIR= ${PREFIX}/share/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} diff -urN /usr/ports/www/opera/distinfo opera/distinfo --- /usr/ports/www/opera/distinfo Wed Feb 9 13:57:08 2005 +++ opera/distinfo Wed Apr 20 13:12:07 2005 @@ -1,2 +1,2 @@ -MD5 (opera-7.54-20050131.1-static-qt.i386.freebsd-en.tar.bz2) = cef4983bc4e91913027b6c5d830492a8 -SIZE (opera-7.54-20050131.1-static-qt.i386.freebsd-en.tar.bz2) = 4782908 +MD5 (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 1b4a940f03bad7af148a0418c8087b62 +SIZE (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 5099452 diff -urN /usr/ports/www/opera/files/patch-ini::pluginpath.ini opera/files/patch-ini::pluginpath.ini --- /usr/ports/www/opera/files/patch-ini::pluginpath.ini Wed Dec 15 21:13:25 2004 +++ opera/files/patch-ini::pluginpath.ini Wed Apr 20 13:09:58 2005 @@ -1,6 +1,6 @@ ---- ini/pluginpath.ini.orig Thu Dec 16 05:03:15 2004 -+++ ini/pluginpath.ini Thu Dec 16 05:01:12 2004 -@@ -3,36 +3,14 @@ +--- ini/pluginpath.ini.orig Fri Dec 3 11:21:10 2004 ++++ ini/pluginpath.ini Fri Dec 3 22:55:00 2004 +@@ -3,40 +3,15 @@ ; This file is stored in UTF-8 encoding [Paths] @@ -43,4 +43,8 @@ -/usr/local/netscape/plugins=1 -/usr/local/lib/netscape/plugins=1 -$HOME/.kde/.konqueror/nsplugins=1 +- +-[KDE] +-plugins=$HOME/.kde/share/config/kcmnspluginrc +%%LOCALBASE%%/lib/netscape-linux/plugins=1 + diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh --- /usr/ports/www/opera/files/patch-install.sh Wed Feb 9 13:57:09 2005 +++ opera/files/patch-install.sh Wed Apr 20 13:11:07 2005 @@ -1,5 +1,16 @@ ---- install.sh.orig Mon Jan 31 16:21:15 2005 -+++ install.sh Wed Feb 9 12:32:04 2005 +--- install.sh.orig Fri Feb 25 14:36:52 2005 ++++ install.sh Wed Mar 2 12:43:44 2005 +@@ -108,8 +108,8 @@ + + if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then + wrapper_dir="${prefix}/bin" +- doc_dir="${prefix}/share/doc/opera" +- share_dir="${prefix}/share/opera" ++ doc_dir="${prefix}/share/doc/opera" ++ share_dir="${prefix}/share/opera" + exec_dir="${share_dir}/bin" + plugin_dir="${share_dir}/plugins" + else @@ -373,7 +373,7 @@ mvv='' # SunOS mv (no -v verbose option) ;; @@ -9,7 +20,35 @@ cpf='-f' if test "$verbose" -gt '1'; then chmodv='-v' -@@ -873,52 +873,13 @@ +@@ -759,7 +759,7 @@ + debug_msg 0 "in generate_wrapper()" + + case "${machine}:${os}" in +- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) ++ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) + wrapper_ibmjava=" + IBMJava2-142/jre \\ + IBMJava2-141/jre \\ +@@ -794,7 +794,7 @@ + error 'os' + ;; + esac +- wrapper_file="${wrapper_dir}/opera" ++ wrapper_file="${wrapper_dir}/opera" + + wrapper_contain="#!/bin/sh + +@@ -850,6 +850,9 @@ + OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" + export OPERA_LD_PRELOAD + ++OPERA_PERSONALDIR=\${HOME}/.opera ++export OPERA_PERSONALDIR ++ + # Native Java enviroment + if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then + INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` +@@ -873,53 +876,12 @@ if test ! \"\${OPERA_JAVA_DIR}\"; then @@ -23,7 +62,7 @@ for SUNJAVA in \\ - jre1.5.0_01 \\ - jdk1.5.0_01/jre \\ +- jdk1.5.0_01/jre \\ - j2re1.4.2_06 \\ - j2sdk1.4.2_06/jre \\ - j2re1.4.2_04 \\ @@ -48,6 +87,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 \\ @@ -65,7 +105,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 +928,8 @@ +@@ -970,11 +932,8 @@ # Acrobat Reader for BINDIR in \\ @@ -79,7 +119,41 @@ ; do if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi done -@@ -1285,36 +1243,13 @@ +@@ -985,12 +944,13 @@ + LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\" + export LD_LIBRARY_PATH + +-# Spellchecker needs to find libaspell.so.15 ++# Spellchecker needs to find libaspell.so.16 + for LIBASPELL_DIR in \\ ++ %%LOCALBASE%%/lib \\ + /usr/local/lib \\ + /opkg/lib \\ + ; do +- if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then ++ if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then + LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" + fi + done +@@ -1080,7 +1040,7 @@ + chop "${OPERADESTDIR}" "str_localdirshare" + chop "${OPERADESTDIR}" "str_localdirplugin" + +- backup ${wrapper_dir}/opera opera ++ #backup ${wrapper_dir}/opera opera + + # Executable + debug_msg 1 "Executable" +@@ -1115,7 +1075,7 @@ + + #cp $cpv $cpf wrapper.sh $wrapper_dir/opera + generate_wrapper +- chmod $chmodv 755 $wrapper_dir/opera ++ chmod $chmodv 755 $wrapper_file + + # Documentation + debug_msg 1 "Documentation" +@@ -1288,36 +1248,13 @@ if test -z "${OPERADESTDIR}"; then @@ -120,7 +194,40 @@ fi # OPERADESTDIR -@@ -1443,72 +1378,36 @@ +@@ -1345,13 +1282,13 @@ + { + # arg1 = location + +- wmconfig_file="${1}/opera" ++ wmconfig_file="${1}/opera" + +- wmconfig_contain='opera name "Opera" ++ wmconfig_contain='opera name "Opera" + opera description "Opera Web Browser" + opera icon "opera.xpm" + opera mini-icon "opera.xpm" +-opera exec "opera &" ++opera exec "opera &" + opera group "Internet"' + + echo "${wmconfig_contain}" > ${wmconfig_file} +@@ -1362,12 +1299,12 @@ + { + # arg1 = location + +- desktop_file="${1}/opera.desktop" ++ desktop_file="${1}/opera.desktop" + + desktop_contain='[Desktop Entry] +-Name=Opera ++Name=Opera + Comment=Web Browser +-Exec=opera ++Exec=opera + Icon=opera.xpm + Terminal=0 + Type=Application' +@@ -1446,72 +1383,36 @@ debug_msg 1 "in gnome()" @@ -128,94 +235,94 @@ - - # /opt/gnome share - if test -d /opt/gnome/share; then -- ++ if test -d %%X11BASE%%/share/gnome/; then + - # /opt/gnome icon - if test ! -d /opt/gnome/share/pixmaps/; then - if test -w /opt/gnome/share; then - mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ - chmod $chmodv 755 /opt/gnome/share/pixmaps - cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm -- fi ++ # %%X11BASE%%/share/gnome icon ++ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then ++ if test -w %%X11BASE%%/share/gnome; then ++ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ ++ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps ++ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm + fi - elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm -- fi ++ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm + fi - # end /opt/gnome icon -- ++ # end %%X11BASE%%/share/gnome icon + - # /opt/gnome link - if test -d /opt/gnome/share/gnome/apps/; then - if test -d /opt/gnome/share/gnome/apps/Internet/; then - if test -w /opt/gnome/share/gnome/apps/Internet; then - generate_desktop /opt/gnome/share/gnome/apps/Internet -- fi ++ # %%X11BASE%%/share/gnome link ++ if test -d %%X11BASE%%/share/gnome/apps/; then ++ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then ++ if test -w %%X11BASE%%/share/gnome/apps/Internet; then ++ generate_desktop %%X11BASE%%/share/gnome/apps/Internet + fi - elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then - if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then - generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW -- fi ++ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then ++ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then ++ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW + fi - elif test -w /opt/gnome/share/gnome/apps; then - mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ - chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet - generate_desktop /opt/gnome/share/gnome/apps/Internet -- fi -- fi ++ elif test -w %%X11BASE%%/share/gnome/apps; then ++ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ ++ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet ++ generate_desktop %%X11BASE%%/share/gnome/apps/Internet + fi + fi - # end /opt/gnome link - fi - # end /opt/gnome share - - elif test -d /usr/share/gnome/; then -+ if test -d %%X11BASE%%/share/gnome/; then - +- - # /usr/share/gnome icon - if test ! -d /usr/share/gnome/pixmaps/; then - if test -w /usr/share/gnome; then - mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ - chmod $chmodv 755 /usr/share/gnome/pixmaps - cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm -+ # %%X11BASE%%/share/gnome icon -+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then -+ if test -w %%X11BASE%%/share/gnome; then -+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ -+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps -+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm - fi +- fi - elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm -+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm - fi +- fi - # end /usr/share/gnome icon -+ # end %%X11BASE%%/share/gnome icon - +- - # /usr/share/gnome link - if test -d /usr/share/gnome/apps/; then - if test -d /usr/share/gnome/apps/Internet/; then - if test -w /usr/share/gnome/apps/Internet; then - generate_desktop /usr/share/gnome/apps/Internet -+ # %%X11BASE%%/share/gnome link -+ if test -d %%X11BASE%%/share/gnome/apps/; then -+ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then -+ if test -w %%X11BASE%%/share/gnome/apps/Internet; then -+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet - fi +- fi - elif test -d /usr/share/gnome/apps/Networking/WWW/; then - if test -w /usr/share/gnome/apps/Networking/WWW; then - generate_desktop /usr/share/gnome/apps/Networking/WWW -+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then -+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then -+ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW - fi +- fi - elif test -w /usr/share/gnome/apps; then - mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/ - chmod $chmodv 755 /usr/share/gnome/apps/Internet - generate_desktop /usr/share/gnome/apps/Internet -+ elif test -w %%X11BASE%%/share/gnome/apps; then -+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ -+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet -+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet - fi - fi +- fi +- fi - # end /usr/share/gnome link + # end %%X11BASE%%/share/gnome link fi # Add ximian here } -@@ -1519,39 +1418,31 @@ +@@ -1522,39 +1423,31 @@ debug_msg 1 "in kde()" diff -urN /usr/ports/www/opera/files/patch-locale::en::search.ini opera/files/patch-locale::en::search.ini --- /usr/ports/www/opera/files/patch-locale::en::search.ini Thu Nov 25 01:06:19 2004 +++ opera/files/patch-locale::en::search.ini Wed Apr 20 13:22:20 2005 @@ -1,9 +1,9 @@ ---- 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 @@ +--- locale/en/search.ini.orig Fri Apr 15 14:21:52 2005 ++++ locale/en/search.ini Wed Apr 20 13:21:46 2005 +@@ -422,8 +422,8 @@ 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,12 @@ Query= Key=x Is post=0 -@@ -45,6 +45,32 @@ +@@ -433,3 +433,30 @@ + Verbtext=17063 + Position=-1 Nameid=0 - - [Search Engine 4] ++ ++[Search Engine 34] +Name=FreeBSD &PRs +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s +Query= @@ -27,7 +29,7 @@ +Position=-1 +Nameid=0 + -+[Search Engine 5] ++[Search Engine 35] +Name=FreshP&orts +URL=http://www.freshports.org/search.php?query=%s +Query= @@ -40,259 +42,3 @@ +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 -urN /usr/ports/www/opera/files/patch-search.ini opera/files/patch-search.ini --- /usr/ports/www/opera/files/patch-search.ini Thu Nov 25 01:06:19 2004 +++ opera/files/patch-search.ini Wed Apr 20 13:23:45 2005 @@ -1,9 +1,9 @@ ---- search.ini.orig Wed Aug 4 21:45:31 2004 -+++ search.ini Wed Aug 4 21:46:17 2004 -@@ -32,8 +32,8 @@ +--- search.ini.orig Fri Apr 15 14:21:52 2005 ++++ search.ini Wed Apr 20 13:23:33 2005 +@@ -422,8 +422,8 @@ 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,12 @@ Query= Key=x Is post=0 -@@ -45,6 +45,32 @@ +@@ -433,3 +433,30 @@ + Verbtext=17063 + Position=-1 Nameid=0 - - [Search Engine 4] ++ ++[Search Engine 34] +Name=FreeBSD &PRs +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s +Query= @@ -27,7 +29,7 @@ +Position=-1 +Nameid=0 + -+[Search Engine 5] ++[Search Engine 35] +Name=FreshP&orts +URL=http://www.freshports.org/search.php?query=%s +Query= @@ -40,259 +42,3 @@ +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 -urN /usr/ports/www/opera/pkg-plist opera/pkg-plist --- /usr/ports/www/opera/pkg-plist Wed Dec 15 21:13:24 2004 +++ opera/pkg-plist Wed Apr 20 13:26:01 2005 @@ -1,7 +1,6 @@ -@comment $FreeBSD: ports/www/opera/pkg-plist,v 1.21 2004/12/15 20:13:24 sf Exp $ +@comment $FreeBSD$ bin/opera %%DOCSDIR%%/LICENSE -%%DOCSDIR%%/help %%DATADIR%%/bin/missingsyms.so %%DATADIR%%/bin/opera %%DATADIR%%/bin/spellcheck.so @@ -9,44 +8,8 @@ %%DATADIR%%/chartables.bin %%DATADIR%%/config/opera6rc %%DATADIR%%/config/opera6rc.fixed -%%DATADIR%%/help/advertising.html -%%DATADIR%%/help/background.png -%%DATADIR%%/help/chat.html -%%DATADIR%%/help/dialogs.html -%%DATADIR%%/help/filetypes.html -%%DATADIR%%/help/fonts.html -%%DATADIR%%/help/glossary.html -%%DATADIR%%/help/help.css -%%DATADIR%%/help/history.html -%%DATADIR%%/help/index.html -%%DATADIR%%/help/input.html -%%DATADIR%%/help/keyboard.html -%%DATADIR%%/help/languages.html -%%DATADIR%%/help/layout.html -%%DATADIR%%/help/license.txt -%%DATADIR%%/help/m2.html -%%DATADIR%%/help/mail.html -%%DATADIR%%/help/menus.html -%%DATADIR%%/help/mouse.html -%%DATADIR%%/help/multimedia.html -%%DATADIR%%/help/network.html -%%DATADIR%%/help/page.html -%%DATADIR%%/help/panels.html -%%DATADIR%%/help/paths.html -%%DATADIR%%/help/personal.html -%%DATADIR%%/help/preferences.html -%%DATADIR%%/help/privacy.html -%%DATADIR%%/help/search.html -%%DATADIR%%/help/security.html -%%DATADIR%%/help/skin.html -%%DATADIR%%/help/sounds.html -%%DATADIR%%/help/start.html -%%DATADIR%%/help/toc.html -%%DATADIR%%/help/toolbars.html -%%DATADIR%%/help/windows.html %%DATADIR%%/hhd.ssr %%DATADIR%%/html40_entities.dtd -%%DATADIR%%/images/background.gif %%DATADIR%%/images/blank.gif %%DATADIR%%/images/drive.gif %%DATADIR%%/images/file.gif @@ -58,10 +21,6 @@ %%DATADIR%%/images/opera_32x32.png %%DATADIR%%/images/opera_48x48.png %%DATADIR%%/images/operabanner.png -%%DATADIR%%/images/shared.gif -%%DATADIR%%/images/splash.png -%%DATADIR%%/images/startup1.png -%%DATADIR%%/images/startup2.png %%DATADIR%%/ini/dialog.ini %%DATADIR%%/ini/fastforward.ini %%DATADIR%%/ini/filehandler.ini @@ -78,12 +37,14 @@ %%DATADIR%%/lngcode.txt %%DATADIR%%/locale/en/default.adr %%DATADIR%%/locale/en/lngcode.txt +%%DATADIR%%/locale/en/license.txt %%DATADIR%%/locale/en/search.ini %%DATADIR%%/locale/english.lng %%DATADIR%%/opera6.adr %%DATADIR%%/plugins/libnpp.so %%DATADIR%%/plugins/operamotifwrapper-1 %%DATADIR%%/plugins/operamotifwrapper-2 +%%DATADIR%%/plugins/operamotifwrapper-3 %%DATADIR%%/plugins/operaplugincleaner %%DATADIR%%/search.ini %%DATADIR%%/skin/standard_skin.zip @@ -91,6 +52,7 @@ %%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 @@ -115,6 +77,13 @@ %%DATADIR%%/styles/user/textonly.css %%DATADIR%%/styles/user/userstyle.ini %%DATADIR%%/styles/wml.css +%%DATADIR%%/svg-sebd.dat +%%DATADIR%%/svg-se.dat +%%DATADIR%%/svg-sabd.dat +%%DATADIR%%/svg-sa.dat +%%DATADIR%%/svg-mobd.dat +%%DATADIR%%/svg-mo.dat + %%GNOME%%share/gnome/apps/Internet/opera.desktop %%GNOME%%share/gnome/pixmaps/opera.xpm @dirrm %%DATADIR%%/styles/user @@ -126,7 +95,6 @@ @dirrm %%DATADIR%%/java @dirrm %%DATADIR%%/ini @dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/config @dirrm %%DATADIR%%/bin @dirrm %%DATADIR%% --- opera.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: