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.6
retrieving revision 1.19
diff -u -p -r1.6 -r1.19
--- pkgsrc/www/midori/Makefile	2009/03/18 03:14:11	1.6
+++ pkgsrc/www/midori/Makefile	2010/04/10 00:57:06	1.19
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2009/03/18 03:14:11 snj Exp $
+# $NetBSD: Makefile,v 1.19 2010/04/10 00:57:06 obache Exp $
 
-DISTNAME=	midori-0.1.4
+DISTNAME=	midori-0.2.4
 CATEGORIES=	www
-MASTER_SITES=	http://goodies.xfce.org/releases/midori/
+MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.twotoasts.de/media/midori/
+HOMEPAGE=	http://www.twotoasts.de/index.php?/pages/midori_summary.html
 COMMENT=	Lightweight web browser using WebKit
 EXTRACT_SUFX=	.tar.bz2
 
 HAS_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_DIRS+=	xdg-1.4
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 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 +29,15 @@ 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"
+
+# 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
 
 # XXX stupid hack. python has a marshal.h that gets included before
 # the local marshal.h
@@ -39,6 +46,8 @@ SUBST_STAGE.marshal=	pre-configure
 SUBST_MESSAGE.marshal=	Gross hack (part one) in progress
 SUBST_FILES.marshal=	midori/midori-locationaction.c midori/midori-panel.c
 SUBST_FILES.marshal+=	midori/midori-view.c midori/midori-searchaction.c
+SUBST_FILES.marshal+=	midori/midori-browser.c
+SUBST_FILES.marshal+=	katze/katze-array.c katze/katze-arrayaction.c
 SUBST_SED.marshal=	-e 's/"marshal/"marshallocal/'
 SUBST_STAGE.marshal2=	pre-configure
 SUBST_MESSAGE.marshal2=	Gross hack (part two) in progress
@@ -49,6 +58,7 @@ pre-configure:
 	${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
@@ -58,5 +68,6 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup
 .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"
 .include "../../mk/bsd.pkg.mk"