[src/trunk]: src/distrib/sets Teach "make sortlists" to ignore .#* files (som...

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

details:   https://anonhg.NetBSD.org/src/rev/5f0fbb6648ae
branches:  trunk
changeset: 795983:5f0fbb6648ae
user:      apb <apb%NetBSD.org@localhost>
date:      Thu May 15 16:32:07 2014 +0000

description:
Teach "make sortlists" to ignore .#* files (sometimes created by cvs),
and to squeeze multiple blank lines.

diffstat:

 distrib/sets/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 2dac409ae747 -r 5f0fbb6648ae distrib/sets/Makefile
--- a/distrib/sets/Makefile     Thu May 15 16:06:38 2014 +0000
+++ b/distrib/sets/Makefile     Thu May 15 16:32:07 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.94 2014/01/27 21:37:17 apb Exp $
+#      $NetBSD: Makefile,v 1.95 2014/05/15 16:32:07 apb Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -306,12 +306,13 @@
 
 # Sort the lists files
 sortlists: .PHONY
-       find ${.CURDIR}/lists \! \( -name CVS -prune \) -type f -print \
+       find ${.CURDIR}/lists \! \( -name CVS -prune \) \! -name .#\* \
+           -type f -print \
        | while read f ; do \
            ${_MKSHMSG} "sorting $${f#${.CURDIR}/}" ; \
            { grep '^#' "$$f" ; \
              grep -v '^#' "$$f" | sort ; \
-           } >"$$f".tmp; \
+           } | cat -s >"$$f".tmp; \
            if cmp "$$f" "$$f".tmp >/dev/null; then \
              : "$$f is unchanged" ; \
              rm "$$f".tmp ; \