===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.59
retrieving revision 1.78
diff -u -p -r1.59 -r1.78
--- mandoc/Makefile	2009/01/17 16:47:02	1.59
+++ mandoc/Makefile	2009/02/23 13:05:06	1.78
@@ -1,101 +1,233 @@
-VERSION	= 1.1.0
+VERSION	= 1.3.0
 
-CFLAGS += -W -Wall -Wno-unused-parameter -g 
+CFLAGS += -W -Wall -Wstrict-prototypes -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 
 
-LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
+TREELNS	= mdoctree.ln mmain.ln 
 
+TERMLNS	= mdoctree.ln mmain.ln term.ln
+
+LINTLNS	= mdoclint.ln mmain.ln
+
+LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
+
+LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.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
+TERMOBJS= mdocterm.o mmain.o term.o
 
-HEADS	= mdoc.h
+TREEOBJS= mdoctree.o mmain.o
 
-BINS	= mdocml
+LINTOBJS= mdoclint.o mmain.o
 
+OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
+
+SRCS	= macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
+	  action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c
+
+HEADS	= mdoc.h private.h term.h mmain.h
+
+MANS	= mdoctree.1 mdocterm.1 mdoc.3
+
+BINS	= mdocterm mdoctree mdoclint
+
 CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
-SUCCESS	= test.1 test.7 test.8 test.9 test.11 test.11 test.12 test.16 \
-	  test.17 test.19 test.20 test.21 test.23 test.25 test.27     \
-	  test.28 test.29 test.31 test.32 test.33 test.34 test.35     \
-	  test.38 test.39 test.40 test.41 test.42 test.43 test.44     \
-	  test.45 test.46 test.47 test.49 test.51 test.52 test.53     \
-	  test.54 test.55 test.56 test.57 test.58 test.59 test.60     \
-	  test.62 test.67 test.68 test.71 test.72 test.73 test.74     \
-	  test.75
+INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
 
-FAIL	= test.0 test.2 test.3 test.4 test.5 test.6 test.13 test.14   \
-	  test.15 test.18 test.22 test.24 test.26 test.30 test.36     \
-	  test.37 test.48 test.50 test.61 test.63 test.64 test.65     \
-	  test.66 test.69 test.70
+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 \
+	  regress/test.prologue.25 \
+	  regress/test.prologue.26 \
+	  regress/test.prologue.27 \
+	  regress/test.prologue.28 \
+	  regress/test.prologue.29 \
+	  regress/test.prologue.30 \
+	  regress/test.prologue.31 \
+	  regress/test.prologue.32 \
+	  regress/test.prologue.33 \
+	  regress/test.sh.01 \
+	  regress/test.sh.02 \
+	  regress/test.sh.03
 
+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 \
+	  regress/test.sh.00 \
+	  regress/test.name.00 \
+	  regress/test.name.01 \
+	  regress/test.name.02 \
+	  regress/test.name.03 \
+	  regress/test.list.00 \
+	  regress/test.list.01 \
+	  regress/test.list.02 \
+	  regress/test.list.03 \
+	  regress/test.list.04 \
+	  regress/test.list.05 \
+	  regress/test.list.06
+
 all:	$(BINS)
 
 lint:	$(LLNS)
 
-mdocml:	mdocml.o tree.o libmdoc.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o tree.o libmdoc.a
-
 clean:
 	rm -f $(CLEAN)
 
-regress: mdocml $(SUCCESS) $(FAIL)
-	@for f in $(SUCCESS) ; do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f || exit 1 ; \
-	done
+dist:	mdocml-$(VERSION).tar.gz
 
-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
+port:	mdocml-oport-$(VERSION).tar.gz
 
-llib-lmdocml.ln: mdocml.ln tree.ln llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln tree.ln llib-llibmdoc.ln
+regress:: mdoclint
+	@for f in $(FAIL); do \
+		echo "./mdoclint $$f" ; \
+		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
+	@for f in $(SUCCEED); do \
+		echo "./mdoclint $$f" ; \
+		./mdoclint $$f 2>/dev/null || exit 1 ; done
 
-macro.ln: macro.c private.h
+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 0444 mdocterm.1 $(PREFIX)/man/man1/
+	install -m 0444 mdocterm.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)/man/man1/mdocterm.1
+	rm -f $(PREFIX)/man/man1/mdoctree.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
 
-strings.ln: strings.c private.h
+term.ln: term.c term.h 
+term.o: term.c term.h
 
+strings.ln: strings.c private.h
 strings.o: strings.c private.h
 
-tree.ln: tree.c mdoc.h
-
-tree.o: tree.c mdoc.h
-
 hash.ln: hash.c private.h
-
 hash.o: hash.c private.h
 
 mdoc.ln: mdoc.c private.h
-
 mdoc.o: mdoc.c private.h
 
-mdocml.ln: mdocml.c mdoc.h
+mdocterm.ln: mdocterm.c mmain.h
+mdocterm.o: mdocterm.c mmain.h
 
-mdocml.o: mdocml.c mdoc.h
+mdoclint.ln: mdoclint.c mmain.h
+mdoclint.o: mdoclint.c mmain.h
 
-xstd.ln: xstd.c private.h
+mdoctree.ln: mdoctree.c mmain.h
+mdoctree.o: mdoctree.c mmain.h
 
+xstd.ln: xstd.c private.h
 xstd.o: xstd.c private.h
 
 argv.ln: argv.c private.h
-
 argv.o: argv.c private.h
 
 validate.ln: validate.c private.h
-
 validate.o: validate.c private.h
 
 action.ln: action.c private.h
-
 action.o: action.c private.h
 
+mmain.ln: mmain.c mmain.h
+mmain.o: mmain.c mmain.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
+mmain.h: mdoc.h
 
+term.h: mdoc.h
+
+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.78 2009/02/23 13:05:06 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
+	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
+	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdoclint.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-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
+
+llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
+
+libmdoc.a: $(LIBOBJS)
+	$(AR) rs $@ $(LIBOBJS)
+
+mdocterm: $(TERMOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
+
+mdoctree: $(TREEOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
+
+mdoclint: $(LINTOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a