* Update to 7.21

* Add a CONFLICT on www/opera [1]

PR:		58023
Submitted by:	maintainer
Obtained from:	Oliver Eikemeier <eikemeier@fillmore-labs.com> [1]

5 files changed, 144 insertions, 100 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index cc50d0628edb..2d1f291fc60e 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.11.20030515
-PORTREVISION=	2
+PORTVERSION=	7.21.20031013
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/711/final/en/i386/static/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/721/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2003/-2003/}.1-static-qt.i386
 
 MAINTAINER=	mezz7@cox.net
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
+CONFLICTS=	opera-*
 RESTRICTED=	"not redistributable; commercial software"
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif
@@ -43,13 +43,13 @@ PLIST_SUB+=	GNOME:=""
 PLIST_SUB+=	GNOME:="@comment "
 .endif
 
-.if exists(${X11BASE}/share/applnk/Internet)
+.if exists(${LOCALBASE}/share/applnk/Internet)
 PLIST_SUB+=	KDE:=""
 .else
 PLIST_SUB+=	KDE:="@comment "
 .endif
 
-.if exists(${X11BASE}/share/applnk/Networking)
+.if exists(${LOCALBASE}/share/applnk/Networking)
 PLIST_SUB+=	KDE2:=""
 .else
 PLIST_SUB+=	KDE2:="@comment "
@@ -62,8 +62,9 @@ PLIST_SUB+=	GNOMELNK:="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
+			${WRKSRC}/install.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index c53aaca8b6a5..aaea43db2a7f 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-7.11-20030515.1-static-qt.i386.tar.bz2) = 5dacb87719576669d4c6e56df5a68fdd
+MD5 (opera-7.21-20031013.1-static-qt.i386.tar.bz2) = 40a1287ffd0c7b9dfa60c278e15dce43
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index e1ecec30a68f..c35b02cd5733 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,9 +1,18 @@
---- install.sh.orig	Thu May 15 11:36:54 2003
-+++ install.sh	Tue May 20 18:11:25 2003
-@@ -712,27 +712,17 @@
+--- install.sh.orig	Mon Oct 13 17:19:39 2003
++++ install.sh	Mon Oct 13 17:26:37 2003
+@@ -180,7 +180,7 @@
+     echo '      --help=long              show advanced functions'
+     echo
+     echo 'If you choose to do a standard locations install, files will be put into'
+-    echo '/usr/bin, /usr/share/doc/opera and /usr/share/opera.'
++    echo '/usr/bin, %%PREFIX%%/share/doc/opera and %%PREFIX%%/share/opera.'
+     echo
+     echo 'However, if you choose to install to user defined locations, you must either'
+     echo '  specify one directory (all files will be put in this directory), or'
+@@ -760,23 +760,18 @@
  
      wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
-     ${plugin_dir} \\
+     ${str_localdirplugin} \\
 -    /usr/lib/opera/plugins \\
 -    /usr/local/lib/opera/plugins \\
 -    /opt/lib/opera/plugins \\"
@@ -16,25 +25,21 @@
 -    /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 \\"
-+    %%LOCALBASE%%/Acrobat[45]/Browsers/intellinux \\
-+    %%LOCALBASE%%/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
-+    %%LOCALBASE%%/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
+-    /usr/Acrobat[45]/Browsers/intellinux \\"
++    %%LOCALBASE%%/Acrobat4/Browsers/intellinux \\
++    %%LOCALBASE%%/Acrobat5/Browsers/intellinux \\"
+ 
  	    wrapper_ibmjava="
+-	    IBMJava2-141/jre \\
 -	    IBMJava2-14/jre \\
 -	    IBMJava2-131/jre \\"
 +	    linux-ibm-jdk1.3.1/jre \\
-+	    linux-ibm-jdk1.4.0/jre \\"
++	    linux-ibm-jdk1.4.0/jre \\
++	    linux-ibm-jdk1.4.1/jre \\"
  	    wrapper_sunjava_machine="i386"
  	;;
  
-@@ -779,15 +769,9 @@
+@@ -817,15 +812,9 @@
  	;;
      esac
      wrapper_netscape_plugin_paths="
@@ -52,7 +57,7 @@
  
      wrapper_file="${wrapper_dir}/opera"
      
-@@ -839,28 +823,13 @@
+@@ -887,39 +876,14 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -65,8 +70,14 @@
 +    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	j2re1.4.2_01 \\
+-	j2sdk1.4.2_01/jre \\
+-	j2re1.4.2 \\
+-	j2sdk1.4.2/jre \\
 -	j2re1.4.1_01 \\
 -	j2re1.4.1 \\
