[pkgsrc/pkgsrc-2017Q1]: pkgsrc/mk/tools Pullup ticket #5348 - requested by maya

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4808f3646ba
branches:  pkgsrc-2017Q1
changeset: 360332:c4808f3646ba
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:00:34 2017 +0000

description:
Pullup ticket #5348 - requested by maya
mk/tools/tools.NetBSD.mk: bugfix for paxctl

Revisions pulled up:
- mk/tools/tools.NetBSD.mk                                      1.61,1.60

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Fri Apr 21 16:03:10 UTC 2017

   Modified Files:
           pkgsrc/mk/tools: tools.NetBSD.mk

   Log Message:
   Check for paxctl's existence rather than version+arch check.

   It likely only matched amd64 before (looks like i386 had a typo),
   but it's necessary on most netbsd archs since netbsd-7.99.x.

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Fri Apr 21 14:45:07 UTC 2017

   Modified Files:
           pkgsrc/mk/tools: tools.NetBSD.mk

   Log Message:
   Workaround for make(1) from recent NetBSD-current to detect paxctl

diffstat:

 mk/tools/tools.NetBSD.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 7d6129e6c0a5 -r c4808f3646ba mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Mon May 01 08:57:40 2017 +0000
+++ b/mk/tools/tools.NetBSD.mk  Mon May 01 09:00:34 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.59 2016/11/10 20:58:46 joerg Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.59.4.1 2017/05/01 09:00:34 bsiegert Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -89,8 +89,7 @@
 TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pax?=           /bin/pax
-.if empty(MACHINE_PLATFORM:MNetBSD-[^0-3].*-386) || \
-       empty(MACHINE_PLATFORM:MNetBSD-[^0-3].*-x86_64)
+.if exists(/usr/sbin/paxctl)
 TOOLS_PLATFORM.paxctl?=                /usr/sbin/paxctl
 .endif
 TOOLS_PLATFORM.printf?=                /usr/bin/printf