o Update 7.10 B1 to 7.11 TP5.

o Tweak the sentences to get the better look in the 80 screen.
o Change the prefix from /usr/local to /usr/X11R6.

PR:		ports/51822
Submitted by:	Mezz <reigncracks@hotmail.com> (maintainer)
Pointed out by:	kris

7 files changed, 92 insertions, 63 deletions

diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 1e143c63eebe..03654e1cc7b9 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.1.0.20030410
+PORTVERSION=	7.11.20030429
 CATEGORIES=	www linux
-MASTER_SITES=	http://public.planetmirror.com/pub/opera/linux/710/beta1/en/i386/static/ \
-		ftp://ftp.hu-berlin.de/pub/www/opera/linux/710/beta1/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/710/beta1/en/i386/static/ \
-		ftp://opera.online.no/pub/online.no/mirrors/operasoftware/linux/710/beta1/en/i386/static/
+MASTER_SITES=	http://snapshot.opera.com/unix/intel-linux/395-20030429-7.11-TP5/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}.1-static-qt.i386
 
@@ -23,6 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
@@ -62,8 +60,8 @@ PLIST_SUB+=	GNOMELNK:="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g' \
-		${WRKSRC}/install.sh
+	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index e71ccf69ec98..c5cfe3b296b5 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-7.1.0-20030410.1-static-qt.i386.tar.bz2) = 973173f4392b498bd0d48d4af3bb7a90
+MD5 (opera-7.11-20030429.1-static-qt.i386.tar.bz2) = ccde5bceb60c2179e6182dd979c3de97
diff --git a/www/linux-opera7/files/patch-install.sh b/www/linux-opera7/files/patch-install.sh
index bc7e1339cf18..c764cc29ef7f 100644
--- a/www/linux-opera7/files/patch-install.sh
+++ b/www/linux-opera7/files/patch-install.sh
@@ -1,6 +1,6 @@
---- install.sh.orig	Sat Apr 12 01:07:58 2003
-+++ install.sh	Sat Apr 12 01:17:23 2003
-@@ -721,20 +721,13 @@
+--- install.sh.orig	Mon May  5 18:19:51 2003
++++ install.sh	Mon May  5 18:49:29 2003
+@@ -721,17 +721,9 @@
      case "${machine}:${os}" in
  	i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
  	    wrapper_plugin_paths="
@@ -15,28 +15,62 @@
 -    /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 \\"
-+    $prefix/lib/RealPlayer8/Plugins \\
-+    $prefix/Acrobat[45]/Browsers/intellinux \\
-+    $prefix/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
-+    $prefix/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
++    %%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 \\"
  	    wrapper_ibmjava="
--	    IBMJava2-14/jre \\
--	    IBMJava2-131/jre \\"
-+	    linux-ibm-jdk1.3.1/jre \\
-+	    linux-ibm-jdk1.4.0/jre \\"
- 	    wrapper_sunjava_machine="i386"
+ 	    IBMJava2-14/jre \\
+ 	    IBMJava2-131/jre \\"
+@@ -781,7 +773,7 @@
  	;;
+     esac
+     wrapper_netscape_plugin_paths="
+-    /usr/lib/RealPlayer8/Plugins \\
++    %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
+     /usr/lib/realplay/plugins \\
+     /usr/lib/RealPlayer8 \\
+     /usr/lib/realplay \\
+@@ -789,7 +781,7 @@
+     /opt/netscape/plugins \\
+     /usr/lib/netscape/plugins \\
+     /usr/local/netscape/plugins \\
+-    /usr/local/lib/netscape/plugins \\"
++    %%LOCALBASE%%/lib/netscape-linux/plugins \\"
  
-@@ -905,7 +898,7 @@
+     wrapper_file="${wrapper_dir}/opera"
+     
+@@ -862,8 +854,8 @@
+ 	jre1.3.1 \\
+ 	j2re1.3 \\
+ 	; 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
++	for PREFIX in %%LOCALBASE%%; do
++	    if test -f \"%%LOCALBASE%%/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"%%LOCALBASE%%/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
+ 	done
+ 	if test \"\${OPERA_JAVA_DIR}\"; then break; fi
+     done
+@@ -871,8 +863,8 @@
+     if test ! \"\${OPERA_JAVA_DIR}\"; then
+ 	for IBMJAVA in \\${wrapper_ibmjava}
+ 	    ; do
+-	    for PREFIX in \${PREFIXES}; do
+-		if test -f \"\${PREFIX}/\${IBMJAVA}/bin/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${IBMJAVA}/bin\" && break; fi
++	    for PREFIX in %%LOCALBASE%%; do
++		if test -f \"%%LOCALBASE%%/\${IBMJAVA}/bin/libjava.so\"; then OPERA_JAVA_DIR=\"%%LOCALBASE%%/\${IBMJAVA}/bin\" && break; fi
+ 	    done
+ 	if test \"\${OPERA_JAVA_DIR}\"; then break; fi
+ 	done
+@@ -905,7 +897,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
 -    /usr/local/Acrobat[45]/bin \\
-+    $prefix/Acrobat[45]/bin \\
++    %%LOCALBASE%%/Acrobat[45]/bin \\
      /usr/lib/Acrobat[45]/bin \\
      /usr/X11R6/lib/Acrobat[45]/bin \\
      /opt/Acrobat[45]/bin \\
-@@ -1106,7 +1099,7 @@
+@@ -1106,7 +1098,7 @@
  	mkdir $mkdirv $mkdirp $share_dir/java/
  	chmod $chmodv 755 $share_dir/java
  	
@@ -45,7 +79,7 @@
  	generate_opera_policy
  	
       # Plug-in files