+-	SUNJava2-1.4.1 \\
+-	BlackdownJava2-1.4.1/jre \\
 -	j2re1.4.0_01 \\
 -	j2sdk1.4.0_01/jre \\
 -	j2re1.4.0 \\
@@ -79,14 +90,20 @@
 -	j2re1.3.1 \\
 -	jre1.3.1 \\
 -	j2re1.3 \\
+-	j2se/1.3/jre \\
+-	java2re \\
+-	jdk1.2.2/jre \\
+-	jdk1.2/jre \\
+-	jre \\
 +	linux-blackdown-jdk1.3.1/jre \\
 +	linux-blackdown-jdk1.4.1/jre \\
 +	linux-sun-jdk1.3.1/jre \\
 +	linux-sun-jdk1.4.1/jre \\
++	linux-sun-jdk1.4.2/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
-@@ -905,11 +874,8 @@
+@@ -983,11 +947,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -100,10 +117,10 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1106,8 +1072,9 @@
-         chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
+@@ -1246,8 +1207,9 @@
+ 	if test -z "${OPERADESTDIR}"; then
  
-      # System wide configuration files
+ 	# System wide configuration files
 -	config_dir="/etc"
 +	config_dir="$prefix/etc"
  	if can_write_to "$config_dir"; then
@@ -111,15 +128,15 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1134,6 +1101,7 @@
- 			;;
- 		esac
- 	    done
+@@ -1259,6 +1221,7 @@
+ 		cp $cpv $cpf config/opera6rc $config_dir
+ 		cp $cpv $cpf config/opera6rc.fixed $config_dir
+ 	    fi
 +fi # XXX
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1238,22 +1206,22 @@
+@@ -1358,22 +1321,22 @@
  
      debug_msg 0 "in icons()"
  
@@ -128,14 +145,14 @@
 -        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 %%X11PREFIX%%/share/icons; then
-+      if test -w %%X11PREFIX%%/share; then
-+        mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/icons/
-+	chmod $chmodv 755 %%X11PREFIX%%/share/icons
-+	cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
++    if test ! -d %%X11BASE%%/share/icons; then
++      if test -w %%X11BASE%%/share; then
++        mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/
++	chmod $chmodv 755 %%X11BASE%%/share/icons
++	cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/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 %%X11PREFIX%%/share/icons; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
++    elif test -w %%X11BASE%%/share/icons; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/icons/opera.xpm
      fi
    
 -    if test ! -d /usr/share/pixmaps; then
@@ -143,23 +160,23 @@
 -	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 %%X11PREFIX%%/share/pixmaps; then
-+      if test -w %%X11PREFIX%%/share; then
-+	mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/pixmaps/
-+	chmod $chmodv 755 %%X11PREFIX%%/share/pixmaps
-+	cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
++    if test ! -d %%X11BASE%%/share/pixmaps; then
++      if test -w %%X11BASE%%/share; then
++	mkdir $mkdirv $mkdirp %%X11BASE%%/share/pixmaps/
++	chmod $chmodv 755 %%X11BASE%%/share/pixmaps
++	cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/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 %%X11PREFIX%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
++    elif test -w %%X11BASE%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/opera.xpm
      fi
    
      if test ! -d /etc/X11/wmconfig/; then
-@@ -1319,36 +1287,36 @@
+@@ -1439,36 +1402,36 @@
        fi
        # end /opt/gnome share
  
 -    elif test -d /usr/share/gnome/; then
-+    elif test -d %%X11PREFIX%%/share/gnome/; then
++    elif test -d %%X11BASE%%/share/gnome/; then
  
 -        # /usr/share/gnome icon
 -        if test ! -d /usr/share/gnome/pixmaps/; then
@@ -167,53 +184,53 @@
 -	    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
