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.109
retrieving revision 1.115
diff -u -p -r1.109 -r1.115
--- pkgsrc/www/midori/Makefile	2018/09/03 10:50:19	1.109
+++ pkgsrc/www/midori/Makefile	2018/12/11 12:40:18	1.115
@@ -1,62 +1,37 @@
-# $NetBSD: Makefile,v 1.109 2018/09/03 10:50:19 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2018/12/11 12:40:18 bsiegert Exp $
 
-DISTNAME=	midori_0.5.11_all_
-PKGNAME=	${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION=	24
+DISTNAME=	midori-v7.0
+PKGNAME=	${DISTNAME:S/v//}
 CATEGORIES=	www
-MASTER_SITES=	http://midori-browser.org/downloads/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=midori-browser/}
+GITHUB_PROJECT=	core
+GITHUB_RELEASE=	v7
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 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_CMAKE=	yes
-USE_TOOLS+=	gmake intltool msgfmt pkg-config
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--disable-zeitgeist
-CMAKE_ARGS+=		-DUSE_ZEITGEIST=OFF
-CMAKE_ARGS+=		-DPREFIX=${PREFIX}
-
-CHECK_PORTABILITY_SKIP+=	win32/old/x86-mingw32-opensuse/install.sh
-CHECK_PORTABILITY_SKIP+=	win32/makedist/makedist.midori
-
-BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
-
-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}
+USE_TOOLS+=	intltool msgfmt pkg-config
 
-NOT_PAX_MPROTECT_SAFE+=	bin/midori
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
-.include "options.mk"
+CONFIGURE_ENV+=	VALAC=${VALAC}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libpeas/buildlink3.mk"
+.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"