Merge remote-tracking branch 'origin/stable/11' into devel-11

36 files changed, 184 insertions, 119 deletions

diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
index cc688fd..4919867 100644
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
+CONTRIB= ${SRCTOP}/contrib/ngatm/sscop
 
 .PATH:	${CONTRIB}
 
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index f6c1baa..b246713 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
+AWKSRC=	${SRCTOP}/contrib/one-true-awk
 .PATH: ${AWKSRC}
 
 PROG=	awk
@@ -26,6 +26,6 @@ proctab.c: maketab
 	${BTOOLSPATH:U.}/maketab > proctab.c
 
 build-tools: maketab
-maketab: ytab.h ${AWKSRC}/maketab.c ${BUILD_TOOLS_META}
+maketab: ytab.h maketab.c ${BUILD_TOOLS_META}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/bc/bc.1 b/usr.bin/bc/bc.1
index a762832..09a5075 100644
--- a/usr.bin/bc/bc.1
+++ b/usr.bin/bc/bc.1
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)bc.1	6.8 (Berkeley) 8/8/91
 .\"
-.Dd November 21 2015 
+.Dd November 21, 2015
 .Dt BC 1
 .Os
 .Sh NAME
diff --git a/usr.bin/bluetooth/Makefile.inc b/usr.bin/bluetooth/Makefile.inc
index c0e05cf..363f1e6 100644
--- a/usr.bin/bluetooth/Makefile.inc
+++ b/usr.bin/bluetooth/Makefile.inc
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${SRCTOP}/usr.bin/Makefile.inc"
 
diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index c689ae4..11e31e6 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -2,10 +2,10 @@
 
 .include <src.opts.mk>
 
-_LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
-_LIBARCHIVECONFDIR=	${.CURDIR}/../../lib/libarchive
+_LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
+_LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
-PROG=	bsdcat	
+PROG=	bsdcat
 BSDCAT_VERSION_STRING=	3.2.2
 
 .PATH:	${_LIBARCHIVEDIR}/cat
diff --git a/usr.bin/ctlstat/ctlstat.8 b/usr.bin/ctlstat/ctlstat.8
index 038b8ca..28e6d6f 100644
--- a/usr.bin/ctlstat/ctlstat.8
+++ b/usr.bin/ctlstat/ctlstat.8
@@ -1,7 +1,7 @@
-.\" 
+.\"
 .\" Copyright (c) 2010 Silicon Graphics International Corp.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -13,7 +13,7 @@
 .\"    ("Disclaimer") and any redistribution must be conditioned upon
 .\"    including a substantially similar Disclaimer requirement for further
 .\"    binary redistribution.
-.\" 
+.\"
 .\" NO WARRANTY
 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -26,7 +26,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGES.
-.\" 
+.\"
 .\" ctlstat utility man page.
 .\"
 .\" Author: Ken Merry <ken@FreeBSD.org>
diff --git a/usr.bin/cut/tests/Makefile b/usr.bin/cut/tests/Makefile
index 310994e..aaf15d4 100644
--- a/usr.bin/cut/tests/Makefile
+++ b/usr.bin/cut/tests/Makefile
@@ -2,6 +2,7 @@
 
 PACKAGE=	tests
 
+ATF_TESTS_SH+=	cut2_test
 NETBSD_ATF_TESTS_SH=	cut_test
 
 ${PACKAGE}FILES=		d_basic.out
diff --git a/usr.bin/cut/tests/cut2_test.sh b/usr.bin/cut/tests/cut2_test.sh
new file mode 100755
index 0000000..e5aaa9a
--- /dev/null
+++ b/usr.bin/cut/tests/cut2_test.sh
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2017 Dell EMC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case s_flag
+s_flag_head()
+{
+	atf_set "descr" "Check -s flag"
+}
+
+s_flag_body()
+{
+	cat >input<<EOF
+a,b,c,d
+b,c,d
+c,d
+d
+EOF
+	atf_check -o inline:'a\nb\nc\n' cut -d, -f 1 -s < input
+	atf_check -o inline:'d\n\n\n' cut -d, -f 4 -s < input
+	atf_check -o inline:'a,b,\nb,\n\n' cut -d 'c' -f 1 -s < input
+	atf_check -o empty cut -d'!' -f 1 -s < input
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case s_flag
+}
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 101f4eb..c999dd0 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -133,7 +133,7 @@ is specified,
 prints out the names and values
 of the variables in the environment, with one name/value pair per line.
 .\"
