===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.58
retrieving revision 1.64
diff -u -p -r1.58 -r1.64
--- mandoc/Makefile	2009/01/17 14:04:25	1.58
+++ mandoc/Makefile	2009/01/20 22:55:46	1.64
@@ -1,39 +1,109 @@
-VERSION	= 1.1.0
+VERSION	= 1.2.0
 
 CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LNS	= macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln tree.ln
+LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
+	  validate.ln action.ln
 
+BINLNS	= tree.ln mdocml.ln
+
+LNS	= $(LIBLNS) $(BINLNS)
+
 LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
 LIBS	= libmdoc.a
 
-OBJS	= macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o action.o tree.o
+LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
+	  validate.o action.o
 
-SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c action.c tree.c
+BINOBJS	= tree.o mdocml.o
 
-HEADS	= mdoc.h
+OBJS	= $(LIBOBJS) $(BINOBJS)
 
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
+	  validate.c action.c tree.c
+
+HEADS	= mdoc.h private.h
+
+MANS	= mdocml.1 mdoc.3
+
 BINS	= mdocml
 
 CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
+INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
+
+FAIL	= regress/test.empty \
+	  regress/test.prologue.00 \
+	  regress/test.prologue.01 \
+	  regress/test.prologue.02 \
+	  regress/test.prologue.03 \
+	  regress/test.prologue.04 \
+	  regress/test.prologue.06 \
+	  regress/test.prologue.13 \
+	  regress/test.prologue.15 \
+	  regress/test.prologue.16 \
+	  regress/test.prologue.18 \
+	  regress/test.prologue.19 \
+	  regress/test.prologue.21 \
+	  regress/test.prologue.22 \
+	  regress/test.prologue.23 \
+	  regress/test.prologue.24
+
+SUCCEED	= regress/test.prologue.05 \
+	  regress/test.prologue.07 \
+	  regress/test.prologue.08 \
+	  regress/test.prologue.09 \
+	  regress/test.prologue.10 \
+	  regress/test.prologue.11 \
+	  regress/test.prologue.12 \
+	  regress/test.prologue.14 \
+	  regress/test.prologue.17 \
+	  regress/test.prologue.20
+
 all:	$(BINS)
 
 lint:	$(LLNS)
 
-mdocml:	mdocml.o tree.o libmdoc.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o tree.o libmdoc.a
-
 clean:
 	rm -f $(CLEAN)
 
-llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
-	$(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
+dist:	mdocml-$(VERSION).tar.gz
 
-llib-lmdocml.ln: mdocml.ln tree.ln llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln tree.ln llib-llibmdoc.ln
+port:	mdocml-oport-$(VERSION).tar.gz
 
+regress::
+	@for f in $(FAIL); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+	@for f in $(SUCCEED); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$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 mdocml $(PREFIX)/bin/
+	install -m 0444 mdocml.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/mdocml
+	rm -f $(PREFIX)/man/man1/mdocml.1
+	rm -f $(PREFIX)/man/man3/mdoc.3
+	rm -f $(PREFIX)/lib/libmdoc.a
+	rm -f $(PREFIX)/include/mdoc.h
+
 macro.ln: macro.c private.h
 
 macro.o: macro.c private.h
@@ -76,6 +146,37 @@ action.o: action.c private.h
 
 private.h: mdoc.h
 
-libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
-	$(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
+mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
+	mkdir -p .dist/mdocml/pkg
+	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .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.64 2009/01/20 22:55:46 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
+	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
+	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
+	( cd .dist/ && tar zcf ../$@ mdocml/ )
+	rm -rf .dist/
+
+mdocml-$(VERSION).tar.gz: $(INSTALL)
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
+	rm -rf .dist/
+
+llib-llibmdoc.ln: $(LIBLNS)
+	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+
+llib-lmdocml.ln: $(BINLNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml $(BINLNS) llib-llibmdoc.ln
+
+libmdoc.a: $(LIBOBJS)
+	$(AR) rs $@ $(LIBOBJS)
+
+mdocml:	$(BINOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a