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.3
retrieving revision 1.110
diff -u -p -r1.3 -r1.110
--- pkgsrc/www/midori/Makefile	2009/01/28 13:33:53	1.3
+++ pkgsrc/www/midori/Makefile	2018/10/24 21:11:56	1.110
@@ -1,40 +1,62 @@
-# $NetBSD: Makefile,v 1.3 2009/01/28 13:33:53 ahoka Exp $
-#
+# $NetBSD: Makefile,v 1.110 2018/10/24 21:11:56 leot Exp $
 
-DISTNAME=	midori-0.1.1
-PKGREVISION=	2
+DISTNAME=	midori_0.5.11_all_
+PKGNAME=	${DISTNAME:S/_all_//:S/_/-/}
+PKGREVISION=	25
 CATEGORIES=	www
-MASTER_SITES=	http://goodies.xfce.org/releases/midori/
+MASTER_SITES=	http://midori-browser.org/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.twotoasts.de/media/midori/
+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_DIRS+=	xdg-1.4
+USE_CMAKE=	yes
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--disable-zeitgeist
+CMAKE_ARGS+=		-DUSE_ZEITGEIST=OFF
+CMAKE_ARGS+=		-DPREFIX=${PREFIX}
 
-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/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
 
-.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}
+
+NOT_PAX_MPROTECT_SAFE+=	bin/midori
+
+.include "options.mk"
+
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libsexy/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/libsoup24/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 "../../www/webkit-gtk/buildlink3.mk"
-.include "../../x11/libunique/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"