Module Name: src
Committed By: wiz
Date: Tue Jan 26 15:11:56 UTC 2010
Modified Files:
src/distrib/sets/lists/text: mi
src/etc/mtree: NetBSD.dist.base
src/gnu/usr.bin/groff/contrib: Makefile
Added Files:
src/gnu/usr.bin/groff/contrib/mom: Makefile Makefile.inc
src/gnu/usr.bin/groff/contrib/mom/examples: Makefile
src/gnu/usr.bin/groff/contrib/mom/momdoc: Makefile
Log Message:
Install mom macro sets again, per request from Petar Bogdanovic.
Don't install generated PostScript files that were part of the reason
for the removal.
Based on a patch by him with slight changes.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.9 -r1.10 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/contrib/Makefile
cvs rdiff -u -r0 -r1.4 src/gnu/usr.bin/groff/contrib/mom/Makefile \
src/gnu/usr.bin/groff/contrib/mom/Makefile.inc
cvs rdiff -u -r0 -r1.8 src/gnu/usr.bin/groff/contrib/mom/examples/Makefile
cvs rdiff -u -r0 -r1.3 src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/text/mi
diff -u src/distrib/sets/lists/text/mi:1.34 src/distrib/sets/lists/text/mi:1.35
--- src/distrib/sets/lists/text/mi:1.34 Mon Dec 14 02:01:54 2009
+++ src/distrib/sets/lists/text/mi Tue Jan 26 15:11:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.34 2009/12/14 02:01:54 matt Exp $
+# $NetBSD: mi,v 1.35 2010/01/26 15:11:56 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -40,39 +40,39 @@
./usr/bin/troff text-groff-bin groff
./usr/bin/vgrind text-groff-bin
./usr/libexec/vfontedpr text-groff-bin
-./usr/share/doc/groff text-obsolete obsolete
-./usr/share/doc/groff/mom text-obsolete obsolete
-./usr/share/doc/groff/mom/README.txt text-obsolete obsolete
-./usr/share/doc/groff/mom/elvis_syntax text-obsolete obsolete
-./usr/share/doc/groff/mom/elvis_syntax.new text-obsolete obsolete
-./usr/share/doc/groff/mom/letter.mom text-obsolete obsolete
+./usr/share/doc/groff text-groff-doc share,groff
+./usr/share/doc/groff/mom text-groff-doc share,groff
+./usr/share/doc/groff/mom/README.txt text-groff-doc share,groff
+./usr/share/doc/groff/mom/elvis_syntax text-groff-doc share,groff
+./usr/share/doc/groff/mom/elvis_syntax.new text-groff-doc share,groff
+./usr/share/doc/groff/mom/letter.mom text-groff-doc share,groff
./usr/share/doc/groff/mom/letter.ps text-obsolete obsolete
-./usr/share/doc/groff/mom/penguin.ps text-obsolete obsolete
-./usr/share/doc/groff/mom/sample_docs.mom text-obsolete obsolete
+./usr/share/doc/groff/mom/penguin.ps text-groff-doc share,groff
+./usr/share/doc/groff/mom/sample_docs.mom text-groff-doc share,groff
./usr/share/doc/groff/mom/sample_docs.ps text-obsolete obsolete
-./usr/share/doc/groff/mom/typesetting.mom text-obsolete obsolete
+./usr/share/doc/groff/mom/typesetting.mom text-groff-doc share,groff
./usr/share/doc/groff/mom/typesetting.ps text-obsolete obsolete
-./usr/share/doc/html/groff text-obsolete obsolete
-./usr/share/doc/html/groff/mom text-obsolete obsolete
-./usr/share/doc/html/groff/mom/appendices.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/color.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/cover.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/definitions.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/docelement.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/docprocessing.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/goodies.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/headfootpage.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/inlines.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/intro.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/letters.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/macrolist.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/rectoverso.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/refer.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/reserved.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/toc.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/typemacdoc.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/typesetting.html text-obsolete obsolete
-./usr/share/doc/html/groff/mom/using.html text-obsolete obsolete
+./usr/share/doc/html/groff text-groff-doc share,groff
+./usr/share/doc/html/groff/mom text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/appendices.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/color.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/cover.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/definitions.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/docelement.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/docprocessing.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/goodies.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/headfootpage.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/inlines.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/intro.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/letters.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/macrolist.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/rectoverso.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/refer.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/reserved.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/toc.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/typemacdoc.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/typesetting.html text-groff-doc share,groff
+./usr/share/doc/html/groff/mom/using.html text-groff-doc share,groff
./usr/share/groff_font/devX100-12/CB text-groff-font share,groff
./usr/share/groff_font/devX100-12/CBI text-groff-font share,groff
./usr/share/groff_font/devX100-12/CI text-groff-font share,groff
@@ -455,7 +455,7 @@
./usr/share/man/cat7/groff_me.0 text-groff-catman .cat,groff
./usr/share/man/cat7/groff_mm.0 text-groff-catman .cat,groff
./usr/share/man/cat7/groff_mmse.0 text-groff-catman .cat,groff
-./usr/share/man/cat7/groff_mom.0 text-obsolete obsolete
+./usr/share/man/cat7/groff_mom.0 text-groff-catman .cat,groff
./usr/share/man/cat7/groff_ms.0 text-groff-catman .cat,groff
./usr/share/man/cat7/groff_msafer.0 text-obsolete obsolete
./usr/share/man/cat7/groff_trace.0 text-groff-catman .cat,groff
@@ -512,6 +512,7 @@
./usr/share/man/html7/groff_me.html text-groff-htmlman html,groff
./usr/share/man/html7/groff_mm.html text-groff-htmlman html,groff
./usr/share/man/html7/groff_mmse.html text-groff-htmlman html,groff
+./usr/share/man/html7/groff_mom.html text-groff-htmlman html,groff
./usr/share/man/html7/groff_ms.html text-groff-htmlman html,groff
./usr/share/man/html7/groff_trace.html text-groff-htmlman html,groff
./usr/share/man/html7/groff_www.html text-groff-htmlman html,groff
@@ -569,7 +570,7 @@
./usr/share/man/man7/groff_me.7 text-groff-man .man,groff
./usr/share/man/man7/groff_mm.7 text-groff-man .man,groff
./usr/share/man/man7/groff_mmse.7 text-groff-man .man,groff
-./usr/share/man/man7/groff_mom.7 text-obsolete obsolete
+./usr/share/man/man7/groff_mom.7 text-groff-man .man,groff
./usr/share/man/man7/groff_ms.7 text-groff-man .man,groff
./usr/share/man/man7/groff_msafer.7 text-obsolete obsolete
./usr/share/man/man7/groff_trace.7 text-groff-man .man,groff
@@ -658,10 +659,10 @@
./usr/share/tmac/mm/se_locale text-groff-share share,groff
./usr/share/tmac/mm/se_ms.cov text-groff-share share,groff
./usr/share/tmac/mmse.tmac text-groff-share share,groff
-./usr/share/tmac/mom.tmac text-obsolete obsolete
+./usr/share/tmac/mom.tmac text-groff-share share,groff
./usr/share/tmac/ms.tmac text-groff-share share,groff
./usr/share/tmac/mse.tmac text-groff-share share,groff
-./usr/share/tmac/om.tmac text-obsolete obsolete
+./usr/share/tmac/om.tmac text-groff-share share,groff
./usr/share/tmac/papersize.tmac text-groff-share share,groff
./usr/share/tmac/pic.tmac text-groff-share share,groff
./usr/share/tmac/ps.tmac text-groff-share share,groff
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.9 src/etc/mtree/NetBSD.dist.base:1.10
--- src/etc/mtree/NetBSD.dist.base:1.9 Sun Jan 24 21:12:17 2010
+++ src/etc/mtree/NetBSD.dist.base Tue Jan 26 15:11:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.9 2010/01/24 21:12:17 joerg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.10 2010/01/26 15:11:56 wiz Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -241,10 +241,14 @@
./usr/share/dict/special
./usr/share/doc
./usr/share/doc/atf
+./usr/share/doc/groff
+./usr/share/doc/groff/mom
./usr/share/doc/html
./usr/share/doc/html/bind9
./usr/share/doc/html/bind9/arm
./usr/share/doc/html/bzip2
+./usr/share/doc/html/groff
+./usr/share/doc/html/groff/mom
./usr/share/doc/html/postfix
./usr/share/doc/html/ntp
./usr/share/doc/html/ntp/build
Index: src/gnu/usr.bin/groff/contrib/Makefile
diff -u src/gnu/usr.bin/groff/contrib/Makefile:1.4 src/gnu/usr.bin/groff/contrib/Makefile:1.5
--- src/gnu/usr.bin/groff/contrib/Makefile:1.4 Wed Jul 16 21:14:53 2008
+++ src/gnu/usr.bin/groff/contrib/Makefile Tue Jan 26 15:11:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/16 21:14:53 perry Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/26 15:11:56 wiz Exp $
# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile,v 1.1 2001/04/17 12:36:32 ru Exp $
@@ -8,6 +8,6 @@
# groffer depends on lots of other non-base programs
# pdfmark depends on ghostscript
# pic2graph depends on convert(1)
-SUBDIR= gdiffmk mm
+SUBDIR= gdiffmk mm mom
.include <bsd.subdir.mk>
Added files:
Index: src/gnu/usr.bin/groff/contrib/mom/Makefile
diff -u /dev/null src/gnu/usr.bin/groff/contrib/mom/Makefile:1.4
--- /dev/null Tue Jan 26 15:11:57 2010
+++ src/gnu/usr.bin/groff/contrib/mom/Makefile Tue Jan 26 15:11:56 2010
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.4 2010/01/26 15:11:56 wiz Exp $
+
+SUBDIR= examples momdoc
+DIST_SUBDIR= contrib/mom
+
+TMACOWN?= ${BINOWN}
+TMACGRP?= ${BINGRP}
+TMACMODE?= ${NOBINMODE}
+# XXX: next depends on ../src/include/defs.h
+TMACDIR?= /usr/share/tmac
+
+NORMALFILES= mom.tmac om.tmac
+MAN= groff_mom.7
+
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
+FILESDIR= ${TMACDIR}
+FILES+= ${NORMALFILES}
+.endif
+
+CLEANFILES+= groff_mom.7
+
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
Index: src/gnu/usr.bin/groff/contrib/mom/Makefile.inc
diff -u /dev/null src/gnu/usr.bin/groff/contrib/mom/Makefile.inc:1.4
--- /dev/null Tue Jan 26 15:11:57 2010
+++ src/gnu/usr.bin/groff/contrib/mom/Makefile.inc Tue Jan 26 15:11:56 2010
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.4 2010/01/26 15:11:56 wiz Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1 2001/04/17 12:36:32 ru Exp $
+
+#DIST_SUBDIR= contrib/mom
+
+.include "../Makefile.inc"
Index: src/gnu/usr.bin/groff/contrib/mom/examples/Makefile
diff -u /dev/null src/gnu/usr.bin/groff/contrib/mom/examples/Makefile:1.8
--- /dev/null Tue Jan 26 15:11:57 2010
+++ src/gnu/usr.bin/groff/contrib/mom/examples/Makefile Tue Jan 26 15:11:56 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.8 2010/01/26 15:11:56 wiz Exp $
+
+DIST_SUBDIR= contrib/mom/examples
+
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
+FILESDIR= ${DOCDIR}/groff/mom
+MOM_FILES= typesetting.mom letter.mom sample_docs.mom
+FILES= README.txt elvis_syntax elvis_syntax.new penguin.ps ${MOM_FILES}
+.endif # MKSHARE
+
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
Index: src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile
diff -u /dev/null src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile:1.3
--- /dev/null Tue Jan 26 15:11:57 2010
+++ src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile Tue Jan 26 15:11:56 2010
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.3 2010/01/26 15:11:56 wiz Exp $
+
+DIST_SUBDIR= contrib/mom/momdoc
+
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
+FILESDIR= ${HTMLDOCDIR}/groff/mom
+FILES= appendices.html \
+ color.html \
+ cover.html \
+ definitions.html \
+ docelement.html \
+ docprocessing.html \
+ goodies.html \
+ headfootpage.html \
+ inlines.html \
+ intro.html \
+ letters.html \
+ macrolist.html \
+ rectoverso.html \
+ refer.html \
+ reserved.html \
+ toc.html \
+ typemacdoc.html \
+ typesetting.html \
+ using.html
+.endif
+
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
