update to 0.2.9

changes: many feature additions, UI improvements, fixes

4 files changed, 24 insertions, 28 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 95547e450d3..e3266ae87ae 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2011/01/13 13:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2011/01/26 19:35:20 drochner Exp $
 
-DISTNAME=	midori-0.2.6
-PKGREVISION=	4
+DISTNAME=	midori-0.2.9
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
 
@@ -16,6 +15,7 @@ USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--disable-vala
 
 REPLACE_PYTHON=		waf wscript docs/api/wscript_build
 REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 5fea8c4a5b4..16549e7a2ca 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2010/07/08 11:44:48 obache Exp $
+@comment $NetBSD: PLIST,v 1.15 2011/01/26 19:35:20 drochner Exp $
 bin/midori
 lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
+lib/midori/libcopy-tabs.so
 lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
 lib/midori/libmouse-gestures.so
@@ -12,7 +13,7 @@ lib/midori/libshortcuts.so
 lib/midori/libstatus-clock.so
 lib/midori/libstatusbar-features.so
 lib/midori/libtab-panel.so
-lib/midori/libtab-switcher.so
+lib/midori/libtabs-minimized.so
 lib/midori/libtoolbar-editor.so
 lib/midori/libweb-cache.so
 share/applications/midori.desktop
@@ -39,6 +40,9 @@ 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/icons/hicolor/scalable/apps/midori.svg
+share/icons/hicolor/scalable/categories/extension.svg
+share/icons/hicolor/scalable/status/news-feed.svg
 share/locale/ast/LC_MESSAGES/midori.mo
 share/locale/ca/LC_MESSAGES/midori.mo
 share/locale/cs/LC_MESSAGES/midori.mo
@@ -58,6 +62,7 @@ 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/lt/LC_MESSAGES/midori.mo
 share/locale/nl/LC_MESSAGES/midori.mo
 share/locale/no/LC_MESSAGES/midori.mo
 share/locale/pa/LC_MESSAGES/midori.mo
diff --git a/www/midori/distinfo b/www/midori/distinfo
index a90ee3975ae..7d0bbf1ab82 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2010/07/08 11:44:48 obache Exp $
+$NetBSD: distinfo,v 1.12 2011/01/26 19:35:20 drochner Exp $
 
-SHA1 (midori-0.2.6.tar.bz2) = c70f6d75e2ea2947dcf05201192b9405bb4036f4
-RMD160 (midori-0.2.6.tar.bz2) = 9086330cedc3dba15474dc0c6919fbffeba7d296
-Size (midori-0.2.6.tar.bz2) = 712959 bytes
-SHA1 (patch-aa) = 44458b593c9e1841b6d4ba3b4f79050b80a0201f
+SHA1 (midori-0.2.9.tar.bz2) = 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b
+RMD160 (midori-0.2.9.tar.bz2) = 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab
+Size (midori-0.2.9.tar.bz2) = 802627 bytes
+SHA1 (patch-aa) = 2036e0de8bedfcf1c07f041f02e8f8b85b8f0cee
diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa
index 6a5999cf8d5..07a6fc26d58 100644
--- a/www/midori/patches/patch-aa
+++ b/www/midori/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2010/05/21 09:36:58 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2011/01/26 19:35:20 drochner Exp $
 
---- wscript.orig	2010-05-16 18:32:33.000000000 +0000
+--- wscript.orig	2010-10-31 22:20:48.000000000 +0000
 +++ wscript
-@@ -88,7 +88,7 @@ def configure (conf):
- 
-     conf.check_tool ('compiler_cc')
-     # Circumvent mandatory check for valac
--    if find_program_impl (conf.env, 'valac'):
-+    if 0:
-         conf.check_tool ('vala')
-     else:
-          conf.check_message ('program', 'valac', False, False)
-@@ -454,7 +454,7 @@ def build (bld):
+@@ -421,7 +421,7 @@ def build (bld):
              'AUTHORS COPYING ChangeLog EXPAT README')
  
      # Install default configuration
@@ -20,12 +11,12 @@ $NetBSD: patch-aa,v 1.4 2010/05/21 09:36:58 drochner Exp $
  
      if bld.env['RST2HTML']:
          # FIXME: Build only if needed
-@@ -533,13 +533,13 @@ def build (bld):
-         bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
- 
-         # FIXME: Determine the library naming for other platforms
--        if Options.platform == 'linux':
-+        if 1:
+@@ -508,13 +508,13 @@ def build (bld):
+                 if os.path.exists (source):
+                     bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
+                                        '/extensions/' + folder, source)
+-        elif Options.platform == 'linux':
++        elif 1:
              extensions = os.listdir ('data/extensions')
              for extension in extensions:
                  folder = 'lib' + extension + '.so'