CVS commit: [pkgsrc-2017Q1] pkgsrc/mk/tools

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 09:00:34 UTC 2017

Modified Files:
        pkgsrc/mk/tools [pkgsrc-2017Q1]: tools.NetBSD.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 pkgsrc/mk/tools/tools.NetBSD.mk

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

Modified files:

Index: pkgsrc/mk/tools/tools.NetBSD.mk
diff -u pkgsrc/mk/tools/tools.NetBSD.mk:1.59 pkgsrc/mk/tools/tools.NetBSD.mk:1.59.4.1
--- pkgsrc/mk/tools/tools.NetBSD.mk:1.59        Thu Nov 10 20:58:46 2016
+++ pkgsrc/mk/tools/tools.NetBSD.mk     Mon May  1 09:00:34 2017
@@ -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.nroff?=                /usr/bin/nroff
 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