- Update to 1.10.0

- Use FreeBSD-specific strings for .Lb
- Cut uname string in footer the way groff does it

4 files changed, 96 insertions, 5 deletions

diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 0faf16977d71..483484cad470 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mdocml
-PORTVERSION=	1.9.25
+PORTVERSION=	1.10.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
 		http://people.freebsd.org/~uqs/distfiles/
@@ -15,7 +15,7 @@ MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	mdoc macro compiler
 
 MAN1=	mandoc.1
-MAN7=	man.7 mdoc.7 mandoc_char.7
+MAN7=	man.7 mdoc.7 roff.7 mandoc_char.7
 
 PLIST_SUB+=	EXAMPLESDIR=share/examples/mandoc
 
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index daf312f88493..924c8fff7862 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,3 +1,3 @@
-MD5 (mdocml-1.9.25.tar.gz) = fb4cf601b65af6c58176a2885426e7df
-SHA256 (mdocml-1.9.25.tar.gz) = 7a82e34f0a4616b1cee425c5175e4a7d5782b54eff117b94d4c815413acd7008
-SIZE (mdocml-1.9.25.tar.gz) = 137082
+MD5 (mdocml-1.10.0.tar.gz) = e647410f28237b5272bb3e67aca6f0cf
+SHA256 (mdocml-1.10.0.tar.gz) = 00e551148db0496c90dab879a7068a327bfddd545183c706a1442ff60ed9d009
+SIZE (mdocml-1.10.0.tar.gz) = 146899
diff --git a/textproc/mdocml/files/patch-lib.in b/textproc/mdocml/files/patch-lib.in
new file mode 100644
index 000000000000..6c448d0acfb9
--- /dev/null
+++ b/textproc/mdocml/files/patch-lib.in
@@ -0,0 +1,80 @@
+--- lib.in
++++ lib.in
+@@ -23,46 +23,72 @@
+  * 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("libbluetooth",	"Bluetooth User Library (libbluetooth, \\-lbluetooth)")
++LINE("libbsm",		"Basic Security Module User 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)")
+ LINE("libcdk",		"Curses Development Kit Library (libcdk, \\-lcdk)")
++LINE("libcipher",	"FreeSec Crypt Library (libcipher, \\-lcipher)")
+ LINE("libcompat",	"Compatibility Library (libcompat, \\-lcompat)")
+ LINE("libcrypt",	"Crypt Library (libcrypt, \\-lcrypt)")
+ LINE("libcurses",	"Curses Library (libcurses, \\-lcurses)")
+-LINE("libedit",		"Command Line Editor Library (libedit, \\-ledit)")
++LINE("libdevinfo",	"Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)")
++LINE("libdevstat",	"Device Statistics Library (libdevstat, \\-ldevstat)")
++LINE("libdisk",		"Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
++LINE("libedit",		"Line Editor and History Library (libedit, \\-ledit)")
++LINE("libefi",		"EFI Runtime Services Library (libefi, \\-lefi)")
+ LINE("libelf",		"ELF Parsing Library (libelf, \\-lelf)")
+ LINE("libevent",	"Event Notification Library (libevent, \\-levent)")
+-LINE("libfetch",	"File Transfer Library for URLs (libfetch, \\-lfetch)")
++LINE("libfetch",	"File Transfer Library (libfetch, \\-lfetch)")
+ LINE("libform",		"Curses Form Library (libform, \\-lform)")
++LINE("libgeom",		"Userland API Library for kernel GEOM subsystem (libgeom, \\-lgeom)")
++LINE("libgpib",		"General-Purpose Instrument Bus (GPIB) library (libgpib, \\-lgpib)")
+ LINE("libi386",		"i386 Architecture Library (libi386, \\-li386)")
+ LINE("libintl",		"Internationalized Message Handling Library (libintl, \\-lintl)")
+ LINE("libipsec",	"IPsec Policy Control Library (libipsec, \\-lipsec)")
++LINE("libipx",		"IPX Address Conversion Support Library (libipx, \\-lipx)")
+ LINE("libiscsi",	"iSCSI protocol library (libiscsi, \\-liscsi)")
++LINE("libjail",		"Jail Library (libjail, \\-ljail)")
++LINE("libkiconv",	"Kernel side iconv library (libkiconv, \\-lkiconv)")
++LINE("libkse",		"N:M Threading Library (libkse, \\-lkse)")
+ LINE("libkvm",		"Kernel Data Access Library (libkvm, \\-lkvm)")
+ LINE("libm",		"Math Library (libm, \\-lm)")
+ LINE("libm68k",		"m68k Architecture Library (libm68k, \\-lm68k)")
+ LINE("libmagic",	"Magic Number Recognition Library (libmagic, \\-lmagic)")
++LINE("libmd",		"Message Digest (MD4, MD5, etc.) Support Library (libmd, \\-lmd)")
++LINE("libmemstat",	"Kernel Memory Allocator Statistics Library (libmemstat, \\-lmemstat)")
+ LINE("libmenu",		"Curses Menu Library (libmenu, \\-lmenu)")
++LINE("libnetgraph",	"Netgraph User Library (libnetgraph, \\-lnetgraph)")
+ 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("libpci",		"PCI Bus Access Library (libpci, \\-lpci)")
+-LINE("libpmc",		"Performance Counters Library (libpmc, \\-lpmc)")
++LINE("libpmc",		"Performance Monitoring Counters Interface Library (libpmc, \\-lpmc)")
+ LINE("libposix",	"POSIX Compatibility Library (libposix, \\-lposix)")
+ LINE("libprop",		"Property Container Object Library (libprop, \\-lprop)")
+ LINE("libpthread",	"POSIX Threads Library (libpthread, \\-lpthread)")
+ LINE("libpuffs",	"puffs Convenience Library (libpuffs, \\-lpuffs)")
+ LINE("librefuse",	"File System in Userspace Convenience Library (librefuse, \\-lrefuse)")
+ LINE("libresolv",	"DNS Resolver Library (libresolv, \\-lresolv)")
++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("libsdp",		"Bluetooth Service Discovery Protocol User Library (libsdp, \\-lsdp)")
+ LINE("libssp",		"Buffer Overflow Protection Library (libssp, \\-lssp)")
+ LINE("libtermcap",	"Termcap Access Library (libtermcap, \\-ltermcap)")
+ LINE("libterminfo",	"Terminal Information Library (libterminfo, \\-lterminfo)")
++LINE("libthr",		"1:1 Threading Library (libthr, \\-lthr)")
++LINE("libufs",		"UFS File System Access Library (libufs, \\-lufs)")
++LINE("libugidfw",	"File System Firewall Interface Library (libugidfw, \\-lugidfw)")
++LINE("libulog",		"User Login Record Library (libulog, \\-lulog)")
+ LINE("libusbhid",	"USB Human Interface Devices Library (libusbhid, \\-lusbhid)")
+ LINE("libutil",		"System Utilities Library (libutil, \\-lutil)")
++LINE("libvgl",		"Video Graphics Library (libvgl, \\-lvgl)")
+ LINE("libx86_64",	"x86_64 Architecture Library (libx86_64, \\-lx86_64)")
+ LINE("libz",		"Compression Library (libz, \\-lz)")
diff --git a/textproc/mdocml/files/patch-mdoc_action.c b/textproc/mdocml/files/patch-mdoc_action.c
new file mode 100644
index 000000000000..0aa62a51191f
--- /dev/null
+++ b/textproc/mdocml/files/patch-mdoc_action.c
@@ -0,0 +1,11 @@
+--- mdoc_action.c
++++ mdoc_action.c
+@@ -609,6 +609,8 @@ post_os(POST_ARGS)
+ 			mdoc_nmsg(m, 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(m, n, MANDOCERR_MEM);
+ 			return(0);