===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.90
retrieving revision 1.105
diff -u -p -r1.90 -r1.105
--- mandoc/Makefile	2009/02/27 17:24:30	1.90
+++ mandoc/Makefile	2009/03/04 14:41:40	1.105
@@ -1,8 +1,18 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.6
-VDATE	= 27 February 2009
+VERSION	= 1.3.18
+VDATE	= 04 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 \
@@ -42,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
 
@@ -89,7 +100,8 @@ 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
 
 SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.07 \
@@ -113,11 +125,13 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.list.04 \
 	  regress/test.list.05 \
 	  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/test.escape.10 \
+	  regress/test.escape.13
 
 REGRESS	= $(FAIL) $(SUCCEED)
 
@@ -140,9 +154,11 @@ 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: mdoclint
 	@for f in $(FAIL); do \
@@ -153,30 +169,31 @@ regress: mdoclint
 		./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
@@ -252,7 +269,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.90 2009/02/27 17:24:30 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.105 2009/03/04 14:41:40 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