3 files changed, 50 insertions, 12 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index ced3fda9a0ad..2d5c0f7931d1 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,14 +3,13 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/midori/Makefile,v 1.10 2008/12/31 03:30:21 mezz Exp $
+#   $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTVERSION=	0.2.0
 CATEGORIES=	www
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
@@ -35,7 +34,7 @@ USE_LDCONFIG=	yes
 .include <bsd.port.pre.mk>
 
 # WAF needs that
-CONFIGURE_ENV+=	CC="${CC=gcc}"
+CONFIGURE_ENV+=	CC=${CC}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/www/midori/distinfo b/www/midori/distinfo
index d5aa5a28086d..2c2276146402 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,3 +1,3 @@
-MD5 (midori-0.1.2.tar.bz2) = 5169ead6783f374cedf3f89bf399bd75
-SHA256 (midori-0.1.2.tar.bz2) = a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
-SIZE (midori-0.1.2.tar.bz2) = 311182
+MD5 (midori-0.2.0.tar.bz2) = 805e2e59a93a0a4b7652d6547b2bd923
+SHA256 (midori-0.2.0.tar.bz2) = 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
+SIZE (midori-0.2.0.tar.bz2) = 570091
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index a96b5b143d2b..639d57a8ba6e 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,7 +1,17 @@
 bin/midori
+etc/xdg/midori/search
+lib/midori/libadblock.so
+lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
+lib/midori/libdnsprefetch.so
+lib/midori/libfeed-panel.so
+lib/midori/libformhistory.so
+lib/midori/libmouse-gestures.so
 lib/midori/libpage-holder.so
-lib/midori/libtab-panel.so
+lib/midori/libshortcuts.so
 lib/midori/libstatusbar-features.so
+lib/midori/libtab-panel.so
+lib/midori/libtoolbar-editor.so
 %%NLS%%share/applications/midori.desktop
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
@@ -15,12 +25,18 @@ share/icons/hicolor/16x16/status/news-feed.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/24x24/apps/midori.png
+share/icons/hicolor/24x24/categories/extension.png
+share/icons/hicolor/24x24/status/news-feed.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/48x48/apps/midori.png
 share/icons/hicolor/48x48/categories/extension.png
 share/icons/hicolor/48x48/status/news-feed.png
+%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/da/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/de/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/el/LC_MESSAGES/midori.mo
@@ -30,18 +46,41 @@ share/icons/hicolor/48x48/status/news-feed.png
 %%NLS%%share/locale/fi/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/id/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/it/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
-share/midori/logo-shade.png
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
+%%DATADIR%%/autosuggestcontrol.css
+%%DATADIR%%/autosuggestcontrol.js
+%%DATADIR%%/res/error.html
+%%DATADIR%%/res/logo-shade.png
+%%DATADIR%%/res/mootools.js
+%%DATADIR%%/res/speeddial-head.html
+%%DATADIR%%/res/speeddial.json
+@dirrm %%DATADIR%%/res
+@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrm lib/midori
-@dirrm share/midori
 @dirrmtry share/applications
 @dirrm %%DOCSDIR%%
+@dirrm etc/xdg/midori
+@dirrmtry etc/xdg