Upgrade to 5.05 TP1.

Note that plugins won't work unless you happen to have a Linux version of
Motif (or OpenMotif) installed; there is no linux-openmotif port (yet) so
you'll have to figure this one out on your own.  Once you do, though, both
www/linux-flashplugin and java/linux-jdk13 should work with no further
tweaks (as should any other Netscape-compatible plugin that installs into
${PREFIX}/lib/netscape-linux/plugins).  Happy browsing!

15 files changed, 165 insertions, 480 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 95e6eb617a26..f3e69c722a96 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -5,16 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	linux-opera
-PORTVERSION=	5.0
-PORTREVISION=	1
+PORTNAME=	opera
+PKGNAMEPREFIX=	linux-
+PORTVERSION=	5.05-tp1
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/tgz/500/ \
-		ftp://ftp.opera.com/pub/opera/linux/500/ \
-		ftp://gd.tuwien.ac.at/infosys/browsers/opera/linux/500/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/500/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/500/
-DISTNAME=	opera-${PORTVERSION}-static.i386
+MASTER_SITES=	http://opera.online.no/linux/tgz/505/ \
+		ftp://ftp.opera.com/pub/opera/linux/505/
+DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
+DISTFILES=	${DISTNAME}.x86${EXTRACT_SUFX}
 
 MAINTAINER=	des@FreeBSD.org
 
@@ -25,15 +23,18 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
+NO_FILTER_SHLIBS=yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|;' \
+	    <${FILESDIR}/opera.sh >${WRKSRC}/wrapper.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh \
-	    --exec_prefix=${PREFIX}/bin \
-	    --docdir=${PREFIX}/share/doc/opera \
-	    --sharedir=${PREFIX}/share/opera )
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	    --exec_prefix=${DATADIR}/bin \
+	    --wrapperdir=${PREFIX}/bin \
+	    --docdir=${DOCSDIR} \
+	    --sharedir=${DATADIR} \
+	    --plugindir=${DATADIR}/plugins )
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 7daf93afcea9..c1ed6c23f47a 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-5.0-static.i386.tar.gz) = 779bf93c11634107cce7cb51066e8b25
+MD5 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = b64ef8bbb7d8378589c2edd0c8b918af
diff --git a/www/linux-opera-devel/files/opera.sh b/www/linux-opera-devel/files/opera.sh
index e5f407cea9c9..415bfa641779 100644
--- a/www/linux-opera-devel/files/opera.sh
+++ b/www/linux-opera-devel/files/opera.sh
@@ -1,3 +1,14 @@
 #!/bin/sh
