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.46
retrieving revision 1.73
diff -u -p -r1.46 -r1.73
--- pkgsrc/www/midori/Makefile	2012/09/07 19:17:42	1.46
+++ pkgsrc/www/midori/Makefile	2014/10/07 16:47:37	1.73
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2012/09/07 19:17:42 adam Exp $
+# $NetBSD: Makefile,v 1.73 2014/10/07 16:47:37 adam Exp $
 
-DISTNAME=	midori-0.4.6
-PKGREVISION=	2
+DISTNAME=	midori-0.4.9
+PKGREVISION=	15
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
@@ -14,13 +14,14 @@ 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-zeitgeist
 
 CHECK_PORTABILITY_SKIP+= win32/x86-mingw32-opensuse/install.sh
 CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
 
 PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.4.9
 
 REPLACE_PYTHON=		waf wscript docs/api/wscript_build
 REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
@@ -68,6 +69,7 @@ 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"
@@ -75,5 +77,5 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
-.include "../../lang/vala016/buildlink3.mk"
+.include "../../lang/vala020/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"