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.19
retrieving revision 1.27
diff -u -p -r1.19 -r1.27
--- pkgsrc/www/midori/Makefile	2010/04/10 00:57:06	1.19
+++ pkgsrc/www/midori/Makefile	2011/01/26 19:35:20	1.27
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2010/04/10 00:57:06 obache Exp $
+# $NetBSD: Makefile,v 1.27 2011/01/26 19:35:20 drochner Exp $
 
-DISTNAME=	midori-0.2.4
+DISTNAME=	midori-0.2.9
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
 
@@ -15,6 +15,7 @@ USE_TOOLS+=	gmake intltool msgfmt pkg-co
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--disable-vala
 
 REPLACE_PYTHON=		waf wscript docs/api/wscript_build
 REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
@@ -31,13 +32,9 @@ CONF_FILES=		${EGDIR}/search ${PKG_SYSCO
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX arould hunk#2 of patch-aa
-PLIST_VARS+=	linux
-.if ${OPSYS} == "Linux"
-PLIST.linux=		yes
-OWN_DIRS+=		${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
-CONF_FILES+=		${EGDIR}/extensions/libadblock.so/config ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
-.endif
+OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
+CONF_FILES+=	${EGDIR}/extensions/libadblock.so/config \
+		${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
 
 # XXX stupid hack. python has a marshal.h that gets included before
 # the local marshal.h