=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.151 retrieving revision 1.155 diff -u -p -r1.151 -r1.155 --- mandoc/Makefile 2009/03/23 21:20:42 1.151 +++ mandoc/Makefile 2009/03/25 15:17:49 1.155 @@ -9,8 +9,8 @@ INSTALL_DATA = install -m 0444 INSTALL_LIB = install -m 0644 INSTALL_MAN = $(INSTALL_DATA) -VERSION = 1.7.2 -VDATE = 23 March 2009 +VERSION = 1.7.3 +VDATE = 24 March 2009 VFLAGS = -DVERSION=\"$(VERSION)\" CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g @@ -18,16 +18,18 @@ LINTFLAGS += $(VFLAGS) CFLAGS += $(VFLAGS) MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \ - argv.ln validate.ln action.ln lib.ln att.ln arch.ln \ - vol.ln msec.ln st.ln + argv.ln mdoc_validate.ln action.ln lib.ln att.ln \ + arch.ln vol.ln msec.ln st.ln MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \ - validate.o action.o lib.o att.o arch.o vol.o msec.o st.o + mdoc_validate.o action.o lib.o att.o arch.o vol.o \ + msec.o st.o MDOCSRCS = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \ - validate.c action.c lib.c att.c arch.c vol.c msec.c st.c + mdoc_validate.c action.c lib.c att.c arch.c vol.c \ + msec.c st.c -MANLNS = man_macro.ln man.ln man_hash.ln -MANOBJS = man_macro.o man.o man_hash.o -MANSRCS = man_macro.c man.c man_hash.c +MANLNS = man_macro.ln man.ln man_hash.ln man_validate.ln +MANOBJS = man_macro.o man.o man_hash.o man_validate.o +MANSRCS = man_macro.c man.c man_hash.c man_validate.c MAINLNS = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln MAINOBJS = main.o term.o ascii.o terminal.o tree.o compat.o @@ -45,12 +47,15 @@ HTMLS = index.html STATICS = style.css external.png TARGZS = mdocml-$(VERSION).tar.gz \ mdocml-oport-$(VERSION).tar.gz \ + mdocml-fport-$(VERSION).tar.gz \ mdocml-nport-$(VERSION).tar.gz 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) \ - $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS) +MAKEFILES = Makefile.netbsd Makefile.openbsd Makefile.freebsd \ + Makefile +INSTALL = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \ + $(STATICS) $(DATAS) all: $(BINS) @@ -64,7 +69,9 @@ cleanlint: dist: mdocml-$(VERSION).tar.gz -port: mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz +port: mdocml-oport-$(VERSION).tar.gz \ + mdocml-fport-$(VERSION).tar.gz \ + mdocml-nport-$(VERSION).tar.gz www: $(HTMLS) $(TARGZS) @@ -76,6 +83,8 @@ installwww: www 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 + install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/ + install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/mdocml.tar.gz install: mkdir -p $(BINDIR) @@ -147,9 +156,12 @@ xstd.o: xstd.c libmdoc.h argv.ln: argv.c libmdoc.h argv.o: argv.c libmdoc.h -validate.ln: validate.c libmdoc.h -validate.o: validate.c libmdoc.h +man_validate.ln: man_validate.c libman.h +man_validate.o: man_validate.c libman.h +mdoc_validate.ln: mdoc_validate.c libmdoc.h +mdoc_validate.o: mdoc_validate.c libmdoc.h + action.ln: action.c libmdoc.h action.o: action.c libmdoc.h @@ -180,10 +192,24 @@ 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.151 2009/03/23 21:20:42 kristaps Exp $$ > .dist/mdocml/pkg/PLIST + echo @comment $$OpenBSD: Makefile,v 1.155 2009/03/25 15:17:49 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 + ( cd .dist/ && tar zcf ../$@ mdocml/ ) + rm -rf .dist/ + +mdocml-fport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.freebsd DESCR + mkdir -p .dist/mdocml + sed -e "s!@VERSION@!$(VERSION)!" Makefile.freebsd > \ + .dist/mdocml/Makefile + ( md5 mdocml-$(VERSION).tar.gz; \ + cksum -a SHA256 mdocml-$(VERSION).tar.gz; \ + echo -n "SIZE (mdocml-$(VERSION).tar.gz) = "; \ + ls -l mdocml-$(VERSION).tar.gz | awk '{print $$5}' \ + ) > .dist/mdocml/distinfo + install -m 0644 DESCR .dist/mdocml/pkg-descr + ( echo; echo "WWW: http://mdocml.bsd.lv/") >> .dist/mdocml/pkg-descr ( cd .dist/ && tar zcf ../$@ mdocml/ ) rm -rf .dist/