===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.101
retrieving revision 1.110
diff -u -p -r1.101 -r1.110
--- mandoc/Makefile	2009/03/01 20:17:03	1.101
+++ mandoc/Makefile	2009/03/08 19:32:03	1.110
@@ -1,7 +1,7 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.14
-VDATE	= 01 March 2009
+VERSION	= 1.4.1
+VDATE	= 8 March 2009
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -13,10 +13,12 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
+CPPFLAGS = -DVERSION=\"$(VERSION)\"
 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
 LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln 
+	  validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
+	  msec.ln st.ln
 
 TREELNS	= mdoctree.ln mmain.ln 
 
@@ -31,7 +33,8 @@ LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocte
 LIBS	= libmdoc.a
 
 LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o
+	  validate.o action.o lib.o att.o arch.o vol.o msec.o \
+	  st.o
 
 TERMOBJS= mdocterm.o mmain.o term.o
 
@@ -39,11 +42,15 @@ TREEOBJS= mdoctree.o mmain.o
 
 LINTOBJS= mdoclint.o mmain.o
 
-OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
+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
+
+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
@@ -60,10 +67,10 @@ MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
 BINS	= mdocterm mdoctree mdoclint
 
 CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	  $(TARGZS)
+	  $(TARGZS) $(GEN)
 
 INSTALL	= $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	  $(STATICS) Makefile.netbsd Makefile.openbsd
+	  $(STATICS) $(SCRIPTS) Makefile.netbsd Makefile.openbsd
 
 FAIL	= regress/test.empty \
 	  regress/test.prologue.00 \
@@ -72,24 +79,14 @@ FAIL	= regress/test.empty \
 	  regress/test.prologue.03 \
 	  regress/test.prologue.04 \
 	  regress/test.prologue.06 \
-	  regress/test.prologue.13 \
-	  regress/test.prologue.15 \
-	  regress/test.prologue.16 \
-	  regress/test.prologue.18 \
 	  regress/test.prologue.19 \
-	  regress/test.prologue.21 \
-	  regress/test.prologue.22 \
 	  regress/test.prologue.23 \
 	  regress/test.prologue.24 \
-	  regress/test.prologue.25 \
-	  regress/test.prologue.26 \
 	  regress/test.prologue.27 \
 	  regress/test.prologue.28 \
-	  regress/test.prologue.29 \
 	  regress/test.prologue.30 \
 	  regress/test.prologue.31 \
 	  regress/test.prologue.32 \
-	  regress/test.prologue.33 \
 	  regress/test.sh.03 \
 	  regress/test.escape.01 \
 	  regress/test.escape.02 \
@@ -100,7 +97,10 @@ FAIL	= regress/test.empty \
 	  regress/test.escape.08 \
 	  regress/test.escape.09 \
 	  regress/test.escape.11 \
-	  regress/test.escape.12
+	  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 \
@@ -109,9 +109,19 @@ SUCCEED	= regress/test.prologue.05 \
 	  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 \
@@ -129,7 +139,9 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.sh.02 \
 	  regress/test.escape.00 \
 	  regress/test.escape.05 \
-	  regress/test.escape.10
+	  regress/test.escape.10 \
+	  regress/test.escape.13 \
+	  regress/test.argv.00
 
 REGRESS	= $(FAIL) $(SUCCEED)
 
@@ -158,7 +170,7 @@ 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
+regress: mdoclint $(FAIL) $(SUCCEED)
 	@for f in $(FAIL); do \
 		echo "./mdoclint $$f" ; \
 		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
@@ -193,6 +205,42 @@ uninstall:
 	rm -f $(LIBDIR)/libmdoc.a
 	rm -f $(INCLUDEDIR)/mdoc.h
 
+lib.ln: lib.c private.h
+lib.o: lib.c private.h
+
+att.ln: att.c private.h
+att.o: att.c private.h
+
+arch.ln: arch.c private.h
+arch.o: arch.c private.h
+
+vol.ln: vol.c private.h
+vol.o: vol.c private.h
+
+msec.ln: msec.c private.h
+msec.o: msec.c private.h
+
+st.ln: st.c private.h
+st.o: st.c private.h
+
+lib.c: lib.in strings.sh
+	sh strings.sh -o $@ lib lib.in
+
+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
 
@@ -267,7 +315,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.101 2009/03/01 20:17:03 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.110 2009/03/08 19:32:03 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