-.Ss Details of Fl S Ss (split-string) processing
+.Ss Details of Fl S \&Ss (split-string) processing
 The processing of the
 .Fl S
 option will split the given
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 2a5cb91..c9c687b 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -81,7 +81,7 @@ If the
 .Fl a
 option is given, then tabs are inserted whenever they would compress the
 resultant file by replacing two or more characters.
-.It Fl t Sm Ar tab1 , tab2 , ... , tabn Sm
+.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm
 Set tab stops at column positions
 .Ar tab1 , tab2 , ... , tabn .
 If only a single number is given, tab stops are set that number of
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index f70eab6..28bf348 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -114,6 +114,9 @@ If the identifier or the key is -1, it will remove all these objects.
 The wiping of all System V IPC objects was first implemented in
 .Fx 6.4 No and 7.1.
 .Sh AUTHORS
-The original author was Adam Glass.
-The wiping of all System V IPC objects was thought up by Callum
-Gibson and extended and implemented by Edwin Groothuis.
+The original author was
+.An Adam Glass .
+The wiping of all System V IPC objects was thought up by
+.An Callum Gibson
+and extended and implemented by
+.An Edwin Groothuis .
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 3c3a23e..5f747bc 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1094,7 +1094,7 @@ Default is
 .Va save .
 .It Va searchheaders
 If this option is set, then a message-list specifier in the form
-.Dq Li / Ns Ar x Ns Li : Ns Ar y
+.Dq Li / Ns Ar x Ns : Ns Ar y
 will expand to all messages containing the substring
 .Ar y
 in the header field
diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1
index 856818a..c63ab68 100644
--- a/usr.bin/mkimg/mkimg.1
+++ b/usr.bin/mkimg/mkimg.1
@@ -253,7 +253,7 @@ Directory to put temporary files in; default is
 .Sh EXAMPLES
 To create a bootable disk image that is partitioned using the GPT scheme and
 containing a root file system that was previously created using
-.Xr makefs
+.Xr makefs 8
 and also containing a swap partition, run the
 .Nm
 utility as follows:
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index f47764c..ec0732a 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -58,7 +58,7 @@ works in two phases:
 An
 .Ar infile
 image is split into clusters; each cluster is compressed using
-.Xr zlib 3 
+.Xr zlib 3
 or
 .Xr lzma 3 .
 .It
@@ -72,7 +72,7 @@ The options are:
 Name of the output file
 .Ar outfile .
 The default is to use the input name with the suffix
-.Pa .uzip 
+.Pa .uzip
 for the
 .Xr zlib 3
 compression or
@@ -174,8 +174,8 @@ to handle resulting images correctly.
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr xz 1 ,
-.Xr zlib 3 ,
 .Xr lzma 3 ,
+.Xr zlib 3 ,
 .Xr geom 4 ,
 .Xr geom_uzip 4 ,
 .Xr md 4 ,
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 7af3d2b..e056485 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -273,12 +273,12 @@ status command, this will be the same XML output via
 .Do
 .Nm
 status
-.Fl x 
+.Fl x
 .Dc
 .El
 .It Cm param
 Display or set parameters.
-One of 
+One of
 .Fl l ,
 .Fl s ,
 or
@@ -293,7 +293,7 @@ To display a specific parameter, specify the parameter with
 .It Fl p Ar name
 Specify the parameter name to list (with
 .Fl l )
