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.5
retrieving revision 1.73
diff -u -p -r1.5 -r1.73
--- pkgsrc/www/midori/Makefile	2009/02/09 22:56:27	1.5
+++ pkgsrc/www/midori/Makefile	2014/10/07 16:47:37	1.73
@@ -1,40 +1,81 @@
-# $NetBSD: Makefile,v 1.5 2009/02/09 22:56:27 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.73 2014/10/07 16:47:37 adam Exp $
 
-DISTNAME=	midori-0.1.1
-PKGREVISION=	4
+DISTNAME=	midori-0.4.9
+PKGREVISION=	15
 CATEGORIES=	www
-MASTER_SITES=	http://goodies.xfce.org/releases/midori/
+MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
 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}
+CONFIGURE_ARGS+=	--disable-zeitgeist
 
-REPLACE_PYTHON=		waf wscript po/wscript_build katze/wscript_build
-REPLACE_PYTHON+=	docs/api/wscript_build icons/wscript_build
-REPLACE_PYTHON+=	midori/wscript_build
+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
+REPLACE_PYTHON+=	icons/wscript_build midori/wscript_build
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
 BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
 
-.include "../../lang/python/application.mk"
+DEPENDS+=		gnome-themes-[0-9]*:../../x11/gnome-themes
+
+EGDIR=			${PREFIX}/share/examples/midori
+OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
+CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
+
+.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
+SUBST_CLASSES+=		marshal marshal2
+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
+SUBST_FILES.marshal2=	midori/wscript_build
+SUBST_SED.marshal2=	-e s/\'marshal/\'marshallocal/
+
+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"
+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"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala020/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"