-+        # %%X11PREFIX%%/share/gnome icon
-+        if test ! -d %%X11PREFIX%%/share/gnome/pixmaps/; then
-+	  if test -w %%X11PREFIX%%/share/gnome; then
-+	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/pixmaps/
-+	    chmod $chmodv 755 %%X11PREFIX%%/share/gnome/pixmaps
-+	    cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/gnome/pixmaps/opera.xpm
++        # %%X11BASE%%/share/gnome icon
++        if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
++	  if test -w %%X11BASE%%/share/gnome; then
++	    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 /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-+	elif test -w %%X11PREFIX%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/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 /usr/share/gnome icon
-+	# end %%X11PREFIX%%/share/gnome icon
++	# end %%X11BASE%%/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
-+	# %%X11PREFIX%%/share/gnome link
-+	if test -d %%X11PREFIX%%/share/gnome/apps/; then
-+          if test -d %%X11PREFIX%%/share/gnome/apps/Internet/; then
-+            if test -w %%X11PREFIX%%/share/gnome/apps/Internet; then
-+              generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
++	# %%X11BASE%%/share/gnome link
++	if test -d %%X11BASE%%/share/gnome/apps/; then
++          if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
++            if test -w %%X11BASE%%/share/gnome/apps/Internet; then
++              generate_desktop %%X11BASE%%/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 %%X11PREFIX%%/share/gnome/apps/Networking/WWW/; then
-+            if test -w %%X11PREFIX%%/share/gnome/apps/Networking/WWW; then
-+	     generate_desktop %%X11PREFIX%%/share/gnome/apps/Networking/WWW
++          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
++            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
++	     generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /usr/share/gnome/apps; then
--	    mkdir $mkdirv $mkdirp/usr/share/gnome/apps/Internet/
+-	    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 %%X11PREFIX%%/share/gnome/apps; then
-+	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/apps/Internet/
-+	    chmod $chmodv 755 %%X11PREFIX%%/share/gnome/apps/Internet
-+            generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
++	  elif test -w %%X11BASE%%/share/gnome/apps; then
++	    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 /usr/share/gnome link
-+	# end %%X11PREFIX%%/share/gnome link
++	# end %%X11BASE%%/share/gnome link
     fi
     # Add ximian here
  }
-@@ -1385,12 +1353,12 @@
+@@ -1505,12 +1468,12 @@
  
      fi  
      
@@ -221,24 +238,45 @@
 -      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 %%X11PREFIX%%/share/applnk/Networking; then
-+      if test ! -d %%X11PREFIX%%/share/applnk/Networking/WWW/ -a -w %%X11PREFIX%%/share/applnk/Networking; then
-+	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/applnk/Networking/WWW/
-+	    chmod $chmodv 755 %%X11PREFIX%%/share/applnk/Networking/WWW
++    if test -d %%LOCALBASE%%/share/applnk/Networking; then
++      if test ! -d %%LOCALBASE%%/share/applnk/Networking/WWW/ -a -w %%LOCALBASE%%/share/applnk/Networking; then
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Networking/WWW/
++	    chmod $chmodv 755 %%LOCALBASE%%/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 %%X11PREFIX%%/share/applnk/Networking/WWW; then generate_desktop %%X11PREFIX%%/share/applnk/Networking/WWW ${1}; fi
++      if test -w %%LOCALBASE%%/share/applnk/Networking/WWW; then generate_desktop %%LOCALBASE%%/share/applnk/Networking/WWW ${1}; fi
      fi
  }
  
-@@ -1414,8 +1382,8 @@
+@@ -1534,8 +1497,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 %%X11PREFIX%%/share/applnk/Internet/ -a -w %%X11PREFIX%%/share/applnk/Internet; then
-+      generate_desktop %%X11PREFIX%%/share/applnk/Internet
++    elif test -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk/Internet; then
++      generate_desktop %%LOCALBASE%%/share/applnk/Internet
      fi
  }
  
