===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.361
retrieving revision 1.371
diff -u -p -r1.361 -r1.371
--- mandoc/Makefile	2011/07/24 10:09:03	1.361
+++ mandoc/Makefile	2011/09/17 15:00:51	1.371
@@ -11,14 +11,15 @@
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS	+= -DOSNAME="\"OpenBSD 4.5\""
 
-VERSION		 = 1.11.5
-VDATE		 = 24 July 2011
+VERSION		 = 1.11.7
+VDATE		 = 2 September 2011
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 # UCS-4 value) should you define USE_WCHAR.  If you define it and your
 # system DOESN'T support this, -Tlocale will produce garbage.
 # If you don't define it, -Tlocale is a synonym for -Tacsii.
-CFLAGS		+= -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS	 	+= -DUSE_WCHAR
+CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
@@ -36,7 +37,7 @@ INSTALL_MAN	 = $(INSTALL_DATA)
 # Linux needs -ldb to compile mandocdb.
 #DBLIB		 = -ldb
 
-all: mandoc preconv
+all: mandoc preconv demandoc
 
 SRCS		 = Makefile \
 		   arch.c \
@@ -45,9 +46,13 @@ SRCS		 = Makefile \
 		   att.in \
 		   chars.c \
 		   chars.in \
-		   compat.c \
+		   compat_getsubopt.c \
+		   compat_strlcat.c \
+		   compat_strlcpy.c \
 		   config.h.post \
 		   config.h.pre \
+		   demandoc.c \
+		   demandoc.1 \
 		   eqn.7 \
 		   eqn.c \
 		   eqn_html.c \
@@ -88,6 +93,7 @@ SRCS		 = Makefile \
 		   mdoc_hash.c \
 		   mdoc_html.c \
 		   mdoc_macro.c \
+		   mdoc_man.c \
 		   mdoc_term.c \
 		   mdoc_validate.c \
 		   msec.c \
@@ -114,9 +120,11 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
+		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
+		   test-strptime.c \
 		   tree.c \
 		   vol.c \
 		   vol.in
@@ -179,6 +187,13 @@ LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
 		   mandoc.ln \
 		   read.ln
 
+COMPAT_OBJS	 = compat_getsubopt.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o
+COMPAT_LNS	 = compat_getsubopt.ln \
+		   compat_strlcat.ln \
+		   compat_strlcpy.ln
+
 arch.o arch.ln: arch.in
 att.o att.ln: att.in
 chars.o chars.ln: chars.in
