From e834fca4704e2b0dcfe5473ae1487d95aa0ec0c0 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Sun, 8 Mar 2009 20:01:18 +0000
Subject: [PATCH] Update to midori 0.1.4.

---
 www/midori/Makefile              |  7 ++++---
 www/midori/distinfo              | 10 +++++-----
 www/midori/patches/patch-wscript | 13 ++++++++-----
 www/midori/pkg/PLIST             |  9 ++++++++-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 8b64d407b26..2697c8f360e 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2009/01/29 20:08:42 sturm Exp $
+# $OpenBSD: Makefile,v 1.6 2009/03/08 20:01:18 landry Exp $
 
 COMMENT =	lightweight web browser
 
-XFCE_VERSION =	0.1.2
+XFCE_VERSION =	0.1.4
 XFCE_GOODIE =	midori
-PKGNAME =	${DISTNAME}p0
 
 MAINTAINER =	Landry Breuil <gaston@gcu.info>
 CATEGORIES =	www
@@ -19,8 +18,10 @@ MODULES =	x11/xfce4 devel/waf
 
 USE_X11 =	Yes
 DESKTOP_FILES =	Yes
+NO_REGRESS =	Yes
 
 LIB_DEPENDS =	webkit-1.0::www/webkit \
+		idn::devel/libidn \
 		sqlite3::databases/sqlite3 \
 		unique-1.0::devel/libunique \
 		soup-2.4:libsoup->=2.24.3p0:devel/libsoup
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 8cf1ff2be0f..a4589d7bfc4 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,5 +1,5 @@
-MD5 (midori-0.1.2.tar.bz2) = UWnq1ng/N0zt8/ib85m9dQ==
-RMD160 (midori-0.1.2.tar.bz2) = 13ViMb2GrqX1U10QvtDapxKOP+c=
-SHA1 (midori-0.1.2.tar.bz2) = e8rOS3ZtpY4xK0lCILFeiKmDuKw=
-SHA256 (midori-0.1.2.tar.bz2) = qWZkHPG24Y5PWKo1hammOQXtUCUog4BMAGoyY2dKMuw=
-SIZE (midori-0.1.2.tar.bz2) = 311182
+MD5 (midori-0.1.4.tar.bz2) = qbIQJ7qJT+0wVdcHTF8HPQ==
+RMD160 (midori-0.1.4.tar.bz2) = nUie8XAoHZuSSZh2afE220PQ7bM=
+SHA1 (midori-0.1.4.tar.bz2) = axjZ9VzjSJy8aSLwvpujSxk/5pY=
+SHA256 (midori-0.1.4.tar.bz2) = SoRCLCcGJRYvbp4eToFR2VRkV9ZMYcKzyJbL9D+1TOU=
+SIZE (midori-0.1.4.tar.bz2) = 352409
diff --git a/www/midori/patches/patch-wscript b/www/midori/patches/patch-wscript
index 870fe42ad47..eaa60bfb339 100644
--- a/www/midori/patches/patch-wscript
+++ b/www/midori/patches/patch-wscript
@@ -1,8 +1,8 @@
-$OpenBSD: patch-wscript,v 1.2 2009/01/26 19:52:49 landry Exp $
+$OpenBSD: patch-wscript,v 1.3 2009/03/08 20:01:18 landry Exp $
 We don't need those files installed..
---- wscript.orig	Mon Jan 19 00:18:58 2009
-+++ wscript	Mon Jan 19 00:19:05 2009
-@@ -267,10 +267,6 @@ def build (bld):
+--- wscript.orig	Mon Feb 23 14:08:30 2009
++++ wscript	Mon Feb 23 14:08:50 2009
+@@ -303,12 +303,8 @@ def build (bld):
      if option_enabled ('addons'):
          bld.add_subdirs ('extensions')
  
@@ -10,6 +10,9 @@ We don't need those files installed..
 -        bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
 -            'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
 -
+     # Install default configuration
+-    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
++    bld.install_files ('${DATADIR}/examples/' + APPNAME + '/', 'data/search')
+ 
      if bld.env['RST2HTML']:
          # FIXME: Build only if needed
-         if not os.access (blddir, os.F_OK):
diff --git a/www/midori/pkg/PLIST b/www/midori/pkg/PLIST
index 81ce20a0f07..f598e6a47cb 100644
--- a/www/midori/pkg/PLIST
+++ b/www/midori/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/01/26 19:52:49 landry Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/03/08 20:01:18 landry Exp $
 @bin bin/midori
 lib/midori/
+lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
 lib/midori/libstatusbar-features.so
 lib/midori/libtab-panel.so
@@ -8,6 +9,11 @@ share/applications/midori.desktop
 share/doc/midori/
 share/doc/midori/user/
 share/doc/midori/user/midori.html
+share/examples/midori/
+@sample ${SYSCONFDIR}/xdg/
+@sample ${SYSCONFDIR}/xdg/midori/
+share/examples/midori/search
+@sample ${SYSCONFDIR}/xdg/midori/search
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
 share/icons/hicolor/16x16/status/news-feed.png
@@ -31,6 +37,7 @@ share/locale/fr/LC_MESSAGES/midori.mo
 share/locale/gl/LC_MESSAGES/midori.mo
 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/nl/LC_MESSAGES/midori.mo
 share/locale/pl/LC_MESSAGES/midori.mo