===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.118
retrieving revision 1.131
diff -u -p -r1.118 -r1.131
--- mandoc/Makefile	2009/03/12 06:33:51	1.118
+++ mandoc/Makefile	2009/03/19 11:49:00	1.131
@@ -1,156 +1,48 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.4.10
-VDATE	= 12 March 2009
-
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
 LIBDIR		= $(PREFIX)/lib
 MANDIR		= $(PREFIX)/man
-
 INSTALL_PROGRAM	= install -m 0755
 INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VFLAGS  = -DVERSION=\"$(VERSION)\"
-CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+VERSION	   = 1.5.5
+VDATE	   = 19 March 2009
 
+VFLAGS     = -DVERSION=\"$(VERSION)\"
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
+LIBLNS	   = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
+	     validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
+	     msec.ln st.ln
+LIBOBJS	   = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
+	     action.o lib.o att.o arch.o vol.o msec.o st.o
+TERMLNS	   = mdocterm.ln term.ln ascii.ln
+TERMOBJS   = mdocterm.o term.o ascii.o
+LLNS	   = llib-llibmdoc.ln llib-lmdocterm.ln
+LNS	   = $(TERMLNS) $(LIBLNS)
+LIBS	   = libmdoc.a
+OBJS	   = $(LIBOBJS) $(TERMOBJS)
+SRCS	   = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
+	     action.c term.c mdocterm.c lib.c att.c arch.c vol.c \
+	     msec.c st.c ascii.c
+DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
+HEADS	   = mdoc.h private.h term.h 
+SGMLS	   = index.sgml
+HTMLS	   = index.html
+STATICS	   = style.css external.png
+TARGZS	   = mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
+	     mdocml-nport-$(VERSION).tar.gz
+MANS	   = mdocterm.1 mdoc.3 mdoc.7
+BINS	   = mdocterm 
+CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
+INSTALL	   = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
+	     $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS)
 
-LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
-	  msec.ln st.ln
-
-TREELNS	= mdoctree.ln mmain.ln 
-
-TERMLNS	= mdoctree.ln mmain.ln term.ln
-
-LINTLNS	= mdoclint.ln mmain.ln
-
-LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
-
-LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln
-
-LIBS	= libmdoc.a
-
-LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o lib.o att.o arch.o vol.o msec.o \
-	  st.o
-
-TERMOBJS= mdocterm.o mmain.o term.o
-
-TREEOBJS= mdoctree.o mmain.o
-
-LINTOBJS= mdoclint.o mmain.o
-
-OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS) $(LINTOBJS)
-
-SRCS	= macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
-	  action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c
-
-SCRIPTS = strings.sh
-
-DATAS	= arch.in att.in lib.in msec.in st.in vol.in
-
-GEN	= lib.c att.c arch.c vol.c msec.c st.c
-
-HEADS	= mdoc.h private.h term.h mmain.h
-
-SGMLS	= index.sgml
-
-HTMLS	= index.html
-
-STATICS	= style.css external.png
-
-TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
-	  mdocml-nport-$(VERSION).tar.gz
-
-MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
-
-BINS	= mdocterm mdoctree mdoclint
-
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	  $(TARGZS) $(GEN)
-
-INSTALL	= $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	  $(STATICS) $(SCRIPTS) Makefile.netbsd Makefile.openbsd \
-	  $(DATAS)
-
-FAIL	= regress/test.empty \
-	  regress/test.prologue.00 \
-	  regress/test.prologue.01 \
-	  regress/test.prologue.02 \
-	  regress/test.prologue.03 \
-	  regress/test.prologue.04 \
-	  regress/test.prologue.06 \
-	  regress/test.prologue.19 \
-	  regress/test.prologue.23 \
-	  regress/test.prologue.24 \
-	  regress/test.prologue.27 \
-	  regress/test.prologue.28 \
-	  regress/test.prologue.30 \
-	  regress/test.prologue.31 \
-	  regress/test.prologue.32 \
-	  regress/test.sh.03 \
-	  regress/test.escape.01 \
-	  regress/test.escape.02 \
-	  regress/test.escape.03 \
-	  regress/test.escape.04 \
-	  regress/test.escape.06 \
-	  regress/test.escape.07 \
-	  regress/test.escape.08 \
-	  regress/test.escape.09 \
-	  regress/test.escape.11 \
-	  regress/test.escape.12 \
-	  regress/test.escape.14 \
-	  regress/test.argv.01 \
-	  regress/test.argv.02
-
-SUCCEED	= regress/test.prologue.05 \
-	  regress/test.prologue.07 \
-	  regress/test.prologue.08 \
-	  regress/test.prologue.09 \
-	  regress/test.prologue.10 \
-	  regress/test.prologue.11 \
-	  regress/test.prologue.12 \
-	  regress/test.prologue.13 \
-	  regress/test.prologue.14 \
-	  regress/test.prologue.15 \
-	  regress/test.prologue.16 \
-	  regress/test.prologue.17 \
-	  regress/test.prologue.18 \
-	  regress/test.prologue.20 \
-	  regress/test.prologue.21 \
-	  regress/test.prologue.22 \
-	  regress/test.prologue.25 \
-	  regress/test.prologue.26 \
-	  regress/test.prologue.29 \
-	  regress/test.prologue.33 \
-	  regress/test.sh.00 \
-	  regress/test.name.00 \
-	  regress/test.name.01 \
-	  regress/test.name.02 \
-	  regress/test.name.03 \
-	  regress/test.list.00 \
-	  regress/test.list.01 \
-	  regress/test.list.02 \
-	  regress/test.list.03 \
-	  regress/test.list.04 \
-	  regress/test.list.05 \
-	  regress/test.list.06 \
-	  regress/test.list.07 \
-	  regress/test.sh.01 \
-	  regress/test.sh.02 \
-	  regress/test.escape.00 \
-	  regress/test.escape.05 \
-	  regress/test.escape.10 \
-	  regress/test.escape.13 \
-	  regress/test.argv.00
-
-REGRESS	= $(FAIL) $(SUCCEED)
-
 all:	$(BINS)
 
 lint:	$(LLNS)