+@@ -1546,14 +1509,14 @@
+ 	test ! -d /usr/lib/menu && test -w /usr/lib && mkdir $mkdirv $mkdirp /usr/lib/menu/
+ 	test -d /usr/lib/menu && generate_mdk_menu /usr/lib/menu
+ 
+-	test ! -d /usr/share/icons && test -w /usr/share && mkdir $mkdirv $mkdirp /usr/share/icons/ && chmod $chmodv 755 /usr/share/icons
+-	test -d /usr/share/icons && cp $cpv $share_dir/images/opera_32x32.png /usr/share/icons/opera.png
++	test ! -d %%X11BASE%%/share/icons && test -w %%X11BASE%%/share && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/ && chmod $chmodv 755 %%X11BASE%%/share/icons
++	test -d %%X11BASE%%/share/icons && cp $cpv $share_dir/images/opera_32x32.png %%X11BASE%%/share/icons/opera.png
+ 
+-	test ! -d /usr/share/icons/mini && test -w /usr/share/icons && mkdir $mkdirv $mkdirp /usr/share/icons/mini/ && chmod $chmodv 755 /usr/share/icons/mini
+-	test -d /usr/share/icons/mini && cp $cpv $share_dir/images/opera_16x16.png /usr/share/icons/mini/opera.png
++	test ! -d %%X11BASE%%/share/icons/mini && test -w %%X11BASE%%/share/icons && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/mini/ && chmod $chmodv 755 %%X11BASE%%/share/icons/mini
++	test -d %%X11BASE%%/share/icons/mini && cp $cpv $share_dir/images/opera_16x16.png %%X11BASE%%/share/icons/mini/opera.png
+ 
+-	test ! -d /usr/share/icons/large && test -w /usr/share/icons && mkdir $mkdirv $mkdirp /usr/share/icons/large && chmod $chmodv 755 /usr/share/icons/large
+-	test -d /usr/share/icons/large && cp $cpv $share_dir/images/opera_48x48.png /usr/share/icons/large/opera.png
++	test ! -d %%X11BASE%%/share/icons/large && test -w %%X11BASE%%/share/icons && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/large && chmod $chmodv 755 %%X11BASE%%/share/icons/large
++	test -d %%X11BASE%%/share/icons/large && cp $cpv $share_dir/images/opera_48x48.png %%X11BASE%%/share/icons/large/opera.png
+ 
+ 	/usr/bin/update-menus || true
+     fi
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index ba122bc86983..c74cc20a748a 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,7 +1,8 @@
-Changelogs for 7.11 Final: http://www.opera.com/linux/changelogs/711/
+##
+Changelogs for 7.21 Final: http://www.opera.com/linux/changelogs/721/
 
-If you are upgrade from version 6 final or 7 development, it might be a good
-idea to backup your personal "~/.opera" directory and remove it. This can be
-done from the command line using "cp -Rp ~/.opera ~/.opera-mybackup" and
+If you are upgrade from version 6 final, 7 development or 7.11, it might be a
+good idea to backup your personal "~/.opera" directory and remove it. This can
+be done from the command line using "cp -Rp ~/.opera ~/.opera-mybackup" and
 "rm -rf ~/.opera".
-
+##
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 60d44d0b274a..4f0c66874159 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -3,16 +3,14 @@ share/doc/opera/LICENSE
 share/doc/opera/help
 share/icons/opera.xpm
 share/opera/bin/m2.so
+share/opera/bin/missingsyms.so
 share/opera/bin/opera
+share/opera/bin/works
 share/opera/chartables.bin
 share/opera/config/opera6rc
 share/opera/config/opera6rc.fixed
-share/opera/conmsg.html
-share/opera/console.html
-share/opera/contool.html
-share/opera/help/accessibility.html
 share/opera/help/advertising.html
-share/opera/help/context.html
+share/opera/help/background.png
 share/opera/help/dialogs.html
 share/opera/help/filetypes.html
 share/opera/help/fonts.html
@@ -21,27 +19,29 @@ share/opera/help/help.css
 share/opera/help/history.html
 share/opera/help/hotlist.html
 share/opera/help/index.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/main.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/page.html
 share/opera/help/paths.html
 share/opera/help/personal.html
+share/opera/help/preferences.html
 share/opera/help/privacy.html
 share/opera/help/search.html
 share/opera/help/security.html
+share/opera/help/skin.html
 share/opera/help/sounds.html
 share/opera/help/start.html
 share/opera/help/toc.html
 share/opera/help/toolbars.html
-share/opera/help/wand.html
-share/opera/help/welcome.html
 share/opera/help/windows.html
 share/opera/images/background.gif
 share/opera/images/blank.gif
@@ -56,7 +56,6 @@ share/opera/images/opera_32x32.png
 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/ini/dialog.ini
@@ -69,14 +68,18 @@ 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/en/lngcode.txt
+share/opera/locale/en/search.ini
 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
@@ -95,7 +98,6 @@ 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/defaultforms.css
 share/opera/styles/user/disabletables.css
 share/opera/styles/user/hidecertainsizes.css
 share/opera/styles/user/hidenonlinkimages.css
@@ -110,6 +112,7 @@ share/pixmaps/opera.xpm
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
+@dirrm share/opera/locale/en
 @dirrm share/opera/locale
 @dirrm share/opera/java
 @dirrm share/opera/ini
@@ -120,13 +123,14 @@ share/pixmaps/opera.xpm
 @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
+
+@cwd %%LOCALBASE%%
+%%KDE:%%share/applnk/Internet/opera.desktop
+%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
 %%KDE2:%%@dirrm share/applnk/Networking/WWW
 
 @cwd /etc/X11
 wmconfig/opera
 %%APPLNK:%%applnk/Internet/opera.desktop
-