forked from freebsd/freebsd-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
104 changed files
with
8,249 additions
and
6,381 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| $Id: LICENSE,v 1.19 2018/07/31 10:18:15 schwarze Exp $ | ||
| $Id: LICENSE,v 1.21 2018/11/26 17:11:11 schwarze Exp $ | ||
|
|
||
| With the exceptions noted below, all code and documentation | ||
| contained in the mandoc toolkit is protected by the Copyright | ||
| of the following developers: | ||
| With the exceptions noted below, all non-trivial files contained | ||
| in the mandoc toolkit are protected by the Copyright of the following | ||
| developers: | ||
|
|
||
| Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <[email protected]> | ||
| Copyright (c) 2010-2018 Ingo Schwarze <[email protected]> | ||
|
|
@@ -12,13 +12,14 @@ Copyright (c) 2013 Franco Fichtner <[email protected]> | |
| Copyright (c) 2014 Baptiste Daroussin <[email protected]> | ||
| Copyright (c) 2016 Ed Maste <[email protected]> | ||
| Copyright (c) 2017 Michael Stapelberg <[email protected]> | ||
| Copyright (c) 2017 Anthony Bentley <[email protected]> | ||
| Copyright (c) 1998, 2004, 2010 Todd C. Miller <[email protected]> | ||
| Copyright (c) 2008, 2017 Otto Moerbeek <[email protected]> | ||
| Copyright (c) 2004 Ted Unangst <[email protected]> | ||
| Copyright (c) 1994 Christos Zoulas <[email protected]> | ||
| Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <[email protected]> | ||
|
|
||
| See the individual source files for information about who contributed | ||
| See the individual files for information about who contributed | ||
| to which file during which years. | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # $Id: Makefile,v 1.519 2018/07/31 15:34:00 schwarze Exp $ | ||
| # $Id: Makefile,v 1.530 2019/03/06 16:08:41 schwarze Exp $ | ||
| # | ||
| # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <[email protected]> | ||
| # Copyright (c) 2011, 2013-2018 Ingo Schwarze <[email protected]> | ||
| # Copyright (c) 2011, 2013-2019 Ingo Schwarze <[email protected]> | ||
| # | ||
| # Permission to use, copy, modify, and distribute this software for any | ||
| # purpose with or without fee is hereby granted, provided that the above | ||
|
|
@@ -15,7 +15,7 @@ | |
| # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
|
|
||
| VERSION = 1.14.4 | ||
| VERSION = 1.14.5 | ||
|
|
||
| # === LIST OF FILES ==================================================== | ||
|
|
||
|
|
@@ -37,9 +37,9 @@ TESTSRCS = test-be32toh.c \ | |
| test-PATH_MAX.c \ | ||
| test-pledge.c \ | ||
| test-progname.c \ | ||
| test-recvmsg.c \ | ||
| test-reallocarray.c \ | ||
| test-recallocarray.c \ | ||
| test-recvmsg.c \ | ||
| test-rewb-bsd.c \ | ||
| test-rewb-sysv.c \ | ||
| test-sandbox_init.c \ | ||
|
|
@@ -54,7 +54,8 @@ TESTSRCS = test-be32toh.c \ | |
| test-vasprintf.c \ | ||
| test-wchar.c | ||
|
|
||
| SRCS = att.c \ | ||
| SRCS = arch.c \ | ||
| att.c \ | ||
| catman.c \ | ||
| cgi.c \ | ||
| chars.c \ | ||
|
|
@@ -96,6 +97,7 @@ SRCS = att.c \ | |
| man_validate.c \ | ||
| mandoc.c \ | ||
| mandoc_aux.c \ | ||
| mandoc_msg.c \ | ||
| mandoc_ohash.c \ | ||
| mandoc_xr.c \ | ||
| mandocd.c \ | ||
|
|
@@ -155,13 +157,14 @@ DISTFILES = INSTALL \ | |
| dbm_map.h \ | ||
| demandoc.1 \ | ||
| eqn.7 \ | ||
| eqn.h \ | ||
| eqn_parse.h \ | ||
| gmdiff \ | ||
| html.h \ | ||
| lib.in \ | ||
| libman.h \ | ||
| libmandoc.h \ | ||
| libmdoc.h \ | ||
| libroff.h \ | ||
| main.h \ | ||
| makewhatis.8 \ | ||
| man.1 \ | ||
|
|
@@ -184,6 +187,7 @@ DISTFILES = INSTALL \ | |
| mandoc_html.3 \ | ||
| mandoc_malloc.3 \ | ||
| mandoc_ohash.h \ | ||
| mandoc_parse.h \ | ||
| mandoc_xr.h \ | ||
| mandocd.8 \ | ||
| mansearch.3 \ | ||
|
|
@@ -198,10 +202,12 @@ DISTFILES = INSTALL \ | |
| roff.h \ | ||
| roff_int.h \ | ||
| soelim.1 \ | ||
| st.in \ | ||
| tag.h \ | ||
| tbl.3 \ | ||
| tbl.7 \ | ||
| tbl.h \ | ||
| tbl_int.h \ | ||
| tbl_parse.h \ | ||
| term.h \ | ||
| $(SRCS) \ | ||
| $(TESTSRCS) | ||
|
|
@@ -230,9 +236,11 @@ LIBROFF_OBJS = eqn.o \ | |
| LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ | ||
| $(LIBMDOC_OBJS) \ | ||
| $(LIBROFF_OBJS) \ | ||
| arch.o \ | ||
| chars.o \ | ||
| mandoc.o \ | ||
| mandoc_aux.o \ | ||
| mandoc_msg.o \ | ||
| mandoc_ohash.o \ | ||
| mandoc_xr.o \ | ||
| msec.o \ | ||
|
|
@@ -320,6 +328,7 @@ SOELIM_OBJS = soelim.o \ | |
| WWW_MANS = apropos.1.html \ | ||
| demandoc.1.html \ | ||
| man.1.html \ | ||
| man.options.1.html \ | ||
| mandoc.1.html \ | ||
| soelim.1.html \ | ||
| man.cgi.3.html \ | ||
|
|
@@ -336,20 +345,27 @@ WWW_MANS = apropos.1.html \ | |
| eqn.7.html \ | ||
| man.7.html \ | ||
| mandoc_char.7.html \ | ||
| mandocd.8.html \ | ||
| mdoc.7.html \ | ||
| roff.7.html \ | ||
| tbl.7.html \ | ||
| catman.8.html \ | ||
| makewhatis.8.html \ | ||
| man.cgi.8.html \ | ||
| mandocd.8.html | ||
|
|
||
| WWW_INCS = eqn.h.html \ | ||
| html.h.html \ | ||
| man.h.html \ | ||
| manconf.h.html \ | ||
| mandoc.h.html \ | ||
| mandoc_aux.h.html \ | ||
| mandoc_parse.h.html \ | ||
| mansearch.h.html \ | ||
| mdoc.h.html \ | ||
| roff.h.html | ||
| roff.h.html \ | ||
| tbl.h.html \ | ||
| tbl_int.h.html \ | ||
| tbl_parse.h.html | ||
|
|
||
| # === USER CONFIGURATION =============================================== | ||
|
|
||
|
|
@@ -361,9 +377,9 @@ all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local | |
|
|
||
| install: base-install $(INSTALL_TARGETS) | ||
|
|
||
| www: $(WWW_MANS) | ||
| www: $(WWW_MANS) $(WWW_INCS) | ||
|
|
||
| $(WWW_MANS): mandoc | ||
| $(WWW_MANS) $(WWW_INCS): mandoc | ||
|
|
||
| .PHONY: base-install cgi-install install www-install | ||
| .PHONY: clean distclean depend | ||
|
|
@@ -382,7 +398,7 @@ clean: | |
| rm -f mandocd catman catman.o $(MANDOCD_OBJS) | ||
| rm -f demandoc $(DEMANDOC_OBJS) | ||
| rm -f soelim $(SOELIM_OBJS) | ||
| rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256 | ||
| rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256 | ||
| rm -rf *.dSYM | ||
|
|
||
| base-install: mandoc demandoc soelim | ||
|
|
@@ -420,8 +436,8 @@ lib-install: libmandoc.a | |
| mkdir -p $(DESTDIR)$(INCLUDEDIR) | ||
| mkdir -p $(DESTDIR)$(MANDIR)/man3 | ||
| $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) | ||
| $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ | ||
| $(DESTDIR)$(INCLUDEDIR) | ||
| $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \ | ||
| mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR) | ||
| $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ | ||
| mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 | ||
|
|
||
|
|
@@ -475,11 +491,14 @@ uninstall: | |
| rm -f $(DESTDIR)$(MANDIR)/man3/mansearch.3 | ||
| rm -f $(DESTDIR)$(MANDIR)/man3/mchars_alloc.3 | ||
| rm -f $(DESTDIR)$(MANDIR)/man3/tbl.3 | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/eqn.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/man.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_parse.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h | ||
| rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h | ||
| [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR) | ||
|
|
||
| regress: all | ||
|
|
@@ -516,7 +535,9 @@ soelim: $(SOELIM_OBJS) | |
| # --- maintainer targets --- | ||
|
|
||
| www-install: www | ||
| $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR) | ||
| $(INSTALL_DATA) mandoc.css $(HTDOCDIR) | ||
| $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man | ||
| $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes | ||
|
|
||
| depend: config.h | ||
| mkdep -f Makefile.depend $(CFLAGS) $(SRCS) | ||
|
|
@@ -564,6 +585,10 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES) | |
| ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) ) | ||
| rm -rf .dist/ | ||
|
|
||
| dist-install: dist | ||
| $(INSTALL_DATA) mandoc-$(VERSION).tar.gz mandoc-$(VERSION).sha256 \ | ||
| $(HTDOCDIR)/snapshots | ||
|
|
||
| # === SUFFIX RULES ===================================================== | ||
|
|
||
| .SUFFIXES: .1 .3 .5 .7 .8 .h | ||
|
|
@@ -573,5 +598,6 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES) | |
| highlight -I $< > $@ | ||
|
|
||
| .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc | ||
| ./mandoc -Thtml -Wall,stop \ | ||
| -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@ | ||
| mandoc -Thtml -Wwarning,stop \ | ||
| -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \ | ||
| $< > $@ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.