CVS commit: [pkgsrc-2017Q1] pkgsrc/www/midori

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 09:02:16 UTC 2017

Modified Files:
        pkgsrc/www/midori [pkgsrc-2017Q1]: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.96.2.1 pkgsrc/www/midori/Makefile
cvs rdiff -u -r1.1 -r1.1.12.1 pkgsrc/www/midori/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/midori/Makefile
diff -u pkgsrc/www/midori/Makefile:1.96 pkgsrc/www/midori/Makefile:1.96.2.1
--- pkgsrc/www/midori/Makefile:1.96     Tue Feb 28 15:20:11 2017
+++ pkgsrc/www/midori/Makefile  Mon May  1 09:02:16 2017
@@ -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 @@ 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
 
 CONFIGURE_ENV= VALAC=${VALAC}
 
+NOT_PAX_MPROTECT_SAFE+=        bin/midori
+
 .include "options.mk"
 
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/www/midori/options.mk
diff -u pkgsrc/www/midori/options.mk:1.1 pkgsrc/www/midori/options.mk:1.1.12.1
--- pkgsrc/www/midori/options.mk:1.1    Sun Oct 25 11:53:24 2015
+++ pkgsrc/www/midori/options.mk        Mon May  1 09:02:16 2017
@@ -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 @@ 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