diff options
| -rw-r--r-- | Makefile | 36 | ||||
| -rw-r--r-- | Makefile.port | 4 | ||||
| -rw-r--r-- | index.sgml | 32 |
3 files changed, 35 insertions, 37 deletions
@@ -1,6 +1,6 @@ .SUFFIXES: .html .sgml -VERSION = 1.3.0 +VERSION = 1.3.3 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g @@ -41,11 +41,14 @@ HTMLS = index.html STATICS = style.css external.png -MANS = mdoctree.1 mdocterm.1 mdoc.3 +TARGZS = mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz + +MANS = mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3 BINS = mdocterm mdoctree mdoclint -CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) +CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ + $(TARGZS) INSTALL = $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS) \ $(SGMLS) $(STATICS) @@ -102,6 +105,8 @@ SUCCEED = regress/test.prologue.05 \ regress/test.list.05 \ regress/test.list.06 +REGRESS = $(FAIL) $(SUCCEED) + all: $(BINS) lint: $(LLNS) @@ -113,10 +118,14 @@ dist: mdocml-$(VERSION).tar.gz port: mdocml-oport-$(VERSION).tar.gz -www: $(HTMLS) +www: $(HTMLS) $(TARGZS) installwww: www install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/ + install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/ + install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/ + install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz + install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz regress:: mdoclint @for f in $(FAIL); do \ @@ -133,23 +142,21 @@ install: mkdir -p $(PREFIX)/man/man1/ install -m 0755 mdocterm $(PREFIX)/bin/ install -m 0755 mdoctree $(PREFIX)/bin/ + install -m 0755 mdoclint $(PREFIX)/bin/ install -m 0444 mdocterm.1 $(PREFIX)/man/man1/ - install -m 0444 mdocterm.1 $(PREFIX)/man/man1/ + install -m 0444 mdoctree.1 $(PREFIX)/man/man1/ + install -m 0444 mdoclint.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)/bin/mdoclint rm -f $(PREFIX)/man/man1/mdocterm.1 rm -f $(PREFIX)/man/man1/mdoctree.1 + rm -f $(PREFIX)/man/man1/mdoclint.1 rm -f $(PREFIX)/man/man3/mdoc.3 rm -f $(PREFIX)/lib/libmdoc.a rm -f $(PREFIX)/include/mdoc.h @@ -199,9 +206,10 @@ mmain.h: mdoc.h term.h: mdoc.h -mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR +mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.port DESCR mkdir -p .dist/mdocml/pkg - sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile + 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 @@ -221,7 +229,9 @@ mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR mdocml-$(VERSION).tar.gz: $(INSTALL) mkdir -p .dist/mdocml/mdocml-$(VERSION)/ + mkdir -p .dist/mdocml/mdocml-$(VERSION)/regress/ install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/ + install -m 0644 $(REGRESS) .dist/mdocml/mdocml-$(VERSION)/regress/ ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ ) rm -rf .dist/ diff --git a/Makefile.port b/Makefile.port index 00f183c2..57120352 100644 --- a/Makefile.port +++ b/Makefile.port @@ -15,10 +15,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://mdocml.bsd.lv/ports-openbsd/ +MASTER_SITES= http://mdocml.bsd.lv/snapshots/ WANTLIB= c -NO_REGRESS= Yes +NO_REGRESS= No .include <bsd.port.mk> @@ -74,21 +74,19 @@ </p> <h2> - nightly source + snapshotted source </h2> <p> - CVS sources are checkedout and snapshotted nightly. These may be found in the <a + CVS sources are checkedout and snapshotted with big updates. These may be found in the <a href="/snapshots/">/snapshots/</a> directory. </p> <p class="boxed"> % cd /tmp<br> - % ftp -V -o- http://mdocml.bsd.lv/snapshots/mdocml.tgz | tar -zxf -<br> + % ftp -V -o- http://mdocml.bsd.lv/snapshots/mdocml.tar.gz | tar -zvxf -<br> % cd mdocml<br> - % make<br> - % make regress<br> - % make install + % make && make regress && make install </p> <h2> @@ -96,28 +94,18 @@ </h2> <p> - The nightly snapshot is automatically converted into an OpenBSD port (ports for other BSD systems not + The source snapshot is automatically converted into an OpenBSD port (ports for other BSD systems not yet available). These may be found in the <a href="/ports-openbsd/">/ports-openbsd/</a> directory. - </p> - - <p> - If installing for the first time (you must have the ports tree installed): + You <span class="emph">must</span> have the ports tree installed. </p> <p class="boxed"> + % sudo pkg_delete mdocml<br> % cd /usr/ports/devel/<br> - % ftp -V -o- http://mdocml.bsd.lv/ports-openbsd/mdocml.tgz | tar -zxf -<br> + % sudo rm -rf mdocml<br> + % ftp -V -o- http://mdocml.bsd.lv/ports-openbsd/mdocml.tar.gz | sudo tar -zvxf -<br> % cd mdocml<br> - % sudo make<br> - % sudo make install - </p> - - <p> - Subsequent installations: - </p> - - <p class="boxed"> - % sudo pkg_add -r mdocml + % sudo make && sudo make regress && sudo make install </p> </td> </tr> |