-export OPERA_DIR=%%PREFIX%%/share/opera
-exec %%PREFIX%%/bin/opera-bin "$@"
+OPERA_DIR="%%PREFIX%%/share/opera"
+OPERA_PLUGIN_PATH="%%PREFIX%%/share/opera/plugins"
+for plugin_dir in \
+    %%PREFIX%%/lib/netscape-linux/plugins \
+    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \
+    ;
+do
+    if [ -d "${plugin_dir}" ] ; then
+        OPERA_PLUGIN_PATH="${OPERA_PLUGIN_PATH}:${plugin_dir}"
+    fi
+done
+export OPERA_DIR OPERA_PLUGIN_PATH
+exec %%DATADIR%%/bin/opera-static "$@"
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
index 8b63941ab361..0f11d6f2f90c 100644
--- a/www/linux-opera-devel/files/patch-aa
+++ b/www/linux-opera-devel/files/patch-aa
@@ -1,139 +1,19 @@
---- install.sh.orig	Thu May 10 16:10:28 2001
-+++ install.sh	Wed May 16 13:32:59 2001
-@@ -125,8 +125,8 @@
- runinstall()
- {
-     # Executable
--	cp $v -fp opera $exec_dir/
--        chmod $vv 755 $exec_dir/opera
-+	cp $v -fp opera $exec_dir/opera-bin
-+        chmod $vv 755 $exec_dir/opera-bin
+--- install.sh.orig	Fri Aug 10 14:29:05 2001
++++ install.sh	Tue Aug 14 13:14:35 2001
+@@ -186,14 +186,9 @@
+ 	mkdir $v -p $plugin_dir/
+ 	chmod $vv 755 $plugin_dir
  
-     # Documentation
- 	mkdir $v -p $doc_dir/
-@@ -175,52 +175,46 @@
+-	cp $v -fdp plugins/* $plugin_dir
++	(cd plugins && tar -cf - . | tar $v -xf - -C $plugin_dir)
+         chmod $vv 755 $plugin_dir/operamotifwrapper
+-        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
+-
+-	icons
+-	gnome
+-	kde2
+-	kde
++        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
  
- 	echo
- 	echo 'Installation successful. Enjoy !'
--	if test "$flag_mode" = "--prefix="; then
--	  echo "You've completed a forced installation, please"
--	  echo "remember to set the enviroment variable OPERADIR"
--	  echo "export OPERADIR=$share_dir"
--	fi
--	echo "Start with \$PATH/opera, $exec_dir/opera or ./opera"
- }
- 
- icons()
- {
--    if test ! -d /usr/share/icons; then install $v -m 755 -o 0 -g 0 -d /usr/share/icons/; fi
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/icons/opera.xpm
-+    if test ! -d $share_dir/icons; then install $v -m 755 -o 0 -g 0 -d $share_dir/icons/; fi
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/icons/opera.xpm
-   
--    if test ! -d /usr/share/pixmaps; then install $v -m 755 -o 0 -g 0 -d /usr/share/pixmaps/; fi   
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/pixmaps/opera.xpm
-+    if test ! -d $share_dir/pixmaps; then install $v -m 755 -o 0 -g 0 -d $share_dir/pixmaps/; fi   
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
-   
--    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-+    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-     
-     if test -d /etc/X11/applnk/; then
-       if test ! -d /etc/X11/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-     fi
- }
- 
- gnome()
- {
--    if test -d /opt/gnome/; then
-+    if test -d just_dont/opt/gnome/; then
-       if test ! -d /opt/gnome/share/pixmaps/; then install $v -m 755 -o 0 -g 0 -d /opt/gnome/share/pixmaps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-       if test -d /opt/gnome/share/gnome/apps/Internet/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-       else
-         install $v -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       fi
-     else
--      if test -d /usr/share/gnome/apps/; then
--        if test -d /usr/share/gnome/apps/Internet/; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
--        elif test -d /usr/share/gnome/apps/Networking/WWW; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Networking/WWW/opera.desktop
-+      if test -d $share_dir/gnome/apps/; then
-+        if test -d $share_dir/gnome/apps/Internet/; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-+        elif test -d $share_dir/gnome/apps/Networking/WWW; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Networking/WWW/opera.desktop
-         else
--          install $v -m 755 -o 0 -g 0 -d /usr/share/gnome/apps/Internet/
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
-+          install $v -m 755 -o 0 -g 0 -d $share_dir/gnome/apps/Internet/
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-         fi
-       fi   
-     fi
-@@ -228,7 +222,7 @@
- 
- kde2()
- {
--    if test -d /opt/kde2/; then
-+    if test -d just_dont/opt/kde2/; then
-       DIR_HI=/opt/kde2/share/icons/hicolor
-       DIR_LO=/opt/kde2/share/icons/locolor
-       if test ! -d $DIR_HI/48x48/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_HI/48x48/apps/; fi
-@@ -237,31 +231,31 @@
-       if test ! -d $DIR_LO/32x32/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/32x32/apps/; fi
-       if test ! -d $DIR_LO/22x22/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/22x22/apps/; fi
-       if test ! -d $DIR_LO/16x16/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/16x16/apps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-       if test ! -d /opt/kde2/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde2/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Networking; then
--        if test ! -d /usr/share/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d /usr/share/applnk/Networking/WWW/; fi
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Networking/WWW/opera.desktop
-+      if test -d $share_dir/applnk/Networking; then
-+        if test ! -d $share_dir/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d $share_dir/applnk/Networking/WWW/; fi
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Networking/WWW/opera.desktop
-       fi
-     fi
- }
- 
- kde()
- {
--    if test -d /opt/kde/; then
-+    if test -d just_dont/opt/kde/; then
-       if test ! -d /opt/kde/share/icons/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/icons/; fi
-       if test ! -d /opt/kde/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Internet/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Internet/opera.desktop; fi
-+      if test -d $share_dir/applnk/Internet/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Internet/opera.desktop; fi
-     fi
- }
+ # Add uninstallation here
  
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index e85929c290d8..7683bb347ac0 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,6 +1,8 @@
 bin/opera
-bin/opera-bin
 share/doc/opera/LICENSE
+share/opera/bin/opera-static
+share/opera/buttons/DefSmall
+share/opera/buttons/Default
 share/opera/buttons/ReadMe.txt
 share/opera/buttons/default/abc.gif
 share/opera/buttons/default/buttons.ini
@@ -142,8 +144,6 @@ 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/DefSmall
-share/opera/buttons/Default
 share/opera/help/access.htm
 share/opera/help/alpha.htm
 share/opera/help/bookmark.htm
@@ -162,7 +162,6 @@ share/opera/help/security.htm
 share/opera/help/starter.htm
 share/opera/help/terms.htm
 share/opera/help/trouble.htm
-share/opera/icons/opera.xpm
 share/opera/images/background.gif
 share/opera/images/blank.gif
 share/opera/images/drive.gif
@@ -178,7 +177,11 @@ share/opera/opera_16x16.png
 share/opera/opera_22x22.png
 share/opera/opera_32x32.png
 share/opera/opera_48x48.png
-share/opera/pixmaps/opera.xpm
+share/opera/plugins/libnpp.so
+share/opera/plugins/libnpp.so.0
+share/opera/plugins/libnpp.so.0.1
+share/opera/plugins/libnpp.so.0.1.1
+share/opera/plugins/operamotifwrapper
 share/opera/styles/OPF.CSS
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -193,13 +196,13 @@ share/opera/styles/mimehead.css
 share/opera/styles/plugins.css
 share/opera/styles/wml.css
 @dirrm share/opera/styles
-@dirrm share/opera/pixmaps
+@dirrm share/opera/plugins
 @dirrm share/opera/images
-@dirrm share/opera/icons
 @dirrm share/opera/help
 @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
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 95e6eb617a26..f3e69c722a96 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -5,16 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	linux-opera
-PORTVERSION=	5.0
-PORTREVISION=	1
+PORTNAME=	opera
+PKGNAMEPREFIX=	linux-
+PORTVERSION=	5.05-tp1
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/tgz/500/ \
-		ftp://ftp.opera.com/pub/opera/linux/500/ \
-		ftp://gd.tuwien.ac.at/infosys/browsers/opera/linux/500/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/500/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/500/
-DISTNAME=	opera-${PORTVERSION}-static.i386
+MASTER_SITES=	http://opera.online.no/linux/tgz/505/ \
+		ftp://ftp.opera.com/pub/opera/linux/505/
+DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
+DISTFILES=	${DISTNAME}.x86${EXTRACT_SUFX}
 
 MAINTAINER=	des@FreeBSD.org
 
@@ -25,15 +23,18 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
+NO_FILTER_SHLIBS=yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|;' \
+	    <${FILESDIR}/opera.sh >${WRKSRC}/wrapper.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh \
-	    --exec_prefix=${PREFIX}/bin \
-	    --docdir=${PREFIX}/share/doc/opera \
-	    --sharedir=${PREFIX}/share/opera )
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	    --exec_prefix=${DATADIR}/bin \
+	    --wrapperdir=${PREFIX}/bin \
+	    --docdir=${DOCSDIR} \
+	    --sharedir=${DATADIR} \
+	    --plugindir=${DATADIR}/plugins )
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 7daf93afcea9..c1ed6c23f47a 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-5.0-static.i386.tar.gz) = 779bf93c11634107cce7cb51066e8b25
+MD5 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = b64ef8bbb7d8378589c2edd0c8b918af
diff --git a/www/linux-opera/files/opera.sh b/www/linux-opera/files/opera.sh
index e5f407cea9c9..415bfa641779 100644
--- a/www/linux-opera/files/opera.sh
+++ b/www/linux-opera/files/opera.sh
@@ -1,3 +1,14 @@
 #!/bin/sh
-export OPERA_DIR=%%PREFIX%%/share/opera
-exec %%PREFIX%%/bin/opera-bin "$@"
+OPERA_DIR="%%PREFIX%%/share/opera"
+OPERA_PLUGIN_PATH="%%PREFIX%%/share/opera/plugins"
+for plugin_dir in \
+    %%PREFIX%%/lib/netscape-linux/plugins \
+    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \
+    ;
+do
+    if [ -d "${plugin_dir}" ] ; then
+        OPERA_PLUGIN_PATH="${OPERA_PLUGIN_PATH}:${plugin_dir}"
+    fi
+done
+export OPERA_DIR OPERA_PLUGIN_PATH
+exec %%DATADIR%%/bin/opera-static "$@"
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
index 8b63941ab361..0f11d6f2f90c 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/files/patch-aa
@@ -1,139 +1,19 @@
---- install.sh.orig	Thu May 10 16:10:28 2001
-+++ install.sh	Wed May 16 13:32:59 2001
-@@ -125,8 +125,8 @@
- runinstall()
- {
-     # Executable
--	cp $v -fp opera $exec_dir/
--        chmod $vv 755 $exec_dir/opera
-+	cp $v -fp opera $exec_dir/opera-bin
-+        chmod $vv 755 $exec_dir/opera-bin
+--- install.sh.orig	Fri Aug 10 14:29:05 2001
++++ install.sh	Tue Aug 14 13:14:35 2001
+@@ -186,14 +186,9 @@
+ 	mkdir $v -p $plugin_dir/
+ 	chmod $vv 755 $plugin_dir
  
-     # Documentation
- 	mkdir $v -p $doc_dir/
-@@ -175,52 +175,46 @@
+-	cp $v -fdp plugins/* $plugin_dir
++	(cd plugins && tar -cf - . | tar $v -xf - -C $plugin_dir)
+         chmod $vv 755 $plugin_dir/operamotifwrapper
+-        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
+-
+-	icons
+-	gnome
+-	kde2
+-	kde
++        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
  
- 	echo
- 	echo 'Installation successful. Enjoy !'
--	if test "$flag_mode" = "--prefix="; then
--	  echo "You've completed a forced installation, please"
--	  echo "remember to set the enviroment variable OPERADIR"
--	  echo "export OPERADIR=$share_dir"
--	fi
--	echo "Start with \$PATH/opera, $exec_dir/opera or ./opera"
- }
- 
- icons()
- {
--    if test ! -d /usr/share/icons; then install $v -m 755 -o 0 -g 0 -d /usr/share/icons/; fi
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/icons/opera.xpm
-+    if test ! -d $share_dir/icons; then install $v -m 755 -o 0 -g 0 -d $share_dir/icons/; fi
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/icons/opera.xpm
-   
--    if test ! -d /usr/share/pixmaps; then install $v -m 755 -o 0 -g 0 -d /usr/share/pixmaps/; fi   
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/pixmaps/opera.xpm
-+    if test ! -d $share_dir/pixmaps; then install $v -m 755 -o 0 -g 0 -d $share_dir/pixmaps/; fi   
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
-   
--    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-+    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-     
-     if test -d /etc/X11/applnk/; then
-       if test ! -d /etc/X11/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-     fi
- }
- 
- gnome()
- {
--    if test -d /opt/gnome/; then
-+    if test -d just_dont/opt/gnome/; then
-       if test ! -d /opt/gnome/share/pixmaps/; then install $v -m 755 -o 0 -g 0 -d /opt/gnome/share/pixmaps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-       if test -d /opt/gnome/share/gnome/apps/Internet/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-       else
-         install $v -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       fi
-     else
--      if test -d /usr/share/gnome/apps/; then
--        if test -d /usr/share/gnome/apps/Internet/; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
--        elif test -d /usr/share/gnome/apps/Networking/WWW; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Networking/WWW/opera.desktop
-+      if test -d $share_dir/gnome/apps/; then
-+        if test -d $share_dir/gnome/apps/Internet/; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-+        elif test -d $share_dir/gnome/apps/Networking/WWW; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Networking/WWW/opera.desktop
-         else
--          install $v -m 755 -o 0 -g 0 -d /usr/share/gnome/apps/Internet/
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
-+          install $v -m 755 -o 0 -g 0 -d $share_dir/gnome/apps/Internet/
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-         fi
-       fi   
-     fi
-@@ -228,7 +222,7 @@
- 
- kde2()
- {
--    if test -d /opt/kde2/; then
-+    if test -d just_dont/opt/kde2/; then
-       DIR_HI=/opt/kde2/share/icons/hicolor
-       DIR_LO=/opt/kde2/share/icons/locolor
-       if test ! -d $DIR_HI/48x48/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_HI/48x48/apps/; fi
-@@ -237,31 +231,31 @@
-       if test ! -d $DIR_LO/32x32/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/32x32/apps/; fi
-       if test ! -d $DIR_LO/22x22/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/22x22/apps/; fi
-       if test ! -d $DIR_LO/16x16/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/16x16/apps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-       if test ! -d /opt/kde2/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde2/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Networking; then
--        if test ! -d /usr/share/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d /usr/share/applnk/Networking/WWW/; fi
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Networking/WWW/opera.desktop
-+      if test -d $share_dir/applnk/Networking; then
-+        if test ! -d $share_dir/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d $share_dir/applnk/Networking/WWW/; fi
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Networking/WWW/opera.desktop
-       fi
-     fi
- }
- 
- kde()
- {
--    if test -d /opt/kde/; then
-+    if test -d just_dont/opt/kde/; then
-       if test ! -d /opt/kde/share/icons/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/icons/; fi
-       if test ! -d /opt/kde/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Internet/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Internet/opera.desktop; fi
-+      if test -d $share_dir/applnk/Internet/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Internet/opera.desktop; fi
-     fi
- }
+ # Add uninstallation here
  
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index e85929c290d8..7683bb347ac0 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,6 +1,8 @@
 bin/opera
-bin/opera-bin
 share/doc/opera/LICENSE
+share/opera/bin/opera-static
+share/opera/buttons/DefSmall
+share/opera/buttons/Default
 share/opera/buttons/ReadMe.txt
 share/opera/buttons/default/abc.gif
 share/opera/buttons/default/buttons.ini
@@ -142,8 +144,6 @@ 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/DefSmall
-share/opera/buttons/Default
 share/opera/help/access.htm
 share/opera/help/alpha.htm
 share/opera/help/bookmark.htm
@@ -162,7 +162,6 @@ share/opera/help/security.htm
 share/opera/help/starter.htm
 share/opera/help/terms.htm
 share/opera/help/trouble.htm
-share/opera/icons/opera.xpm
 share/opera/images/background.gif
 share/opera/images/blank.gif
 share/opera/images/drive.gif
@@ -178,7 +177,11 @@ share/opera/opera_16x16.png
 share/opera/opera_22x22.png
 share/opera/opera_32x32.png
 share/opera/opera_48x48.png
-share/opera/pixmaps/opera.xpm
+share/opera/plugins/libnpp.so
+share/opera/plugins/libnpp.so.0
+share/opera/plugins/libnpp.so.0.1
+share/opera/plugins/libnpp.so.0.1.1
+share/opera/plugins/operamotifwrapper
 share/opera/styles/OPF.CSS
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -193,13 +196,13 @@ share/opera/styles/mimehead.css
 share/opera/styles/plugins.css
 share/opera/styles/wml.css
 @dirrm share/opera/styles
-@dirrm share/opera/pixmaps
+@dirrm share/opera/plugins
 @dirrm share/opera/images
-@dirrm share/opera/icons
 @dirrm share/opera/help
 @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
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 95e6eb617a26..f3e69c722a96 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -5,16 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	linux-opera
-PORTVERSION=	5.0
-PORTREVISION=	1
+PORTNAME=	opera
+PKGNAMEPREFIX=	linux-
+PORTVERSION=	5.05-tp1
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/tgz/500/ \
-		ftp://ftp.opera.com/pub/opera/linux/500/ \
-		ftp://gd.tuwien.ac.at/infosys/browsers/opera/linux/500/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/500/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/500/
-DISTNAME=	opera-${PORTVERSION}-static.i386
+MASTER_SITES=	http://opera.online.no/linux/tgz/505/ \
+		ftp://ftp.opera.com/pub/opera/linux/505/
+DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
+DISTFILES=	${DISTNAME}.x86${EXTRACT_SUFX}
 
 MAINTAINER=	des@FreeBSD.org
 
@@ -25,15 +23,18 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
+NO_FILTER_SHLIBS=yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|;' \
+	    <${FILESDIR}/opera.sh >${WRKSRC}/wrapper.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh \
-	    --exec_prefix=${PREFIX}/bin \
-	    --docdir=${PREFIX}/share/doc/opera \
-	    --sharedir=${PREFIX}/share/opera )
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	    --exec_prefix=${DATADIR}/bin \
+	    --wrapperdir=${PREFIX}/bin \
+	    --docdir=${DOCSDIR} \
+	    --sharedir=${DATADIR} \
+	    --plugindir=${DATADIR}/plugins )
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index 7daf93afcea9..c1ed6c23f47a 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-5.0-static.i386.tar.gz) = 779bf93c11634107cce7cb51066e8b25
+MD5 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = b64ef8bbb7d8378589c2edd0c8b918af
diff --git a/www/linux-opera7/files/opera.sh b/www/linux-opera7/files/opera.sh
index e5f407cea9c9..415bfa641779 100644
--- a/www/linux-opera7/files/opera.sh
+++ b/www/linux-opera7/files/opera.sh
@@ -1,3 +1,14 @@
 #!/bin/sh
-export OPERA_DIR=%%PREFIX%%/share/opera
-exec %%PREFIX%%/bin/opera-bin "$@"
+OPERA_DIR="%%PREFIX%%/share/opera"
+OPERA_PLUGIN_PATH="%%PREFIX%%/share/opera/plugins"
+for plugin_dir in \
+    %%PREFIX%%/lib/netscape-linux/plugins \
+    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \
+    ;
+do
+    if [ -d "${plugin_dir}" ] ; then
+        OPERA_PLUGIN_PATH="${OPERA_PLUGIN_PATH}:${plugin_dir}"
+    fi
+done
+export OPERA_DIR OPERA_PLUGIN_PATH
+exec %%DATADIR%%/bin/opera-static "$@"
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 8b63941ab361..0f11d6f2f90c 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,139 +1,19 @@
---- install.sh.orig	Thu May 10 16:10:28 2001
-+++ install.sh	Wed May 16 13:32:59 2001
-@@ -125,8 +125,8 @@
- runinstall()
- {
-     # Executable
--	cp $v -fp opera $exec_dir/
--        chmod $vv 755 $exec_dir/opera
-+	cp $v -fp opera $exec_dir/opera-bin
-+        chmod $vv 755 $exec_dir/opera-bin
+--- install.sh.orig	Fri Aug 10 14:29:05 2001
++++ install.sh	Tue Aug 14 13:14:35 2001
+@@ -186,14 +186,9 @@
+ 	mkdir $v -p $plugin_dir/
+ 	chmod $vv 755 $plugin_dir
  
-     # Documentation
- 	mkdir $v -p $doc_dir/
-@@ -175,52 +175,46 @@
+-	cp $v -fdp plugins/* $plugin_dir
++	(cd plugins && tar -cf - . | tar $v -xf - -C $plugin_dir)
+         chmod $vv 755 $plugin_dir/operamotifwrapper
+-        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
+-
+-	icons
+-	gnome
+-	kde2
+-	kde
++        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
  
- 	echo
- 	echo 'Installation successful. Enjoy !'
--	if test "$flag_mode" = "--prefix="; then
--	  echo "You've completed a forced installation, please"
--	  echo "remember to set the enviroment variable OPERADIR"
--	  echo "export OPERADIR=$share_dir"
--	fi
--	echo "Start with \$PATH/opera, $exec_dir/opera or ./opera"
- }
- 
- icons()
- {
--    if test ! -d /usr/share/icons; then install $v -m 755 -o 0 -g 0 -d /usr/share/icons/; fi
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/icons/opera.xpm
-+    if test ! -d $share_dir/icons; then install $v -m 755 -o 0 -g 0 -d $share_dir/icons/; fi
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/icons/opera.xpm
-   
--    if test ! -d /usr/share/pixmaps; then install $v -m 755 -o 0 -g 0 -d /usr/share/pixmaps/; fi   
--    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/pixmaps/opera.xpm
-+    if test ! -d $share_dir/pixmaps; then install $v -m 755 -o 0 -g 0 -d $share_dir/pixmaps/; fi   
-+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
-   
--    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-+    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
-     
-     if test -d /etc/X11/applnk/; then
-       if test ! -d /etc/X11/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
-     fi
- }
- 
- gnome()
- {
--    if test -d /opt/gnome/; then
-+    if test -d just_dont/opt/gnome/; then
-       if test ! -d /opt/gnome/share/pixmaps/; then install $v -m 755 -o 0 -g 0 -d /opt/gnome/share/pixmaps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-       if test -d /opt/gnome/share/gnome/apps/Internet/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
-       else
-         install $v -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
-       fi
-     else
--      if test -d /usr/share/gnome/apps/; then
--        if test -d /usr/share/gnome/apps/Internet/; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
--        elif test -d /usr/share/gnome/apps/Networking/WWW; then
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Networking/WWW/opera.desktop
-+      if test -d $share_dir/gnome/apps/; then
-+        if test -d $share_dir/gnome/apps/Internet/; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-+        elif test -d $share_dir/gnome/apps/Networking/WWW; then
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Networking/WWW/opera.desktop
-         else
--          install $v -m 755 -o 0 -g 0 -d /usr/share/gnome/apps/Internet/
--          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
-+          install $v -m 755 -o 0 -g 0 -d $share_dir/gnome/apps/Internet/
-+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
-         fi
-       fi   
-     fi
-@@ -228,7 +222,7 @@
- 
- kde2()
- {
--    if test -d /opt/kde2/; then
-+    if test -d just_dont/opt/kde2/; then
-       DIR_HI=/opt/kde2/share/icons/hicolor
-       DIR_LO=/opt/kde2/share/icons/locolor
-       if test ! -d $DIR_HI/48x48/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_HI/48x48/apps/; fi
-@@ -237,31 +231,31 @@
-       if test ! -d $DIR_LO/32x32/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/32x32/apps/; fi
-       if test ! -d $DIR_LO/22x22/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/22x22/apps/; fi
-       if test ! -d $DIR_LO/16x16/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/16x16/apps/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
--      install $v -m 644 -o 0 -g 0 $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-       if test ! -d /opt/kde2/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde2/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Networking; then
--        if test ! -d /usr/share/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d /usr/share/applnk/Networking/WWW/; fi
--        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Networking/WWW/opera.desktop
-+      if test -d $share_dir/applnk/Networking; then
-+        if test ! -d $share_dir/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d $share_dir/applnk/Networking/WWW/; fi
-+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Networking/WWW/opera.desktop
-       fi
-     fi
- }
- 
- kde()
- {
--    if test -d /opt/kde/; then
-+    if test -d just_dont/opt/kde/; then
-       if test ! -d /opt/kde/share/icons/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/icons/; fi
-       if test ! -d /opt/kde/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/applnk/Internet/; fi
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
--      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
-+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
-     else
--      if test -d /usr/share/applnk/Internet/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Internet/opera.desktop; fi
-+      if test -d $share_dir/applnk/Internet/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Internet/opera.desktop; fi
-     fi
- }
+ # Add uninstallation here
  
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index e85929c290d8..7683bb347ac0 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -1,6 +1,8 @@
 bin/opera
-bin/opera-bin
 share/doc/opera/LICENSE
+share/opera/bin/opera-static
+share/opera/buttons/DefSmall
+share/opera/buttons/Default
 share/opera/buttons/ReadMe.txt
 share/opera/buttons/default/abc.gif
 share/opera/buttons/default/buttons.ini
@@ -142,8 +144,6 @@ 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/DefSmall
-share/opera/buttons/Default
 share/opera/help/access.htm
 share/opera/help/alpha.htm
 share/opera/help/bookmark.htm
@@ -162,7 +162,6 @@ share/opera/help/security.htm
 share/opera/help/starter.htm
 share/opera/help/terms.htm
 share/opera/help/trouble.htm
-share/opera/icons/opera.xpm
 share/opera/images/background.gif
 share/opera/images/blank.gif
 share/opera/images/drive.gif
@@ -178,7 +177,11 @@ share/opera/opera_16x16.png
 share/opera/opera_22x22.png
 share/opera/opera_32x32.png
 share/opera/opera_48x48.png
-share/opera/pixmaps/opera.xpm
+share/opera/plugins/libnpp.so
+share/opera/plugins/libnpp.so.0
+share/opera/plugins/libnpp.so.0.1
+share/opera/plugins/libnpp.so.0.1.1
+share/opera/plugins/operamotifwrapper
 share/opera/styles/OPF.CSS
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -193,13 +196,13 @@ share/opera/styles/mimehead.css
 share/opera/styles/plugins.css
 share/opera/styles/wml.css
 @dirrm share/opera/styles
-@dirrm share/opera/pixmaps
+@dirrm share/opera/plugins
 @dirrm share/opera/images
-@dirrm share/opera/icons
 @dirrm share/opera/help
 @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