- Update to 9.61

PR:		ports/128264
Submitted by:	Arjan van Leeuwen <freebsd-maintainer opera.com> (maintainer)
Reviewed by:	itetcu
Security:	http://www.vuxml.org/freebsd/f5c4d7f7-9f4b-11dd-bab1-001999392805.html

6 files changed, 48 insertions, 33 deletions

diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index af76e94a8cb7..7fc79c11d085 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -29,13 +29,13 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc3-shared-qt3.i386
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Linux plugin support for the native Opera browser
 
-RUN_DEPENDS=	${LOCALBASE}/share/opera/bin/operapluginwrapper:${PORTSDIR}/www/opera
+RUN_DEPENDS=	${PREFIX}/share/opera/bin/operapluginwrapper:${PORTSDIR}/www/opera
 
-OPERA_VER=	9.60
+OPERA_VER=	9.61
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20081004
-OPERA_BUILD=	2444
+OPERA_DATE=	20081017
+OPERA_BUILD=	2456
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
diff --git a/www/opera-linuxplugins/distinfo b/www/opera-linuxplugins/distinfo
index 75c20996ed0a..dec2d6fa3737 100644
--- a/www/opera-linuxplugins/distinfo
+++ b/www/opera-linuxplugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = 2020395b8422e881e77928b586519bf8
-SHA256 (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = c45586665b317bb1dcc590b891df371d602db2d044da55f2f623388a35bbd2b5
-SIZE (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = 7165845
+MD5 (opera-9.61.gcc3-shared-qt3.i386.tar.bz2) = 12cb3ce5ad031c38ede4385e1a298d89
+SHA256 (opera-9.61.gcc3-shared-qt3.i386.tar.bz2) = 15163faab9d9eb9c5000c944f5d81a003ec7a43927f2d02c7f145fadd870a9e6
+SIZE (opera-9.61.gcc3-shared-qt3.i386.tar.bz2) = 7301358
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 295ef4a95d21..8ed08de312b7 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
 		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
@@ -30,11 +29,11 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}${OPERA_MINVER}-freebsd${OPERA_TYPE}-shared-qt
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-OPERA_VER=	9.60
+OPERA_VER=	9.61
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20081004
-OPERA_BUILD=	2444
+OPERA_DATE=	20081017
+OPERA_BUILD=	2456
 OPERA_LIB=	shared
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/www/opera/distinfo b/www/opera/distinfo
index fc652c899d73..845688731824 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,15 +1,15 @@
-MD5 (opera-9.60-freebsd5-shared-qt3.i386.tar.bz2) = b8d37a4d95a77900eda9e6394b2edb6d
-SHA256 (opera-9.60-freebsd5-shared-qt3.i386.tar.bz2) = ff5a9f022f6dbab5faabd1195c0af5edd091218377b93698ee1c0c88562a6d04
-SIZE (opera-9.60-freebsd5-shared-qt3.i386.tar.bz2) = 7342693
-MD5 (opera-9.60-freebsd6-shared-qt3.i386.tar.bz2) = cf6c7ab724bb0f9566fb2ab1e988fe7c
-SHA256 (opera-9.60-freebsd6-shared-qt3.i386.tar.bz2) = b6d2647f7033c86dadcad653798d1110895e50634156aa64587d77dad41a693c
-SIZE (opera-9.60-freebsd6-shared-qt3.i386.tar.bz2) = 7345388
-MD5 (opera-9.60-freebsd6-shared-qt3.amd64.tar.bz2) = fab27a28c6a0b42c1a35eef8afdc94d1
-SHA256 (opera-9.60-freebsd6-shared-qt3.amd64.tar.bz2) = a212df4699b36831d6bb28fa2d74abfdd6875c0e40c8c8f976a78b2c4bef3efc
-SIZE (opera-9.60-freebsd6-shared-qt3.amd64.tar.bz2) = 7854123
-MD5 (opera-9.60-freebsd7-shared-qt3.i386.tar.bz2) = c20655b94b84ac870b948587bb9e2629
-SHA256 (opera-9.60-freebsd7-shared-qt3.i386.tar.bz2) = 6377421417eb94e61192bddb559772bb4962df6b0fe736e69c5a805bf958d329
-SIZE (opera-9.60-freebsd7-shared-qt3.i386.tar.bz2) = 7216117
-MD5 (opera-9.60-freebsd7-shared-qt3.amd64.tar.bz2) = 79cc3b332e66b6d198559f8421a2a193
-SHA256 (opera-9.60-freebsd7-shared-qt3.amd64.tar.bz2) = 2e66e9a5ff1079e5a1b878a08925dd2a0db24036e739af7da0210c854e8cf4eb
-SIZE (opera-9.60-freebsd7-shared-qt3.amd64.tar.bz2) = 7743771
+MD5 (opera-9.61-freebsd5-shared-qt3.i386.tar.bz2) = 7d7428eb90de613f4c4e419d3b8df40d
+SHA256 (opera-9.61-freebsd5-shared-qt3.i386.tar.bz2) = bc4b94ac23812dd3e0a2a5c18413feac32cbf407e9072a23d5bca5e598bd43f9
+SIZE (opera-9.61-freebsd5-shared-qt3.i386.tar.bz2) = 7485931
+MD5 (opera-9.61-freebsd6-shared-qt3.i386.tar.bz2) = 0f3c092cb174d6aedbaf3de08afcafda
+SHA256 (opera-9.61-freebsd6-shared-qt3.i386.tar.bz2) = 6120a699262a1f5af15b1678e0a504a31bf70e5d2d53e9584a7f42c4f12537db
+SIZE (opera-9.61-freebsd6-shared-qt3.i386.tar.bz2) = 7488263
+MD5 (opera-9.61-freebsd6-shared-qt3.amd64.tar.bz2) = 31c64464f49ce52e40b78436eb7f79f3
+SHA256 (opera-9.61-freebsd6-shared-qt3.amd64.tar.bz2) = 09fcc8932e69d118578706cb1a87abbdcab1ba1c78f173d20b5bfc43cf6a0843
+SIZE (opera-9.61-freebsd6-shared-qt3.amd64.tar.bz2) = 7993195
+MD5 (opera-9.61-freebsd7-shared-qt3.i386.tar.bz2) = c26771feb9da16545adb7c65d399252e
+SHA256 (opera-9.61-freebsd7-shared-qt3.i386.tar.bz2) = 0c0dee77598aa87c00206bfd13796624528d80122f871dba7795f6a2239f6e55
+SIZE (opera-9.61-freebsd7-shared-qt3.i386.tar.bz2) = 7355208
+MD5 (opera-9.61-freebsd7-shared-qt3.amd64.tar.bz2) = 2af9f45ad5516b65de2d0a1d12af4dff
+SHA256 (opera-9.61-freebsd7-shared-qt3.amd64.tar.bz2) = 314f0a065d9bc4380019578089f250e3776b05e6865bf21faa2259655f5dcc22
+SIZE (opera-9.61-freebsd7-shared-qt3.amd64.tar.bz2) = 7886963
diff --git a/www/opera/files/operapluginwrapper b/www/opera/files/operapluginwrapper
index bb5e450c2220..1e3ef651bb93 100644
--- a/www/opera/files/operapluginwrapper
+++ b/www/opera/files/operapluginwrapper
@@ -1,18 +1,19 @@
 #!/bin/sh
 
 if [ -n "$4" ]; then
-ELFTYPE=`brandelf $4`
+	ELFTYPE=`brandelf $4`
 elif [ -n "$3" ]; then
-ELFTYPE=`brandelf $3`
+	ELFTYPE=`brandelf $3`
 fi
 
 WRAPPER="freebsd"
+
 case "${ELFTYPE}" in
-*SVR4*|*Linux*)
-if [ -x "$0.linux" ]; then
-WRAPPER="linux"
-fi
-;;
+	*SVR4*|*Linux*)
+		if [ -x "$0.linux" ]; then
+			WRAPPER="linux"
+		fi
+	;;
 esac
 
 exec $0.$WRAPPER $@
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index eeba4e2398d7..54fbce1d68bd 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -83,6 +83,18 @@ bin/opera
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/svg-sa.dat
 %%DATADIR%%/search.ini
