Update midori to 0.2.4.

v0.2.4
 + Prevent completion from overlapping
 + Fix tab order when restoring session
 + Ignore accidentally middle click search
 + Implement bookmark export to XBEL
 + Provide scroll hotkeys, default to Vim
 + Store and complete search in location
 + Fix opening externally with multiple windows
 + Only use icons in panel buttons
 + Fix build with different GTK+ versions
 + Omit micro version and arch from ident string

v0.2.3
 + Improve relocatability for Win32
 + Implement 'Close other tabs' menu item
 + Use new GTK+ accessors where available
 + Allow searching freely in History panel
 + Re-implement completion based on sqlite
 + Re-implement completion suggestion popup
 + Simplify sqlite use towards efficient calls
 + Move panel icons to the bottom
 + Merge Netscape Plugins and Extensions panels
 + Implement 'about:version' special page
 + Implement 'Preferred languages' preference
 + Improve window raising behaviour
 + Allow Ctrl+Right-click to suppress javascript menu
 + Add 'Open link as web app' in context menu
 + Add 'Block image' menu item to Adblock
 + Location progress and compat code refactored
 + Implement 'Paste and proceed' in location
 + Move DNS prefetching into the core
 + Allow selecting and deleting multiple cookies
 + Support attaching/ detaching web inspector
 + Always enable web inspector
 + --diagnostic-dialog command line switch
 + Faster file existence checks
 + Simplified, faster adblock implementation

v0.2.2
 + Turn libnotify into a proper build-time dependency
 + Use Ctrl + Return to open tabs from the location entry
 + Support right-click on bookmark menu items
 + Support -e in midori -a and with multiple commands
 + Make Middle click open selection search if needed
 + Make Ctrl+C work as expected again
 + Fix order of History, Trash and Recently opened pages
 + Revise Shortcuts dialogue to fix oddities
 + Perform Form history completion case insensitive
 + Add 'Web Cache' to Delete Private data dialogue
 + Load accels from /etc/xdg if present
 + Improve XBEL format compatibility and performance
 + Fix inline find by correcting key handling
 + Add option to open panels in separate windows
 + Support Portrait orientation in Fremantle
 + Support Hildon MIME and URI handling
 + Check status before caching in Web Cache
 + Show popup menu on news feed icon if needed
 + Support Colourful Tabs with Tab Panel
 + Tweak sqlite and dbus handling for Win32
 + 'Run as web app' and 'Show in toolbar' for bookmarks
 + Add 'Small icons' toolbar style
 + Fix build with Glib < 2.20 and GTK+ < 2.12
 + Add Import bookmarks for XBEL, Opera and RDF
 + Add Open Link in Foreground/ Background Tab menu
 + Allow closing all tabs
 + Hildon file chooser support

v0.2.1
 + Fix Mouse Gestures to work after activation
 + Explicitly link to X11 to support gold
 + Implement various Hildon specific features
 + Hide the navigationbar in fullscreen
 + Implement permanent storage of form history
 + Support keyboard shortcuts like Ctrl+Tab or "a"
 + Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT
 + Make creation of new windows fast
 + Introduce the Tab History List extension
 + Load icons laziy at startup to speed up startup
 + Introduce a Web Cache extension
 + Refactor and tweak the Preferences dialogue
 + Implement combos to choose external applications

v0.2.0
 + (Kinetic) drag scrolling on touchscreen devices
 + Workaround a speed dial crasher
 + Faster Adblock with element blocking, for all WebKitGTK+ versions
 + Stripped menu, toolbar and tap on hold on Maemo, and 5.0 menu support
 + Add a DNS prefetching extension
 + Better IDN handling
 + Add a form history extension
 + Restore scrolling positions from the session
 + Keep typed address when switching tabs
 + Avoid storing duplicate history items per day
 + Fix multiple duplicate HTTP authentication dialogs
 + Pass mailto: links to the email client
 + Improve context menu with WebKitGTK+ 1.1.15
 + Checkbox "Remember password" in HTTP authentication
 + Fix a crasher when modifying bookmarks
 + Support page icons other than favicon.ico
 + iPhone identity in Network preferences

v0.1.10:
 + Fix freezing when opening multiple windows
 + Revamp Adblock with WebKitGTK+ 1.1.14 API
 + Greatly improve the address completion
 + Always show news feed icon
 + Better handling of feeds in the feed panel
 + Add Gtk+ and WebKit version to the About dialog
 + Improve tab panel and support minimized tabs
 + Implement disabling of extensions in crahs dialog
 + Don't make the web inspector transient
 + Tidy up the Preferences a bit
 + Load default bookmarks and config from /etc
 + Do not use xprop at runtime
 + Use GNOME proxy server if libsoup-gnome is installed
 + Integrate Save As with transfers
 + Save HTTP logins in a text file
 + Support Undo and Redo with WebKitGTK+ 1.1.14

4 files changed, 46 insertions, 21 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 964013e5aa6..9426e36c1de 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/04/10 00:57:06 obache Exp $
 
-DISTNAME=	midori-0.1.9
-PKGREVISION=	5
+DISTNAME=	midori-0.2.4
 CATEGORIES=	www
-MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.1/
+MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.twotoasts.de/index.php?/pages/midori_summary.html
@@ -18,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 REPLACE_PYTHON=		waf wscript docs/api/wscript_build
-REPLACE_PYTHON+=	katze/wscript_build extensions/wscript_build
+REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
 REPLACE_PYTHON+=	icons/wscript_build midori/wscript_build
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
@@ -30,7 +29,15 @@ EGDIR=			${PREFIX}/share/examples/midori
 OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
 CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
 
-PRIVILEGED_STAGES+=	clean
+.include "../../mk/bsd.prefs.mk"
+
+# XXX arould hunk#2 of patch-aa
+PLIST_VARS+=	linux
+.if ${OPSYS} == "Linux"
+PLIST.linux=		yes
+OWN_DIRS+=		${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
+CONF_FILES+=		${EGDIR}/extensions/libadblock.so/config ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
+.endif
 
 # XXX stupid hack. python has a marshal.h that gets included before
 # the local marshal.h
@@ -44,12 +51,11 @@ 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
-SUBST_FILES.marshal2=	midori/wscript_build katze/wscript_build
+SUBST_FILES.marshal2=	midori/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 dd747c57d15..95fb4d714be 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,24 +1,27 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/06 06:48:11 hasso Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/04/10 00:57:06 obache Exp $
 bin/midori
 lib/midori/libadblock.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
 lib/midori/libfeed-panel.so
+lib/midori/libformhistory.so
 lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
 lib/midori/libshortcuts.so
 lib/midori/libstatusbar-features.so
 lib/midori/libtab-panel.so
+lib/midori/libtab-switcher.so
 lib/midori/libtoolbar-editor.so
+lib/midori/libweb-cache.so
 share/applications/midori.desktop
 share/doc/midori/AUTHORS
 share/doc/midori/COPYING
 share/doc/midori/ChangeLog
 share/doc/midori/EXPAT
 share/doc/midori/README
-share/doc/midori/TRANSLATE
 share/doc/midori/user/midori.html
 share/examples/midori/search
+${PLIST.linux}share/examples/midori/extensions/libadblock.so/config
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
 share/icons/hicolor/16x16/status/news-feed.png
@@ -34,6 +37,8 @@ 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/ast/LC_MESSAGES/midori.mo
+share/locale/ca/LC_MESSAGES/midori.mo
 share/locale/cs/LC_MESSAGES/midori.mo
 share/locale/da/LC_MESSAGES/midori.mo
 share/locale/de/LC_MESSAGES/midori.mo
@@ -49,9 +54,12 @@ 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/ko/LC_MESSAGES/midori.mo
 share/locale/nl/LC_MESSAGES/midori.mo
+share/locale/no/LC_MESSAGES/midori.mo
 share/locale/pl/LC_MESSAGES/midori.mo
 share/locale/pt/LC_MESSAGES/midori.mo
+share/locale/pt_BR/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
@@ -62,6 +70,8 @@ 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/res/autosuggestcontrol.css
+share/midori/res/autosuggestcontrol.js
 share/midori/res/error.html
 share/midori/res/logo-shade.png
 share/midori/res/mootools.js
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 2467f452e57..102ba4fa591 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/08/06 06:48:11 hasso Exp $
+$NetBSD: distinfo,v 1.8 2010/04/10 00:57:06 obache Exp $
 
-SHA1 (midori-0.1.9.tar.bz2) = d54314f7e0e2714866e0e57dc55f142c2285757c
-RMD160 (midori-0.1.9.tar.bz2) = 9e1d6d18cd16f00119adc739551c6ecbb980b166
-Size (midori-0.1.9.tar.bz2) = 516902 bytes
-SHA1 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b
+SHA1 (midori-0.2.4.tar.bz2) = 41b11ff4a65256fc3fdcafb8151f60195d7f8845
+RMD160 (midori-0.2.4.tar.bz2) = 8291b66b23c80b1881c06a1f001789155a5fbf76
+Size (midori-0.2.4.tar.bz2) = 645554 bytes
+SHA1 (patch-aa) = 9d78b4fc1f2a1c881d07283d261e5f1ac3765f47
diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa
index 3b9465fe661..d8aa85f7694 100644
--- a/www/midori/patches/patch-aa
+++ b/www/midori/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2009/03/18 03:14:11 snj Exp $
+$NetBSD: patch-aa,v 1.2 2010/04/10 00:57:06 obache 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')
+--- wscript.orig	2010-03-07 21:23:04.000000000 +0000
++++ wscript
+@@ -430,7 +430,7 @@ def build (bld):
+             'AUTHORS COPYING ChangeLog EXPAT README')
  
      # Install default configuration
 -    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
-+    bld.install_files ('${DESTDIR}${PREFIX}/share/examples/midori/', 'data/search')
++    bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + '/', 'data/search')
  
      if bld.env['RST2HTML']:
          # FIXME: Build only if needed
+@@ -515,7 +515,7 @@ def build (bld):
+                 folder = 'lib' + extension + '.so'
+                 source = 'data/extensions/' + extension +  '/config'
+                 if os.path.exists (source):
+-                    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
++                    bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + \
+                                        '/extensions/' + folder, source)
+ 
+     if Options.commands['check']: