diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile	Fri Aug  1 23:43:57 2003
+++ opera/Makefile	Tue Aug 12 23:15:50 2003
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.12.20030305
+PORTVERSION=	7.20.20030811
 CATEGORIES=	www
-MASTER_SITES=	http://opera.online.no/unix/freebsd/612/final/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/612/final/en/static/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386.freebsd
+MASTER_SITES=	http://snapshot.opera.com/unix/intel-freebsd/438-20030811-7.20-B3/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RESTRICTED=	"not redistributable; commercial software"
@@ -20,19 +19,65 @@
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
 
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-do-install:
-	cd ${WRKSRC} && ${SH} install.sh --prefix="${PREFIX}"
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS+=   c_r.4:${PORTSDIR}/misc/compat4x
+.endif
+
+.if exists(/etc/X11/applnk)
+PLIST_SUB+=	APPLNK:=""
+.else
+PLIST_SUB+=	APPLNK:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome)
+PLIST_SUB+=	GNOME:=""
+.else
+PLIST_SUB+=	GNOME:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/applnk/Internet)
+PLIST_SUB+=	KDE:=""
+.else
+PLIST_SUB+=	KDE:="@comment "
 .endif
+
+.if exists(${X11BASE}/share/applnk/Networking)
+PLIST_SUB+=	KDE2:=""
+.else
+PLIST_SUB+=	KDE2:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome/apps)
+PLIST_SUB+=	GNOMELNK:=""
+.else
+PLIST_SUB+=	GNOMELNK:="@comment "
+.endif
+
+pre-everything:
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> NOTE: The native version of Opera can not be'
+	@${ECHO_MSG} '===> installed at the same time as linux-opera. If you'
+	@${ECHO_MSG} '===> already have www/linux-opera installed, we'
+	@${ECHO_MSG} '===> recommend you press Ctrl-C now and deinstall it.'
+	@${ECHO_MSG} '===> **************************************************'
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
+
+do-install:
+	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo	Wed Mar 12 10:23:51 2003
+++ opera/distinfo	Tue Aug 12 22:16:30 2003
@@ -1 +1 @@
-MD5 (opera-6.12-20030305.1-static-qt.i386.freebsd.tar.bz2) = 1c1b2e5e7cadf849a87adb4805472da8
+MD5 (opera-7.20-20030811.1-static-qt.i386.freebsd.tar.bz2) = 907400369b07ffcb79939feb323245e4
diff -urN /usr/ports/www/opera/files/patch-aa opera/files/patch-aa
--- /usr/ports/www/opera/files/patch-aa	Wed Mar 12 10:23:51 2003
+++ opera/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
---- install.sh.orig	Tue Mar 11 15:29:39 2003
-+++ install.sh	Tue Mar 11 15:30:46 2003
-@@ -1092,16 +1092,10 @@
- 	mkdir $mkdirv $mkdirp $plugin_dir/
- 	chmod $chmodv 755 $plugin_dir
- 
--	cp $cpv $cpf $cpp plugins/operamotifwrapper plugins/operaplugincleaner plugins/libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/
--        chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release
--
--	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major.$plugin_version_minor
--	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major
--	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
--
-      # System wide configuration files
--	config_dir='/usr/local/etc'
-+	config_dir="$prefix/etc"
- 	if can_write_to "$config_dir"; then
-+if false; then # XXX
- 	    echo
- 	    echo "System wide configuration files:"
- 	    echo "  $config_dir/opera6rc"
-@@ -1128,6 +1122,7 @@
- 			;;
- 		esac
- 	    done
-+fi # XXX
- 	else
- 	    echo
- 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh
--- /usr/ports/www/opera/files/patch-install.sh	Thu Jan  1 01:00:00 1970
+++ opera/files/patch-install.sh	Tue Aug 12 22:44:53 2003
@@ -0,0 +1,269 @@
+--- install.sh.orig	Mon Aug 11 16:27:15 2003
++++ install.sh	Tue Aug 12 22:44:18 2003
+@@ -712,27 +712,17 @@
+ 
+     wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
+     ${plugin_dir} \\
+-    /usr/lib/opera/plugins \\
+-    /usr/local/lib/opera/plugins \\
+-    /opt/lib/opera/plugins \\"
++    /usr/local/share/opera/plugins \\"
+ 
+     case "${machine}:${os}" in
+ 	i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ 	    wrapper_plugin_paths="
+     /usr/local/Acrobat[45]/Browsers/intellinux \\
+-    /usr/lib/Acrobat[45]/Browsers/intellinux \\
+-    /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
+-    /opt/Acrobat[45]/Browsers/intellinux \\
+-    /usr/Acrobat[45]/Browsers/intellinux \\
+-    /usr/j2se/jre/plugin/i386/ns4 \\
+-    /usr/java/jre1.4.0/plugin/i386/ns4 \\
+-    /usr/java/jre1.3.1/plugin/i386/ns4 \\
+-    /usr/lib/j2re1.3/plugin/i386/netscape4 \\
+-    /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\
+-    /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"
++    /usr/local/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
++    /usr/local/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
+ 	    wrapper_ibmjava="
+-	    IBMJava2-14/jre \\
+-	    IBMJava2-131/jre \\"
++	    linux-ibm-jdk1.3.1/jre \\
++	    linux-ibm-jdk1.4.0/jre \\"
+ 	    wrapper_sunjava_machine="i386"
+ 	;;
+ 
+@@ -779,15 +769,9 @@
+ 	;;
+     esac
+     wrapper_netscape_plugin_paths="
+-    /usr/lib/RealPlayer8/Plugins \\
+-    /usr/lib/realplay/plugins \\
+-    /usr/lib/RealPlayer8 \\
+-    /usr/lib/realplay \\
++    /usr/local/lib/RealPlayer8/Plugins \\
+     \"\${HOME}/.netscape/plugins\" \\
+-    /opt/netscape/plugins \\
+-    /usr/lib/netscape/plugins \\
+-    /usr/local/netscape/plugins \\
+-    /usr/local/lib/netscape/plugins \\"
++    /usr/local/lib/netscape-linux/plugins \\"
+ 
+     wrapper_file="${wrapper_dir}/opera"
+     
+@@ -846,28 +830,13 @@
+ 
+ if test ! \"\${OPERA_JAVA_DIR}\"; then
+ 
+-    PREFIXES=\"
+-	/usr
+-	/usr/java
+-	/usr/lib
+-	/usr/local
+-	/opt\"
++    PREFIXES=\"/usr/local\"
+ 
+     for SUNJAVA in \\
+-	j2re1.4.1_01 \\
+-	j2re1.4.1 \\
+-	j2re1.4.0_01 \\
+-	j2sdk1.4.0_01/jre \\
+-	j2re1.4.0 \\
+-	jre1.4.0 \\
+-	j2se/1.4/jre \\
+-	j2se/1.3/jre \\
+-	j2se/jre \\
+-	jre1.3.1_02 \\
+-	jre1.3.1_01 \\
+-	j2re1.3.1 \\
+-	jre1.3.1 \\
+-	j2re1.3 \\
++	linux-blackdown-jdk1.3.1/jre \\
++	linux-blackdown-jdk1.4.1/jre \\
++	linux-sun-jdk1.3.1/jre \\
++	linux-sun-jdk1.4.1/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
+@@ -912,11 +881,8 @@
+ 
+ # Acrobat Reader
+ for BINDIR in \\
+-    /usr/local/Acrobat[45]/bin \\
+-    /usr/lib/Acrobat[45]/bin \\
+-    /usr/X11R6/lib/Acrobat[45]/bin \\
+-    /opt/Acrobat[45]/bin \\
+-    /usr/Acrobat[45]/bin \\
++    /usr/local/Acrobat4/bin \\
++    /usr/local/Acrobat5/bin \\
+     ; do
+     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
+ done
+@@ -1116,44 +1082,6 @@
+ 	cp $cpv $cpf plugins/operamotifwrapper plugins/operaplugincleaner plugins/libnpp.so $plugin_dir/
+         chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
+ 
+-     # System wide configuration files
+-	config_dir='/usr/local/etc'
+-	if can_write_to "$config_dir"; then
+-	    echo
+-	    echo "System wide configuration files:"
+-	    echo "  $config_dir/opera6rc"
+-	    echo "  $config_dir/opera6rc.fixed"
+-	    echo " cannot be prefixed"
+-	    echo "Do you want to install them [y,n | yes,no]?"
+-	    while true; do
+-		read install_config
+-		case "${install_config}" in
+-
+-		    ''|y|Y|yes|YES)
+-			backup $config_dir/opera6rc opera6rc config
+-			backup $config_dir/opera6rc.fixed opera6rc.fixed config
+-			cp $cpv $cpf config/opera6rc $config_dir
+-			cp $cpv $cpf config/opera6rc.fixed $config_dir
+-			break
+-			;;
+-
+-		    n|N|no|NO)
+-			break
+-			;;
+-		    *)
+-			echo 'Invalid answer, try again:'
+-			;;
+-		esac
+-	    done
+-	else
+-	    echo
+-	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
+-	    echo " System wide configuration files:"
+-	    echo "  $config_dir/opera6rc"
+-	    echo "  $config_dir/opera6rc.fixed"
+-	    echo " were not installed"
+-	fi
+-
+      # Shorcuts and Icons
+ 	icons
+ 	gnome
+@@ -1249,22 +1177,22 @@
+ 
+     debug_msg 0 "in icons()"
+ 
+-    if test ! -d /usr/share/icons; then
+-      if test -w /usr/share; then
+-        mkdir $mkdirv $mkdirp /usr/share/icons/
+-	chmod $chmodv 755 /usr/share/icons
+-	cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++    if test ! -d /usr/X11R6/share/icons; then
++      if test -w /usr/X11R6/share; then
++        mkdir $mkdirv $mkdirp /usr/X11R6/share/icons/
++	chmod $chmodv 755 /usr/X11R6/share/icons
++	cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/icons/opera.xpm
+       fi
+-    elif test -w /usr/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++    elif test -w /usr/X11R6/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/icons/opera.xpm
+     fi
+   
+-    if test ! -d /usr/share/pixmaps; then
+-      if test -w /usr/share; then
+-	mkdir $mkdirv $mkdirp /usr/share/pixmaps/
+-	chmod $chmodv 755 /usr/share/pixmaps
+-	cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++    if test ! -d /usr/X11R6/share/pixmaps; then
++      if test -w /usr/X11R6/share; then
++	mkdir $mkdirv $mkdirp /usr/X11R6/share/pixmaps/
++	chmod $chmodv 755 /usr/X11R6/share/pixmaps
++	cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/opera.xpm
+       fi
+-    elif test -w /usr/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w /usr/X11R6/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/opera.xpm
+     fi
+   
+     if test ! -d /etc/X11/wmconfig/; then
+@@ -1330,36 +1258,36 @@
+       fi
+       # end /opt/gnome share
+ 
+-    elif test -d /usr/share/gnome/; then
++    elif test -d /usr/X11R6/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
++        # /usr/X11R6/share/gnome icon
++        if test ! -d /usr/X11R6/share/gnome/pixmaps/; then
++	  if test -w /usr/X11R6/share/gnome; then
++	    mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/pixmaps/
++	    chmod $chmodv 755 /usr/X11R6/share/gnome/pixmaps
++	    cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
+ 	  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 /usr/X11R6/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
+ 	fi
+-	# end /usr/share/gnome icon
++	# end /usr/X11R6/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
++	# /usr/X11R6/share/gnome link
++	if test -d /usr/X11R6/share/gnome/apps/; then
++          if test -d /usr/X11R6/share/gnome/apps/Internet/; then
++            if test -w /usr/X11R6/share/gnome/apps/Internet; then
++              generate_desktop /usr/X11R6/share/gnome/apps/Internet
+ 	    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 /usr/X11R6/share/gnome/apps/Networking/WWW/; then
++            if test -w /usr/X11R6/share/gnome/apps/Networking/WWW; then
++	     generate_desktop /usr/X11R6/share/gnome/apps/Networking/WWW
+ 	    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 /usr/X11R6/share/gnome/apps; then
++	    mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/apps/Internet/
++	    chmod $chmodv 755 /usr/X11R6/share/gnome/apps/Internet
++            generate_desktop /usr/X11R6/share/gnome/apps/Internet
+           fi
+ 	fi
+-	# end /usr/share/gnome link
++	# end /usr/X11R6/share/gnome link
+    fi
+    # Add ximian here
+ }
+@@ -1396,12 +1324,12 @@
+ 
+     fi  
+     
+-    if test -d /usr/share/applnk/Networking; then
+-      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
+-	    mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
+-	    chmod $chmodv 755 /usr/share/applnk/Networking/WWW
++    if test -d /usr/X11R6/share/applnk/Networking; then
++      if test ! -d /usr/X11R6/share/applnk/Networking/WWW/ -a -w /usr/X11R6/share/applnk/Networking; then
++	    mkdir $mkdirv $mkdirp /usr/X11R6/share/applnk/Networking/WWW/
++	    chmod $chmodv 755 /usr/X11R6/share/applnk/Networking/WWW
+       fi
+-      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
++      if test -w /usr/X11R6/share/applnk/Networking/WWW; then generate_desktop /usr/X11R6/share/applnk/Networking/WWW ${1}; fi
+     fi
+ }
+ 
+@@ -1425,8 +1353,8 @@
+       fi
+       if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
+ 
+-    elif test -d /usr/share/applnk/Internet/ -a -w /usr/share/applnk/Internet; then
+-      generate_desktop /usr/share/applnk/Internet
++    elif test -d /usr/X11R6/share/applnk/Internet/ -a -w /usr/X11R6/share/applnk/Internet; then
++      generate_desktop /usr/X11R6/share/applnk/Internet
+     fi
+ }
+ 
diff -urN /usr/ports/www/opera/pkg-descr opera/pkg-descr
--- /usr/ports/www/opera/pkg-descr	Mon Oct 14 23:02:11 2002
+++ opera/pkg-descr	Tue Aug 12 21:58:55 2003
@@ -1,4 +1,18 @@
-Opera is currently the fastest and most standards-compliant full-featured
-graphical web browser around.
+Opera 7 is a substantial upgrade, with code rewritten from the rendering engine
+and up, resulting in the fastest, smallest, most full-featured desktop browser
+ever released.
+
+-New rendering engine
+Opera's new rendering engine supports W3C's DOM (Document Object Model) level 2,
+non-standard dynamic HTML (DHTML), CSS1 and CSS2, ECMAScript, and has improved
+HTML 4.01 support, as well as complete support for WML 1.3 and 2.0. It is
+faster, smaller and can dynamically change documents through DOM.
+
+-M2 -- new e-mail client
+Opera's new e-mail client, M2, automatically categorizes and sorts e-mail
+messages by contact and has an integrated spam filter. Innovative features such
+as QuickReply and QuickFind lets users answer or find e-mails at unrivalled
+speed. M2 supports POP3, IMAP, ESMTP, and threaded display of mailing lists.
+In addition, M2 supports news servers with password authentication.
 
 WWW: http://www.opera.com/
