diff --git a/www/midori/Makefile b/www/midori/Makefile index 71577a2eb54..19c8337b648 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/22 08:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2011/03/12 12:51:25 landry Exp $ COMMENT = lightweight web browser -XFCE_VERSION = 0.2.9 +XFCE_VERSION = 0.3.2 XFCE_GOODIE = midori -MAINTAINER = Landry Breuil +MAINTAINER = Landry Breuil CATEGORIES = www # LGPLv2.1 diff --git a/www/midori/distinfo b/www/midori/distinfo index 5984581b129..58229ef7a56 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,5 +1,5 @@ -MD5 (midori-0.2.9.tar.bz2) = pYIdjjH6lEN07VHAnKTnQA== -RMD160 (midori-0.2.9.tar.bz2) = O48vj6VfEOgKnnaeQIX5a3+naas= -SHA1 (midori-0.2.9.tar.bz2) = MynDucvh0voMuU4/hkgC+uT8Xps= -SHA256 (midori-0.2.9.tar.bz2) = gDv1NKtzz3pQ3dOLvWiXYljDbzNaPx3BiA9TkVx/33g= -SIZE (midori-0.2.9.tar.bz2) = 802627 +MD5 (midori-0.3.2.tar.bz2) = mdnwuTbnBStBw9Hnp9fWcg== +RMD160 (midori-0.3.2.tar.bz2) = /Rb2yutO5FttXr4vG48OHvJ1xXI= +SHA1 (midori-0.3.2.tar.bz2) = KW+pL4v9kTyHimacEeUFu0+osqs= +SHA256 (midori-0.3.2.tar.bz2) = kxaAP91ohCxD8Gr+ZF7E+kUgbxQnlvYTHSdhujQV4rw= +SIZE (midori-0.3.2.tar.bz2) = 826287 diff --git a/www/midori/patches/patch-midori_main_c b/www/midori/patches/patch-midori_main_c index 68a89950943..2f38baadf65 100644 --- a/www/midori/patches/patch-midori_main_c +++ b/www/midori/patches/patch-midori_main_c @@ -1,13 +1,15 @@ -$OpenBSD: patch-midori_main_c,v 1.4 2010/11/02 09:56:19 landry Exp $ +$OpenBSD: patch-midori_main_c,v 1.5 2011/03/12 12:51:25 landry Exp $ use path to our root ca list for ssl cert validation ---- midori/main.c.orig Sun Oct 31 23:20:48 2010 -+++ midori/main.c Mon Nov 1 08:26:36 2010 -@@ -861,8 +861,7 @@ midori_soup_session_prepare (SoupSession* sessio +--- midori/main.c.orig Sun Feb 20 00:00:26 2011 ++++ midori/main.c Sun Feb 20 20:31:06 2011 +@@ -898,10 +898,7 @@ midori_soup_session_prepare (SoupSession* sessio #if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91) const gchar* certificate_files[] = { - "/etc/pki/tls/certs/ca-bundle.crt", - "/etc/ssl/certs/ca-certificates.crt", +- "/etc/ssl/certs/ca-bundle.crt", +- "/usr/local/share/certs/ca-root-nss.crt", + "/etc/ssl/cert.pem", NULL }; diff --git a/www/midori/patches/patch-wscript b/www/midori/patches/patch-wscript index 1e0809c3def..0a64d45bfbc 100644 --- a/www/midori/patches/patch-wscript +++ b/www/midori/patches/patch-wscript @@ -1,8 +1,8 @@ -$OpenBSD: patch-wscript,v 1.12 2010/11/02 09:56:19 landry Exp $ +$OpenBSD: patch-wscript,v 1.13 2011/03/12 12:51:25 landry Exp $ We don't need those files installed.. ---- wscript.orig Sun Oct 31 23:20:48 2010 -+++ wscript Mon Nov 1 08:31:47 2010 -@@ -68,7 +68,7 @@ +--- wscript.orig Mon Jan 31 02:04:53 2011 ++++ wscript Mon Jan 31 09:15:35 2011 +@@ -68,7 +68,7 @@ def rc_file(self, node): self.compiled_tasks.append (rctask) rc_file = extension ('.rc')(rc_file) Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE', @@ -11,12 +11,12 @@ We don't need those files installed.. def configure (conf): def option_checkfatal (option, desc): -@@ -416,12 +416,8 @@ +@@ -417,12 +417,8 @@ def build (bld): bld.add_group () - if bld.env['docs']: -- bld.install_files ('${DOCDIR}/' + '/', \ +- bld.install_files ('${DOCDIR}/', \ - 'AUTHORS COPYING ChangeLog EXPAT README') - # Install default configuration @@ -25,4 +25,3 @@ We don't need those files installed.. if bld.env['RST2HTML']: # FIXME: Build only if needed - diff --git a/www/midori/pkg/PLIST b/www/midori/pkg/PLIST index 1e8ca7e74b6..146296e8e42 100644 --- a/www/midori/pkg/PLIST +++ b/www/midori/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.19 2010/11/02 09:56:19 landry Exp $ +@comment $OpenBSD: PLIST,v 1.20 2011/03/12 12:51:25 landry Exp $ @bin bin/midori -include/midori-0.2/ -include/midori-0.2/extensions/ -include/midori-0.2/extensions/history-list.h +include/midori-0.3/ +include/midori-0.3/extensions/ +include/midori-0.3/extensions/history-list.h lib/midori/ lib/midori/libadblock.so lib/midori/libaddons.so @@ -49,6 +49,7 @@ share/icons/hicolor/48x48/status/news-feed.png share/icons/hicolor/scalable/apps/midori.svg share/icons/hicolor/scalable/categories/extension.svg share/icons/hicolor/scalable/status/news-feed.svg +share/locale/ar/LC_MESSAGES/midori.mo share/locale/ast/LC_MESSAGES/midori.mo share/locale/ca/LC_MESSAGES/midori.mo share/locale/cs/LC_MESSAGES/midori.mo