[src/trunk]: src/usr.bin/kdump - fix "obsolete" skipping to handle obsolete e...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2f92bac16ae
branches:  trunk
changeset: 357318:a2f92bac16ae
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 05 22:52:12 2017 +0000

description:
- fix "obsolete" skipping to handle obsolete entries that contain other
  variables
- skip files particular to other xserver versions than ours.

XXX: How does this build in the build farm?

diffstat:

 usr.bin/kdump/Makefile.ioctl-c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r f2f4caa366db -r a2f92bac16ae usr.bin/kdump/Makefile.ioctl-c
--- a/usr.bin/kdump/Makefile.ioctl-c    Sun Nov 05 17:44:28 2017 +0000
+++ b/usr.bin/kdump/Makefile.ioctl-c    Sun Nov 05 22:52:12 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ioctl-c,v 1.33 2016/08/18 08:02:58 mrg Exp $
+#      $NetBSD: Makefile.ioctl-c,v 1.34 2017/11/05 22:52:12 christos Exp $
 
 # NOTE: <bsd.own.mk> needs to be previously .included for NETBSDSRCDIR
 
@@ -25,7 +25,13 @@
 .endif
 
 .if !make(cleandir) && !make(obj) && !make(includes) && !make(install)
-DEPFILEGLOB = ${TOOL_SED} -ne '/\/usr\/.*include\/.*\.h[       ]/{s/[  ]obsolete$$//;t' -e 's/xenio//;t' -e 's,\.\([^  ]*\).*,${DESTDIR}\1,;p;}' ${SETFILES}
+DEPFILEGLOB = ${TOOL_SED} \
+    -ne '/\/usr\/.*include\/.*\.h[     ]/{s/[  ,]obsolete//;t' \
+    -e "s/xorg_server_ver=${XORG_SERVER_VER}//;t skipserver" \
+    -e "s/xorg_server_ver=//;t" \
+    -e ":skipserver" \
+    -e 's/xenio//;t' \
+    -e 's,\.\([^       ]*\).*,${DESTDIR}\1,;p;}' ${SETFILES}
 DEPFILES != (${DEPFILEGLOB}; echo ${EXTRAS}) | xargs egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' 2>/dev/null || :
 .endif