===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.82
retrieving revision 1.101
diff -u -p -r1.82 -r1.101
--- mandoc/Makefile	2009/02/23 22:51:10	1.82
+++ mandoc/Makefile	2009/03/01 20:17:03	1.101
@@ -1,7 +1,18 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.3
+VERSION	= 1.3.14
+VDATE	= 01 March 2009
 
+BINDIR		= $(PREFIX)/bin
+INCLUDEDIR	= $(PREFIX)/include
+LIBDIR		= $(PREFIX)/lib
+MANDIR		= $(PREFIX)/man
+
+INSTALL_PROGRAM	= install -m 0755
+INSTALL_DATA	= install -m 0444
+INSTALL_LIB	= install -m 0644
+INSTALL_MAN	= $(INSTALL_DATA)
+
 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
 LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
@@ -41,7 +52,8 @@ HTMLS	= index.html
 
 STATICS	= style.css external.png
 
-TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
+TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
+	  mdocml-nport-$(VERSION).tar.gz
 
 MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
 
@@ -50,8 +62,8 @@ BINS	= mdocterm mdoctree mdoclint
 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 \
@@ -78,9 +90,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 \
@@ -103,7 +123,13 @@ 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.list.07 \
+	  regress/test.sh.01 \
+	  regress/test.sh.02 \
+	  regress/test.escape.00 \
+	  regress/test.escape.05 \
+	  regress/test.escape.10
 
 REGRESS	= $(FAIL) $(SUCCEED)
 
@@ -114,20 +140,25 @@ 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) $(TARGZS)
 
 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/
 	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+	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::
+regress: mdoclint
 	@for f in $(FAIL); do \
 		echo "./mdoclint $$f" ; \
 		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
@@ -136,30 +167,31 @@ regress::
 		./mdoclint $$f 2>/dev/null || exit 1 ; done
 
 install:
-	mkdir -p $(PREFIX)/bin/
-	mkdir -p $(PREFIX)/include/mdoc/
-	mkdir -p $(PREFIX)/lib/
-	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 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/
+	mkdir -p $(BINDIR)
+	mkdir -p $(INCLUDEDIR)
+	mkdir -p $(LIBDIR)/lib
+	mkdir -p $(MANDIR)/man1
+	mkdir -p $(MANDIR)/man3
+	$(INSTALL_PROGRAM) mdocterm $(BINDIR)
+	$(INSTALL_PROGRAM) mdoctree $(BINDIR)
+	$(INSTALL_PROGRAM) mdoclint $(BINDIR)
+	$(INSTALL_MAN) mdocterm.1 $(MANDIR)/man1
+	$(INSTALL_MAN) mdoctree.1 $(MANDIR)/man1
+	$(INSTALL_MAN) mdoclint.1 $(MANDIR)/man1
+	$(INSTALL_MAN) mdoc.3 $(MANDIR)/man3
+	$(INSTALL_LIB) libmdoc.a $(LIBDIR)
+	$(INSTALL_DATA) mdoc.h $(INCLUDEDIR)
 
 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
+	rm -f $(BINDIR)/mdocterm
+	rm -f $(BINDIR)/mdoctree
+	rm -f $(BINDIR)/mdoclint
+	rm -f $(MANDIR)/man1/mdocterm.1
+	rm -f $(MANDIR)/man1/mdoctree.1
+	rm -f $(MANDIR)/man1/mdoclint.1
+	rm -f $(MANDIR)/man3/mdoc.3
+	rm -f $(LIBDIR)/libmdoc.a
+	rm -f $(INCLUDEDIR)/mdoc.h
 
 macro.ln: macro.c private.h
 macro.o: macro.c private.h
@@ -206,15 +238,36 @@ mmain.h: mdoc.h
 
 term.h: mdoc.h
 
-mdocml-oport-$(VERSION).tar.gz: mdocml-$(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 > \
+	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.82 2009/02/23 22:51:10 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.101 2009/03/01 20:17: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
@@ -258,4 +311,5 @@ mdoclint: $(LINTOBJS) libmdoc.a
 
 .sgml.html:
 	validate $<
-	cp -f $< $@
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+