diff -urN /usr/ports/www/opera/pkg-message opera/pkg-message
--- /usr/ports/www/opera/pkg-message	Thu Jan  1 01:00:00 1970
+++ opera/pkg-message	Tue Aug 12 22:31:05 2003
@@ -0,0 +1,6 @@
+
+If you are upgrading from version 6, it is recommended to backup your personal
+"~/.opera" directory and remove it before starting the upgraded Opera for the
+first time. This can be done from the command line using 
+"cp -Rp ~/.opera ~/.opera-mybackup" and "rm -rf ~/.opera".
+
diff -urN /usr/ports/www/opera/pkg-plist opera/pkg-plist
--- /usr/ports/www/opera/pkg-plist	Wed Mar 12 10:23:51 2003
+++ opera/pkg-plist	Tue Aug 12 22:52:22 2003
@@ -1,340 +1,44 @@
 bin/opera
 share/doc/opera/LICENSE
 share/doc/opera/help
+share/opera/bin/m2.so
 share/opera/bin/opera
-share/opera/buttons/DefSmall
-share/opera/buttons/Default
-share/opera/buttons/default/abc.gif
-share/opera/buttons/default/buttons.ini
-share/opera/buttons/default/cascade.gif
-share/opera/buttons/default/compose.gif
-share/opera/buttons/default/copy.gif
-share/opera/buttons/default/delete.gif
-share/opera/buttons/default/doccomp.gif
-share/opera/buttons/default/docerr.gif
-share/opera/buttons/default/dochtlst.gif
-share/opera/buttons/default/docim.gif
-share/opera/buttons/default/docload.gif
-share/opera/buttons/default/docmail.gif
-share/opera/buttons/default/docnews.gif
-share/opera/buttons/default/docprog.gif
-share/opera/buttons/default/docsrch.gif
-share/opera/buttons/default/doctrsf.gif
-share/opera/buttons/default/document.gif
-share/opera/buttons/default/docunkn.gif
-share/opera/buttons/default/docunrd.gif
-share/opera/buttons/default/dropdown.gif
-share/opera/buttons/default/figprog.gif
-share/opera/buttons/default/finished.gif
-share/opera/buttons/default/forward.gif
-share/opera/buttons/default/fullscre.gif
-share/opera/buttons/default/go.gif
-share/opera/buttons/default/hisecu.gif
-share/opera/buttons/default/home.gif
-share/opera/buttons/default/hotlist.gif
-share/opera/buttons/default/hotlstto.gif
-share/opera/buttons/default/html.gif
-share/opera/buttons/default/im.gif
-share/opera/buttons/default/incl.gif
-share/opera/buttons/default/keyb.gif
-share/opera/buttons/default/load.gif
-share/opera/buttons/default/loading.gif
-share/opera/buttons/default/losecu.gif
-share/opera/buttons/default/maxlist.gif
-share/opera/buttons/default/maxmail.gif
-share/opera/buttons/default/menu.gif
-share/opera/buttons/default/mesecu.gif
-share/opera/buttons/default/moveto.gif
-share/opera/buttons/default/new.gif
-share/opera/buttons/default/newbkmk.gif
-share/opera/buttons/default/newcntct.gif
-share/opera/buttons/default/newfldr.gif
-share/opera/buttons/default/newscatc.gif
-share/opera/buttons/default/newsfoll.gif
-share/opera/buttons/default/newsfoll1.gif
-share/opera/buttons/default/newsgrp.gif
-share/opera/buttons/default/newsmrea.gif
-share/opera/buttons/default/newsnext.gif
-share/opera/buttons/default/newsover.gif
-share/opera/buttons/default/newsprev.gif
-share/opera/buttons/default/newssall.gif
-share/opera/buttons/default/newsthr.gif
-share/opera/buttons/default/newsunr.gif
-share/opera/buttons/default/next.gif
-share/opera/buttons/default/noimg.gif
-share/opera/buttons/default/nosecu.gif
-share/opera/buttons/default/open.gif
-share/opera/buttons/default/previous.gif
-share/opera/buttons/default/previous1.gif
-share/opera/buttons/default/print.gif
-share/opera/buttons/default/printact.gif
-share/opera/buttons/default/printall.gif
-share/opera/buttons/default/printscr.gif
-share/opera/buttons/default/printvie.gif
-share/opera/buttons/default/redirect.gif
-share/opera/buttons/default/reload.gif
-share/opera/buttons/default/reply.gif
-share/opera/buttons/default/replyall.gif
-share/opera/buttons/default/save.gif
-share/opera/buttons/default/search.gif
-share/opera/buttons/default/send.gif
-share/opera/buttons/default/send1.gif
-share/opera/buttons/default/sendqd.gif
-share/opera/buttons/default/show.gif
-share/opera/buttons/default/split.gif
-share/opera/buttons/default/stop.gif
-share/opera/buttons/default/stop1.gif
-share/opera/buttons/default/tbsearch.gif
-share/opera/buttons/default/tile.gif
-share/opera/buttons/default/tilevert.gif
-share/opera/buttons/default/update.gif
-share/opera/buttons/default/url.gif
-share/opera/buttons/default/usermode.gif
-share/opera/buttons/default/websrch.gif
-share/opera/buttons/defsmall/abc.gif
-share/opera/buttons/defsmall/buttons.ini
-share/opera/buttons/defsmall/cascade.gif
-share/opera/buttons/defsmall/compose.gif
-share/opera/buttons/defsmall/copy.gif
-share/opera/buttons/defsmall/delete.gif
-share/opera/buttons/defsmall/dropdown.gif
-share/opera/buttons/defsmall/forward.gif
-share/opera/buttons/defsmall/fullscre.gif
-share/opera/buttons/defsmall/home.gif
-share/opera/buttons/defsmall/hotlist.gif
-share/opera/buttons/defsmall/hotlstto.gif
-share/opera/buttons/defsmall/imsmall.gif
-share/opera/buttons/defsmall/incl.gif
-share/opera/buttons/defsmall/keyb.gif
-share/opera/buttons/defsmall/maxlist.gif
-share/opera/buttons/defsmall/maxmail.gif
-share/opera/buttons/defsmall/menu.gif
-share/opera/buttons/defsmall/moveto.gif
-share/opera/buttons/defsmall/new.gif
-share/opera/buttons/defsmall/newbkmk.gif
-share/opera/buttons/defsmall/newcntct.gif
-share/opera/buttons/defsmall/newfldr.gif
-share/opera/buttons/defsmall/newscatc.gif
-share/opera/buttons/defsmall/newsfoll.gif
-share/opera/buttons/defsmall/newsgrp.gif
-share/opera/buttons/defsmall/newsmrea.gif
-share/opera/buttons/defsmall/newsnext.gif
-share/opera/buttons/defsmall/newsover.gif
-share/opera/buttons/defsmall/newsprev.gif
-share/opera/buttons/defsmall/newssall.gif
-share/opera/buttons/defsmall/newsthr.gif
-share/opera/buttons/defsmall/newsunr.gif
-share/opera/buttons/defsmall/next.gif
-share/opera/buttons/defsmall/open.gif
-share/opera/buttons/defsmall/previous.gif
-share/opera/buttons/defsmall/print.gif
-share/opera/buttons/defsmall/redirect.gif
-share/opera/buttons/defsmall/reload.gif
-share/opera/buttons/defsmall/reply.gif
-share/opera/buttons/defsmall/replyall.gif
-share/opera/buttons/defsmall/save.gif
-share/opera/buttons/defsmall/search.gif
-share/opera/buttons/defsmall/send.gif
-share/opera/buttons/defsmall/sendqd.gif
-share/opera/buttons/defsmall/split.gif
-share/opera/buttons/defsmall/tile.gif
-share/opera/buttons/defsmall/tilevert.gif
-share/opera/buttons/defsmall/update.gif
-share/opera/buttons/defsmall/url.gif
-share/opera/buttons/examples/example_big.ini
-share/opera/buttons/examples/example_small.ini
-share/opera/buttons/examples/opera_22x22.png
-share/opera/buttons/examples/opera_32x32.png
-share/opera/buttons/readme.txt
-share/opera/buttons/standard/addressbar_high_security.png
-share/opera/buttons/standard/addressbar_html.png
-share/opera/buttons/standard/addressbar_html_alt2.png
-share/opera/buttons/standard/addressbar_html_alt3.png
-share/opera/buttons/standard/addressbar_html_alt4.png
-share/opera/buttons/standard/addressbar_load_images.png
-share/opera/buttons/standard/addressbar_low_security.png
-share/opera/buttons/standard/addressbar_medium_security.png
-share/opera/buttons/standard/addressbar_no_images.png
-share/opera/buttons/standard/addressbar_no_security.png
-share/opera/buttons/standard/addressbar_print_pv.png
-share/opera/buttons/standard/addressbar_show_images.png
-share/opera/buttons/standard/buttons.ini
-share/opera/buttons/standard/general_delete.png
-share/opera/buttons/standard/general_move_to.png
-share/opera/buttons/standard/general_new_folder.png
-share/opera/buttons/standard/general_next.png
-share/opera/buttons/standard/general_previous.png
-share/opera/buttons/standard/general_save.png
-share/opera/buttons/standard/general_stop.png
-share/opera/buttons/standard/general_view.png
-share/opera/buttons/standard/hotlist_new_bookmark.png
-share/opera/buttons/standard/hotlist_new_contact.png
-share/opera/buttons/standard/icons/bookmark_unvisited.png
-share/opera/buttons/standard/icons/bookmark_visited.png
-share/opera/buttons/standard/icons/boy01.png
-share/opera/buttons/standard/icons/boy02.png
-share/opera/buttons/standard/icons/boy03.png
-share/opera/buttons/standard/icons/boy04.png
-share/opera/buttons/standard/icons/boy05.png
-share/opera/buttons/standard/icons/boy06.png
-share/opera/buttons/standard/icons/boy07.png
-share/opera/buttons/standard/icons/boy08.png
-share/opera/buttons/standard/icons/boy09.png
-share/opera/buttons/standard/icons/boy10.png
-share/opera/buttons/standard/icons/boy11.png
-share/opera/buttons/standard/icons/boy13.png
-share/opera/buttons/standard/icons/boy14.png
-share/opera/buttons/standard/icons/boy15.png
-share/opera/buttons/standard/icons/boy16.png
-share/opera/buttons/standard/icons/close.png
-share/opera/buttons/standard/icons/dropdown.png
-share/opera/buttons/standard/icons/folder_closed.png
-share/opera/buttons/standard/icons/folder_find_results.png
-share/opera/buttons/standard/icons/folder_open.png
-share/opera/buttons/standard/icons/folder_parent.png
-share/opera/buttons/standard/icons/folder_personalbar.png
-share/opera/buttons/standard/icons/girl01.png
-share/opera/buttons/standard/icons/girl02.png
-share/opera/buttons/standard/icons/girl03.png
-share/opera/buttons/standard/icons/girl04.png
-share/opera/buttons/standard/icons/girl05.png
-share/opera/buttons/standard/icons/girl06.png
-share/opera/buttons/standard/icons/girl07.png
-share/opera/buttons/standard/icons/girl08.png
-share/opera/buttons/standard/icons/girl09.png
-share/opera/buttons/standard/icons/girl10.png
-share/opera/buttons/standard/icons/girl11.png
-share/opera/buttons/standard/icons/girl12.png
-share/opera/buttons/standard/icons/girl13.png
-share/opera/buttons/standard/icons/girl14.png
-share/opera/buttons/standard/icons/girl15.png
-share/opera/buttons/standard/icons/girl16.png
-share/opera/buttons/standard/icons/news_read.png
-share/opera/buttons/standard/icons/news_subscribed.png
-share/opera/buttons/standard/icons/news_unread.png
-share/opera/buttons/standard/icons/news_unsubscribed.png
-share/opera/buttons/standard/icons/special01.png
-share/opera/buttons/standard/icons/special02.png
-share/opera/buttons/standard/icons/special03.png
-share/opera/buttons/standard/icons/special04.png
-share/opera/buttons/standard/icons/special05.png
-share/opera/buttons/standard/icons/status_away.png
-share/opera/buttons/standard/icons/status_no_messaging.png
-share/opera/buttons/standard/icons/status_not_available.png
-share/opera/buttons/standard/icons/status_offline.png
-share/opera/buttons/standard/icons/status_online.png
-share/opera/buttons/standard/icons/status_requesting.png
-share/opera/buttons/standard/icons/transfer_failure.png
-share/opera/buttons/standard/icons/transfer_loading.png
-share/opera/buttons/standard/icons/transfer_loading_waiting.png
-share/opera/buttons/standard/icons/transfer_size_mismatch.png
-share/opera/buttons/standard/icons/transfer_stopped.png
-share/opera/buttons/standard/mail_add_attachment.png
-share/opera/buttons/standard/mail_check.png
-share/opera/buttons/standard/mail_compose.png
-share/opera/buttons/standard/mail_redirect.png
-share/opera/buttons/standard/mail_reply.png
-share/opera/buttons/standard/mail_reply_all.png
-share/opera/buttons/standard/mail_send.png
-share/opera/buttons/standard/mail_send_all.png
-share/opera/buttons/standard/main_active_bookmark_folder.png
-share/opera/buttons/standard/main_back.png
-share/opera/buttons/standard/main_cascade.png
-share/opera/buttons/standard/main_find.png
-share/opera/buttons/standard/main_forward.png
-share/opera/buttons/standard/main_full_screen.png
-share/opera/buttons/standard/main_home.png
-share/opera/buttons/standard/main_hotlist.png
-share/opera/buttons/standard/main_new.png
-share/opera/buttons/standard/main_open.png
-share/opera/buttons/standard/main_print.png
-share/opera/buttons/standard/main_reload.png
-share/opera/buttons/standard/main_save.png
-share/opera/buttons/standard/main_stop.png
-share/opera/buttons/standard/main_tile.png
-share/opera/buttons/standard/news_catch_up.png
-share/opera/buttons/standard/personalbar_bookmark.png
-share/opera/buttons/standard/progress_empty.png
-share/opera/buttons/standard/progress_full.png
-share/opera/buttons/standard/search_music.png
-share/opera/buttons/standard/search_shopping.png
-share/opera/buttons/standard/search_stock.png
-share/opera/buttons/standard/search_web.png
-share/opera/buttons/standard/skin/drop_target_bottom.png
-share/opera/buttons/standard/skin/drop_target_left.png
-share/opera/buttons/standard/skin/drop_target_right.png
-share/opera/buttons/standard/skin/drop_target_top.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_active_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_active_tile_center.png
-share/opera/buttons/standard/skin/pagebar_active_tile_left.png
-share/opera/buttons/standard/skin/pagebar_active_tile_right.png
-share/opera/buttons/standard/skin/pagebar_active_tile_top.png
-share/opera/buttons/standard/skin/pagebar_border_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_border_tile_left.png
-share/opera/buttons/standard/skin/pagebar_border_tile_right.png
-share/opera/buttons/standard/skin/pagebar_border_tile_top.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_center.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_left.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_right.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_top.png
-share/opera/buttons/standard/special_dropdown.png
-share/opera/buttons/standard/transfers_resume.png
-share/opera/buttons/standard/transfers_retransfer.png
-share/opera/buttons/standard/windowbar_doc_complete.png
-share/opera/buttons/standard/windowbar_doc_complete_unread.png
-share/opera/buttons/standard/windowbar_doc_incomplete.png
-share/opera/buttons/standard/windowbar_hotlist.png
-share/opera/buttons/standard/windowbar_mail_box.png
-share/opera/buttons/standard/windowbar_mail_search.png
-share/opera/buttons/standard/windowbar_messaging_new.png
-share/opera/buttons/standard/windowbar_messaging_normal.png
-share/opera/buttons/standard/windowbar_news_article.png
-share/opera/buttons/standard/windowbar_news_group.png
-share/opera/buttons/standard/windowbar_news_group_list.png
-share/opera/buttons/standard/windowbar_transfers.png
-share/opera/buttons/standard/windowbar_unknown.png
 share/opera/chartables.bin
 share/opera/config/opera6rc
 share/opera/config/opera6rc.fixed
