Module Name: src
Committed By: tls
Date: Sun Aug 10 07:09:35 UTC 2014
Modified Files:
src/external/bsd/nvi/docs/USD.doc/edit [tls-earlyentropy]: Makefile
src/external/bsd/nvi/docs/USD.doc/exref [tls-earlyentropy]: Makefile
src/external/bsd/nvi/docs/USD.doc/vi.ref [tls-earlyentropy]: Makefile
src/external/bsd/nvi/docs/USD.doc/vitut [tls-earlyentropy]: Makefile
src/external/bsd/nvi/usr.bin/nvi [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/nvi/docs/USD.doc/edit/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/nvi/docs/USD.doc/exref/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 \
src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/bsd/nvi/usr.bin/nvi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/docs/USD.doc/edit/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/edit/Makefile:1.1 src/external/bsd/nvi/docs/USD.doc/edit/Makefile:1.1.2.1
--- src/external/bsd/nvi/docs/USD.doc/edit/Makefile:1.1 Fri Nov 22 16:00:45 2013
+++ src/external/bsd/nvi/docs/USD.doc/edit/Makefile Sun Aug 10 07:09:35 2014
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 07:09:35 tls Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
.include "../../../Makefile.inc"
.PATH: ${DIST}/docs/edit
-DIR= usd/11.edit
+
+SECTION=usd
+ARTICLE=edit
SRCS= edittut.ms
MACROS= -ms
+ROFF_TBL=yes
+EXTRAHTMLFILES=edit1.png edit2.png edit3.png
-all: paper.ps
-
-paper.ps: ${SRCS}
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET}
+.include <bsd.doc.mk>
# index for versatec is different from the one in edit.tut
# because the fonts are different and entries reference page
@@ -20,5 +21,3 @@ paper.ps: ${SRCS}
editvindex:
${TOOL_ROFF_RAW} ${MACROS} -n22 edit.vindex
-
-.include <bsd.doc.mk>
Index: src/external/bsd/nvi/docs/USD.doc/exref/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.1 src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.1.2.1
--- src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.1 Fri Nov 22 16:00:45 2013
+++ src/external/bsd/nvi/docs/USD.doc/exref/Makefile Sun Aug 10 07:09:35 2014
@@ -1,21 +1,27 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 07:09:35 tls Exp $
#
# @(#)Makefile 8.8 (Berkeley) 10/10/96
.include "../../../Makefile.inc"
.PATH: ${DIST}/docs/exref
-DIR= usd/12.ex
-SRCS= ex.rm ex.summary
+SECTION= reference/ref1
+ARTICLE= ex
+SUBARTICLES= reference summary
+SRCS.reference= ex.rm
+SRCS.summary= ex.summary
MACROS= -ms
-CLEANFILES= summary.ps
-
-all: paper.ps summary.ps
-
-paper.ps: ex.rm
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET}
-
-summary.ps: ex.summary
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET}
+ROFF_TBL= yes
+EXTRAHTMLFILES= \
+ reference1.png reference2.png reference3.png reference4.png \
+ reference5.png reference6.png reference7.png reference8.png \
+ reference9.png reference10.png reference11.png reference12.png \
+ reference13.png reference14.png reference15.png reference16.png \
+ reference17.png reference18.png reference19.png reference20.png \
+ reference21.png reference22.png reference23.png reference24.png \
+ reference25.png reference26.png reference27.png \
+ summary1.png summary2.png summary3.png summary4.png \
+ summary5.png summary6.png summary7.png summary8.png \
+ summary9.png
.include <bsd.doc.mk>
Index: src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.1 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.1.2.1
--- src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.1 Fri Nov 22 16:00:45 2013
+++ src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile Sun Aug 10 07:09:35 2014
@@ -1,26 +1,19 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 07:09:35 tls Exp $
#
# @(#)Makefile 8.20 (Berkeley) 8/18/96
-DIR= usd/13.viref
-SRCS= vi.ref ex.cmd.roff set.opt.roff vi.cmd.roff ref.so
+SECTION= reference/ref1
+ARTICLE= vi
+SRCS= vi.ref
+DEPSRCS= ex.cmd.roff set.opt.roff vi.cmd.roff ref.so index.so
MACROS= -me
-CLEANFILES+= vi.ref.txt vi.ref.ps index index.so
+ROFF_TBL= yes
+CLEANFILES+= index index.so
-all: vi.ref.txt vi.ref.ps
-
-vi.ref.txt: vi.ref index.so
- ${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | ${TOOL_ROFF_ASCII} ${MACROS} > $@
- rm -f index
- chmod 444 $@
-
-vi.ref.ps: vi.ref index.so
- ${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | ${TOOL_ROFF_PS} ${MACROS} > $@
- rm -f index
- chmod 444 $@
+.include <bsd.doc.mk>
+# index.so is generated.
index.so: vi.ref
- # Build index.so, side-effect of building the paper.
${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | \
${TOOL_ROFF_PS} ${MACROS} > /dev/null
sed -e 's/MINUSSIGN/\\-/' \
@@ -30,6 +23,3 @@ index.so: vi.ref
sort -u '-t ' +0 -1 +1n | awk -f merge.awk | \
sed -e 's/__SPACE/ /g' > $@
rm -f index
- chmod 444 $@
-
-.include <bsd.doc.mk>
Index: src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.1 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.1.2.1
--- src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.1 Fri Nov 22 16:00:45 2013
+++ src/external/bsd/nvi/docs/USD.doc/vitut/Makefile Sun Aug 10 07:09:35 2014
@@ -1,26 +1,33 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 07:09:35 tls Exp $
#
# @(#)Makefile 8.7 (Berkeley) 8/18/96
.include "../../../Makefile.inc"
.PATH: ${DIST}/docs/vitut
-DIR= usd/12.vi
-SRCS= vi.in vi.chars
-MACROS= -ms
-CLEANFILES+= vitut.ps summary.ps viapwh.ps
-
-all: vitut.ps summary.ps viapwh.ps
-
-vitut.ps: ${SRCS}
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > $@
- chmod 444 $@
-summary.ps: vi.summary
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > $@
- chmod 444 $@
-
-viapwh.ps: vi.apwh.ms
- ${TOOL_TBL} ${.ALLSRC} | ${TOOL_ROFF_PS} ${MACROS} > $@
- chmod 444 $@
+SECTION= usd
+ARTICLE= vi
+SUBARTICLES= vitut summary
+SRCS.vitut= vi.in vi.chars
+SRCS.summary= vi.summary
+SRCS.viapwh= vi.apwh.ms
+MACROS= -ms
+ROFF_TBL= yes
+EXTRAHTMLFILES= \
+ vitut1.png vitut2.png vitut3.png vitut4.png vitut5.png \
+ vitut6.png vitut7.png vitut8.png vitut9.png vitut10.png \
+ vitut11.png vitut12.png vitut13.png vitut14.png vitut15.png \
+ vitut16.png vitut17.png vitut18.png vitut19.png vitut20.png \
+ vitut21.png vitut22.png vitut23.png vitut24.png vitut25.png \
+ vitut26.png vitut27.png vitut28.png vitut29.png vitut30.png \
+ vitut31.png vitut32.png vitut33.png \
+ summary1.png summary2.png summary3.png summary4.png \
+ summary5.png summary6.png summary7.png summary8.png \
+ summary9.png summary10.png summary11.png summary12.png \
+ summary13.png summary14.png summary15.png summary16.png \
+ summary17.png summary18.png summary19.png summary20.png \
+ summary21.png summary22.png summary23.png summary24.png \
+ summary25.png summary26.png summary27.png summary28.png \
+ summary29.png
.include <bsd.doc.mk>
Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4.2.1
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4 Sat Nov 30 14:52:40 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Sun Aug 10 07:09:35 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/11/30 14:52:40 christos Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2014/08/10 07:09:35 tls Exp $
.include <bsd.own.mk>
@@ -79,10 +79,11 @@ ipc_def.h: ipc.awk vipc.awk ipc_cmd.c ip
.for i in cl common ex ip ipc vi
DPSRCS+=${i}_extern.h
CLEANFILES+=${i}_extern.h
-_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
+# does not work, DIST isn't set yet here
+#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
${i}_extern.h: ${SRCS}
${_MKTARGET_CREATE}
- @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M*/$i/*} > ${.TARGET}.tmp
+ @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M${DIST}/$i/*} > ${.TARGET}.tmp
@if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
rm -f ${.TARGET}.tmp; \
else \
