Update to 9.0

PR:		99204
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)

7 files changed, 203 insertions, 206 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 916cf59d854a..0768f2a64064 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -8,29 +8,31 @@
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/&,} \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
+MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://www.opera.mirroarrr.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/&,} \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en-${OPERA_BUILD}
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	8.54
-OPERA_MINVER=	#
+OPERA_VER=	9.0
+OPERA_MINVER=	0
 OPERA_REL=	final
-OPERA_DATE=	20060330
+OPERA_DATE=	20060616
+OPERA_BUILD=	344
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
@@ -40,25 +42,49 @@ WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
 
+MAN1=		opera.1
+
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPTIONS=	ASPELL	"Support spelling checker"	off
-
-.include <bsd.port.pre.mk>
+OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
+		SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT}
 
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+.if exists(${X11BASE}/lib/libqt-mt.prl)
+QT_PRESENT=	on
+.else
+QT_PRESENT=	off
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x
+OPERA_TYPE=	4
+.elif ${OSVERSION} >= 500000
+OPERA_TYPE=	3
+.else
+OPERA_TYPE=	1
 .endif
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
+.if defined(WITH_SHARED) && ${OPERA_TYPE} > 1
+OPERA_LIB=	shared
+LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
+.else
+OPERA_LIB=	static
+OPERA_TYPE=	1
+.endif
+
+.if ${OPERA_TYPE} == 1 && ${OSVERSION} >= 500000
+LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME=""
 .else
@@ -76,14 +102,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+			${WRKSRC}/config/opera6rc
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
 