-share/opera/help/accessibility.html
 share/opera/help/advertising.html
 share/opera/help/dialogs.html
 share/opera/help/filetypes.html
 share/opera/help/fonts.html
+share/opera/help/glossary.html
 share/opera/help/help.css
 share/opera/help/history.html
+share/opera/help/hotlist.html
 share/opera/help/index.html
-share/opera/help/interface.html
+share/opera/help/input.html
 share/opera/help/keyboard.html
 share/opera/help/languages.html
 share/opera/help/layout.html
 share/opera/help/license.txt
-share/opera/help/look.html
+share/opera/help/m2.html
+share/opera/help/mail.html
 share/opera/help/menus.html
 share/opera/help/mouse.html
 share/opera/help/multimedia.html
 share/opera/help/network.html
-share/opera/help/opera.html
 share/opera/help/page.html
 share/opera/help/paths.html
 share/opera/help/personal.html
-share/opera/help/plugins.html
+share/opera/help/preferences.html
 share/opera/help/privacy.html
 share/opera/help/search.html
+share/opera/help/search.ini
 share/opera/help/security.html
+share/opera/help/skin.html
 share/opera/help/sounds.html
 share/opera/help/start.html
-share/opera/help/startup.txt
-share/opera/help/tipday.txt
+share/opera/help/toc.html
+share/opera/help/toolbars.html
 share/opera/help/windows.html
 share/opera/images/background.gif
 share/opera/images/blank.gif
