- Update to 9.20

PR:		111475
Submitted by:	Arjan van Leeuwen <freebsd-maintainer@opera.com> (maintainer)

5 files changed, 48 insertions, 91 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index a6163bfb9322..ac1dda2f27fd 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -28,18 +28,18 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	9.10
+OPERA_VER=	9.20
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20061214
-OPERA_BUILD=	521
+OPERA_DATE=	20070409
+OPERA_BUILD=	638
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386
 WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
 
 MAN1=		opera.1
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 75ff58d5c43b..cfc7b5cfc250 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,9 +1,9 @@
-MD5 (opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2) = 72bcdaf0d674590e913ff85617a80726
-SHA256 (opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2) = d9ef50faa78daa52f0c204b3e71620de439880b59279b573dd7dd727f2fbb377
-SIZE (opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2) = 6469740
-MD5 (opera-9.10-20061214.3-shared-qt.i386.freebsd-en.tar.bz2) = 73a804205ec4df3cfeb2478281e8dff7
-SHA256 (opera-9.10-20061214.3-shared-qt.i386.freebsd-en.tar.bz2) = a7674a817c2448c4c9c7d2726ffeb8fd68fee5b61e2155d09dc9d7f817a19613
-SIZE (opera-9.10-20061214.3-shared-qt.i386.freebsd-en.tar.bz2) = 5070903
-MD5 (opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2) = fc6d9252233f784df8fe9957dce754ce
-SHA256 (opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2) = eef25201c0c45d6ff5eae4739844dc9ef624cea8d7e9f9809506a9789f2cb7e4
-SIZE (opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2) = 5070029
+MD5 (opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2) = 21892c3663f9ce73719045de65bcd259
+SHA256 (opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2) = 434dadf22984dea89a08a850da8a1359f4e89b963509270da680ea348a9ebc35
+SIZE (opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2) = 6547395
+MD5 (opera-9.20-20070409.3-shared-qt.i386.freebsd-en.tar.bz2) = 19da2f4a76c90e52307b96ae1e4bfd8a
+SHA256 (opera-9.20-20070409.3-shared-qt.i386.freebsd-en.tar.bz2) = f12458e2516a012d6103c7c109000cad95159b90ba3b972aa560151a04b0f05c
+SIZE (opera-9.20-20070409.3-shared-qt.i386.freebsd-en.tar.bz2) = 5175546
+MD5 (opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2) = ae34b8fde421b3d27b9090ec0ad6fb17
+SHA256 (opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2) = 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41
+SIZE (opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2) = 5176848
diff --git a/www/opera/files/patch-ini_pluginpath.ini b/www/opera/files/patch-ini_pluginpath.ini
index 277c971a02bb..2ed8b7217ce9 100644
--- a/www/opera/files/patch-ini_pluginpath.ini
+++ b/www/opera/files/patch-ini_pluginpath.ini
@@ -1,64 +1,33 @@
---- ini/pluginpath.ini.orig	Thu Dec 14 15:06:40 2006
-+++ ini/pluginpath.ini	Sun Dec 17 14:43:05 2006
-@@ -6,46 +6,22 @@
- plugins=$HOME/.kde/share/config/kcmnspluginrc
+--- ini/pluginpath.ini.orig	Mon Apr  9 18:07:38 2007
++++ ini/pluginpath.ini	Wed Apr 11 14:25:38 2007
+@@ -7,21 +7,18 @@
  
  [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
+-/usr/local/share/opera/plugins=1
+-/usr/local/share/opera/plugins=1
 +%%PREFIX%%/share/opera/plugins=1
 +%%LOCALBASE%%/share/opera/plugins=1
  
--; Adobe Acrobat
--/usr/local/Acrobat7.0/Browsers/intellinux=1
--/usr/local/Acrobat7/Browsers/intellinux=1
+ ; Adobe Acrobat
+-/usr/X11R6/Acrobat7/Browser/intellinux=1
 -/usr/local/Acrobat5/Browsers/intellinux=1
 -/usr/local/Acrobat4/Browsers/intellinux=1
--/usr/lib/Acrobat7.0/Browsers/intellinux=1
--/usr/lib/Acrobat7/Browsers/intellinux=1
--/usr/lib/Acrobat5/Browsers/intellinux=1
--/usr/lib/Acrobat4/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
--/opt/Acrobat7.0/Browsers/intellinux=1
--/opt/Acrobat7/Browsers/intellinux=1
--/opt/Acrobat5/Browsers/intellinux=1
--/opt/Acrobat4/Browsers/intellinux=1
--/usr/Acrobat7.0/Browsers/intellinux=1
--/usr/Acrobat7/Browsers/intellinux=1
--/usr/Acrobat5/Browsers/intellinux=1
--/usr/Acrobat4/Browsers/intellinux=1
-+; Adobe Reader
 +%%X11BASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux=1
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
  
--; Realplayer
--/usr/lib/RealPlayer8/Plugins=1
--/usr/lib/realplay/plugins=1
--/usr/lib/RealPlayer8=1
--/usr/lib/realplay=1
-+; FreeBSD Plug-in Paths
-+%%X11BASE%%/lib/browser_plugins=1
-+%%LOCALBASE%%/lib/browser_plugins=1
-+%%X11BASE%%/lib/npapi/symlinks/opera=1
-+%%LOCALBASE%%/lib/npapi/symlinks/opera=1
-+
-+; FreeBSD Linux Plug-in Paths
-+%%LOCALBASE%%/lib/browser_linux_plugins=1
-+%%X11BASE%%/lib/browser_linux_plugins=1
-+%%LOCALBASE%%/lib/npapi/symlinks/linux-opera=1
-+%%X11BASE%%/lib/npapi/symlinks/linux-opera=1
- 
+ ; Realplayer
+-/usr/local/lib/RealPlayer8/Plugins=1
+-
 -; Netscape Plug-in Paths
--$HOME/.netscape6/plugins=1
+-/usr/X11R6/lib/browser_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/RealPlayer8/Plugins=1
+ 
+ ; FreeBSD Plug-in Paths
+-/usr/local/lib/npapi/symlinks/opera
+-/usr/local/lib/npapi/symlinks/linux-opera
++%%LOCALBASE%%/lib/npapi/symlinks/opera
++%%LOCALBASE%%/lib/npapi/symlinks/linux-opera
++
diff --git a/www/opera/files/patch-search.ini b/www/opera/files/patch-search.ini
index 722cfc877c79..67a3839f6411 100644
--- a/www/opera/files/patch-search.ini
+++ b/www/opera/files/patch-search.ini
@@ -1,23 +1,5 @@
---- search.ini.orig	Tue Apr 11 12:23:52 2006
-+++ search.ini	Thu Apr 20 11:51:10 2006
-@@ -55,7 +55,7 @@
- Search Type=40
- Verbtext=0
- Nameid=69678
--Position=3
-+Position=4
- 
- [Search Engine 5]
- Name=
-@@ -68,7 +68,7 @@
- Search Type=41
- Verbtext=0
- Nameid=17174
--Position=4
-+Position=5
- 
- [Search Engine 6]
- Name=
+--- search.ini.orig	Mon Apr  9 18:07:38 2007
++++ search.ini	Wed Apr 11 14:26:05 2007
 @@ -445,4 +445,44 @@
  Search Type=119
  Verbtext=0
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 3f9d06d1a0c4..f582050b8901 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -61,15 +61,21 @@ bin/opera
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/plugins.css
 %%DATADIR%%/styles/user/accessibility.css
+%%DATADIR%%/styles/user/altdebugger.css
+%%DATADIR%%/styles/user/classid.css
 %%DATADIR%%/styles/user/contrastbw.css
 %%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/debugwithoutline.css
+%%DATADIR%%/styles/user/disablebreaks.css
+%%DATADIR%%/styles/user/disablefloats.css
+%%DATADIR%%/styles/user/disableforms.css
+%%DATADIR%%/styles/user/disablepositioning.css
 %%DATADIR%%/styles/user/disabletables.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/outline.css
+%%DATADIR%%/styles/user/structureblock.css
+%%DATADIR%%/styles/user/structureinline.css
+%%DATADIR%%/styles/user/structuretables.css
+%%DATADIR%%/styles/user/tablelayout.css
+%%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/warning.css
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-sebd.dat