-@@ -1119,8 +1112,9 @@
+@@ -1119,8 +1111,9 @@
          chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
  
       # System wide configuration files
@@ -56,7 +90,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1147,6 +1141,7 @@
+@@ -1147,6 +1140,7 @@
  			;;
  		esac
  	    done
@@ -64,7 +98,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1230,22 +1225,22 @@
+@@ -1230,22 +1224,22 @@
  
      debug_msg 0 "in icons()"
  
@@ -99,7 +133,7 @@
      fi
    
      if test ! -d /etc/X11/wmconfig/; then
-@@ -1311,36 +1306,36 @@
+@@ -1311,36 +1305,36 @@
        fi
        # end /opt/gnome share
  
@@ -148,7 +182,7 @@
 -	    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/
++	    mkdir $mkdirv $mkdirp%%X11PREFIX%%/share/gnome/apps/Internet/
 +	    chmod $chmodv 755 %%X11PREFIX%%/share/gnome/apps/Internet
 +            generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
            fi
@@ -158,7 +192,7 @@
     fi
     # Add ximian here
  }
-@@ -1377,12 +1372,12 @@
+@@ -1377,12 +1371,12 @@
  
      fi  
      
@@ -176,7 +210,7 @@
      fi
  }
  
-@@ -1406,8 +1401,8 @@
+@@ -1406,8 +1400,8 @@
        fi
        if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
  
diff --git a/www/linux-opera7/files/patch-runme.sh b/www/linux-opera7/files/patch-runme.sh
deleted file mode 100644
index 21b2504efc3e..000000000000
--- a/www/linux-opera7/files/patch-runme.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- runme.sh.orig	Thu Apr  3 17:31:40 2003
-+++ runme.sh	Thu Apr  3 18:36:09 2003
-@@ -177,7 +177,7 @@
- export OPERA_DIR OPERA_PLUGIN_PATH
- 
- # Running Opera
--${OPERA} "${@}"
-+exec ${OPERA} "${@}"
- 
- # Cleanup
- if test "${_CLEAN_OPERA_POLICY_}" = 'YES'; then
diff --git a/www/linux-opera7/pkg-descr b/www/linux-opera7/pkg-descr
index e872a4dad0e9..ab8cb8619076 100644
--- a/www/linux-opera7/pkg-descr
+++ b/www/linux-opera7/pkg-descr
@@ -1,10 +1,19 @@
-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.
+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.
+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.
+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.
 
 This is still a very early development version!
 
diff --git a/www/linux-opera7/pkg-message b/www/linux-opera7/pkg-message
index 0a62dec3388f..238dcc531b16 100644
--- a/www/linux-opera7/pkg-message
+++ b/www/linux-opera7/pkg-message
@@ -3,24 +3,22 @@ Newsgroups: opera.linux,opera.beta
 Subject: Preview 3 of Opera 7.10 for Linux available
 Date: 2003-04-03 03:12:15 PST
 
-This is the first release ever that is synchronized with an Opera 
-for windows release. Windows is released as 7.10 Beta 1 today and 
-since we share the user interface and most of the other components 
-we have jumped to the 7.10 tag as well (thus skipping 7.0). We have 
-not has as much time to test this release compared with the windows 
-version and we lack some linux specific features so we still name it
-a Technology Preview.
+This is the first release ever that is synchronized with an Opera for windows
+release. Windows is released as 7.10 Beta 1 today and since we share the user
+interface and most of the other components we have jumped to the 7.10 tag as
+well (thus skipping 7.0). We have not has as much time to test this release
+compared with the windows version and we lack some linux specific features so
+we still name it a Technology Preview.
 
-Please discuss this release in the opera.linux newsgroup or opera-
-linux mail list before submitting bugs to our BTS (Bug Tracking 
-System). We recommend that you not install it over a current 
-version of Opera.
+Please discuss this release in the opera.linux newsgroup or opera-linux mail
+list before submitting bugs to our BTS (Bug Tracking System). We recommend that
+you not install it over a current version of Opera.
 
-Changelogs for beta 1: http://www.opera.com/linux/changelogs/710/
+Changelogs for 7.11 TP5:
+http://snapshot.opera.com/unix/intel-linux/395-20030429-7.11-TP5/changelog.txt
 
 Before you run Opera7:
-   Since this is a beta 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".
+   Since this is a beta 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-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index bead2a68232e..694c4bb4b134 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -1,6 +1,7 @@
 bin/opera
 share/doc/opera/LICENSE
 share/doc/opera/help
+share/icons/opera.xpm
 share/opera/bin/m2.so
 share/opera/bin/opera
 share/opera/buttons/DefSmall
@@ -367,6 +368,7 @@ share/opera/ini/standard_mouse.ini
 share/opera/ini/standard_toolbar.ini
 share/opera/java/opera.jar
 share/opera/java/opera.policy
+share/opera/locale/english.lng
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/operamotifwrapper
@@ -402,6 +404,7 @@ share/opera/styles/user/showstructure.css
 share/opera/styles/user/textonly.css
 share/opera/styles/user/userstyle.ini
 share/opera/styles/wml.css
+share/pixmaps/opera.xpm
 @dirrm share/opera/styles/user
 @dirrm share/opera/styles
 @dirrm share/opera/skin
@@ -423,15 +426,13 @@ share/opera/styles/wml.css
 @dirrm share/opera
 @dirrm share/doc/opera
 
-@cwd %%X11BASE%%
 %%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
-share/icons/opera.xpm
-share/pixmaps/opera.xpm
 %%KDE2:%%@dirrm share/applnk/Networking/WWW
 
 @cwd /etc/X11
 wmconfig/opera
 %%APPLNK:%%applnk/Internet/opera.desktop
+