===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.187
retrieving revision 1.198
diff -u -p -r1.187 -r1.198
--- mandoc/Makefile	2009/07/04 09:01:55	1.187
+++ mandoc/Makefile	2009/07/19 09:46:12	1.198
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
+.SUFFIXES:	.html .xml .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz 
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -9,8 +9,8 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.7.20
-VDATE	   = 22 June 2009
+VERSION	   = 1.8.1
+VDATE	   = 19 July 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
@@ -50,27 +50,21 @@ SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h libmandoc.h
 SGMLS	   = index.sgml 
-HTMLS	   = index.html
+XSLS	   = ChangeLog.xsl
+HTMLS	   = index.html ChangeLog.html
+XMLS	   = ChangeLog.xml
 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 \
-	     mdocml-nport-$(VERSION).tar.gz
+MD5S	   = mdocml-$(VERSION).md5 
+TARGZS	   = mdocml-$(VERSION).tar.gz
 MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
 	     man.7 man.3
 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 $(MD5S)
-MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
-	     Makefile
-INSTALL	   = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
-	     $(STATICS) $(DATAS)
+	     $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS) 
+INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+	     $(DATAS) $(XSLS)
 
 all:	$(BINS)
 
@@ -86,27 +80,14 @@ dist:	mdocml-$(VERSION).tar.gz
 
 html:	$(HTMLS)
 
-www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) ChangeLog
+www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
 
 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)
@@ -189,52 +170,11 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
-ChangeLog::
-	cvs2cl -P -t --no-indent --FSF --no-times
+ChangeLog.xml:
+	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
-mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
-	mkdir -p .dist/mdocml/
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
-		.dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/
-	echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
-	echo bin/mandoc >> .dist/mdocml/PLIST
-	echo man/man1/mandoc.1 >> .dist/mdocml/PLIST
-	echo man/man7/mdoc.7 >> .dist/mdocml/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
-
-mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
-	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
-		.dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	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.187 2009/07/04 09:01:55 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
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
-
-mdocml-fport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.freebsd DESCR
-	mkdir -p .dist/mdocml
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.freebsd > \
-		.dist/mdocml/Makefile
-	( md5 mdocml-$(VERSION).tar.gz; \
-	  cksum -a SHA256 mdocml-$(VERSION).tar.gz; \
-	  echo -n "SIZE (mdocml-$(VERSION).tar.gz) = "; \
-	  ls -l mdocml-$(VERSION).tar.gz | awk '{print $$5}' \
-	  ) > .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/pkg-descr
-	( echo; echo "WWW: http://mdocml.bsd.lv/") >> .dist/mdocml/pkg-descr
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+ChangeLog.html: ChangeLog.xml ChangeLog.xsl
+	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
 	mkdir -p .dist/mdocml/mdocml-$(VERSION)/