update to 0.4.7

changes:
-improvements to UI and download behavior
-bugfixes

pkgsrc change: use vala-0.18 to build

3 files changed, 21 insertions, 16 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 20cdb331b40..959b03f3554 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2012/10/08 23:02:33 adam Exp $
+# $NetBSD: Makefile,v 1.50 2012/10/11 14:55:38 drochner Exp $
 
-DISTNAME=	midori-0.4.6
-PKGREVISION=	5
+DISTNAME=	midori-0.4.7
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
@@ -68,6 +67,7 @@ pre-configure:
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../net/libsoup24/buildlink3.mk"
+#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
@@ -75,5 +75,5 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
-.include "../../lang/vala016/buildlink3.mk"
+.include "../../lang/vala018/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index d474dd23bcb..9e3217a6c4e 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.23 2012/06/01 20:21:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2012/10/11 14:55:38 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
 lib/midori/libadblock.so
@@ -7,6 +8,7 @@ lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
 lib/midori/libcopy-tabs.so
+lib/midori/libdelayed-load.so
 lib/midori/libexternal-download-manager.so
 lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
@@ -32,22 +34,22 @@ share/examples/midori/extensions/adblock/config
 share/examples/midori/search
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
-share/icons/hicolor/16x16/status/news-feed.png
+share/icons/hicolor/16x16/status/internet-news-reader.png
 share/icons/hicolor/22x22/apps/midori.png
 share/icons/hicolor/22x22/categories/extension.png
-share/icons/hicolor/22x22/status/news-feed.png
+share/icons/hicolor/22x22/status/internet-news-reader.png
 share/icons/hicolor/24x24/apps/midori.png
 share/icons/hicolor/24x24/categories/extension.png
-share/icons/hicolor/24x24/status/news-feed.png
+share/icons/hicolor/24x24/status/internet-news-reader.png
 share/icons/hicolor/32x32/apps/midori.png
 share/icons/hicolor/32x32/categories/extension.png
-share/icons/hicolor/32x32/status/news-feed.png
+share/icons/hicolor/32x32/status/internet-news-reader.png
 share/icons/hicolor/48x48/apps/midori.png
 share/icons/hicolor/48x48/categories/extension.png
-share/icons/hicolor/48x48/status/news-feed.png
+share/icons/hicolor/48x48/status/internet-news-reader.png
 share/icons/hicolor/scalable/apps/midori.svg
 share/icons/hicolor/scalable/categories/extension.svg
-share/icons/hicolor/scalable/status/news-feed.svg
+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
@@ -94,8 +96,11 @@ share/midori/res/autosuggestcontrol.css
 share/midori/res/autosuggestcontrol.js
 share/midori/res/close.png
 share/midori/res/error.html
+share/midori/res/gtk3.css
 share/midori/res/logo-shade.png
-share/midori/res/speeddial-head-0.4.6.html
+share/midori/res/speeddial-head.html
+share/vala/vapi/delayed-load.deps
+share/vala/vapi/delayed-load.vapi
 share/vala/vapi/external-download-manager.deps
 share/vala/vapi/external-download-manager.vapi
 share/vala/vapi/history-list.deps
diff --git a/www/midori/distinfo b/www/midori/distinfo
index e5ac1c4001f..e9375438623 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2012/06/01 20:21:03 drochner Exp $
+$NetBSD: distinfo,v 1.21 2012/10/11 14:55:38 drochner Exp $
 
-SHA1 (midori-0.4.6.tar.bz2) = 68a41fef15dde865f7cf4579c0dfbd0bae0cccc5
-RMD160 (midori-0.4.6.tar.bz2) = 4f55a332579426c91406617d554ff59570d60f8a
-Size (midori-0.4.6.tar.bz2) = 978570 bytes
+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 (patch-aa) = e776d3d8199441b42fd13e1b90072387b44ac8a5