diff options
author | maya <maya> | 2017-04-22 07:16:19 +0000 |
---|---|---|
committer | maya <maya> | 2017-04-22 07:16:19 +0000 |
commit | dd8ca80cdf66874b4b8f7e0f30e067089c269acb (patch) | |
tree | 793dbe2e926be3395cebb310711fbf51e5116532 /www | |
parent | 3c99424b5f23af085b55bdccb8a286590364e824 (diff) | |
download | pkgsrc-dd8ca80cdf66874b4b8f7e0f30e067089c269acb.tar.gz |
Midori binary needs WX memory, use NOT_PAX_MPROTECT_SAFE.
from macallan@
While here, appease pkglint.
bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/midori/Makefile | 12 | ||||
-rw-r--r-- | www/midori/options.mk | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile index 1f16c0497c0..6e9f4b83129 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.96 2017/02/28 15:20:11 ryoon Exp $ +# $NetBSD: Makefile,v 1.97 2017/04/22 07:16:19 maya Exp $ DISTNAME= midori_0.5.11_all_ PKGNAME= ${DISTNAME:S/_all_//:S/_/-/} -PKGREVISION= 11 +PKGREVISION= 12 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,6 +42,8 @@ CONF_FILES+= ${EGDIR}/extensions/adblock/config \ CONFIGURE_ENV= VALAC=${VALAC} +NOT_PAX_MPROTECT_SAFE+= bin/midori + .include "options.mk" .include "../../databases/sqlite3/buildlink3.mk" diff --git a/www/midori/options.mk b/www/midori/options.mk index d5775dae113..b59055320d0 100644 --- a/www/midori/options.mk +++ b/www/midori/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2015/10/25 11:53:24 jmcneill Exp $ +# $NetBSD: options.mk,v 1.2 2017/04/22 07:16:19 maya Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.midori @@ -10,13 +10,13 @@ PKG_SUGGESTED_OPTIONS= gtk2 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mgtk2) -.include "../../www/webkit24-gtk/buildlink3.mk" +.include "../../www/webkit24-gtk/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mgtk3) CONFIGURE_ARGS+= --enable-gtk3 CMAKE_ARGS+= -DUSE_GTK3=1 -.include "../../www/webkit24-gtk3/buildlink3.mk" +.include "../../www/webkit24-gtk3/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" .endif |