===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.162
retrieving revision 1.167
diff -u -p -r1.162 -r1.167
--- mandoc/Makefile	2009/03/26 16:23:22	1.162
+++ mandoc/Makefile	2009/04/03 13:18:26	1.167
@@ -9,23 +9,23 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.7.6
-VDATE	   = 26 March 2009
+VERSION	   = 1.7.9
+VDATE	   = 03 April 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 
-MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \
-	     argv.ln mdoc_validate.ln mdoc_action.ln lib.ln att.ln \
-	     arch.ln vol.ln msec.ln st.ln
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \
-	     mdoc_validate.o mdoc_action.o lib.o att.o arch.o vol.o \
-	     msec.o st.o
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \
-	     mdoc_validate.c mdoc_action.c lib.c att.c arch.c vol.c \
-	     msec.c st.c
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
+	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+	     mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+	     arch.o vol.o msec.o st.o
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+	     mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+	     arch.c vol.c msec.c st.c
 
 MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
 	     man_action.ln
@@ -34,11 +34,11 @@ MANOBJS	   = man_macro.o man.o man_hash.o man_validate
 MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
 	     man_action.c
 
-MAINLNS	   = main.ln mdoc_term.ln ascii.ln terminal.ln tree.ln \
+MAINLNS	   = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
 	     compat.ln man_term.ln
-MAINOBJS   = main.o mdoc_term.o ascii.o terminal.o tree.o compat.o \
+MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
 	     man_term.o
-MAINSRCS   = main.c mdoc_term.c ascii.c terminal.c tree.c compat.c \
+MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
 	     man_term.c
 
 LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
@@ -57,7 +57,8 @@ TARGZS	   = mdocml-$(VERSION).tar.gz \
 	     mdocml-nport-$(VERSION).tar.gz
 MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7
 BINS	   = mandoc
-CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
+CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) \
+	     tags
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
 	     Makefile
 INSTALL	   = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -135,8 +136,8 @@ mdoc_macro.o: mdoc_macro.c libmdoc.h
 mdoc_term.ln: mdoc_term.c term.h mdoc.h
 mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-strings.ln: strings.c libmdoc.h
-strings.o: strings.c libmdoc.h
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h
 
 man_hash.ln: man_hash.c libman.h
 man_hash.o: man_hash.c libman.h
@@ -153,15 +154,12 @@ man.o: man.c libman.h
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
-terminal.ln: terminal.c term.h man.h mdoc.h
-terminal.o: terminal.c term.h man.h mdoc.h
+term.ln: term.c term.h man.h mdoc.h
+term.o: term.c term.h man.h mdoc.h
 
-xstd.ln: xstd.c libmdoc.h
-xstd.o: xstd.c libmdoc.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-argv.ln: argv.c libmdoc.h
-argv.o: argv.c libmdoc.h
-
 man_validate.ln: man_validate.c libman.h
 man_validate.o: man_validate.c libman.h
 
@@ -196,7 +194,7 @@ 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.162 2009/03/26 16:23:22 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.167 2009/04/03 13:18:26 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mandoc >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST