===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.79
retrieving revision 1.90
diff -u -p -r1.79 -r1.90
--- mandoc/Makefile	2009/02/23 15:19:47	1.79
+++ mandoc/Makefile	2009/02/27 17:24:30	1.90
@@ -1,6 +1,7 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.0
+VERSION	= 1.3.6
+VDATE	= 27 February 2009
 
 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
@@ -41,14 +42,17 @@ HTMLS	= index.html
 
 STATICS	= style.css external.png
 
-MANS	= mdoctree.1 mdocterm.1 mdoc.3
+TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
 
+MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
+
 BINS	= mdocterm mdoctree mdoclint
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS)
+CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+	  $(TARGZS)
 
-INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS) \
-	  $(SGMLS) $(STATICS)
+INSTALL	= $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
+	  $(STATICS) Makefile.netbsd Makefile.openbsd
 
 FAIL	= regress/test.empty \
 	  regress/test.prologue.00 \
@@ -75,9 +79,17 @@ FAIL	= regress/test.empty \
 	  regress/test.prologue.31 \
 	  regress/test.prologue.32 \
 	  regress/test.prologue.33 \
-	  regress/test.sh.01 \
-	  regress/test.sh.02 \
-	  regress/test.sh.03
+	  regress/test.sh.03 \
+	  regress/test.escape.01 \
+	  regress/test.escape.02 \
+	  regress/test.escape.03 \
+	  regress/test.escape.04 \
+	  regress/test.escape.06 \
+	  regress/test.escape.07 \
+	  regress/test.escape.08 \
+	  regress/test.escape.09 \
+	  regress/test.escape.11 \
+	  regress/test.escape.12
 
 SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.07 \
@@ -100,8 +112,15 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.list.03 \
 	  regress/test.list.04 \
 	  regress/test.list.05 \
-	  regress/test.list.06
+	  regress/test.list.06 \
+	  regress/test.sh.01 \
+	  regress/test.sh.02 \
+	  regress/test.escape.00 \
+	  regress/test.escape.05 \
+	  regress/test.escape.10
 
+REGRESS	= $(FAIL) $(SUCCEED)
+
 all:	$(BINS)
 
 lint:	$(LLNS)
@@ -109,13 +128,23 @@ lint:	$(LLNS)
 clean:
 	rm -f $(CLEAN)
 
+cleanlint:
+	rm -f $(LNS) $(LLNS)
+
 dist:	mdocml-$(VERSION).tar.gz
 
-port:	mdocml-oport-$(VERSION).tar.gz
+port:	mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
 
-www:	$(HTMLS)
+www:	$(HTMLS) $(TARGZS)
 
-regress:: mdoclint
+installwww: www
+	install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+
+regress: mdoclint
 	@for f in $(FAIL); do \
 		echo "./mdoclint $$f" ; \
 		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
@@ -130,23 +159,21 @@ install:
 	mkdir -p $(PREFIX)/man/man1/
 	install -m 0755 mdocterm $(PREFIX)/bin/
 	install -m 0755 mdoctree $(PREFIX)/bin/
+	install -m 0755 mdoclint $(PREFIX)/bin/
 	install -m 0444 mdocterm.1 $(PREFIX)/man/man1/
-	install -m 0444 mdocterm.1 $(PREFIX)/man/man1/
+	install -m 0444 mdoctree.1 $(PREFIX)/man/man1/
+	install -m 0444 mdoclint.1 $(PREFIX)/man/man1/
 	install -m 0444 mdoc.3 $(PREFIX)/man/man3/
 	install -m 0644 libmdoc.a $(PREFIX)/lib/
 	install -m 0444 mdoc.h $(PREFIX)/include/
 
-install-dist: mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
-	install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/mdocml-oport.tar.gz
-
 uninstall:
 	rm -f $(PREFIX)/bin/mdocterm
 	rm -f $(PREFIX)/bin/mdoctree
+	rm -f $(PREFIX)/bin/mdoclint
 	rm -f $(PREFIX)/man/man1/mdocterm.1
 	rm -f $(PREFIX)/man/man1/mdoctree.1
+	rm -f $(PREFIX)/man/man1/mdoclint.1
 	rm -f $(PREFIX)/man/man3/mdoc.3
 	rm -f $(PREFIX)/lib/libmdoc.a
 	rm -f $(PREFIX)/include/mdoc.h
@@ -196,14 +223,36 @@ mmain.h: mdoc.h
 
 term.h: mdoc.h
 
-mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
+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/mdocterm >> .dist/mdocml/PLIST
+	echo bin/mdoctree >> .dist/mdocml/PLIST
+	echo bin/mdoclint >> .dist/mdocml/PLIST
+	echo lib/libmdoc.a >> .dist/mdocml/PLIST
+	echo include/mdoc.h >> .dist/mdocml/PLIST
+	echo man/man1/mdoctree.1 >> .dist/mdocml/PLIST
+	echo man/man1/mdocterm.1 >> .dist/mdocml/PLIST
+	echo man/man1/mdoclint.1 >> .dist/mdocml/PLIST
+	echo man/man3/mdoc.3 >> .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.port > .dist/mdocml/Makefile
+	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.79 2009/02/23 15:19:47 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.90 2009/02/27 17:24:30 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
@@ -218,7 +267,9 @@ mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
 	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/regress/
 	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	install -m 0644 $(REGRESS) .dist/mdocml/mdocml-$(VERSION)/regress/
 	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
@@ -245,4 +296,5 @@ mdoclint: $(LINTOBJS) libmdoc.a
 
 .sgml.html:
 	validate $<
-	cp -f $< $@
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+