@@ -349,15 +53,29 @@
 share/opera/images/opera_48x48.png
 share/opera/images/operabanner.png
 share/opera/images/shared.gif
-share/opera/images/splash.png
 share/opera/images/startup1.png
 share/opera/images/startup2.png
-share/opera/java/lc.jar
+share/opera/ini/dialog.ini
+share/opera/ini/fastforward.ini
+share/opera/ini/minimal_toolbar.ini
+share/opera/ini/standard_keyboard.ini
+share/opera/ini/standard_menu.ini
+share/opera/ini/standard_mouse.ini
+share/opera/ini/standard_toolbar.ini
+share/opera/ini/unix_keyboard.ini
 share/opera/java/opera.jar
 share/opera/java/opera.policy
+share/opera/jsconsole.html
+share/opera/lngcode.txt
+share/opera/locale/english.lng
 share/opera/opera6.adr
+share/opera/plugins/libnpp.so
+share/opera/plugins/operamotifwrapper
+share/opera/plugins/operaplugincleaner
 share/opera/search.ini
 share/opera/skin/foreground.png
+share/opera/skin/standard_skin.zip
+share/opera/skin/windows_skin.zip
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -367,26 +85,45 @@
 share/opera/styles/email.css
 share/opera/styles/history.css
 share/opera/styles/im.css
