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.81 retrieving revision 1.104 diff -u -p -r1.81 -r1.104 --- pkgsrc/www/midori/Makefile 2015/06/07 14:06:00 1.81 +++ pkgsrc/www/midori/Makefile 2018/03/12 11:17:47 1.104 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.81 2015/06/07 14:06:00 youri Exp $ +# $NetBSD: Makefile,v 1.104 2018/03/12 11:17:47 wiz Exp $ -DISTNAME= midori_0.5.9_all_ +DISTNAME= midori_0.5.11_all_ PKGNAME= ${DISTNAME:S/_all_//:S/_/-/} -PKGREVISION= 3 +PKGREVISION= 19 CATEGORIES= www MASTER_SITES= http://midori-browser.org/downloads/ @@ -18,13 +18,13 @@ HAS_CONFIGURE= yes USE_CMAKE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} +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 +CHECK_PORTABILITY_SKIP+= win32/old/x86-mingw32-opensuse/install.sh +CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg @@ -42,8 +42,9 @@ CONF_FILES+= ${EGDIR}/extensions/adblock CONFIGURE_ENV= VALAC=${VALAC} -pre-configure: - ${RM} ${WRKSRC}/extensions/history-list.vala.orig +NOT_PAX_MPROTECT_SAFE+= bin/midori + +.include "options.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -54,9 +55,8 @@ pre-configure: #.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 "../../sysutils/libnotify/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXScrnSaver/buildlink3.mk" BUILDLINK_DEPMETHOD.vala= build .include "../../lang/vala/buildlink3.mk" .include "../../mk/bsd.pkg.mk"