Mon May 1 09:00:34 2017 UTC ()
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


(bsiegert)
diff -r1.59 -r1.59.4.1 pkgsrc/mk/tools/tools.NetBSD.mk
cvs diff -r1.59 -r1.59.4.1 pkgsrc/mk/tools/tools.NetBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.NetBSD.mk 2016/11/10 20:58:46 1.59
+++ pkgsrc/mk/tools/tools.NetBSD.mk 2017/05/01 09:00:34 1.59.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.NetBSD.mk,v 1.59 2016/11/10 20:58:46 joerg Exp $ 1# $NetBSD: tools.NetBSD.mk,v 1.59.4.1 2017/05/01 09:00:34 bsiegert Exp $
2# 2#
3# System-supplied tools for the NetBSD operating system. 3# System-supplied tools for the NetBSD operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8TOOLS_PLATFORM.byacc?= /usr/bin/yacc 8TOOLS_PLATFORM.byacc?= /usr/bin/yacc
9.if exists(/usr/bin/bzcat) 9.if exists(/usr/bin/bzcat)
10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
11.endif 11.endif
12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
13TOOLS_PLATFORM.cat?= /bin/cat 13TOOLS_PLATFORM.cat?= /bin/cat
14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
@@ -79,28 +79,27 @@ TOOLS_PLATFORM.msgconv?= /usr/bin/msgcon @@ -79,28 +79,27 @@ TOOLS_PLATFORM.msgconv?= /usr/bin/msgcon
79.if exists(/usr/bin/msgfmt) 79.if exists(/usr/bin/msgfmt)
80TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt 80TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
81.endif 81.endif
82.if exists(/usr/bin/msgmerge) 82.if exists(/usr/bin/msgmerge)
83TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge 83TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge
84.endif 84.endif
85TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 85TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
86TOOLS_PLATFORM.mv?= /bin/mv 86TOOLS_PLATFORM.mv?= /bin/mv
87TOOLS_PLATFORM.nice?= /usr/bin/nice 87TOOLS_PLATFORM.nice?= /usr/bin/nice
88TOOLS_PLATFORM.nroff?= /usr/bin/nroff 88TOOLS_PLATFORM.nroff?= /usr/bin/nroff
89TOOLS_PLATFORM.openssl?= /usr/bin/openssl 89TOOLS_PLATFORM.openssl?= /usr/bin/openssl
90TOOLS_PLATFORM.patch?= /usr/bin/patch 90TOOLS_PLATFORM.patch?= /usr/bin/patch
91TOOLS_PLATFORM.pax?= /bin/pax 91TOOLS_PLATFORM.pax?= /bin/pax
92.if empty(MACHINE_PLATFORM:MNetBSD-[^0-3].*-386) || \ 92.if exists(/usr/sbin/paxctl)
93 empty(MACHINE_PLATFORM:MNetBSD-[^0-3].*-x86_64) 
94TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl 93TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl
95.endif 94.endif
96TOOLS_PLATFORM.printf?= /usr/bin/printf 95TOOLS_PLATFORM.printf?= /usr/bin/printf
97TOOLS_PLATFORM.pwd?= /bin/pwd 96TOOLS_PLATFORM.pwd?= /bin/pwd
98.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 97.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
99TOOLS_PLATFORM.readelf?= /usr/bin/readelf 98TOOLS_PLATFORM.readelf?= /usr/bin/readelf
100.else 99.else
101TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 100TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
102.endif 101.endif
103TOOLS_PLATFORM.readlink?= /usr/bin/readlink 102TOOLS_PLATFORM.readlink?= /usr/bin/readlink
104TOOLS_PLATFORM.rm?= /bin/rm 103TOOLS_PLATFORM.rm?= /bin/rm
105TOOLS_PLATFORM.rmdir?= /bin/rmdir 104TOOLS_PLATFORM.rmdir?= /bin/rmdir
106TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 105TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff