[pkgsrc/pkgsrc-2017Q1]: pkgsrc/www/midori Pullup ticket #5349 - requested by ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7252b490d97c
branches:  pkgsrc-2017Q1
changeset: 360333:7252b490d97c
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:02:16 2017 +0000

description:
Pullup ticket #5349 - requested by sevan
www/midori: build fix

Revisions pulled up:
- www/midori/Makefile                                           1.97
- www/midori/options.mk                                         1.2

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Sat Apr 22 07:16:19 UTC 2017

   Modified Files:
           pkgsrc/www/midori: Makefile options.mk

   Log Message:
   Midori binary needs WX memory, use NOT_PAX_MPROTECT_SAFE.
   from macallan@

   While here, appease pkglint.

   bump PKGREVISION.

diffstat:

 www/midori/Makefile   |  12 +++++++-----
 www/midori/options.mk |   6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r c4808f3646ba -r 7252b490d97c www/midori/Makefile
--- a/www/midori/Makefile       Mon May 01 09:00:34 2017 +0000
+++ b/www/midori/Makefile       Mon May 01 09:02:16 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2017/02/28 15:20:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2017/05/01 09:02:16 bsiegert 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 @@
 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 @@
 
 CONFIGURE_ENV= VALAC=${VALAC}
 
+NOT_PAX_MPROTECT_SAFE+=        bin/midori
+
 .include "options.mk"
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff -r c4808f3646ba -r 7252b490d97c www/midori/options.mk
--- a/www/midori/options.mk     Mon May 01 09:00:34 2017 +0000
+++ b/www/midori/options.mk     Mon May 01 09:02:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/10/25 11:53:24 jmcneill Exp $
+# $NetBSD: options.mk,v 1.1.12.1 2017/05/01 09:02:16 bsiegert Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.midori
 
@@ -10,13 +10,13 @@
 .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