svn commit: r241774 - in head: contrib/mdocml lib share/man/man7 usr.bin
Ulrich Spoerlein
uqs at FreeBSD.org
Sat Oct 20 10:06:39 UTC 2012
Author: uqs
Date: Sat Oct 20 10:06:38 2012
New Revision: 241774
URL: http://svn.freebsd.org/changeset/base/241774
Log:
Apply local patches to mandoc and connect it to the build.
- adds a couple more library strings used in the tree
- changes some more to the current groff spelling
- changes page footer to match groff style
Modified:
head/contrib/mdocml/lib.in
head/contrib/mdocml/mdoc_validate.c
head/contrib/mdocml/msec.in
head/lib/Makefile
head/share/man/man7/hier.7
head/usr.bin/Makefile
Modified: head/contrib/mdocml/lib.in
==============================================================================
--- head/contrib/mdocml/lib.in Sat Oct 20 10:02:18 2012 (r241773)
+++ head/contrib/mdocml/lib.in Sat Oct 20 10:06:38 2012 (r241774)
@@ -23,12 +23,12 @@
* Be sure to escape strings.
*/
-LINE("libarchive", "Reading and Writing Streaming Archives Library (libarchive, \\-larchive)")
+LINE("libarchive", "Streaming Archive Library (libarchive, \\-larchive)")
LINE("libarm", "ARM Architecture Library (libarm, \\-larm)")
LINE("libarm32", "ARM32 Architecture Library (libarm32, \\-larm32)")
LINE("libbluetooth", "Bluetooth Library (libbluetooth, \\-lbluetooth)")
-LINE("libbsm", "Basic Security Module User Library (libbsm, \\-lbsm)")
-LINE("libc", "Standard C Library (libc, \\-lc)")
+LINE("libbsm", "Basic Security Module Library (libbsm, \\-lbsm)")
+LINE("libc", "Standard C\\~Library (libc, \\-lc)")
LINE("libc_r", "Reentrant C\\~Library (libc_r, \\-lc_r)")
LINE("libcalendar", "Calendar Arithmetic Library (libcalendar, \\-lcalendar)")
LINE("libcam", "Common Access Method User Library (libcam, \\-lcam)")
@@ -42,6 +42,7 @@ LINE("libdevstat", "Device Statistics Li
LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
LINE("libdwarf", "DWARF Access Library (libdwarf, \\-ldwarf)")
LINE("libedit", "Command Line Editor Library (libedit, \\-ledit)")
+LINE("libefi", "EFI Runtime Services Library (libefi, \\-lefi)")
LINE("libelf", "ELF Access Library (libelf, \\-lelf)")
LINE("libevent", "Event Notification Library (libevent, \\-levent)")
LINE("libfetch", "File Transfer Library for URLs (libfetch, \\-lfetch)")
@@ -68,11 +69,13 @@ LINE("libnetgraph", "Netgraph User Libra
LINE("libnetpgp", "Netpgp signing, verification, encryption and decryption (libnetpgp, \\-lnetpgp)")
LINE("libossaudio", "OSS Audio Emulation Library (libossaudio, \\-lossaudio)")
LINE("libpam", "Pluggable Authentication Module Library (libpam, \\-lpam)")
-LINE("libpcap", "Capture Library (libpcap, \\-lpcap)")
+LINE("libpcap", "Packet Capture Library (libpcap, \\-lpcap)")
LINE("libpci", "PCI Bus Access Library (libpci, \\-lpci)")
LINE("libpmc", "Performance Counters Library (libpmc, \\-lpmc)")
LINE("libposix", "POSIX Compatibility Library (libposix, \\-lposix)")
LINE("libppath", "Property-List Paths Library (libppath, \\-lppath)")
+LINE("libproc", "Processor Monitoring and Analysis Library (libproc, \\-lproc)")
+LINE("libprocstat", "Process and Files Information Retrieval (libprocstat, \\-lprocstat)")
LINE("libprop", "Property Container Object Library (libprop, \\-lprop)")
LINE("libpthread", "POSIX Threads Library (libpthread, \\-lpthread)")
LINE("libpuffs", "puffs Convenience Library (libpuffs, \\-lpuffs)")
@@ -82,9 +85,12 @@ LINE("libresolv", "DNS Resolver Library
LINE("librpcsec_gss", "RPC GSS-API Authentication Library (librpcsec_gss, \\-lrpcsec_gss)")
LINE("librpcsvc", "RPC Service Library (librpcsvc, \\-lrpcsvc)")
LINE("librt", "POSIX Real\\-time Library (librt, \\-lrt)")
+LINE("librtld_db", "Run-time Linker Debugging Library (librtld_db, \\-lrtld_db)")
LINE("libsaslc", "Simple Authentication and Security Layer client library (libsaslc, \\-lsaslc)")
+LINE("libsbuf", "Safe String Composition Library (libsbuf, \\-lsbuf)")
LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-lsdp)")
LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)")
+LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)")
LINE("libSystem", "System Library (libSystem, \\-lSystem)")
LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)")
LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)")
Modified: head/contrib/mdocml/mdoc_validate.c
==============================================================================
--- head/contrib/mdocml/mdoc_validate.c Sat Oct 20 10:02:18 2012 (r241773)
+++ head/contrib/mdocml/mdoc_validate.c Sat Oct 20 10:06:38 2012 (r241774)
@@ -2234,6 +2234,8 @@ post_os(POST_ARGS)
mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
return(0);
}
+ if (strncmp(utsname.sysname, "FreeBSD", sizeof("FreeBSD")) == 0)
+ strtok(utsname.release, "-");
if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
return(0);
Modified: head/contrib/mdocml/msec.in
==============================================================================
--- head/contrib/mdocml/msec.in Sat Oct 20 10:02:18 2012 (r241773)
+++ head/contrib/mdocml/msec.in Sat Oct 20 10:06:38 2012 (r241774)
@@ -22,16 +22,16 @@
* Be sure to escape strings.
*/
-LINE("1", "General Commands Manual")
-LINE("2", "System Calls Manual")
-LINE("3", "Library Functions Manual")
+LINE("1", "FreeBSD General Commands Manual")
+LINE("2", "FreeBSD System Calls Manual")
+LINE("3", "FreeBSD Library Functions Manual")
LINE("3p", "Perl Library Functions Manual")
-LINE("4", "Kernel Interfaces Manual")
-LINE("5", "File Formats Manual")
-LINE("6", "Games Manual")
-LINE("7", "Miscellaneous Information Manual")
-LINE("8", "System Manager\'s Manual")
-LINE("9", "Kernel Developer\'s Manual")
+LINE("4", "FreeBSD Kernel Interfaces Manual")
+LINE("5", "FreeBSD File Formats Manual")
+LINE("6", "FreeBSD Games Manual")
+LINE("7", "FreeBSD Miscellaneous Information Manual")
+LINE("8", "FreeBSD System Manager\'s Manual")
+LINE("9", "FreeBSD Kernel Developer\'s Manual")
LINE("X11", "X11 Developer\'s Manual")
LINE("X11R6", "X11 Developer\'s Manual")
LINE("unass", "Unassociated")
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Sat Oct 20 10:02:18 2012 (r241773)
+++ head/lib/Makefile Sat Oct 20 10:06:38 2012 (r241774)
@@ -85,6 +85,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libkiconv \
liblzma \
libmagic \
+ libmandoc \
libmemstat \
${_libmilter} \
${_libmp} \
Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7 Sat Oct 20 10:02:18 2012 (r241773)
+++ head/share/man/man7/hier.7 Sat Oct 20 10:06:38 2012 (r241774)
@@ -546,6 +546,8 @@ see
.Xr setlocale 3
.It Pa man/
manual pages
+.It Pa mdocml/
+data files used by mdocml
.It Pa me/
macros for use with the me macro package;
see
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sat Oct 20 10:02:18 2012 (r241773)
+++ head/usr.bin/Makefile Sat Oct 20 10:06:38 2012 (r241774)
@@ -96,6 +96,7 @@ SUBDIR= alias \
m4 \
${_makewhatis} \
${_man} \
+ mandoc \
mesg \
minigzip \
ministat \
More information about the svn-src-all
mailing list