Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/midori/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/midori/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.28
retrieving revision 1.58
diff -u -p -r1.28 -r1.58
--- pkgsrc/www/midori/Makefile	2011/03/11 21:04:52	1.28
+++ pkgsrc/www/midori/Makefile	2013/06/03 10:06:09	1.58
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2011/03/11 21:04:52 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2013/06/03 10:06:09 wiz Exp $
 
-DISTNAME=	midori-0.3.2
+DISTNAME=	midori-0.4.9
+PKGREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.3/
+MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.twotoasts.de/index.php?/pages/midori_summary.html
@@ -13,9 +14,13 @@ HAS_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--disable-vala
+CONFIGURE_ARGS+=	--disable-zeitgeist
+
+CHECK_PORTABILITY_SKIP+= win32/x86-mingw32-opensuse/install.sh
+CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
+
+PYTHON_FOR_BUILD_ONLY=	yes
 
 REPLACE_PYTHON=		waf wscript docs/api/wscript_build
 REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
@@ -32,9 +37,11 @@ CONF_FILES=		${EGDIR}/search ${PKG_SYSCO
 
 .include "../../mk/bsd.prefs.mk"
 
-OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
-CONF_FILES+=	${EGDIR}/extensions/libadblock.so/config \
-		${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
+OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
+CONF_FILES+=	${EGDIR}/extensions/adblock/config \
+		${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
+
+CONFIGURE_ENV=	VALAC=${VALAC}
 
 # XXX stupid hack. python has a marshal.h that gets included before
 # the local marshal.h
@@ -61,10 +68,13 @@ pre-configure:
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../net/libsoup24/buildlink3.mk"
+#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala020/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"