===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.137
retrieving revision 1.143
diff -u -p -r1.137 -r1.143
--- mandoc/Makefile	2009/03/20 19:56:25	1.137
+++ mandoc/Makefile	2009/03/22 19:01:11	1.143
@@ -9,14 +9,18 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.6.4
-VDATE	   = 20 March 2009
+VERSION	   = 1.6.8
+VDATE	   = 21 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 
+# If you want to strip `Xo/Xc' macro pairs, enable this.  Really, only
+# OpenBSD should be doing this while it kicks its cruft.
+CFLAGS	  += -DSTRIP_XO
+
 LIBLNS	   = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
 	     validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
 	     msec.ln st.ln
@@ -36,13 +40,13 @@ OBJS	   = $(LIBOBJS) $(MAINOBJS)
 SRCS	   = $(LIBSRCS) $(MAINSRCS)
 DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 HEADS	   = mdoc.h private.h term.h 
-SGMLS	   = index.sgml
+SGMLS	   = index.sgml 
 HTMLS	   = index.html
 STATICS	   = style.css external.png
 TARGZS	   = mdocml-$(VERSION).tar.gz \
 	     mdocml-oport-$(VERSION).tar.gz \
 	     mdocml-nport-$(VERSION).tar.gz
-MANS	   = mandoc.1 mdoc.3 mdoc.7
+MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7
 BINS	   = mandoc
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
 INSTALL	   = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
@@ -167,7 +171,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.137 2009/03/20 19:56:25 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.143 2009/03/22 19:01:11 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mandoc >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST