===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.99
retrieving revision 1.107
diff -u -p -r1.99 -r1.107
--- mandoc/Makefile	2009/03/01 20:05:32	1.99
+++ mandoc/Makefile	2009/03/05 13:12:12	1.107
@@ -1,7 +1,7 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.13
-VDATE	= 01 March 2009
+VERSION	= 1.3.18
+VDATE	= 04 March 2009
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -100,7 +100,10 @@ FAIL	= regress/test.empty \
 	  regress/test.escape.08 \
 	  regress/test.escape.09 \
 	  regress/test.escape.11 \
-	  regress/test.escape.12
+	  regress/test.escape.12 \
+	  regress/test.escape.14 \
+	  regress/test.argv.01 \
+	  regress/test.argv.02
 
 SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.07 \
@@ -129,7 +132,9 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.sh.02 \
 	  regress/test.escape.00 \
 	  regress/test.escape.05 \
-	  regress/test.escape.10
+	  regress/test.escape.10 \
+	  regress/test.escape.13 \
+	  regress/test.argv.00
 
 REGRESS	= $(FAIL) $(SUCCEED)
 
@@ -158,7 +163,7 @@ installwww: www
 	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: mdoclint
+regress: mdoclint $(FAIL) $(SUCCEED)
 	@for f in $(FAIL); do \
 		echo "./mdoclint $$f" ; \
 		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
@@ -167,31 +172,31 @@ regress: mdoclint
 		./mdoclint $$f 2>/dev/null || exit 1 ; done
 
 install:
-	mkdir -p $(DESTDIR)$(BINDIR)
-	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-	mkdir -p $(DESTDIR)$(LIBDIR)/lib
-	mkdir -p $(DESTDIR)$(MANDIR)/man1
-	mkdir -p $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL_PROGRAM) mdocterm $(DESTDIR)$(BINDIR)
-	$(INSTALL_PROGRAM) mdoctree $(DESTDIR)$(BINDIR)
-	$(INSTALL_PROGRAM) mdoclint $(DESTDIR)$(BINDIR)
-	$(INSTALL_MAN) mdocterm.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mdoctree.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mdoclint.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mdoc.3 $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL_LIB) libmdoc.a $(DESTDIR)$(LIBDIR)
-	$(INSTALL_DATA) mdoc.h $(DESTDIR)$(INCLUDEDIR)
+	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 $(DESTDIR)$(BINDIR)/mdocterm
-	rm -f $(DESTDIR)$(BINDIR)/mdoctree
-	rm -f $(DESTDIR)$(BINDIR)/mdoclint
-	rm -f $(DESTDIR)$(MANDIR)/man1/mdocterm.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/mdoctree.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/mdoclint.1
-	rm -f $(DESTDIR)$(MANDIR)/man3/mdoc.3
-	rm -f $(DESTDIR)$(LIBDIR)/libmdoc.a
-	rm -f $(DESTDIR)$(INCLUDEDIR)/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
@@ -267,7 +272,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.99 2009/03/01 20:05:32 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.107 2009/03/05 13:12:12 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