Update to v0.1.7:

 + Save the activation status of extensions
 + Catch and ignore mouse buttons meant for horizontal scrolling
 + Improve panel detaching and how panels handle it
 + Add a Feed Panel extension
 + Add a Fixed-width Font Family preference
 + Support spell checking
 + Implement (optional) Speed dial feature
 + Support nicer error pages with WebKitGTK+ 1.1.6
 + Implement middle click to open menu items in tabs
 + Implement -s, --snapshot command line switch
 + Use libnotify (runtime dependency) for finished transfers
 + Add a Go button to the address entry
 + Always append tabs opened via middle/ double click on the tab bar
 + Implement Open new pages in: New window preference
 + Implement inline find with direct '.' and '/' hotkeys
 + Add basic support for @-moz-document in user styles

3 files changed, 21 insertions, 10 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 99829c6ed6f..228d46be0dd 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2009/05/13 18:41:31 snj Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/08 21:17:04 ahoka Exp $
 
-DISTNAME=	midori-0.1.6
+DISTNAME=	midori-0.1.7
 CATEGORIES=	www
 MASTER_SITES=	http://goodies.xfce.org/releases/midori/
 
@@ -39,7 +39,8 @@ SUBST_STAGE.marshal=	pre-configure
 SUBST_MESSAGE.marshal=	Gross hack (part one) in progress
 SUBST_FILES.marshal=	midori/midori-locationaction.c midori/midori-panel.c
 SUBST_FILES.marshal+=	midori/midori-view.c midori/midori-searchaction.c
-SUBST_FILES.marshal+=	katze/katze-array.c
+SUBST_FILES.marshal+=	midori/midori-browser.c
+SUBST_FILES.marshal+=	katze/katze-array.c katze/katze-arrayaction.c
 SUBST_SED.marshal=	-e 's/"marshal/"marshallocal/'
 SUBST_STAGE.marshal2=	pre-configure
 SUBST_MESSAGE.marshal2=	Gross hack (part two) in progress
@@ -61,5 +62,6 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 552ce2dfdcb..242042010a7 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2009/05/13 18:41:31 snj Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/08 21:17:04 ahoka Exp $
 bin/midori
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
+lib/midori/libfeed-panel.so
 lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
 lib/midori/libstatusbar-features.so
@@ -26,6 +27,7 @@ share/icons/hicolor/32x32/status/news-feed.png
 share/icons/hicolor/48x48/apps/midori.png
 share/icons/hicolor/48x48/categories/extension.png
 share/icons/hicolor/48x48/status/news-feed.png
+share/locale/cs/LC_MESSAGES/midori.mo
 share/locale/da/LC_MESSAGES/midori.mo
 share/locale/de/LC_MESSAGES/midori.mo
 share/locale/el/LC_MESSAGES/midori.mo
@@ -42,14 +44,21 @@ share/locale/it/LC_MESSAGES/midori.mo
 share/locale/ja/LC_MESSAGES/midori.mo
 share/locale/nl/LC_MESSAGES/midori.mo
 share/locale/pl/LC_MESSAGES/midori.mo
-share/locale/pt_PT/LC_MESSAGES/midori.mo
+share/locale/pt/LC_MESSAGES/midori.mo
+share/locale/ro/LC_MESSAGES/midori.mo
 share/locale/ru/LC_MESSAGES/midori.mo
+share/locale/sk/LC_MESSAGES/midori.mo
 share/locale/sv/LC_MESSAGES/midori.mo
 share/locale/tr/LC_MESSAGES/midori.mo
 share/locale/uk/LC_MESSAGES/midori.mo
 share/locale/zh_CN/LC_MESSAGES/midori.mo
 share/locale/zh_TW/LC_MESSAGES/midori.mo
-share/midori/logo-shade.png
+share/midori/res/error.html
+share/midori/res/logo-shade.png
+share/midori/res/mootools.js
+share/midori/res/speeddial-head.html
+share/midori/res/speeddial.json
+@dirrm share/midori/res
 @dirrm share/midori
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/status
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/categories
diff --git a/www/midori/distinfo b/www/midori/distinfo
index a5fb2abe723..fc1f54010cc 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/05/13 18:41:31 snj Exp $
+$NetBSD: distinfo,v 1.5 2009/06/08 21:17:04 ahoka Exp $
 
-SHA1 (midori-0.1.6.tar.bz2) = 4240ecad520510fda002cd3da1e3f4f5cc1fa184
-RMD160 (midori-0.1.6.tar.bz2) = 9cf3981b4abeccf2e7c1831cac4a0af364104976
-Size (midori-0.1.6.tar.bz2) = 390115 bytes
+SHA1 (midori-0.1.7.tar.bz2) = 29ee96a632eacbfd40852f9ae386ea666f7f9fdb
+RMD160 (midori-0.1.7.tar.bz2) = cd17daad777242c5f2b7e4c85c2e28b2cf22d0d9
+Size (midori-0.1.7.tar.bz2) = 463060 bytes
 SHA1 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b