ports/77303: Update www/opera to 7.54u2

[Arjan van Leeuwen]

>Number:         77303
>Category:       ports
>Synopsis:       Update www/opera to 7.54u2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 09 11:40:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD winston.piwebs.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Sun Jan 16 21:32:29 CET 2005 root at winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON i386


	
>Description:
This patch updates www/opera to version 7.54u2 (20050131). This version
contains several important security updates. See
	http://www.opera.com/freebsd/changelogs/754u2/index.dml
for more information.

>How-To-Repeat:
	
>Fix:

diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile	Thu Dec 16 01:19:17 2004
+++ opera/Makefile	Wed Feb  9 12:27:17 2005
@@ -29,9 +29,9 @@
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 OPERA_VER=	7.54
-OPERA_MINVER=	u1
+OPERA_MINVER=	u2
 OPERA_REL=	final
-OPERA_DATE=	20041210
+OPERA_DATE=	20050131
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
diff -urN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo	Thu Dec 16 01:19:17 2004
+++ opera/distinfo	Wed Feb  9 12:27:37 2005
@@ -1,2 +1,2 @@
-MD5 (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4977bb6e4b445942c370070f88f7d377
-SIZE (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4782184
+MD5 (opera-7.54-20050131.1-static-qt.i386.freebsd-en.tar.bz2) = cef4983bc4e91913027b6c5d830492a8
+SIZE (opera-7.54-20050131.1-static-qt.i386.freebsd-en.tar.bz2) = 4782908
diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh
--- /usr/ports/www/opera/files/patch-install.sh	Thu Dec 16 01:19:17 2004
+++ opera/files/patch-install.sh	Wed Feb  9 12:32:23 2005
@@ -1,5 +1,5 @@
---- install.sh.orig	Fri Dec 10 13:53:57 2004
-+++ install.sh	Wed Dec 15 15:35:18 2004
+--- install.sh.orig	Mon Jan 31 16:21:15 2005
++++ install.sh	Wed Feb  9 12:32:04 2005
 @@ -373,7 +373,7 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
@@ -9,7 +9,7 @@
  		cpf='-f'
  		if test "$verbose" -gt '1'; then
  		    chmodv='-v'
-@@ -873,47 +873,12 @@
+@@ -873,52 +873,13 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -22,6 +22,10 @@
 +    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	jre1.5.0_01 \\
+ 	jdk1.5.0_01/jre \\
+-	j2re1.4.2_06 \\
+-	j2sdk1.4.2_06/jre \\
 -	j2re1.4.2_04 \\
 -	j2sdk1.4.2_04/jre \\
 -	j2re1.4.2_03 \\
@@ -43,6 +47,7 @@
 -	j2se/1.4/jre \\
 -	j2se/1.3/jre \\
 -	j2se/jre \\
+-	jre1.3.1_15 \\
 -	jre1.3.1_02 \\
 -	jre1.3.1_01 \\
 -	j2re1.3.1 \\
@@ -60,7 +65,7 @@
  	; 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
-@@ -962,11 +927,8 @@
+@@ -967,11 +928,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -74,7 +79,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1281,36 +1243,13 @@
+@@ -1285,36 +1243,13 @@
  
  	if test -z "${OPERADESTDIR}"; then
  
@@ -115,7 +120,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1439,72 +1378,36 @@
+@@ -1443,72 +1378,36 @@
  
      debug_msg 1 "in gnome()"
  
@@ -210,7 +215,7 @@
     fi
     # Add ximian here
  }
-@@ -1515,39 +1418,31 @@
+@@ -1519,39 +1418,31 @@
  
      debug_msg 1 "in kde()"
  
>Release-Note:
>Audit-Trail:
>Unformatted: