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.14
retrieving revision 1.44
diff -u -p -r1.14 -r1.44
--- pkgsrc/www/midori/Makefile	2009/08/11 11:55:28	1.14
+++ pkgsrc/www/midori/Makefile	2012/06/14 07:44:19	1.44
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2009/08/11 11:55:28 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2012/06/14 07:44:19 sbd Exp $
 
-DISTNAME=	midori-0.1.9
+DISTNAME=	midori-0.4.6
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.1/
+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
@@ -17,8 +17,13 @@ USE_TOOLS+=	gmake intltool msgfmt pkg-co
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
+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+=	katze/wscript_build extensions/wscript_build
+REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
 REPLACE_PYTHON+=	icons/wscript_build midori/wscript_build
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
@@ -30,7 +35,13 @@ EGDIR=			${PREFIX}/share/examples/midori
 OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
 CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
 
-PRIVILEGED_STAGES+=	clean
+.include "../../mk/bsd.prefs.mk"
+
+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
@@ -44,12 +55,11 @@ SUBST_FILES.marshal+=	katze/katze-array.
 SUBST_SED.marshal=	-e 's/"marshal/"marshallocal/'
 SUBST_STAGE.marshal2=	pre-configure
 SUBST_MESSAGE.marshal2=	Gross hack (part two) in progress
-SUBST_FILES.marshal2=	midori/wscript_build katze/wscript_build
+SUBST_FILES.marshal2=	midori/wscript_build
 SUBST_SED.marshal2=	-e s/\'marshal/\'marshallocal/
 
 pre-configure:
 	${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
-	${MV} ${WRKSRC}/katze/marshal.list ${WRKSRC}/katze/marshallocal.list
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
@@ -64,4 +74,6 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala014/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"