Update to 0.1.6.

Changes:
 + Add Delete All to transferbar
 + Show search in context menu
 + Implement 'Default' search engine
 + Show only icons in Statusbar Features
 + Implement Clear private data
 + Support News Feed icon and external aggregator
 + Fix reloading of Not found pages
 + Fixup spaces when middle click opening
 + Fix possibly wrong identificaton string
 + Optionally search engines in completion
 + Optionally Gtk 2.16 entry progress and icon
 + Experimental panel detaching
 + Support external download manager again
 + Implement '-a', '--app' argument
 + Implement '-c', '--config' argument
 + Fix a bookmark saving issue
 + Support data: URIs in the address entry
 + Several performance and memory leak fixes
 + Load cookies idle to accelerate startup
 + Support mailto: links
 + Save tab reordering in the session
 + Add a Cookie Manager extension
 + Fix crashers in Colourful Tabs

3 files changed, 12 insertions, 10 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 476eb49a11d..99829c6ed6f 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2009/03/25 22:37:15 he Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/13 18:41:31 snj Exp $
 
-DISTNAME=	midori-0.1.5
-PKGREVISION=	1
+DISTNAME=	midori-0.1.6
 CATEGORIES=	www
 MASTER_SITES=	http://goodies.xfce.org/releases/midori/
 
@@ -40,14 +39,16 @@ 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_SED.marshal=	-e 's/"marshal/"marshallocal/'
 SUBST_STAGE.marshal2=	pre-configure
 SUBST_MESSAGE.marshal2=	Gross hack (part two) in progress
-SUBST_FILES.marshal2=	midori/wscript_build
+SUBST_FILES.marshal2=	midori/wscript_build katze/wscript_build
 SUBST_SED.marshal2=	-e s/\'marshal/\'marshallocal/
 
 pre-configure:
 	${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
+	${MV} ${WRKSRC}/katze/marshal.list ${WRKSRC}/katze/marshallocal.list
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 9463a248b33..552ce2dfdcb 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2009/03/22 23:18:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/05/13 18:41:31 snj Exp $
 bin/midori
 lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
 lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
 lib/midori/libstatusbar-features.so
-lib/midori/libtab-panel.so
 share/applications/midori.desktop
 share/doc/midori/AUTHORS
 share/doc/midori/COPYING
@@ -35,6 +35,7 @@ share/locale/et/LC_MESSAGES/midori.mo
 share/locale/fi/LC_MESSAGES/midori.mo
 share/locale/fr/LC_MESSAGES/midori.mo
 share/locale/gl/LC_MESSAGES/midori.mo
+share/locale/he/LC_MESSAGES/midori.mo
 share/locale/hu/LC_MESSAGES/midori.mo
 share/locale/id/LC_MESSAGES/midori.mo
 share/locale/it/LC_MESSAGES/midori.mo
diff --git a/www/midori/distinfo b/www/midori/distinfo
index d0544e108f8..a5fb2abe723 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/03/22 23:18:01 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/05/13 18:41:31 snj Exp $
 
-SHA1 (midori-0.1.5.tar.bz2) = 5a83ecd140735ab6323fb21cd7771fbdfe20b7f8
-RMD160 (midori-0.1.5.tar.bz2) = 59ddbfd2133e013f1a0597acfdeed96cdd2fa08d
-Size (midori-0.1.5.tar.bz2) = 371500 bytes
+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 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b