From d37f35a0f353393293623a52f5de300a3f544a15 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 15 Mar 2013 18:28:50 +0000
Subject: update to 0.4.9 changes: -bugfixes -UI improvements

---
 www/midori/Makefile         |  6 +++---
 www/midori/PLIST            |  7 ++++++-
 www/midori/distinfo         |  9 +++++----
 www/midori/patches/patch-ab | 13 +++++++++++++
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 www/midori/patches/patch-ab

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 96bf1e95d95..c9abceb3cf6 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2013/02/16 11:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2013/03/15 18:28:50 drochner Exp $
 
-DISTNAME=	midori-0.4.7
-PKGREVISION=	2
+DISTNAME=	midori-0.4.9
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
@@ -15,6 +14,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--disable-zeitgeist
 
 CHECK_PORTABILITY_SKIP+= win32/x86-mingw32-opensuse/install.sh
 CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 9e3217a6c4e..d7eb6fc09d9 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.24 2012/10/11 14:55:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2013/03/15 18:28:50 drochner Exp $
 bin/midori
 include/midori-0.4/extensions/delayed-load.h
 include/midori-0.4/extensions/external-download-manager.h
 include/midori-0.4/extensions/history-list.h
+include/midori-0.4/extensions/nsplugin-manager.h
 lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
@@ -14,6 +15,7 @@ lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
 lib/midori/libhistory-list.so
 lib/midori/libmouse-gestures.so
+lib/midori/libnsplugin-manager.so
 lib/midori/libshortcuts.so
 lib/midori/libstatus-clock.so
 lib/midori/libstatusbar-features.so
@@ -53,6 +55,7 @@ share/icons/hicolor/scalable/status/internet-news-reader.svg
 share/locale/ar/LC_MESSAGES/midori.mo
 share/locale/ast/LC_MESSAGES/midori.mo
 share/locale/be/LC_MESSAGES/midori.mo
+share/locale/bg/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
@@ -105,3 +108,5 @@ share/vala/vapi/external-download-manager.deps
 share/vala/vapi/external-download-manager.vapi
 share/vala/vapi/history-list.deps
 share/vala/vapi/history-list.vapi
+share/vala/vapi/nsplugin-manager.deps
+share/vala/vapi/nsplugin-manager.vapi
diff --git a/www/midori/distinfo b/www/midori/distinfo
index e9375438623..22a3d24a70b 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.21 2012/10/11 14:55:38 drochner Exp $
+$NetBSD: distinfo,v 1.22 2013/03/15 18:28:51 drochner Exp $
 
-SHA1 (midori-0.4.7.tar.bz2) = f32b1dc76061de3cefc222d779a7d6441b92a4fa
-RMD160 (midori-0.4.7.tar.bz2) = 72b0cf1290ed2a6c5e306b9b2dbb1ad4ce565860
-Size (midori-0.4.7.tar.bz2) = 1015921 bytes
+SHA1 (midori-0.4.9.tar.bz2) = c845ced87ee758472d8e5e2080a5b2b1d4f2d041
+RMD160 (midori-0.4.9.tar.bz2) = 9c0f6b22a8e37d2b2952420e6a9863def83cbbfc
+Size (midori-0.4.9.tar.bz2) = 1079713 bytes
 SHA1 (patch-aa) = e776d3d8199441b42fd13e1b90072387b44ac8a5
+SHA1 (patch-ab) = 1d9dedf91c5d60e596644c4f059276d2f54f12b3
diff --git a/www/midori/patches/patch-ab b/www/midori/patches/patch-ab
new file mode 100644
index 00000000000..4d15d6ed523
--- /dev/null
+++ b/www/midori/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2013/03/15 18:28:51 drochner Exp $
+
+--- midori/midori-privatedata.c.orig	2013-03-07 17:44:14.000000000 +0000
++++ midori/midori-privatedata.c
+@@ -11,7 +11,7 @@
+ 
+ #include "midori-privatedata.h"
+ 
+-#include "marshal.h"
++#include "marshallocal.h"
+ #include "midori-platform.h"
+ #include "midori-core.h"
+ 
-- 
cgit v1.2.3