+.if defined(WITHOUT_SHARED) && ${OSVERSION} >= 500000
 post-install:
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/opera/distinfo b/www/opera/distinfo
index f5839890cde1..f4c07d010862 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,3 +1,9 @@
-MD5 (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = 3278224c6f3988a03ac87f7606dba232
-SHA256 (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = c44cef042168158de2f9ef3558552924aad898d00541d9b415c25b1071355486
-SIZE (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = 5563667
+MD5 (opera-9.0-20060616.1-static-qt.i386.freebsd-en-344.tar.bz2) = 4813bac66647229e64e8c13bdbf7a080
+SHA256 (opera-9.0-20060616.1-static-qt.i386.freebsd-en-344.tar.bz2) = 143f04a484a25c12460e75b1737f86f4131076f556a81e81a46bc1f950e38c9e
+SIZE (opera-9.0-20060616.1-static-qt.i386.freebsd-en-344.tar.bz2) = 6439484
+MD5 (opera-9.0-20060616.3-shared-qt.i386.freebsd-en-344.tar.bz2) = 881694725d7223ef706259d808db3bef
+SHA256 (opera-9.0-20060616.3-shared-qt.i386.freebsd-en-344.tar.bz2) = e10b0bbc8f234491cadacb4461f3ed132f0f0e75cd8c7edde9cfe2500ccecbc8
+SIZE (opera-9.0-20060616.3-shared-qt.i386.freebsd-en-344.tar.bz2) = 5037788
+MD5 (opera-9.0-20060616.4-shared-qt.i386.freebsd-en-344.tar.bz2) = aabfc04204ecbeb9637bb1789b2a5512
+SHA256 (opera-9.0-20060616.4-shared-qt.i386.freebsd-en-344.tar.bz2) = aac10b7fdd6984edc223d5928a4724e7c423c85ad4b88e8b8bf6a3427a290f33
+SIZE (opera-9.0-20060616.4-shared-qt.i386.freebsd-en-344.tar.bz2) = 5038626
diff --git a/www/opera/files/patch-ini_spellcheck.ini b/www/opera/files/patch-ini_spellcheck.ini
deleted file mode 100644
index a2ec7c7ccb2e..000000000000
--- a/www/opera/files/patch-ini_spellcheck.ini
+++ /dev/null
@@ -1,9 +0,0 @@
---- ini/spellcheck.ini.orig	Thu May 13 13:51:43 2004
-+++ ini/spellcheck.ini	Thu May 13 13:52:00 2004
-@@ -3,5 +3,6 @@
- ; This file is stored in UTF-8 encoding
- 
- [Spell Check]
-+Spell Check Engine=%%PREFIX%%/share/opera/bin/spellcheck.so
- Default Language=en
- Default Encoding=iso8859-1
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 37300fa8431d..9e37cab9c721 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -1,54 +1,6 @@
---- install.sh.orig	Fri Mar 31 14:12:48 2006
-+++ install.sh	Mon Apr 10 08:09:43 2006
-@@ -397,7 +397,7 @@
- 	    mvv=''    # SunOS mv (no -v verbose option)
- 	;;
- 
--	i[3456]86:FreeBSD|i[3456]86:NetBSD)
-+	i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD)
- 		cpf='-f'
- 		if test "$verbose" -gt '1'
- 		then
-@@ -789,7 +789,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 \\
-@@ -832,10 +832,19 @@
- OPERA_SCRIPT_PATH=$0
- export OPERA_SCRIPT_PATH
- 
-+# Location of locale data
-+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then
-+    PATH_LOCALE=%%LOCALBASE%%/share/compat/locale
-+    export PATH_LOCALE
-+fi
-+
- # Location of the Opera binaries
- OPERA_BINARYDIR=${str_localdirexec}
- export OPERA_BINARYDIR
- 
-+# Make sure the compat libraries are found
-+test -d %%LOCALBASE%%/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:%%LOCALBASE%%/lib/compat/\"
-+
- # Parse commandline parameters
- toset=
- _QTSTYLE_FROM_CMDLINE_='NO'
-@@ -887,6 +896,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\`
-@@ -910,69 +922,12 @@
+--- install.sh.orig	Fri Jun 16 12:03:46 2006
++++ install.sh	Tue Jun 20 15:24:11 2006
+@@ -924,69 +924,14 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -58,7 +10,7 @@
 -	/usr/lib
 -	/usr/local
 -	/opt\"
-+	PREFIXES=\"%%LOCALBASE%%\"
++    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
 -	java-1.5.0-sun-1.5.0.06 \\
@@ -119,10 +71,12 @@
 +	jdk1.3.1/jre \\
 +	jdk1.4.2/jre \\
 +	jdk1.5.0/jre \\
++	diablo-jre1.5.0 \\
++	diablo-jdk1.5.0/jre \\
  	; 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
-@@ -1023,11 +978,8 @@
+@@ -1037,11 +982,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -131,12 +85,12 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+	%%LOCALBASE%%/Acrobat4/bin \\
-+	%%LOCALBASE%%/Acrobat5/bin \\
++    %%LOCALBASE%%/Acrobat4/bin \\
++    %%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1038,12 +990,13 @@
+@@ -1052,12 +994,13 @@
  LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
  export LD_LIBRARY_PATH
  
@@ -152,7 +106,7 @@
          LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
      fi
  done"
-@@ -1153,7 +1106,7 @@
+@@ -1167,7 +1110,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -161,23 +115,7 @@
  
      # Executable
      debug_msg 1 "Executable"
-@@ -1193,15 +1146,6 @@
-     generate_wrapper
-     chmod $chmodv 755 $wrapper_dir/opera
- 
--    # Manual page
--    debug_msg 1 "Manual page"
--
--    mkdir $mkdirv $mkdirp ${man_dir}
--    chmod $chmodv 755 ${man_dir}
--    mkdir $mkdirv $mkdirp ${man_dir}/man1
--    chmod $chmodv 755 ${man_dir}/man1
--    cp $cpv $cpf man/opera.1 ${man_dir}/man1
--
-     # Documentation
-     debug_msg 1 "Documentation"
- 
-@@ -1377,44 +1321,13 @@
+@@ -1328,41 +1271,9 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -217,14 +155,9 @@
 -	fi
 -
  	if test "${bool_icons}" -ne 0
- 	then
--	    xdg
-+		gnome
-+		kde 3
+ 	then xdg
  	fi
- 
-     fi # OPERADESTDIR
-@@ -1623,48 +1536,42 @@
+@@ -1573,48 +1484,43 @@
      # This function searches for common gnome icon paths.
      debug_msg 1 "in gnome()"
  
@@ -236,8 +169,8 @@
 -	then
 -	    # /opt/gnome icon
 -	    if test ! -d /opt/gnome/share/pixmaps/
-+	   # %%X11BASE%%/share/gnome icon
-+           if test ! -d %%X11BASE%%/share/gnome/pixmaps
++	    # %%X11BASE%%/share/gnome icon
++	    if test ! -d %%X11BASE%%/share/gnome/pixmaps/;
  	    then
 -		if test -w /opt/gnome/share
 +		if test -w %%X11BASE%%/share/gnome;
@@ -245,58 +178,58 @@
 -		    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
-+                   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
++		    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
-+           elif test -w %%X11BASE%%/share/gnome/pixmaps
-+           then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/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
 -	    # end /opt/gnome icon
--
++	    # end %%X11BASE%%/share/gnome icon
+ 
 -	    # /opt/gnome link
 -	    if test -d /opt/gnome/share/gnome/apps/
-+           # end %%X11BASE%%/share/gnome icon
-+           # %%X11BASE%%/share/gnome link
-+           if test -d %%X11BASE%%/share/gnome/apps/
++	    # %%X11BASE%%/share/gnome link
++	    if test -d %%X11BASE%%/share/gnome/apps/
  	    then
 -		if test -d /opt/gnome/share/gnome/apps/Internet/
-+               if test -d %%X11BASE%%/share/gnome/apps/Internet/
++		if test -d %%X11BASE%%/share/gnome/apps/Internet/
  		then
 -		    if test -w /opt/gnome/share/gnome/apps/Internet
 -		    then generate_desktop /opt/gnome/share/gnome/apps/Internet
-+                   if test -w %%X11BASE%%/share/gnome/apps/Internet
-+                   then generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++		    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/
-+               elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/
++		elif test -d %%X11BASE%%/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
-+                   if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW
-+                   then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++		    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
-+               elif test -w %%X11BASE%%/share/gnome/apps
++		elif test -w %%X11BASE%%/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
-+                   mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
-+                   chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
-+                   generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++		    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
-+           # end %%X11BASE%%/share/gnome link
++	    # end %%X11BASE%%/share/gnome link
  
      elif test -d /usr/share/gnome/
      then
-@@ -1712,9 +1619,9 @@
+@@ -1662,9 +1568,9 @@
      # This function searches for common kde2 and kde 3 icon paths.
      debug_msg 1 "in kde()"
  
@@ -304,51 +237,87 @@
 +    if test -d %%LOCALBASE%%/share;
      then
 -	DIR_HI=/opt/kde$1/share/icons/hicolor
-+        DIR_HI=%%LOCALBASE%%/share/icons/hicolor
++	DIR_HI=%%LOCALBASE%%/share/icons/hicolor
  	if test -d "$DIR_HI" -a -w "$DIR_HI"
  	then
  	    if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
-@@ -1728,7 +1635,7 @@
+@@ -1678,7 +1584,7 @@
  	    fi
  	fi
  
 -	DIR_LO=/opt/kde$1/share/icons/locolor
-+        DIR_LO=%%LOCALBASE%%/share/icons/locolor
++	DIR_LO=%%LOCALBASE%%/share/icons/locolor
  	if test -d $DIR_LO -a -w $DIR_LO
  	then
  	    if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
-@@ -1742,15 +1649,15 @@
+@@ -1692,15 +1598,15 @@
  	    fi
  	fi
  
 -	if test -d /opt/kde$1/share/applnk/
-+        if test -d %%LOCALBASE%%/share/applnk/
++	if test -d %%LOCALBASE%%/share/applnk/
  	then
 -	    if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
-+            if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
++	    if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
  	    then
 -		mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
 -		chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
-+                mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+                chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
++		mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
++		chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
  	    fi
 -	    if test -w /opt/kde$1/share/applnk/Internet
 -	    then generate_desktop /opt/kde$1/share/applnk/Internet $1
-+            if test -w %%LOCALBASE%%/share/applnk/Internet
-+            then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
++	    if test -w %%LOCALBASE%%/share/applnk/Internet
++	    then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
  	    fi
  	fi
      fi
-@@ -1866,12 +1773,8 @@
- 	generate_desktop ${SHORTCUT_DIR} xdg
- 	${UDD}
-     else
+@@ -1784,45 +1690,9 @@
+ }
+ 
+ xdg()
+-{   # http://standards.freedesktop.org
+-    UDD=''
+-    for BIN_DIR in `pathdirs`; do
+-	test -x ${BIN_DIR}/update-desktop-database || continue
+-	UDD=${BIN_DIR}/update-desktop-database; break
+-    done
+-
+-    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+-    if test "$UDD"; then
+-	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor; do
+-	    test -d ${ICON_DIR} && break
+-	done
+-
+-	if   test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
+-	elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
+-	else
+-	    for RESOLUTION in 48x48 32x32 22x22; do
+-		TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
+-		test -d ${TO_DIR} && test -w ${TO_DIR} && cp $cpv $share_dir/images/opera_${RESOLUTION}.png ${TO_DIR}/opera.png
+-	    done
+-	fi
+-
+-	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do
+-	    test -d ${SHORTCUT_DIR} && break;
+-	done
+-
+-	if   test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
+-	elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
+-	fi
+-	generate_desktop ${SHORTCUT_DIR} xdg
+-	${UDD}
+-    else
 -	icons
- 	gnome
- 	kde 3
+-	gnome
+-	kde 3
 -	kde 2
 -	kde1
 -	mandrake
-     fi
+-    fi
++{
++    gnome
++    kde 3
  }
  
+ echo test | sed -n -e 's/test//' || error 'sed'
diff --git a/www/opera/files/patch-search.ini b/www/opera/files/patch-search.ini
index 128105ee3a6d..722cfc877c79 100644
--- a/www/opera/files/patch-search.ini
+++ b/www/opera/files/patch-search.ini
@@ -1,22 +1,28 @@
---- search.ini.orig	Mon Nov 14 14:51:18 2005
-+++ search.ini	Tue Nov 22 21:50:07 2005
-@@ -435,8 +435,8 @@
- Nameid=0
+--- 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 34]
--Name=Google Linu&x
--URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
- Query=
- Key=x
- Is post=0
-@@ -445,4 +445,30 @@
- Search Type=0
- Verbtext=17063
+ [Search Engine 5]
+ Name=
+@@ -68,7 +68,7 @@
+ Search Type=41
+ Verbtext=0
+ Nameid=17174
+-Position=4
++Position=5
+ 
+ [Search Engine 6]
+ Name=
+@@ -445,4 +445,44 @@
+ Search Type=119
+ Verbtext=0
  Position=-1
--Nameid=0
-\ No newline at end of file
+-Nameid=291960
 +Nameid=0
 +
 +[Search Engine 35]
@@ -44,3 +50,17 @@
 +Verbtext=17063
 +Position=-1
 +Nameid=0
++
++[Search Engine 37]
++Name=FreeBSD &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
++
diff --git a/www/opera/pkg-message b/www/opera/pkg-message
index e8b9a82dd290..6d3b1b7f27a1 100644
--- a/www/opera/pkg-message
+++ b/www/opera/pkg-message
@@ -1,18 +1,6 @@
 ###########################################################################
 
-If you are running FreeBSD 5.x or 6.x and are experiencing a core dump when 
-starting Opera, try updating the compat4x port.
-
-To enable the built-in plug-ins, add the following to /etc/libmap.conf:
-
-# Opera - Motif
-[/usr/X11R6/share/opera/plugins/operamotifwrapper-1]
-libXm.so.1		libXm.so.3
-libXThrStub.so.6	libXtst.so.6
-[/usr/X11R6/share/opera/plugins/operamotifwrapper-2]
-libXm.so.2		libXm.so.3
-libXThrStub.so.6	libXtst.so.6
-[/usr/X11R6/share/opera/plugins/operamotifwrapper-3]
-libXThrStub.so.6	libXtst.so.6
+Warning: Plugin support on FreeBSD 5.x or higher is only available if you 
+use a version of Opera that uses shared Qt.
 
 ###########################################################################
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 40f04aec9e2b..b2d2aa95e5d9 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -9,70 +9,64 @@ bin/opera
 %%DATADIR%%/config/opera6rc
 %%DATADIR%%/config/opera6rc.fixed
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/blank.gif
-%%DATADIR%%/images/drive.gif
-%%DATADIR%%/images/file.gif
-%%DATADIR%%/images/folder.gif
-%%DATADIR%%/images/link.gif
 %%DATADIR%%/images/opera.xpm
 %%DATADIR%%/images/opera_16x16.png
 %%DATADIR%%/images/opera_22x22.png
 %%DATADIR%%/images/opera_32x32.png
 %%DATADIR%%/images/opera_48x48.png
-%%DATADIR%%/images/operabanner.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
 %%DATADIR%%/ini/filehandler.ini
 %%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/spellcheck.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
 %%DATADIR%%/ini/standard_toolbar.ini
 %%DATADIR%%/ini/unix_keyboard.ini
+%%DATADIR%%/ini/xmlentities.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
-%%DATADIR%%/jsconsole.html
 %%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-3
+%%DATADIR%%/plugins/operapluginwrapper
 %%DATADIR%%/plugins/operaplugincleaner
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/styles/OPF.css
 %%DATADIR%%/styles/about.css
 %%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/certinfo.css
-%%DATADIR%%/styles/csr.css
+%%DATADIR%%/styles/config.css
+%%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/email.css
+%%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
+%%DATADIR%%/styles/image.css
+%%DATADIR%%/styles/images/bar.png
+%%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/opera.png
+%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/mimehead.css
-%%DATADIR%%/styles/opf.css
 %%DATADIR%%/styles/plugins.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/contrastbw.css
 %%DATADIR%%/styles/user/contrastwb.css
 %%DATADIR%%/styles/user/debugwithoutline.css
 %%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/hidecertainsizes.css
 %%DATADIR%%/styles/user/hidenonlinkimages.css
 %%DATADIR%%/styles/user/imageandlinkonly.css
 %%DATADIR%%/styles/user/nostalgia.css
 %%DATADIR%%/styles/user/showstructure.css
 %%DATADIR%%/styles/user/textonly.css
-%%DATADIR%%/styles/user/userstyle.ini
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-sebd.dat
 %%DATADIR%%/svg-se.dat
@@ -84,6 +78,7 @@ bin/opera
 %%GNOME%%share/gnome/apps/Internet/opera.desktop
 %%GNOME%%share/gnome/pixmaps/opera.xpm
 @dirrm %%DATADIR%%/styles/user
+@dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins