Update to 10.01.

Security:	http://www.opera.com/support/search/view/938/
		http://www.opera.com/support/search/view/939/
Feature safe:	yes

6 files changed, 68 insertions, 14 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index f7c3c10efc98..1348e07e1354 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
@@ -33,13 +32,21 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	10.00
-OPERA_BUILD=	4585
+OPERA_VER=	10.01
+OPERA_BUILD=	4682
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION}<700055
+IGNORE=	you need FreeBSD>=7.0 RELEASE with Linux emulation 2.6.x.
+.elif ${OSVERSION}<800076 && ! defined (OVERRIDE_LINUX_NONBASE_PORTS)
+IGNORE=	you need to use non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f8 and OVERRIDE_LINUX_NONBASE_PORTS=f8). You also can use f10 instead of f8, but I only have tested it with f8.
+.endif
+
 post-extract:
 	@${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
 		${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
@@ -63,4 +70,4 @@ do-install:
 			--exec_prefix=${DATADIR}/bin \
 			--plugindir=${DATADIR}/plugins)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index cead668bb471..c6697b83b6d0 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = a9b938bce7fa3de0307712fb659add43
-SHA256 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 2983c89877dad49e6c11a9bed31ddb80a5144e699d8308ca993aad7e0cc8e9e0
-SIZE (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 13365053
+MD5 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = f2a140a59d886c69700fac1fea1fc6d8
+SHA256 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = c5540fdd5be76c7817d16c85e700d074e7bff215583806a31e7493a767df0b69
+SIZE (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = 13300483
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index a28bb15c03de..227f33b1e3bb 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -36,6 +36,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/be/be.lng
+%%DATADIR%%/locale/be/bookmarks.adr
+%%DATADIR%%/locale/be/search.ini
+%%DATADIR%%/locale/be/standard_speeddial.ini
 %%DATADIR%%/locale/bg/bg.lng
 %%DATADIR%%/locale/cs/cs.lng
 %%DATADIR%%/locale/da/bookmarks.adr
@@ -45,7 +48,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/de/search.ini
 %%DATADIR%%/locale/de/standard_speeddial.ini
 %%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/en-GB/bookmarks.adr
 %%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/search.ini
 %%DATADIR%%/locale/en-GB/standard_speeddial.ini
 %%DATADIR%%/locale/en/bookmarks.adr
 %%DATADIR%%/locale/en/en.lng
@@ -53,12 +58,18 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/en/license.txt
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/en/standard_speeddial.ini
+%%DATADIR%%/locale/es-ES/bookmarks.adr
 %%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-ES/search.ini
+%%DATADIR%%/locale/es-ES/standard_speeddial.ini
 %%DATADIR%%/locale/es-LA/es-LA.lng
 %%DATADIR%%/locale/et/et.lng
 %%DATADIR%%/locale/fi/fi.lng
 %%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr/bookmarks.adr
 %%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fr/search.ini
+%%DATADIR%%/locale/fr/standard_speeddial.ini
 %%DATADIR%%/locale/fy/fy.lng
 %%DATADIR%%/locale/hi/hi.lng
 %%DATADIR%%/locale/hi/standard_speeddial.ini
@@ -67,7 +78,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/id/bookmarks.adr
 %%DATADIR%%/locale/id/id.lng
 %%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/it/bookmarks.adr
 %%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/it/search.ini
+%%DATADIR%%/locale/it/standard_speeddial.ini
 %%DATADIR%%/locale/ja/bookmarks.adr
 %%DATADIR%%/locale/ja/ja.lng
 %%DATADIR%%/locale/ja/license.txt
@@ -77,7 +91,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/ko/ko.lng
 %%DATADIR%%/locale/lt/lt.lng
 %%DATADIR%%/locale/mk/mk.lng
+%%DATADIR%%/locale/nb/bookmarks.adr
 %%DATADIR%%/locale/nb/nb.lng
+%%DATADIR%%/locale/nb/search.ini
+%%DATADIR%%/locale/nb/standard_speeddial.ini
 %%DATADIR%%/locale/nl/nl.lng
 %%DATADIR%%/locale/nn/nn.lng
 %%DATADIR%%/locale/pl/bookmarks.adr
@@ -97,6 +114,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/ta/ta.lng
 %%DATADIR%%/locale/te/te.lng
 %%DATADIR%%/locale/tr/tr.lng
+%%DATADIR%%/locale/uk/bookmarks.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/standard_speeddial.ini
 %%DATADIR%%/locale/uk/uk.lng
 %%DATADIR%%/locale/zh-cn/bookmarks.adr
 %%DATADIR%%/locale/zh-cn/browser.js
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index f7c3c10efc98..1348e07e1354 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
@@ -33,13 +32,21 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	10.00
-OPERA_BUILD=	4585
+OPERA_VER=	10.01
+OPERA_BUILD=	4682
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION}<700055
+IGNORE=	you need FreeBSD>=7.0 RELEASE with Linux emulation 2.6.x.
+.elif ${OSVERSION}<800076 && ! defined (OVERRIDE_LINUX_NONBASE_PORTS)
+IGNORE=	you need to use non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f8 and OVERRIDE_LINUX_NONBASE_PORTS=f8). You also can use f10 instead of f8, but I only have tested it with f8.
+.endif
+
 post-extract:
 	@${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
 		${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
@@ -63,4 +70,4 @@ do-install:
 			--exec_prefix=${DATADIR}/bin \
 			--plugindir=${DATADIR}/plugins)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index cead668bb471..c6697b83b6d0 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = a9b938bce7fa3de0307712fb659add43
-SHA256 (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 2983c89877dad49e6c11a9bed31ddb80a5144e699d8308ca993aad7e0cc8e9e0
-SIZE (opera-10.00.gcc4-bundled-qt4.i386.tar.bz2) = 13365053
+MD5 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = f2a140a59d886c69700fac1fea1fc6d8
+SHA256 (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = c5540fdd5be76c7817d16c85e700d074e7bff215583806a31e7493a767df0b69
+SIZE (opera-10.01.gcc4-bundled-qt4.i386.tar.bz2) = 13300483
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index a28bb15c03de..227f33b1e3bb 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -36,6 +36,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/be/be.lng
+%%DATADIR%%/locale/be/bookmarks.adr
+%%DATADIR%%/locale/be/search.ini
+%%DATADIR%%/locale/be/standard_speeddial.ini
 %%DATADIR%%/locale/bg/bg.lng
 %%DATADIR%%/locale/cs/cs.lng
 %%DATADIR%%/locale/da/bookmarks.adr
@@ -45,7 +48,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/de/search.ini
 %%DATADIR%%/locale/de/standard_speeddial.ini
 %%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/en-GB/bookmarks.adr
 %%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/search.ini
 %%DATADIR%%/locale/en-GB/standard_speeddial.ini
 %%DATADIR%%/locale/en/bookmarks.adr
 %%DATADIR%%/locale/en/en.lng
@@ -53,12 +58,18 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/en/license.txt
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/en/standard_speeddial.ini
+%%DATADIR%%/locale/es-ES/bookmarks.adr
 %%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-ES/search.ini
+%%DATADIR%%/locale/es-ES/standard_speeddial.ini
 %%DATADIR%%/locale/es-LA/es-LA.lng
 %%DATADIR%%/locale/et/et.lng
 %%DATADIR%%/locale/fi/fi.lng
 %%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr/bookmarks.adr
 %%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fr/search.ini
+%%DATADIR%%/locale/fr/standard_speeddial.ini
 %%DATADIR%%/locale/fy/fy.lng
 %%DATADIR%%/locale/hi/hi.lng
 %%DATADIR%%/locale/hi/standard_speeddial.ini
@@ -67,7 +78,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/id/bookmarks.adr
 %%DATADIR%%/locale/id/id.lng
 %%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/it/bookmarks.adr
 %%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/it/search.ini
+%%DATADIR%%/locale/it/standard_speeddial.ini
 %%DATADIR%%/locale/ja/bookmarks.adr
 %%DATADIR%%/locale/ja/ja.lng
 %%DATADIR%%/locale/ja/license.txt
@@ -77,7 +91,10 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/ko/ko.lng
 %%DATADIR%%/locale/lt/lt.lng
 %%DATADIR%%/locale/mk/mk.lng
+%%DATADIR%%/locale/nb/bookmarks.adr
 %%DATADIR%%/locale/nb/nb.lng
+%%DATADIR%%/locale/nb/search.ini
+%%DATADIR%%/locale/nb/standard_speeddial.ini
 %%DATADIR%%/locale/nl/nl.lng
 %%DATADIR%%/locale/nn/nn.lng
 %%DATADIR%%/locale/pl/bookmarks.adr
@@ -97,6 +114,9 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/locale/ta/ta.lng
 %%DATADIR%%/locale/te/te.lng
 %%DATADIR%%/locale/tr/tr.lng
+%%DATADIR%%/locale/uk/bookmarks.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/standard_speeddial.ini
 %%DATADIR%%/locale/uk/uk.lng
 %%DATADIR%%/locale/zh-cn/bookmarks.adr
 %%DATADIR%%/locale/zh-cn/browser.js