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.24
retrieving revision 1.77
diff -u -p -r1.24 -r1.77
--- pkgsrc/www/midori/Makefile	2010/11/15 22:58:52	1.24
+++ pkgsrc/www/midori/Makefile	2015/04/03 07:38:35	1.77
@@ -1,27 +1,31 @@
-# $NetBSD: Makefile,v 1.24 2010/11/15 22:58:52 abs Exp $
+# $NetBSD: Makefile,v 1.77 2015/04/03 07:38:35 wiz Exp $
 
-DISTNAME=	midori-0.2.6
-PKGREVISION=	2
+DISTNAME=	midori_0.5.9_all_
+PKGNAME=	${DISTNAME:S/_all_//:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
+MASTER_SITES=	http://midori-browser.org/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.twotoasts.de/index.php?/pages/midori_summary.html
+HOMEPAGE=	http://midori-browser.org/
 COMMENT=	Lightweight web browser using WebKit
+LICENSE=	gnu-lgpl-v2.1
 EXTRACT_SUFX=	.tar.bz2
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 HAS_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_CMAKE=	yes
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--disable-zeitgeist
+CMAKE_ARGS+=		-DUSE_ZEITGEIST=OFF
+CMAKE_ARGS+=		-DPREFIX=${PREFIX}
 
-REPLACE_PYTHON=		waf wscript docs/api/wscript_build
-REPLACE_PYTHON+=	tests/wscript_build extensions/wscript_build
-REPLACE_PYTHON+=	icons/wscript_build midori/wscript_build
+CHECK_PORTABILITY_SKIP+= win32/old/x86-mingw32-opensuse/install.sh
+CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
 
-BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
 BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
 
 DEPENDS+=		gnome-themes-[0-9]*:../../x11/gnome-themes
@@ -32,39 +36,24 @@ CONF_FILES=		${EGDIR}/search ${PKG_SYSCO
 
 .include "../../mk/bsd.prefs.mk"
 
-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
-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/
+OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
+CONF_FILES+=	${EGDIR}/extensions/adblock/config \
+		${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
 
-pre-configure:
-	${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
+CONFIGURE_ENV=	VALAC=${VALAC}
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .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 "../../graphics/gnome-icon-theme/buildlink3.mk"
 .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"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"