+share/opera/styles/info.css
 share/opera/styles/mime.css
 share/opera/styles/mimehead.css
 share/opera/styles/opf.css
 share/opera/styles/plugins.css
+share/opera/styles/user/accessibility.css
+share/opera/styles/user/contrastbw.css
+share/opera/styles/user/contrastwb.css
+share/opera/styles/user/debugwithoutline.css
+share/opera/styles/user/disabletables.css
+share/opera/styles/user/hidecertainsizes.css
+share/opera/styles/user/hidenonlinkimages.css
+share/opera/styles/user/imageandlinkonly.css
+share/opera/styles/user/nostalgia.css
+share/opera/styles/user/showstructure.css
+share/opera/styles/user/textonly.css
+share/opera/styles/user/userstyle.ini
 share/opera/styles/wml.css
+@dirrm share/opera/styles/user
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
 @dirrm share/opera/locale
 @dirrm share/opera/java
+@dirrm share/opera/ini
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config
-@dirrm share/opera/buttons/standard/skin
-@dirrm share/opera/buttons/standard/icons
-@dirrm share/opera/buttons/standard
-@dirrm share/opera/buttons/examples
-@dirrm share/opera/buttons/defsmall
-@dirrm share/opera/buttons/default
-@dirrm share/opera/buttons
 @dirrm share/opera/bin
 @dirrm share/opera
 @dirrm share/doc/opera
+
+%%KDE:%%share/applnk/Internet/opera.desktop
+%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
+%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
+%%GNOME:%%share/gnome/pixmaps/opera.xpm
+%%KDE2:%%@dirrm share/applnk/Networking/WWW
+
+@cwd /etc/X11
+wmconfig/opera
+%%APPLNK:%%applnk/Internet/opera.desktop
+