===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.178
retrieving revision 1.185
diff -u -p -r1.178 -r1.185
--- mandoc/Makefile	2009/06/13 18:05:53	1.178
+++ mandoc/Makefile	2009/06/25 08:42:06	1.185
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .sgml .1.txt .3.txt .7.txt .1 .3 .7
+.SUFFIXES:	.html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -9,13 +9,13 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.7.16
-VDATE	   = 13 June 2009
+VERSION	   = 1.7.20
+VDATE	   = 22 June 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
-LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
+LINTFLAGS += $(VFLAGS)
 
 MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
 	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
@@ -51,6 +51,10 @@ HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h 
 SGMLS	   = index.sgml 
 HTMLS	   = index.html
 STATICS	   = style.css external.png
+MD5S	   = mdocml-$(VERSION).md5 \
+	     mdocml-oport-$(VERSION).md5 \
+	     mdocml-fport-$(VERSION).md5 \
+	     mdocml-nport-$(VERSION).md5
 TARGZS	   = mdocml-$(VERSION).tar.gz \
 	     mdocml-oport-$(VERSION).tar.gz \
 	     mdocml-fport-$(VERSION).tar.gz \
@@ -79,12 +83,12 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-port:	mdocml-oport-$(VERSION).tar.gz \
-	mdocml-fport-$(VERSION).tar.gz \
-	mdocml-nport-$(VERSION).tar.gz
+html:	$(HTMLS)
 
-www:	all $(HTMLS) $(TARGZS) $(TEXTS) ChangeLog
+md5:	$(MD5)
 
+www:	all $(TARGZS) $(TEXTS) ChangeLog
+
 installwww: www
 	install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
 	install -m 0444 ChangeLog $(PREFIX)/snapshots/
@@ -204,7 +208,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.178 2009/06/13 18:05:53 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.185 2009/06/25 08:42:06 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
@@ -232,13 +236,13 @@ mdocml-$(VERSION).tar.gz: $(INSTALL)
 	rm -rf .dist/
 
 llib-llibmdoc.ln: $(MDOCLNS)
-	$(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS)
+	$(LINT) -Clibmdoc $(MDOCLNS)
 
 llib-llibman.ln: $(MANLNS)
-	$(LINT) $(LINTFLAGS) -Clibman $(MANLNS)
+	$(LINT) -Clibman $(MANLNS)
 
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
 libmdoc.a: $(MDOCOBJS)
 	$(AR) rs $@ $(MDOCOBJS)
@@ -254,10 +258,13 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-	./mandoc -Wall $< | col -b > $@
+	./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .3.3.txt:
-	./mandoc -Wall $< | col -b > $@
+	./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .7.7.txt:
-	./mandoc -Wall $< | col -b > $@
+	./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.tar.gz.md5:
+	md5 $< $@