Hi,
please find attached an update of the opera port to version 10. Please
test and comment.
cheers,
Nikolay
--
"It's all part of my Can't-Do approach to life." Wally
Index: Makefile
===================================================================
RCS file: /a/devel/cvs/ports/www/opera/Makefile,v
retrieving revision 1.59
diff -p -u -r1.59 Makefile
--- Makefile 5 Mar 2009 05:38:17 -0000 1.59
+++ Makefile 2 Sep 2009 19:13:19 -0000
@@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.59 2009/03/05 05:38:17 sturm Exp $
ONLY_FOR_ARCHS= i386
+SHARED_ONLY= Yes
COMMENT= fast and customizable WWW browser
-V= 9.64
-OPERA_BUILD= 2480
-DISTNAME= opera-${V}.gcc295-static-qt3.i386
+V= 10.00
+OPERA_BUILD= 4585
+DISTNAME= opera-${V}.gcc4-shared-qt3.i386
PKGNAME= opera-${V}
CATEGORIES= www
@@ -31,7 +32,7 @@ MASTER_SITES_OPERA= ftp://ftp.opera.com/
ftp://ftp.rge.com/pub/infosystems/opera/ \
http://www.rge.com/pub/infosystems/opera/
-MASTER_SITES= ${MASTER_SITES_OPERA:=linux/${V:S/.//}/final/en/i386/static/}
+MASTER_SITES= ${MASTER_SITES_OPERA:=linux/${V:S/.//}/final/en/i386/shared/}
EXTRACT_SUFX= .tar.bz2
RUN_DEPENDS= ::devel/desktop-file-utils \
@@ -40,7 +41,7 @@ RUN_DEPENDS= ::devel/desktop-file-utils
NO_BUILD= Yes
NO_REGRESS= Yes
-WRKDIST= ${WRKDIR}/opera-$V-${OPERA_BUILD}.gcc295-static-qt3.i386
+WRKDIST= ${WRKDIR}/opera-$V-${OPERA_BUILD}.gcc4-shared-qt3.i386
do-install:
cd ${WRKBUILD} && ./install.sh \
Index: distinfo
===================================================================
RCS file: /a/devel/cvs/ports/www/opera/distinfo,v
retrieving revision 1.45
diff -p -u -r1.45 distinfo
--- distinfo 5 Mar 2009 05:38:17 -0000 1.45
+++ distinfo 2 Sep 2009 18:46:45 -0000
@@ -1,5 +1,5 @@
-MD5 (opera-9.64.gcc295-static-qt3.i386.tar.bz2) = t5UtpYI4PkLEW/E6l833tg==
-RMD160 (opera-9.64.gcc295-static-qt3.i386.tar.bz2) =
bkPgoE0X2t9ZtnO8/0z/1deGC6E=
-SHA1 (opera-9.64.gcc295-static-qt3.i386.tar.bz2) = Cq0BFhmfz/Ip9BEgqqy8JkM/ioA=
-SHA256 (opera-9.64.gcc295-static-qt3.i386.tar.bz2) =
PanGOjLkMUFU01KwYagpOQM8NvauifCv2xpyiPpXGp8=
-SIZE (opera-9.64.gcc295-static-qt3.i386.tar.bz2) = 9061350
+MD5 (opera-10.00.gcc4-shared-qt3.i386.tar.bz2) = q/DpD2wGILGx+VuYYLMBiQ==
+RMD160 (opera-10.00.gcc4-shared-qt3.i386.tar.bz2) =
CrRIJX8G12IVALCWb7khvo7Mvgo=
+SHA1 (opera-10.00.gcc4-shared-qt3.i386.tar.bz2) = jF1uGSzraWbzudFVEBVncuXB2rY=
+SHA256 (opera-10.00.gcc4-shared-qt3.i386.tar.bz2) =
imQ2gDpi/Nfrjyx9weKoWSsI1+UkPiSMgCKH/CEjbEo=
+SIZE (opera-10.00.gcc4-shared-qt3.i386.tar.bz2) = 8454441
cvs diff: Diffing files
cvs diff: Diffing patches
Index: patches/patch-install_sh
===================================================================
RCS file: /a/devel/cvs/ports/www/opera/patches/patch-install_sh,v
retrieving revision 1.21
diff -p -u -r1.21 patch-install_sh
--- patches/patch-install_sh 13 Jun 2008 23:01:36 -0000 1.21
+++ patches/patch-install_sh 2 Sep 2009 18:04:32 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-install_sh,v 1.21 2008/06/13 23:01:36 sturm Exp $
---- install.sh.orig Wed Jun 11 23:11:27 2008
-+++ install.sh Sat Jun 14 00:54:10 2008
+--- install.sh.orig Sun Aug 30 18:25:07 2009
++++ install.sh Wed Sep 2 20:04:25 2009
@@ -870,7 +870,7 @@ generate_wrapper()
wrapper_contain="#!/bin/sh
@@ -20,7 +20,7 @@ $OpenBSD: patch-install_sh,v 1.21 2008/0
# Native Java enviroment
for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
do if test -f \"\$d/javapath.txt\"
-@@ -1060,9 +1057,6 @@ if test \"\${OPERA_JAVA_DIR}\"; then
+@@ -1063,9 +1060,6 @@ if test \"\${OPERA_JAVA_DIR}\"; then
export LD_LIBRARY_PATH OPERA_JAVA_DIR
fi
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /a/devel/cvs/ports/www/opera/pkg/PLIST,v
retrieving revision 1.29
diff -p -u -r1.29 PLIST
--- pkg/PLIST 2 Dec 2008 19:54:16 -0000 1.29
+++ pkg/PLIST 2 Sep 2009 18:47:37 -0000
@@ -20,6 +20,9 @@ share/examples/opera/opera6rc.fixed
@sample /etc/opera6rc.fixed
share/icons/
share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/opera.png
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/opera.png
@@ -32,249 +35,191 @@ share/icons/hicolor/32x32/apps/opera.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/opera.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/opera.svg
share/opera/
+share/opera/defaults/
+share/opera/defaults/bookmarks.adr
+share/opera/defaults/feedreaders.ini
+share/opera/defaults/filehandler.ini
+share/opera/defaults/font.ini
+share/opera/defaults/license.txt
+share/opera/defaults/mailproviders.xml
+share/opera/defaults/pluginpath.ini
+share/opera/defaults/search.ini
+share/opera/defaults/standard_speeddial.ini
+share/opera/defaults/standard_trusted_repositories.ini
+share/opera/defaults/webmailproviders.ini
+share/opera/defaults/xmlentities.ini
share/opera/encoding.bin
+share/opera/extra/
+share/opera/extra/missingplugin.svg
+share/opera/extra/missingpluginhover.svg
+share/opera/extra/svg-mo.dat
+share/opera/extra/svg-mobd.dat
+share/opera/extra/svg-sa.dat
+share/opera/extra/svg-sabd.dat
+share/opera/extra/svg-se.dat
+share/opera/extra/svg-sebd.dat
share/opera/html40_entities.dtd
-share/opera/ini/
-share/opera/ini/dialog.ini
-share/opera/ini/fastforward.ini
-share/opera/ini/filehandler.ini
-share/opera/ini/font.ini
-share/opera/ini/mailproviders.xml
-share/opera/ini/pluginpath.ini
-share/opera/ini/speeddial_default.ini
-share/opera/ini/standard_keyboard.ini
-share/opera/ini/standard_keyboard_compat.ini
-share/opera/ini/standard_menu.ini
-share/opera/ini/standard_mouse.ini
-share/opera/ini/standard_toolbar.ini
-share/opera/ini/unix_keyboard.ini
-share/opera/ini/xmlentities.ini
share/opera/java/
share/opera/java/opera.jar
share/opera/java/opera.policy
share/opera/lngcode.txt
share/opera/locale/
share/opera/locale/be/
-share/opera/locale/be/byelorussian.lng
-share/opera/locale/be/license.txt
-share/opera/locale/be/opera6.adr
-share/opera/locale/be/search.ini
+share/opera/locale/be/be.lng
share/opera/locale/bg/
-share/opera/locale/bg/bulgarian.lng
-share/opera/locale/bg/license.txt
-share/opera/locale/bg/opera6.adr
-share/opera/locale/bg/search.ini
+share/opera/locale/bg/bg.lng
share/opera/locale/cs/
-share/opera/locale/cs/czech.lng
-share/opera/locale/cs/license.txt
-share/opera/locale/cs/opera6.adr
-share/opera/locale/cs/search.ini
+share/opera/locale/cs/cs.lng
share/opera/locale/da/
-share/opera/locale/da/dansk.lng
-share/opera/locale/da/license.txt
-share/opera/locale/da/opera6.adr
-share/opera/locale/da/search.ini
+share/opera/locale/da/bookmarks.adr
+share/opera/locale/da/da.lng
share/opera/locale/de/
-share/opera/locale/de/deutsch.lng
-share/opera/locale/de/license.txt
-share/opera/locale/de/opera6.adr
+share/opera/locale/de/bookmarks.adr
+share/opera/locale/de/de.lng
share/opera/locale/de/search.ini
+share/opera/locale/de/standard_speeddial.ini
share/opera/locale/el/
-share/opera/locale/el/greek.lng
-share/opera/locale/el/license.txt
-share/opera/locale/el/opera6.adr
-share/opera/locale/el/search.ini
+share/opera/locale/el/el.lng
share/opera/locale/en/
share/opera/locale/en-GB/
-share/opera/locale/en-GB/british.lng
-share/opera/locale/en-GB/license.txt
-share/opera/locale/en-GB/opera6.adr
-share/opera/locale/en-GB/search.ini
+share/opera/locale/en-GB/en-GB.lng
+share/opera/locale/en-GB/standard_speeddial.ini
+share/opera/locale/en/bookmarks.adr
+share/opera/locale/en/en.lng
+share/opera/locale/en/en.zip
share/opera/locale/en/license.txt
-share/opera/locale/en/opera6.adr
share/opera/locale/en/search.ini
-share/opera/locale/english.lng
+share/opera/locale/en/standard_speeddial.ini
share/opera/locale/es-ES/
-share/opera/locale/es-ES/espanol-espana.lng
-share/opera/locale/es-ES/license.txt
-share/opera/locale/es-ES/opera6.adr
-share/opera/locale/es-ES/search.ini
+share/opera/locale/es-ES/es-ES.lng
share/opera/locale/es-LA/
-share/opera/locale/es-LA/espanol-america_latina.lng
-share/opera/locale/es-LA/license.txt
-share/opera/locale/es-LA/opera6.adr
-share/opera/locale/es-LA/search.ini
+share/opera/locale/es-LA/es-LA.lng
share/opera/locale/et/
-share/opera/locale/et/eesti.lng
-share/opera/locale/et/license.txt
-share/opera/locale/et/opera6.adr
-share/opera/locale/et/search.ini
+share/opera/locale/et/et.lng
share/opera/locale/fi/
-share/opera/locale/fi/license.txt
-share/opera/locale/fi/opera6.adr
-share/opera/locale/fi/search.ini
-share/opera/locale/fi/suomi.lng
+share/opera/locale/fi/fi.lng
share/opera/locale/fr/
share/opera/locale/fr-CA/
-share/opera/locale/fr-CA/francais-canadien.lng
-share/opera/locale/fr-CA/license.txt
-share/opera/locale/fr-CA/opera6.adr
-share/opera/locale/fr-CA/search.ini
-share/opera/locale/fr/francais.lng
-share/opera/locale/fr/license.txt
-share/opera/locale/fr/opera6.adr
-share/opera/locale/fr/search.ini
+share/opera/locale/fr-CA/fr-CA.lng
+share/opera/locale/fr/fr.lng
share/opera/locale/fy/
-share/opera/locale/fy/frisian.lng
-share/opera/locale/fy/license.txt
-share/opera/locale/fy/opera6.adr
-share/opera/locale/fy/search.ini
+share/opera/locale/fy/fy.lng
share/opera/locale/hi/
-share/opera/locale/hi/hindi.lng
-share/opera/locale/hi/license.txt
-share/opera/locale/hi/opera6.adr
-share/opera/locale/hi/search.ini
+share/opera/locale/hi/hi.lng
+share/opera/locale/hi/standard_speeddial.ini
share/opera/locale/hr/
-share/opera/locale/hr/croatian.lng
-share/opera/locale/hr/license.txt
-share/opera/locale/hr/opera6.adr
-share/opera/locale/hr/search.ini
+share/opera/locale/hr/hr.lng
share/opera/locale/hu/
-share/opera/locale/hu/hungarian.lng
-share/opera/locale/hu/license.txt
-share/opera/locale/hu/opera6.adr
-share/opera/locale/hu/search.ini
+share/opera/locale/hu/hu.lng
share/opera/locale/id/
-share/opera/locale/id/indonesian.lng
-share/opera/locale/id/license.txt
-share/opera/locale/id/opera6.adr
-share/opera/locale/id/search.ini
+share/opera/locale/id/bookmarks.adr
+share/opera/locale/id/id.lng
+share/opera/locale/id/standard_speeddial.ini
share/opera/locale/it/
-share/opera/locale/it/italiano.lng
-share/opera/locale/it/license.txt
-share/opera/locale/it/opera6.adr
-share/opera/locale/it/search.ini
+share/opera/locale/it/it.lng
share/opera/locale/ja/
-share/opera/locale/ja/japanese.lng
+share/opera/locale/ja/bookmarks.adr
+share/opera/locale/ja/ja.lng
share/opera/locale/ja/license.txt
-share/opera/locale/ja/opera6.adr
share/opera/locale/ja/search.ini
+share/opera/locale/ja/standard_speeddial.ini
share/opera/locale/ka/
-share/opera/locale/ka/georgian.lng
-share/opera/locale/ka/license.txt
-share/opera/locale/ka/opera6.adr
-share/opera/locale/ka/search.ini
+share/opera/locale/ka/ka.lng
share/opera/locale/ko/
-share/opera/locale/ko/korean.lng
-share/opera/locale/ko/license.txt
-share/opera/locale/ko/opera6.adr
-share/opera/locale/ko/search.ini
+share/opera/locale/ko/ko.lng
share/opera/locale/lt/
-share/opera/locale/lt/license.txt
-share/opera/locale/lt/lithuanian.lng
-share/opera/locale/lt/opera6.adr
-share/opera/locale/lt/search.ini
+share/opera/locale/lt/lt.lng
share/opera/locale/mk/
-share/opera/locale/mk/license.txt
-share/opera/locale/mk/macedonian.lng
-share/opera/locale/mk/opera6.adr
-share/opera/locale/mk/search.ini
+share/opera/locale/mk/mk.lng
share/opera/locale/nb/
-share/opera/locale/nb/license.txt
-share/opera/locale/nb/norsk.lng
-share/opera/locale/nb/opera6.adr
-share/opera/locale/nb/search.ini
+share/opera/locale/nb/nb.lng
share/opera/locale/nl/
-share/opera/locale/nl/license.txt
-share/opera/locale/nl/nederlands.lng
-share/opera/locale/nl/opera6.adr
-share/opera/locale/nl/search.ini
+share/opera/locale/nl/nl.lng
share/opera/locale/nn/
-share/opera/locale/nn/license.txt
-share/opera/locale/nn/nynorsk.lng
-share/opera/locale/nn/opera6.adr
-share/opera/locale/nn/search.ini
+share/opera/locale/nn/nn.lng
share/opera/locale/pl/
-share/opera/locale/pl/license.txt
-share/opera/locale/pl/opera6.adr
-share/opera/locale/pl/polski.lng
+share/opera/locale/pl/bookmarks.adr
+share/opera/locale/pl/pl.lng
share/opera/locale/pl/search.ini
+share/opera/locale/pl/standard_speeddial.ini
share/opera/locale/pt/
share/opera/locale/pt-BR/
-share/opera/locale/pt-BR/brazilportuguese.lng
-share/opera/locale/pt-BR/license.txt
-share/opera/locale/pt-BR/opera6.adr
-share/opera/locale/pt-BR/search.ini
-share/opera/locale/pt/license.txt
-share/opera/locale/pt/opera6.adr
-share/opera/locale/pt/portuguese.lng
-share/opera/locale/pt/search.ini
+share/opera/locale/pt-BR/pt-BR.lng
+share/opera/locale/pt/pt.lng
+share/opera/locale/ro/
+share/opera/locale/ro/ro.lng
share/opera/locale/ru/
-share/opera/locale/ru/license.txt
-share/opera/locale/ru/opera6.adr
-share/opera/locale/ru/russian.lng
+share/opera/locale/ru/bookmarks.adr
+share/opera/locale/ru/ru.lng
share/opera/locale/ru/search.ini
+share/opera/locale/ru/standard_speeddial.ini
+share/opera/locale/sk/
+share/opera/locale/sk/sk.lng
+share/opera/locale/sr/
+share/opera/locale/sr/sr.lng
share/opera/locale/sv/
-share/opera/locale/sv/license.txt
-share/opera/locale/sv/opera6.adr
-share/opera/locale/sv/search.ini
-share/opera/locale/sv/svenska.lng
+share/opera/locale/sv/sv.lng
share/opera/locale/ta/
-share/opera/locale/ta/license.txt
-share/opera/locale/ta/opera6.adr
-share/opera/locale/ta/search.ini
-share/opera/locale/ta/tamil.lng
+share/opera/locale/ta/ta.lng
share/opera/locale/te/
-share/opera/locale/te/license.txt
-share/opera/locale/te/opera6.adr
-share/opera/locale/te/search.ini
-share/opera/locale/te/telugu.lng
+share/opera/locale/te/te.lng
share/opera/locale/tr/
-share/opera/locale/tr/license.txt
-share/opera/locale/tr/opera6.adr
-share/opera/locale/tr/search.ini
-share/opera/locale/tr/turkce.lng
+share/opera/locale/tr/tr.lng
share/opera/locale/uk/
-share/opera/locale/uk/license.txt
-share/opera/locale/uk/opera6.adr
-share/opera/locale/uk/search.ini
-share/opera/locale/uk/ukrainian.lng
+share/opera/locale/uk/uk.lng
share/opera/locale/zh-cn/
-share/opera/locale/zh-cn/chinese_simp.lng
-share/opera/locale/zh-cn/license.txt
-share/opera/locale/zh-cn/opera6.adr
+share/opera/locale/zh-cn/bookmarks.adr
+share/opera/locale/zh-cn/browser.js
share/opera/locale/zh-cn/search.ini
+share/opera/locale/zh-cn/standard_speeddial.ini
+share/opera/locale/zh-cn/turbosettings.xml
+share/opera/locale/zh-cn/zh-cn.lng
+share/opera/locale/zh-hk/
+share/opera/locale/zh-hk/browser.js
+share/opera/locale/zh-hk/turbosettings.xml
share/opera/locale/zh-tw/
-share/opera/locale/zh-tw/chinese.lng
-share/opera/locale/zh-tw/license.txt
-share/opera/locale/zh-tw/opera6.adr
-share/opera/locale/zh-tw/search.ini
-share/opera/opera6.adr
-share/opera/search.ini
+share/opera/locale/zh-tw/browser.js
+share/opera/locale/zh-tw/turbosettings.xml
+share/opera/locale/zh-tw/zh-tw.lng
+share/opera/scripts/
+share/opera/scripts/common.js
+share/opera/scripts/substance.js
share/opera/skin/
share/opera/skin/standard_skin.zip
-share/opera/skin/windows_skin.zip
share/opera/styles/
+share/opera/styles/Inconsolata.otf
share/opera/styles/about.css
share/opera/styles/cache.css
share/opera/styles/certinfo.css
share/opera/styles/config.css
share/opera/styles/contentblock.css
+share/opera/styles/debug.css
share/opera/styles/dir.css
share/opera/styles/error.css
share/opera/styles/history.css
share/opera/styles/im.css
share/opera/styles/image.css
share/opera/styles/images/
+share/opera/styles/images/Opera_256x256.png
share/opera/styles/images/bar.png
+share/opera/styles/images/bullet.png
share/opera/styles/images/center.png
share/opera/styles/images/customize.gif
share/opera/styles/images/darkBox.png
share/opera/styles/images/defaultFavicon.png
+share/opera/styles/images/error.png
+share/opera/styles/images/file.png
share/opera/styles/images/flag.png
share/opera/styles/images/folder.png
+share/opera/styles/images/header-expanded.png
+share/opera/styles/images/header.png
+share/opera/styles/images/info-header.png
share/opera/styles/images/opera.png
+share/opera/styles/images/page-bot.png
share/opera/styles/images/red_center.png
share/opera/styles/images/red_left.png
share/opera/styles/images/red_right.png
@@ -282,12 +227,17 @@ share/opera/styles/images/root.png
share/opera/styles/images/section.png
share/opera/styles/images/smartGroup.png
share/opera/styles/images/top.png
+share/opera/styles/images/warning.png
share/opera/styles/info.css
+share/opera/styles/m2_welcome_message.mbs
+share/opera/styles/mail.css
share/opera/styles/mathml.css
share/opera/styles/message.css
share/opera/styles/mime.css
+share/opera/styles/opera.css
share/opera/styles/plugins.css
share/opera/styles/search.css
+share/opera/styles/unstyledxml.css
share/opera/styles/user/
share/opera/styles/user/accessibility.css
share/opera/styles/user/altdebugger.css
@@ -308,12 +258,16 @@ share/opera/styles/user/toc.css
share/opera/styles/warning.css
share/opera/styles/webfeeds.html
share/opera/styles/wml.css
-share/opera/svg-mo.dat
-share/opera/svg-mobd.dat
-share/opera/svg-sa.dat
-share/opera/svg-sabd.dat
-share/opera/svg-se.dat
-share/opera/svg-sebd.dat
+share/opera/ui/
+share/opera/ui/dialog.ini
+share/opera/ui/fastforward.ini
+share/opera/ui/standard_keyboard.ini
+share/opera/ui/standard_keyboard_compat.ini
+share/opera/ui/standard_menu.ini
+share/opera/ui/standard_mouse.ini
+share/opera/ui/standard_toolbar.ini
+share/opera/ui/standard_trusted_repositories.ini
+share/opera/ui/unix_keyboard.ini
@sysctl kern.emul.linux=1
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database