+%%DATADIR%%/locale/et/eesti.lng
+%%DATADIR%%/locale/et/license.txt
+%%DATADIR%%/locale/et/search.ini
+%%DATADIR%%/locale/et/opera6.adr
+%%DATADIR%%/locale/te/opera6.adr
+%%DATADIR%%/locale/te/license.txt
+%%DATADIR%%/locale/te/search.ini
+%%DATADIR%%/locale/te/telugu.lng
+%%DATADIR%%/locale/ta/tamil.lng
+%%DATADIR%%/locale/ta/opera6.adr
+%%DATADIR%%/locale/ta/search.ini
+%%DATADIR%%/locale/ta/license.txt
 %%DATADIR%%/locale/nl/search.ini
 %%DATADIR%%/locale/nl/nederlands.lng
 %%DATADIR%%/locale/nl/opera6.adr
@@ -241,6 +253,8 @@ bin/opera
 @dirrm %%DATADIR%%/locale/zh-cn
 @dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
+@dirrm %%DATADIR%%/locale/te
+@dirrm %%DATADIR%%/locale/ta
 @dirrm %%DATADIR%%/locale/sv
 @dirrm %%DATADIR%%/locale/ru
 @dirrm %%DATADIR%%/locale/pt-BR
@@ -263,6 +277,7 @@ bin/opera
 @dirrm %%DATADIR%%/locale/fr-CA
 @dirrm %%DATADIR%%/locale/fr
 @dirrm %%DATADIR%%/locale/fi
+@dirrm %%DATADIR%%/locale/et
 @dirrm %%DATADIR%%/locale/es-LA
 @dirrm %%DATADIR%%/locale/es-ES
 @dirrm %%DATADIR%%/locale/en-GB