5 files changed, 40 insertions, 32 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 2e15aca4d4d0..d3ebe32c94b4 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -28,11 +28,11 @@ 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.02
-OPERA_MINVER=	
+OPERA_VER=	9.10
+OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20060919
-OPERA_BUILD=	434
+OPERA_DATE=	20061214
+OPERA_BUILD=	521
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
@@ -48,7 +48,7 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
 OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
-		SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT}
+		SHARED	"Use a shared Qt library (instead of static)"	on
 
 .if exists(${X11BASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
@@ -124,8 +124,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/symhack.so ${DATADIR}/
 .endif
 
-.if defined(WITHOUT_SHARED) && ${OSVERSION} >= 500000
 	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/opera/distinfo b/www/opera/distinfo
index f8a61969666f..75ff58d5c43b 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,9 +1,9 @@
-MD5 (opera-9.02-20060919.1-static-qt.i386.freebsd-en.tar.bz2) = ad16b2895b4e4921935433d32a367a4f
-SHA256 (opera-9.02-20060919.1-static-qt.i386.freebsd-en.tar.bz2) = f89b245ac50c4e68863fda165fa1e174f0380181d31145d69ba155cd1006aca4
-SIZE (opera-9.02-20060919.1-static-qt.i386.freebsd-en.tar.bz2) = 6455356
-MD5 (opera-9.02-20060919.3-shared-qt.i386.freebsd-en.tar.bz2) = 337fe151ae68773d2c085de9d5f3bda3
-SHA256 (opera-9.02-20060919.3-shared-qt.i386.freebsd-en.tar.bz2) = 402aa4d30bbaf23b5d1ee15220bed9d8aaf0a7eb271e5eed67cbc6152fd3d061
-SIZE (opera-9.02-20060919.3-shared-qt.i386.freebsd-en.tar.bz2) = 5061149
-MD5 (opera-9.02-20060919.4-shared-qt.i386.freebsd-en.tar.bz2) = 5c6833af434acb16dc37fd59bbd5dd57
-SHA256 (opera-9.02-20060919.4-shared-qt.i386.freebsd-en.tar.bz2) = cf711c6aeeebdf03cc4891c8d1596f3a45e3545b2cf6b8d3752f449547a41e66
-SIZE (opera-9.02-20060919.4-shared-qt.i386.freebsd-en.tar.bz2) = 5057395
+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
diff --git a/www/opera/files/patch-ini_pluginpath.ini b/www/opera/files/patch-ini_pluginpath.ini
index de63ee9e44fc..277c971a02bb 100644
--- a/www/opera/files/patch-ini_pluginpath.ini
+++ b/www/opera/files/patch-ini_pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig	Tue Sep 19 19:09:09 2006
-+++ ini/pluginpath.ini	Fri Dec  8 22:38:49 2006
-@@ -6,46 +6,20 @@
+--- 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
  
  [Paths]
@@ -13,7 +13,7 @@
 +%%PREFIX%%/share/opera/plugins=1
 +%%LOCALBASE%%/share/opera/plugins=1
  
- ; Adobe Acrobat
+-; Adobe Acrobat
 -/usr/local/Acrobat7.0/Browsers/intellinux=1
 -/usr/local/Acrobat7/Browsers/intellinux=1
 -/usr/local/Acrobat5/Browsers/intellinux=1
@@ -34,25 +34,31 @@
 -/usr/Acrobat7/Browsers/intellinux=1
 -/usr/Acrobat5/Browsers/intellinux=1
 -/usr/Acrobat4/Browsers/intellinux=1
-+%%X11BASE%%/Acrobat7/Browser/intellinux=1
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
-+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
++; Adobe Reader
++%%X11BASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux=1
  
- ; Realplayer
+-; Realplayer
 -/usr/lib/RealPlayer8/Plugins=1
 -/usr/lib/realplay/plugins=1
 -/usr/lib/RealPlayer8=1
 -/usr/lib/realplay=1
-+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
- 
- ; Netscape Plug-in Paths
--$HOME/.netscape6/plugins=1
++; FreeBSD Plug-in Paths
 +%%X11BASE%%/lib/browser_plugins=1
 +%%LOCALBASE%%/lib/browser_plugins=1
- $HOME/.netscape/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
+ 
+-; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
+-$HOME/.netscape/plugins=1
 -/opt/netscape/plugins=1
 -/usr/lib/netscape/plugins=1
 -/usr/local/netscape/plugins=1
 -/usr/local/lib/netscape/plugins=1
 -$HOME/.kde/.konqueror/nsplugins=1
-+
diff --git a/www/opera/pkg-message b/www/opera/pkg-message
index 6d3b1b7f27a1..5e98a0233137 100644
--- a/www/opera/pkg-message
+++ b/www/opera/pkg-message
@@ -1,6 +1,6 @@
 ###########################################################################
 
-Warning: Plugin support on FreeBSD 5.x or higher is only available if you 
-use a version of Opera that uses shared Qt.
+To use Linux plugins such as Adobe Flash and Acrobat Reader, install the
+www/opera-linuxplugins port.
 
 ###########################################################################
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index a6952eb3134e..a5571ac26bfc 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -52,6 +52,9 @@ bin/opera
 %%DATADIR%%/styles/images/bar.png
 %%DATADIR%%/styles/images/center.png
 %%DATADIR%%/styles/images/opera.png
+%%DATADIR%%/styles/images/red_center.png
+%%DATADIR%%/styles/images/red_left.png
+%%DATADIR%%/styles/images/red_right.png
 %%DATADIR%%/styles/images/root.png
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
@@ -67,6 +70,7 @@ bin/opera
 %%DATADIR%%/styles/user/nostalgia.css
 %%DATADIR%%/styles/user/showstructure.css
 %%DATADIR%%/styles/user/textonly.css
+%%DATADIR%%/styles/warning.css
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-sebd.dat
 %%DATADIR%%/svg-se.dat