6 files changed, 38 insertions, 12 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 6cd5c4b793e4..2a4840b59a47 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -19,13 +19,14 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i3
 		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.gcc4-static-qt3.i386
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -33,8 +34,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.52
-OPERA_BUILD=	2091
+OPERA_VER=	9.60
+OPERA_BUILD=	2444
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index a148e9720a0e..ab092f172eeb 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 2f629584c78c039e947e96df32beb512
-SHA256 (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 9120c08a313f01cda21a8c095bc442eec9095a4bf1eb53a0b06b4fabd0849845
-SIZE (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 8918389
+MD5 (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 6540c5e73da81ac7891e2994fcd54dde
+SHA256 (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 4f6f097ebaf3ba95f5bd35a2d7087800a4cf4e739e47e2297edb339c7797f30f
+SIZE (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 9142543
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 16968d15a7ac..0c8302a6479f 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -16,6 +16,7 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/ini/font.ini
 %%DATADIR%%/ini/mailproviders.xml
 %%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/speeddial_default.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_keyboard_compat.ini
 %%DATADIR%%/ini/standard_menu.ini
@@ -94,6 +95,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/hu/license.txt
 %%DATADIR%%/locale/hu/opera6.adr
 %%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/id/indonesian.lng
+%%DATADIR%%/locale/id/license.txt
+%%DATADIR%%/locale/id/opera6.adr
+%%DATADIR%%/locale/id/search.ini
 %%DATADIR%%/locale/it/italiano.lng
 %%DATADIR%%/locale/it/license.txt
 %%DATADIR%%/locale/it/opera6.adr
@@ -154,6 +159,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/tr/opera6.adr
 %%DATADIR%%/locale/tr/search.ini
 %%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/uk/license.txt
+%%DATADIR%%/locale/uk/opera6.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/ukrainian.lng
 %%DATADIR%%/locale/zh-cn/chinese_simp.lng
 %%DATADIR%%/locale/zh-cn/license.txt
 %%DATADIR%%/locale/zh-cn/opera6.adr
@@ -214,6 +223,7 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/user/tablelayout.css
 %%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-mo.dat
 %%DATADIR%%/svg-mobd.dat
@@ -229,6 +239,7 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/locale/zh-tw
 @dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
 @dirrm %%DATADIR%%/locale/sv
 @dirrm %%DATADIR%%/locale/ru
@@ -244,6 +255,7 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/locale/ka
 @dirrm %%DATADIR%%/locale/ja
 @dirrm %%DATADIR%%/locale/it
+@dirrm %%DATADIR%%/locale/id
 @dirrm %%DATADIR%%/locale/hu
 @dirrm %%DATADIR%%/locale/hr
 @dirrm %%DATADIR%%/locale/hi
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 6cd5c4b793e4..2a4840b59a47 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -19,13 +19,14 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i3
 		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.gcc4-static-qt3.i386
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -33,8 +34,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.52
-OPERA_BUILD=	2091
+OPERA_VER=	9.60
+OPERA_BUILD=	2444
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index a148e9720a0e..ab092f172eeb 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 2f629584c78c039e947e96df32beb512
-SHA256 (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 9120c08a313f01cda21a8c095bc442eec9095a4bf1eb53a0b06b4fabd0849845
-SIZE (opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2) = 8918389
+MD5 (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 6540c5e73da81ac7891e2994fcd54dde
+SHA256 (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 4f6f097ebaf3ba95f5bd35a2d7087800a4cf4e739e47e2297edb339c7797f30f
+SIZE (opera-9.60.gcc4-static-qt3.i386.tar.bz2) = 9142543
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 16968d15a7ac..0c8302a6479f 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -16,6 +16,7 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/ini/font.ini
 %%DATADIR%%/ini/mailproviders.xml
 %%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/speeddial_default.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_keyboard_compat.ini
 %%DATADIR%%/ini/standard_menu.ini
@@ -94,6 +95,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/hu/license.txt
 %%DATADIR%%/locale/hu/opera6.adr
 %%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/id/indonesian.lng
+%%DATADIR%%/locale/id/license.txt
+%%DATADIR%%/locale/id/opera6.adr
+%%DATADIR%%/locale/id/search.ini
 %%DATADIR%%/locale/it/italiano.lng
 %%DATADIR%%/locale/it/license.txt
 %%DATADIR%%/locale/it/opera6.adr
@@ -154,6 +159,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/tr/opera6.adr
 %%DATADIR%%/locale/tr/search.ini
 %%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/uk/license.txt
+%%DATADIR%%/locale/uk/opera6.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/ukrainian.lng
 %%DATADIR%%/locale/zh-cn/chinese_simp.lng
 %%DATADIR%%/locale/zh-cn/license.txt
 %%DATADIR%%/locale/zh-cn/opera6.adr
@@ -214,6 +223,7 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/styles/user/tablelayout.css
 %%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-mo.dat
 %%DATADIR%%/svg-mobd.dat
@@ -229,6 +239,7 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/locale/zh-tw
 @dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/uk
 @dirrm %%DATADIR%%/locale/tr
 @dirrm %%DATADIR%%/locale/sv
 @dirrm %%DATADIR%%/locale/ru
@@ -244,6 +255,7 @@ share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/locale/ka
 @dirrm %%DATADIR%%/locale/ja
 @dirrm %%DATADIR%%/locale/it
+@dirrm %%DATADIR%%/locale/id
 @dirrm %%DATADIR%%/locale/hu
 @dirrm %%DATADIR%%/locale/hr
 @dirrm %%DATADIR%%/locale/hi