Makefile properly generates MD5 sums.

More clean-ups of new, simplified webpage.

2 files changed, 33 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index cefef547..3c3987a1 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ TEXTS	   = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
 	     mandoc_char.7.txt man.7.txt man.3.txt
 BINS	   = mandoc
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	     $(TARGZS) tags $(TEXTS) ChangeLog
+	     $(TARGZS) tags $(TEXTS) ChangeLog $(MD5S)
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
 	     Makefile
 INSTALL	   = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -85,21 +85,27 @@ dist:	mdocml-$(VERSION).tar.gz
 
 html:	$(HTMLS)
 
-md5:	$(MD5)
-
-www:	all $(TARGZS) $(TEXTS) ChangeLog
+www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) ChangeLog
 
 installwww: www
 	install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
 	install -m 0444 ChangeLog $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
 	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
 	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+	install -m 0444 mdocml-oport-$(VERSION).md5 $(PREFIX)/ports-openbsd/
+	install -m 0444 mdocml-oport-$(VERSION).md5 $(PREFIX)/ports-openbsd/mdocml.md5
 	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
+	install -m 0444 mdocml-nport-$(VERSION).md5 $(PREFIX)/ports-netbsd/
+	install -m 0444 mdocml-nport-$(VERSION).md5 $(PREFIX)/ports-netbsd/mdocml.md5
 	install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/
 	install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/mdocml.tar.gz
+	install -m 0444 mdocml-fport-$(VERSION).md5 $(PREFIX)/ports-freebsd/
+	install -m 0444 mdocml-fport-$(VERSION).md5 $(PREFIX)/ports-freebsd/mdocml.md5
 
 install:
 	mkdir -p $(BINDIR)
@@ -182,7 +188,7 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
-ChangeLog:
+ChangeLog::
 	cvs2cl -P -t --no-indent --FSF --no-times
 
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
@@ -267,4 +273,4 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .tar.gz.md5:
-	md5 $< $@
+	md5 $< > $@
diff --git a/index.sgml b/index.sgml
index 59777d3e..17416a20 100644
--- a/index.sgml
+++ b/index.sgml
@@ -67,24 +67,24 @@
 					<col width="60%">
 					<tbody>
 						<tr>
-							<td>FreeBSD (ports)</td>
+							<td>FreeBSD</td>
 							<td>
 							<a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/textproc/mdocml/"
-								class="external">/textproc/mandoc</a> 
+								class="external">ports/textproc/mandoc</a> 
 							</td>
 						</tr>
 						<tr>
-							<td>NetBSD (pkgsrc)</td>
+							<td>NetBSD</td>
 							<td>
 							<a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/textproc/mdocml/"
-								class="external">/textproc/mandoc</a> 
+								class="external">pkgsrc/textproc/mandoc</a> 
 							</td>
 						</tr>
 						<tr>
-							<td>OpenBSD (base system)</td>
+							<td>OpenBSD</td>
 							<td>
 							<a href="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/mandoc/"
-								class="external">/usr.bin/mandoc</a> 
+								class="external">src/usr.bin/mandoc</a> 
 							</td>
 						</tr>
 					</tbody>
@@ -101,21 +101,14 @@
 						<tr>
 							<td>Source archive</td>
 							<td>
-							<a href="http://mdocml.bsd.lv/snapshots/mdocml.tar.gz">/snapshots/mdocml.tar.gz</a> 
+							<a href="http://mdocml.bsd.lv/snapshots/mdocml.tar.gz">mdocml.tar.gz</a> 
 							(<a href="http://mdocml.bsd.lv/snapshots/mdocml.md5">md5</a>)
 							</td>
 						</tr>
 						<tr>
-							<td>OpenBSD port</td>
-							<td>
-							<a href="http://mdocml.bsd.lv/ports-openbsd/mdocml.tar.gz">/ports-openbsd/mdocml.tar.gz</a> 
-							(<a href="http://mdocml.bsd.lv/ports-openbsd/mdocml.md5">md5</a>)
-							</td>
-						</tr>
-						<tr>
 							<td>FreeBSD port</td>
 							<td>
-							<a href="http://mdocml.bsd.lv/ports-freebsd/mdocml.tar.gz">/ports-freebsd/mdocml.tar.gz</a> 
+							<a href="http://mdocml.bsd.lv/ports-freebsd/mdocml.tar.gz">mdocml.tar.gz</a> 
 							(<a href="http://mdocml.bsd.lv/snapshots/mdocml.md5">md5</a>)
 							</td>
 						</tr>
@@ -126,6 +119,13 @@
 							(<a href="http://mdocml.bsd.lv/snapshots/mdocml.md5">md5</a>)
 							</td>
 						</tr>
+						<tr>
+							<td>OpenBSD port</td>
+							<td>
+							<a href="http://mdocml.bsd.lv/ports-openbsd/mdocml.tar.gz">mdocml.tar.gz</a> 
+							(<a href="http://mdocml.bsd.lv/ports-openbsd/mdocml.md5">md5</a>)
+							</td>
+						</tr>
 					</tbody>
 					</table>
 
@@ -144,12 +144,6 @@
 							</td>
 						</tr>
 						<tr>
-							<td>OpenBSD port</td>
-							<td>
-							<a href="http://mdocml.bsd.lv/ports-openbsd/">/ports-openbsd/</a> 
-							</td>
-						</tr>
-						<tr>
 							<td>FreeBSD port</td>
 							<td>
 							<a href="http://mdocml.bsd.lv/ports-freebsd/">/ports-freebsd/</a> 
@@ -161,6 +155,12 @@
 							<a href="http://mdocml.bsd.lv/ports-netbsd/">/ports-netbsd/</a> 
 							</td>
 						</tr>
+						<tr>
+							<td>OpenBSD port</td>
+							<td>
+							<a href="http://mdocml.bsd.lv/ports-openbsd/">/ports-openbsd/</a> 
+							</td>
+						</tr>
 					</tbody>
 					</table>
 				</td>