Update to 0.1.4. Changes:

v0.1.4:
 + Automatic inline find can be disabled
 + Implement an Encoding menu
 + Add Open all in Tabs for bookmarks and history
 + Bookmarks can be moved to other folders
 + Fix blank page 'loading' and HTTP authentication
 + Display history dates in the local format
 + Allow editing of completion items

v0.1.3:
 + Sidepanel can be aligned on the right
 + Bookmarks can be organized in folders
 + Support find as you type
 + Support international domain names
 + Tweak location completion
 + Provide default search engines
 + Integrate with Maemo if available
 + Implement Mouse Gestures extension
 + Implement a Plugins panel
 + Editing the toolbar via a context menu
 + Introduce Zoom Text and Images preference

v0.1.2:
 + Open new tabs by clicking on the tabbar
 + Refactor and speed up location completion
 + Show a Crash dialog after crashes
 + Dynamically save files when needed
 + Support Back/ Forward mouse buttons
 + Support javascript: bookmarklets
 + Implement Proxy and Identification string
 + Implement cookie storage on disk
 + Remove autotooled build system
 + Add a new Extensions panel
 + Implement opening of new windows
 + Display tooltips in Preferences

4 files changed, 67 insertions, 17 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 7d3cc38e9c6..ead9f9f108c 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2009/02/09 22:56:27 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.6 2009/03/18 03:14:11 snj Exp $
 
-DISTNAME=	midori-0.1.1
-PKGREVISION=	4
+DISTNAME=	midori-0.1.4
 CATEGORIES=	www
 MASTER_SITES=	http://goodies.xfce.org/releases/midori/
 
@@ -19,22 +17,46 @@ USE_TOOLS+=	gmake intltool msgfmt pkg-config
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
-REPLACE_PYTHON=		waf wscript po/wscript_build katze/wscript_build
-REPLACE_PYTHON+=	docs/api/wscript_build icons/wscript_build
-REPLACE_PYTHON+=	midori/wscript_build
+REPLACE_PYTHON=		waf wscript docs/api/wscript_build
+REPLACE_PYTHON+=	katze/wscript_build extensions/wscript_build
+REPLACE_PYTHON+=	icons/wscript_build midori/wscript_build
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
 BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
 
-.include "../../lang/python/application.mk"
+DEPENDS+=		gnome-themes-[0-9]*:../../x11/gnome-themes
+
+EGDIR=			${PREFIX}/share/examples/midori
+OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
+CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
+
+PRIVILEGED_STAGES+=	clean
+
+# XXX stupid hack. python has a marshal.h that gets included before
+# the local marshal.h
+SUBST_CLASSES+=		marshal marshal2
+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_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_SED.marshal2=	-e s/\'marshal/\'marshallocal/
+
+pre-configure:
+	${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/application.mk"
+BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../net/libsoup24/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index a2d6faa3fe0..b0234b16b22 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/01/29 16:56:08 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/18 03:14:11 snj Exp $
 bin/midori
+lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
 lib/midori/libstatusbar-features.so
 lib/midori/libtab-panel.so
@@ -11,7 +12,7 @@ share/doc/midori/EXPAT
 share/doc/midori/README
 share/doc/midori/TRANSLATE
 share/doc/midori/user/midori.html
-share/midori/logo-shade.png
+share/examples/midori/search
 share/icons/hicolor/32x32/apps/midori.png
 share/icons/hicolor/32x32/categories/extension.png
 share/icons/hicolor/32x32/status/news-feed.png
@@ -24,7 +25,9 @@ share/icons/hicolor/16x16/status/news-feed.png
 share/icons/hicolor/22x22/apps/midori.png
 share/icons/hicolor/22x22/categories/extension.png
 share/icons/hicolor/22x22/status/news-feed.png
+share/locale/da/LC_MESSAGES/midori.mo
 share/locale/de/LC_MESSAGES/midori.mo
+share/locale/el/LC_MESSAGES/midori.mo
 share/locale/en_GB/LC_MESSAGES/midori.mo
 share/locale/es/LC_MESSAGES/midori.mo
 share/locale/et/LC_MESSAGES/midori.mo
@@ -33,12 +36,23 @@ share/locale/fr/LC_MESSAGES/midori.mo
 share/locale/gl/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
+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/ru/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/midori/logo-shade.png
+@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
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/status
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/categories
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/status
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/categories
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
@@ -46,8 +60,8 @@ share/locale/uk/LC_MESSAGES/midori.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/categories
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/examples/midori
 @dirrm share/doc/midori/user
 @dirrm share/doc/midori
-@dirrm share/midori
-@dirrm lib/midori
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/midori
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 4549c5eaab4..c9e497bf6a1 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/11 20:15:49 ahoka Exp $
+$NetBSD: distinfo,v 1.2 2009/03/18 03:14:11 snj Exp $
 
-SHA1 (midori-0.1.1.tar.bz2) = df1176aa584369f04e5e7e76bc4e193af0580ab0
-RMD160 (midori-0.1.1.tar.bz2) = 936e9f310ee1d3b9546eee8ed1806bf8d1827d53
-Size (midori-0.1.1.tar.bz2) = 309109 bytes
+SHA1 (midori-0.1.4.tar.bz2) = 6b18d9f55ce3489cbc6922f0be9ba34b193fe696
+RMD160 (midori-0.1.4.tar.bz2) = 9d489ef170281d9b9249987669f136db43d0edb3
+Size (midori-0.1.4.tar.bz2) = 352409 bytes
+SHA1 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b
diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa
new file mode 100644
index 00000000000..3b9465fe661
--- /dev/null
+++ b/www/midori/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2009/03/18 03:14:11 snj Exp $
+
+--- wscript.orig	2009-03-17 18:29:37.000000000 -0700
++++ wscript	2009-03-17 18:29:33.000000000 -0700
+@@ -311,7 +311,7 @@ def build (bld):
+             'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
+ 
+     # Install default configuration
+-    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
++    bld.install_files ('${DESTDIR}${PREFIX}/share/examples/midori/', 'data/search')
+ 
+     if bld.env['RST2HTML']:
+         # FIXME: Build only if needed