update to 0.3.3

changes: minor improvements, mostly UI and networking related

4 files changed, 17 insertions, 16 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index e1772fc7669..7010e4c9ba3 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2011/03/11 21:04:52 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2011/04/08 20:02:13 drochner Exp $
 
-DISTNAME=	midori-0.3.2
+DISTNAME=	midori-0.3.3
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.3/
 
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 30425d2ee40..b304afb5c18 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2011/03/11 21:04:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2011/04/08 20:02:13 drochner Exp $
 bin/midori
 lib/midori/libadblock.so
 lib/midori/libaddons.so
@@ -22,7 +22,8 @@ share/doc/midori/COPYING
 share/doc/midori/ChangeLog
 share/doc/midori/EXPAT
 share/doc/midori/README
-share/doc/midori/user/midori.html
+share/doc/midori/faq.css
+share/doc/midori/faq.html
 share/examples/midori/extensions/libadblock.so/config
 share/examples/midori/search
 share/icons/hicolor/16x16/apps/midori.png
diff --git a/www/midori/distinfo b/www/midori/distinfo
index a8e81cff9ed..4511da86716 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2011/03/11 21:04:52 drochner Exp $
+$NetBSD: distinfo,v 1.14 2011/04/08 20:02:13 drochner Exp $
 
-SHA1 (midori-0.3.2.tar.bz2) = 296fa92f8bfd913c878a669c11e505bb4fa8b2ab
-RMD160 (midori-0.3.2.tar.bz2) = fd16f6caeb4ee45b6d5ebe2f1b8f0e1ef275c572
-Size (midori-0.3.2.tar.bz2) = 826287 bytes
-SHA1 (patch-aa) = 2036e0de8bedfcf1c07f041f02e8f8b85b8f0cee
+SHA1 (midori-0.3.3.tar.bz2) = 01baf6243f7b00af5e5b4eb6ac5d3233e60bc993
+RMD160 (midori-0.3.3.tar.bz2) = f2380250f3246a3a7c32edb3eba884d3c8ed946f
+Size (midori-0.3.3.tar.bz2) = 848720 bytes
+SHA1 (patch-aa) = 4c3f5f1c248a871e73c6eaf51f9d9259e02d1e6a
diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa
index 07a6fc26d58..edc6e350ae7 100644
--- a/www/midori/patches/patch-aa
+++ b/www/midori/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2011/01/26 19:35:20 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2011/04/08 20:02:13 drochner Exp $
 
---- wscript.orig	2010-10-31 22:20:48.000000000 +0000
+--- wscript.orig	2011-03-13 22:03:35.000000000 +0000
 +++ wscript
-@@ -421,7 +421,7 @@ def build (bld):
-             'AUTHORS COPYING ChangeLog EXPAT README')
+@@ -407,7 +407,7 @@ def build (bld):
+             'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
  
      # Install default configuration
 -    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
 +    bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + '/', 'data/search')
  
-     if bld.env['RST2HTML']:
-         # FIXME: Build only if needed
-@@ -508,13 +508,13 @@ def build (bld):
+     if bld.env['INTLTOOL']:
+         obj = bld.new_task_gen ('intltool_po')
+@@ -481,13 +481,13 @@ def build (bld):
                  if os.path.exists (source):
                      bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
                                         '/extensions/' + folder, source)