@@ -193,6 +208,8 @@ $(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
 $(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
 $(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
 
+$(COMPAT_OBJS) $(COMPAT_LNS): config.h
+
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
 		   man_html.o \
@@ -204,6 +221,9 @@ MANDOC_HTML_LNS	 = eqn_html.ln \
 		   mdoc_html.ln \
 		   tbl_html.ln
 
+MANDOC_MAN_OBJS  = mdoc_man.o
+MANDOC_MAN_LNS   = mdoc_man.ln
+
 MANDOC_TERM_OBJS = eqn_term.o \
 		   man_term.o \
 		   mdoc_term.o \
@@ -220,11 +240,13 @@ MANDOC_TERM_LNS	 = eqn_term.ln \
 		   tbl_term.ln
 
 MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
 		   $(MANDOC_TERM_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
 MANDOC_LNS	 = $(MANDOC_HTML_LNS) \
+		   $(MANDOC_MAN_LNS) \
 		   $(MANDOC_TERM_LNS) \
 		   main.ln \
 		   out.ln \
@@ -234,8 +256,6 @@ $(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS): html.h
 $(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
 $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
 
-compat.o compat.ln: config.h
-
 MANDOCDB_OBJS	 = mandocdb.o
 MANDOCDB_LNS	 = mandocdb.ln
 
@@ -246,7 +266,17 @@ PRECONV_LNS	 = preconv.ln
 
 $(PRECONV_OBJS) $(PRECONV_LNS): config.h
 
-INDEX_MANS	 = mandoc.1.html \
+DEMANDOC_OBJS	 = demandoc.o
+DEMANDOC_LNS	 = demandoc.ln
+
+$(DEMANDOC_OBJS) $(DEMANDOC_LNS): config.h
+
+INDEX_MANS	 = demandoc.1.html \
+		   demandoc.1.xhtml \
+		   demandoc.1.ps \
+		   demandoc.1.pdf \
+		   demandoc.1.txt \
+		   mandoc.1.html \
 		   mandoc.1.xhtml \
 		   mandoc.1.ps \
 		   mandoc.1.pdf \
@@ -308,7 +338,7 @@ INDEX_OBJS	 = $(INDEX_MANS) \
 
 www: index.html
 
-lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln
+lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln llib-ldemandoc.ln
 
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
@@ -317,11 +347,18 @@ clean:
 	rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
 	rm -f preconv $(PRECONV_OBJS)
 	rm -f llib-lpreconv.ln $(PRECONV_LNS)
+	rm -f demandoc $(DEMANDOC_OBJS)
+	rm -f llib-ldemandoc.ln $(DEMANDOC_LNS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f llib-lmandoc.ln $(MANDOC_LNS)
-	rm -f config.h config.log compat.o compat.ln
-	rm -f mdocml.tar.gz
+	rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS)
+	rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip
 	rm -f index.html $(INDEX_OBJS)
+	rm -rf test-strlcpy.DSYM
+	rm -rf test-strlcat.DSYM 
+	rm -rf test-strptime.DSYM 
+	rm -rf test-mmap.DSYM 
+	rm -rf test-getsubopt.DSYM
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -332,16 +369,17 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
 	mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL_MAN) mandoc.1 preconv.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
 	$(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
 	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 installwww: www
 	mkdir -p $(PREFIX)/snapshots
+	mkdir -p $(PREFIX)/binaries
 	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
 	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
 	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
@@ -350,30 +388,36 @@ installwww: www
 	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
 	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
 
-libmandoc.a: compat.o $(LIBMANDOC_OBJS)
-	$(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
-	$(LINT) $(LINTFLAGS) -Clibmandoc compat.ln $(LIBMANDOC_LNS)
+llib-llibmandoc.ln: $(COMPAT_LNS) $(LIBMANDOC_LNS)
+	$(LINT) $(LINTFLAGS) -Clibmandoc $(COMPAT_LNS) $(LIBMANDOC_LNS)
 
 mandoc: $(MANDOC_OBJS) libmandoc.a
-	$(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
 llib-lmandoc.ln: $(MANDOC_LNS)
 	$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
 mandocdb: $(MANDOCDB_OBJS) libmandoc.a
-	$(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
+	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
 llib-lmandocdb.ln: $(MANDOCDB_LNS)
 	$(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)
 
 preconv: $(PRECONV_OBJS)
-	$(CC) -o $@ $(PRECONV_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
 llib-lpreconv.ln: $(PRECONV_LNS)
 	$(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS)
 
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+
+llib-ldemandoc.ln: $(DEMANDOC_LNS)
+	$(LINT) $(LINTFLAGS) -Cdemandoc $(DEMANDOC_LNS)
+
 mdocml.md5: mdocml.tar.gz
 	md5 mdocml.tar.gz >$@
 
@@ -383,12 +427,51 @@ mdocml.tar.gz: $(SRCS)
 	( cd .dist/ && tar zcf ../$@ ./ )
 	rm -rf .dist/
 
+mdocml-win32.zip: $(SRCS)
+	mkdir -p .win32/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .win32
+	cp .win32/Makefile .win32/Makefile.old
+	grep -v DUSE_WCHAR .win32/Makefile.old >.win32/Makefile
+	( cd .win32; \
+		CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
+		make install PREFIX=mdocml-$(VERSION) ; \
+		zip -r ../$@ mdocml-$(VERSION) )
+	rm -rf .win32
+
+mdocml-win64.zip: $(SRCS)
+	mkdir -p .win64/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .win64
+	cp .win64/Makefile .win64/Makefile.old
+	grep -v DUSE_WCHAR .win64/Makefile.old >.win64/Makefile
+	( cd .win64; \
+		CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
+		make install PREFIX=mdocml-$(VERSION) ; \
+		zip -r ../$@ mdocml-$(VERSION) )
+	rm -rf .win64
+
+mdocml-macosx.zip: $(SRCS)
+	mkdir -p .macosx/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .macosx
+	( cd .macosx; \
+		CFLAGS="-arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" make; \
+		make install PREFIX=mdocml-$(VERSION) ; \
+		zip -r ../$@ mdocml-$(VERSION) )
+	rm -rf .macosx
+
 index.html: $(INDEX_OBJS)
 
 config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	  echo; \
+	  if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRPTIME'; \
+		rm test-strptime; \
+	  fi; \
+	  if $(CC) $(CFLAGS) -Werror -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \
+		echo '#define HAVE_GETSUBOPT'; \
+		rm test-getsubopt; \
+	  fi; \
 	  if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCAT'; \
 		rm test-strlcat; \