3 files changed, 32 insertions, 11 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index ce9444e4ea0d..9083a8e591c6 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -7,29 +7,34 @@
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 CATEGORIES=	www
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
 
-LIB_DEPENDS=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		rsvg-convert:${PORTSDIR}/graphics/librsvg2
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/WebKit/webkit -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-unique \
-		--disable-gio \
-		--disable-sqlite
+CONFIGURE_ARGS+=--disable-unique
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 intltool libxml2 pkgconfig
 INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
+
+.include <bsd.port.pre.mk>
+
+# WAF needs that
+CONFIGURE_ENV+=	CC="${CC=gcc}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -39,4 +44,4 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 63231f64beb7..d5aa5a28086d 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,3 +1,3 @@
-MD5 (midori-0.1.0.tar.bz2) = b0316a886dc22c766ff680324b59b994
-SHA256 (midori-0.1.0.tar.bz2) = 41d613014aa183874477fc3d0bd44e7b66fb399e6cd971431933a2ee51647029
-SIZE (midori-0.1.0.tar.bz2) = 273058
+MD5 (midori-0.1.2.tar.bz2) = 5169ead6783f374cedf3f89bf399bd75
+SHA256 (midori-0.1.2.tar.bz2) = a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
+SIZE (midori-0.1.2.tar.bz2) = 311182
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 4a04b9b82794..a96b5b143d2b 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,9 +1,14 @@
 bin/midori
+lib/midori/libpage-holder.so
+lib/midori/libtab-panel.so
+lib/midori/libstatusbar-features.so
 %%NLS%%share/applications/midori.desktop
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/COPYING
+%%DOCSDIR%%/EXPAT
 %%DOCSDIR%%/README
+%%DOCSDIR%%/TRANSLATE
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
 share/icons/hicolor/16x16/status/news-feed.png
@@ -16,16 +21,27 @@ 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/da/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/de/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/el/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/es/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/et/LC_MESSAGES/midori.mo
+%%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/hu/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ja/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/ru/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
+@dirrm lib/midori
 @dirrm share/midori
 @dirrmtry share/applications
 @dirrm %%DOCSDIR%%