-or set (with 
+or set (with
 .Fl s ) .
 .It Fl q
 Enable quiet mode for parameter listing.
@@ -361,11 +361,11 @@ The drive will verify the checksum before writing the block to tape.
 .El
 .It Cm locate
 Set the tape drive's logical position.
-One of 
+One of
 .Fl b ,
 .Fl e ,
 .Fl f ,
-or 
+or
 .Fl s
 must be specified to indicate the type of position.
 If the partition number is specified, the drive will first relocate to the
diff --git a/usr.bin/perror/perror.1 b/usr.bin/perror/perror.1
index 6fa1664..8d9c5bd 100644
--- a/usr.bin/perror/perror.1
+++ b/usr.bin/perror/perror.1
@@ -1,8 +1,8 @@
-.\" 
+.\"
 .\" Copyright (c) 2009 Hudson River Trading LLC
 .\" Written by: George V. Neville-Neil <gnn@FreeBSD.org>
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -11,7 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -23,7 +23,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .Dd May 12, 2009
diff --git a/usr.bin/revoke/revoke.1 b/usr.bin/revoke/revoke.1
index 2ab52c3..822d13b 100644
--- a/usr.bin/revoke/revoke.1
+++ b/usr.bin/revoke/revoke.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,7 +21,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .Dd June 15, 2009
@@ -53,4 +53,4 @@ The
 program first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq Mt ed@FreeBSD.org
+.An \&Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1
index 16e340a..ef1e128 100644
--- a/usr.bin/sdiff/sdiff.1
+++ b/usr.bin/sdiff/sdiff.1
@@ -167,8 +167,6 @@ The default is
 was written from scratch for the public domain by
 .An Ray Lai Aq ray@cyth.net .
 .Sh CAVEATS
-.Pp
 Tabs are treated as anywhere from one to eight characters wide,
 depending on the current column.
 Terminals that treat tabs as eight characters wide will look best.
-
diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile
index 0d017e1..c157af8 100644
--- a/usr.bin/sed/tests/Makefile
+++ b/usr.bin/sed/tests/Makefile
@@ -2,11 +2,15 @@
 
 PACKAGE=	tests
 
+NETBSD_ATF_TESTS_SH+=	sed_test
 TAP_TESTS_SH=	legacy_test
 TAP_TESTS_SH+=	multi_test
 TEST_METADATA.multi_test+=	required_files="/usr/share/dict/words"
 TAP_TESTS_SH+=	inplace_race_test
 
+ATF_TESTS_SH_SED_sed_test+=	-e 's,atf_expect_fail "PR bin/28126",,g'
+${PACKAGE}FILES+=		d_c2048.in
+
 ${PACKAGE}FILES+=		hanoi.sed
 ${PACKAGE}FILES+=		math.sed
 ${PACKAGE}FILES+=		regress.G.out
@@ -35,4 +39,5 @@ ${PACKAGE}FILES+=		regress.y.out
 
 SUBDIR=		regress.multitest.out
 
+.include <netbsd-tests.test.mk>
 .include <bsd.test.mk>
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index 7404de4..2650c4f 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -12,33 +12,31 @@ PACKAGE=	svn
 
 .if !defined(SVNDIR)
 
-SVNDIR=		${.CURDIR}/../../../contrib/subversion/subversion
-APRU=		${.CURDIR}/../../../contrib/apr-util
-APR=		${.CURDIR}/../../../contrib/apr
+SVNDIR=		${SRCTOP}/contrib/subversion/subversion
+APRU=		${SRCTOP}/contrib/apr-util
+APR=		${SRCTOP}/contrib/apr
 WARNS?=		0	# definitely not warns friendly
 
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
-
-LIBAPRDIR=		${.OBJDIR}/../lib/libapr
-LIBAPR_UTILDIR=		${.OBJDIR}/../lib/libapr_util
-LIBSERFDIR=		${.OBJDIR}/../lib/libserf
-
-LIBSVN_CLIENTDIR=	${.OBJDIR}/../lib/libsvn_client
-LIBSVN_DELTADIR=	${.OBJDIR}/../lib/libsvn_delta
-LIBSVN_DIFFDIR=		${.OBJDIR}/../lib/libsvn_diff
-LIBSVN_FSDIR=		${.OBJDIR}/../lib/libsvn_fs
-LIBSVN_FS_FSDIR=	${.OBJDIR}/../lib/libsvn_fs_fs
-LIBSVN_FS_UTILDIR=	${.OBJDIR}/../lib/libsvn_fs_util
-LIBSVN_FS_XDIR=		${.OBJDIR}/../lib/libsvn_fs_x
-LIBSVN_RADIR=		${.OBJDIR}/../lib/libsvn_ra
-LIBSVN_RA_LOCALDIR=	${.OBJDIR}/../lib/libsvn_ra_local
-LIBSVN_RA_SVNDIR=	${.OBJDIR}/../lib/libsvn_ra_svn
-LIBSVN_RA_SERFDIR=	${.OBJDIR}/../lib/libsvn_ra_serf
-LIBSVN_REPOSDIR=	${.OBJDIR}/../lib/libsvn_repos
-LIBSVN_SUBRDIR=		${.OBJDIR}/../lib/libsvn_subr
-LIBSVN_WCDIR=		${.OBJDIR}/../lib/libsvn_wc
+.sinclude "${.CURDIR:H:H}/Makefile.inc"
+
+LIBAPRDIR=		${.OBJDIR:H}/lib/libapr
+LIBAPR_UTILDIR=		${.OBJDIR:H}/lib/libapr_util
+LIBSERFDIR=		${.OBJDIR:H}/lib/libserf
+
+LIBSVN_CLIENTDIR=	${.OBJDIR:H}/lib/libsvn_client
+LIBSVN_DELTADIR=	${.OBJDIR:H}/lib/libsvn_delta
+LIBSVN_DIFFDIR=		${.OBJDIR:H}/lib/libsvn_diff
+LIBSVN_FSDIR=		${.OBJDIR:H}/lib/libsvn_fs
+LIBSVN_FS_FSDIR=	${.OBJDIR:H}/lib/libsvn_fs_fs
+LIBSVN_FS_UTILDIR=	${.OBJDIR:H}/lib/libsvn_fs_util
+LIBSVN_FS_XDIR=		${.OBJDIR:H}/lib/libsvn_fs_x
+LIBSVN_RADIR=		${.OBJDIR:H}/lib/libsvn_ra
+LIBSVN_RA_LOCALDIR=	${.OBJDIR:H}/lib/libsvn_ra_local
+LIBSVN_RA_SVNDIR=	${.OBJDIR:H}/lib/libsvn_ra_svn
+LIBSVN_RA_SERFDIR=	${.OBJDIR:H}/lib/libsvn_ra_serf
+LIBSVN_REPOSDIR=	${.OBJDIR:H}/lib/libsvn_repos
+LIBSVN_SUBRDIR=		${.OBJDIR:H}/lib/libsvn_subr
+LIBSVN_WCDIR=		${.OBJDIR:H}/lib/libsvn_wc
 
 LIBAPR=			${LIBAPRDIR}/libapr.a
 LIBAPR_UTIL=		${LIBAPR_UTILDIR}/libapr-util.a
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index 87d9df1..9591914 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svn
 
@@ -17,11 +17,11 @@ SRCS=	add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
 	resolved-cmd.c revert-cmd.c status-cmd.c similarity.c status.c \
 	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
index 9cda0f0..eab3b2c 100644
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnadmin
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}admin
 
 SRCS=	svnadmin.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnbench/Makefile b/usr.bin/svn/svnbench/Makefile