@@ -176,77 +68,49 @@ installwww: www
 	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
 	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
 
-regress: mdoclint $(FAIL) $(SUCCEED)
-	@for f in $(FAIL); do \
-		echo "./mdoclint $$f" ; \
-		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
-	@for f in $(SUCCEED); do \
-		echo "./mdoclint $$f" ; \
-		./mdoclint $$f 2>/dev/null || exit 1 ; done
-
 install:
 	mkdir -p $(BINDIR)
 	mkdir -p $(INCLUDEDIR)
 	mkdir -p $(LIBDIR)/lib
 	mkdir -p $(MANDIR)/man1
 	mkdir -p $(MANDIR)/man3
+	mkdir -p $(MANDIR)/man7
 	$(INSTALL_PROGRAM) mdocterm $(BINDIR)
-	$(INSTALL_PROGRAM) mdoctree $(BINDIR)
-	$(INSTALL_PROGRAM) mdoclint $(BINDIR)
 	$(INSTALL_MAN) mdocterm.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoctree.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoclint.1 $(MANDIR)/man1
 	$(INSTALL_MAN) mdoc.3 $(MANDIR)/man3
+	$(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
 	$(INSTALL_LIB) libmdoc.a $(LIBDIR)
 	$(INSTALL_DATA) mdoc.h $(INCLUDEDIR)
 
 uninstall:
 	rm -f $(BINDIR)/mdocterm
-	rm -f $(BINDIR)/mdoctree
-	rm -f $(BINDIR)/mdoclint
 	rm -f $(MANDIR)/man1/mdocterm.1
-	rm -f $(MANDIR)/man1/mdoctree.1
-	rm -f $(MANDIR)/man1/mdoclint.1
 	rm -f $(MANDIR)/man3/mdoc.3
+	rm -f $(MANDIR)/man7/mdoc.7
 	rm -f $(LIBDIR)/libmdoc.a
 	rm -f $(INCLUDEDIR)/mdoc.h
 
-lib.ln: lib.c private.h
-lib.o: lib.c private.h
+lib.ln: lib.c lib.in private.h
+lib.o: lib.c lib.in private.h
 
-att.ln: att.c private.h
-att.o: att.c private.h
+att.ln: att.c att.in private.h
+att.o: att.c att.in private.h
 
-arch.ln: arch.c private.h
-arch.o: arch.c private.h
+arch.ln: arch.c arch.in private.h
+arch.o: arch.c arch.in private.h
 
-vol.ln: vol.c private.h
-vol.o: vol.c private.h
+vol.ln: vol.c vol.in private.h
+vol.o: vol.c vol.in private.h
 
-msec.ln: msec.c private.h
-msec.o: msec.c private.h
+ascii.ln: ascii.c ascii.in term.h
+ascii.o: ascii.c ascii.in term.h
 
-st.ln: st.c private.h
-st.o: st.c private.h
+msec.ln: msec.c msec.in private.h
+msec.o: msec.c msec.in private.h
 
-lib.c: lib.in strings.sh
-	sh strings.sh -o $@ lib lib.in
+st.ln: st.c st.in private.h
+st.o: st.c st.in private.h
 
-st.c: st.in strings.sh
-	sh strings.sh -o $@ st st.in
-
-msec.c: msec.in strings.sh
-	sh strings.sh -o $@ msec msec.in
-
-att.c: att.in strings.sh
-	sh strings.sh -o $@ att att.in
-
-arch.c: arch.in strings.sh
-	sh strings.sh -o $@ arch arch.in
-
-vol.c: vol.in strings.sh
-	sh strings.sh -o $@ vol vol.in
-
 macro.ln: macro.c private.h
 macro.o: macro.c private.h
 
@@ -262,15 +126,9 @@ hash.o: hash.c private.h
 mdoc.ln: mdoc.c private.h
 mdoc.o: mdoc.c private.h
 
-mdocterm.ln: mdocterm.c mmain.h
-mdocterm.o: mdocterm.c mmain.h
+mdocterm.ln: mdocterm.c
+mdocterm.o: mdocterm.c
 
-mdoclint.ln: mdoclint.c mmain.h
-mdoclint.o: mdoclint.c mmain.h
-
-mdoctree.ln: mdoctree.c mmain.h
-mdoctree.o: mdoctree.c mmain.h
-
 xstd.ln: xstd.c private.h
 xstd.o: xstd.c private.h
 
@@ -283,13 +141,8 @@ validate.o: validate.c private.h
 action.ln: action.c private.h
 action.o: action.c private.h
 
-mmain.ln: mmain.c mmain.h
-mmain.o: mmain.c mmain.h
-
 private.h: mdoc.h
 
-mmain.h: mdoc.h
-
 term.h: mdoc.h
 
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
@@ -302,13 +155,9 @@ mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.
 	install -m 0644 DESCR .dist/mdocml/
 	echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
 	echo bin/mdocterm >> .dist/mdocml/PLIST
-	echo bin/mdoctree >> .dist/mdocml/PLIST
-	echo bin/mdoclint >> .dist/mdocml/PLIST
 	echo lib/libmdoc.a >> .dist/mdocml/PLIST
 	echo include/mdoc.h >> .dist/mdocml/PLIST
-	echo man/man1/mdoctree.1 >> .dist/mdocml/PLIST
 	echo man/man1/mdocterm.1 >> .dist/mdocml/PLIST
-	echo man/man1/mdoclint.1 >> .dist/mdocml/PLIST
 	echo man/man3/mdoc.3 >> .dist/mdocml/PLIST
 	( cd .dist/ && tar zcf ../$@ mdocml/ )
 	rm -rf .dist/
@@ -321,33 +170,24 @@ mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.
 	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
 	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
 	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-	echo @comment $$OpenBSD: Makefile,v 1.118 2009/03/12 06:33:51 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.131 2009/03/19 11:49:00 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mdocterm >> .dist/mdocml/pkg/PLIST
-	echo bin/mdoctree >> .dist/mdocml/pkg/PLIST
-	echo bin/mdoclint >> .dist/mdocml/pkg/PLIST
 	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
 	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdoclint.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
 	( cd .dist/ && tar zcf ../$@ mdocml/ )
 	rm -rf .dist/
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
 	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
-	mkdir -p .dist/mdocml/mdocml-$(VERSION)/regress/
 	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	install -m 0644 $(REGRESS) .dist/mdocml/mdocml-$(VERSION)/regress/
 	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
 llib-llibmdoc.ln: $(LIBLNS)
 	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
 
-llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
-
 llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
 	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
 
@@ -356,12 +196,6 @@ libmdoc.a: $(LIBOBJS)
 
 mdocterm: $(TERMOBJS) libmdoc.a
 	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
-
-mdoctree: $(TREEOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
-
-mdoclint: $(LINTOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a 
 
 .sgml.html:
 	validate $<