[src/trunk]: src/external/bsd/nvi/docs/USD.doc/vi.ref Fix the index building ...

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

details:   https://anonhg.NetBSD.org/src/rev/f7feff2cb9d4
branches:  trunk
changeset: 332195:f7feff2cb9d4
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Sep 10 21:44:22 2014 +0000

description:
Fix the index building which got completely broken after the last update.

diffstat:

 external/bsd/nvi/docs/USD.doc/vi.ref/Makefile |  8 +++++---
 external/bsd/nvi/docs/USD.doc/vi.ref/ref.so   |  4 ++--
 external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref   |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r e90b8b67144f -r f7feff2cb9d4 external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile     Wed Sep 10 21:13:50 2014 +0000
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile     Wed Sep 10 21:44:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/07/05 19:23:00 dholland Exp $
+#      $NetBSD: Makefile,v 1.5 2014/09/10 21:44:22 christos Exp $
 #
 #      @(#)Makefile    8.20 (Berkeley) 8/18/96
 
@@ -6,6 +6,8 @@
 ARTICLE=       vi
 SRCS=          vi.ref
 DEPSRCS=       ex.cmd.roff set.opt.roff vi.cmd.roff ref.so index.so
+# Add -U to the macros if you want to build the index since it needs
+# unsafe mode for .sy
 MACROS=                -me
 ROFF_TBL=      yes
 CLEANFILES+=   index index.so
@@ -14,12 +16,12 @@
 
 # index.so is generated.
 index.so: vi.ref
-       ${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | \
+       ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | ${TOOL_TBL} | \
            ${TOOL_ROFF_PS} ${MACROS} > /dev/null
        sed -e 's/MINUSSIGN/\\-/' \
            -e 's/DOUBLEQUOTE/""/' \
            -e "s/SQUOTE/'/" \
            -e 's/ /__SPACE/g' < index | \
-       sort -u '-t     ' +0 -1 +1n | awk -f merge.awk | \
+       sort -u '-t     ' +0 -1 +1n | awk -f ${.CURDIR}/merge.awk | \
        sed -e 's/__SPACE/ /g' > $@
        rm -f index
diff -r e90b8b67144f -r f7feff2cb9d4 external/bsd/nvi/docs/USD.doc/vi.ref/ref.so
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so       Wed Sep 10 21:13:50 2014 +0000
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so       Wed Sep 10 21:44:22 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ref.so,v 1.1 2013/11/22 16:00:45 christos Exp $
+.\"    $NetBSD: ref.so,v 1.2 2014/09/10 21:44:22 christos Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,7 @@
 ..
 .\" key words for index
 .de KY
-.sy echo >>index '\\$1 \\n%'
+.if \n[.U]==0 .sy echo >>index '\\$1   \\n%'
 ..
 .\" option names
 .de OP
diff -r e90b8b67144f -r f7feff2cb9d4 external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref       Wed Sep 10 21:13:50 2014 +0000
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref       Wed Sep 10 21:44:22 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: vi.ref,v 1.1 2013/11/22 16:00:45 christos Exp $
+.\"    $NetBSD: vi.ref,v 1.2 2014/09/10 21:44:22 christos Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -113,7 +113,7 @@
 The financial support of UUNET Communications Services is gratefully
 acknowledged.
 .)q
-.sy echo -n >index
+.if \n[.U]==0 .sy echo -n >index
 .oh 'Vi/Ex Reference''USD:13-%'
 .eh 'USD:13-%''Vi/Ex Reference'
 .bp 4