index 8f54baf..8fe07d7 100644
--- a/usr.bin/svn/svnbench/Makefile
+++ b/usr.bin/svn/svnbench/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnbench
 
@@ -11,11 +11,11 @@ PROG=	svn${SVNLITE}bench
 SRCS=	help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \
 	null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
index 09bb541..ccb54eb 100644
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svndumpfilter
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}dumpfilter
 
 SRCS=	svndumpfilter.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnfsfs/Makefile b/usr.bin/svn/svnfsfs/Makefile
index 67be638..2a465b6 100644
--- a/usr.bin/svn/svnfsfs/Makefile
+++ b/usr.bin/svn/svnfsfs/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnfsfs
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}fsfs
 
 SRCS=	dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
index f024d50..b4c3929 100644
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnlook
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}look
 
 SRCS=	svnlook.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
index 0815b30..f2bd597 100644
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnmucc
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}mucc
 
 SRCS=	svnmucc.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
index a63ac62..f1dd5e7 100644
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnrdump
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}rdump
 
 SRCS=	dump_editor.c load_editor.c svnrdump.c util.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
index 4b79cf4..5e2c79c 100644
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnserve
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}serve
 
 SRCS=	cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
index dddd773..7867611 100644
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnsync
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}sync
 
 SRCS=	svnsync.c sync.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile
index de59168..29e5b33 100644
--- a/usr.bin/svn/svnversion/Makefile
+++ b/usr.bin/svn/svnversion/Makefile
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnversion
 
@@ -10,11 +10,11 @@ PROG=	svn${SVNLITE}version
 
 SRCS=	svnversion.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
diff --git a/usr.bin/timeout/timeout.1 b/usr.bin/timeout/timeout.1
index 70a9106..c9e838b 100644
--- a/usr.bin/timeout/timeout.1
+++ b/usr.bin/timeout/timeout.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 28, 2014
+.Dd February 17, 2017
 .Dt TIMEOUT 1
 .Os
 .Sh NAME
@@ -127,3 +127,12 @@ the exit status return is 125.
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr signal 3
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Fx 10.3 .
+.Sh AUTHORS
+.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org
+and
+.An Vsevolod Stakhov Aq Mt vsevolod@FreeBSD.org
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index f76e462..9ab76be 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -14,33 +14,33 @@
 .Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
-.It Fl h No , Fl -help
+.It Fl h \&No , Fl -help
 Show an overview of options
-.It Fl f Ar filename No , Fl -file Ar filename
+.It Fl f Ar filename \&No , Fl -file Ar filename
 Specify the name of the units data file to load.
-.It Fl H Ar filename No , Fl -historyfile Ar filename
+.It Fl H Ar filename \&No , Fl -historyfile Ar filename
 Ignored, for compatibility with GNU units.
 .It Fl e , Fl -exponential
 Behave as if -o '%6e' was typed.
-.It Fl q No , Fl -quiet
+.It Fl q \&No , Fl -quiet
 Suppress prompting of the user for units and the display of statistics
 about the number of units loaded.
-.It Fl U No , Fl -unitsfile
+.It Fl U \&No , Fl -unitsfile
 If the default unit file exists prints its location.
 If not, print
 .Qo
 Units data file not found
 .Qc
-.It Fl t No , Fl -terse
+.It Fl t \&No , Fl -terse
 Only print the result.  This is used when calling
 .Nm
 from other programs for easy to parse results.
-.It Fl v No , Fl -verbose
+.It Fl v \&No , Fl -verbose
 Print the units in the conversion output.
 Be more verbose in general.
-.It Fl o Ar format No , Fl -output-format Ar format
+.It Fl o Ar format \&No , Fl -output-format Ar format
 Select the output format string by which numbers are printed.
-.It Fl V No , Fl -version
+.It Fl V \&No , Fl -version
 Print the version number, usage, and then exit.
 .It Ar from-unit to-unit
 Allow a single unit conversion to be done directly from the command
diff --git a/usr.bin/unzip/unzip.1 b/usr.bin/unzip/unzip.1
index 780321c..b7c2d85 100644
--- a/usr.bin/unzip/unzip.1
+++ b/usr.bin/unzip/unzip.1
@@ -171,7 +171,7 @@ The
 utility is only able to process ZIP archives handled by
 .Xr libarchive 3 .
 Depending on the installed version of
-.Xr libarchive ,
+.Xr libarchive 3 ,
 this may or may not include self-extracting archives.
 .Sh SEE ALSO
 .Xr libarchive 3
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 9ce7e05..366a6c7 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -40,7 +40,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl m
-.Op Fl r 
+.Op Fl r
 .Op Fl o Ar output_file
 .Op Ar file
 .Ar name
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 0fe70a1..cda7295 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -206,7 +206,7 @@ The operands specified to
 are treated independently and may be used
 as queries on different whois servers.
 .Sh ENVIRONMENT
-.Bl -tag
+.Bl -tag -width WHOIS_SERVER
 .It Ev WHOIS_SERVER
 The primary default whois server.
 If this is unset,