Merge sync of head

3 files changed, 29 insertions, 5 deletions

diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile
index 8096cc92c8ec..f2dc481057e5 100644
--- a/lib/libdpv/Makefile
+++ b/lib/libdpv/Makefile
@@ -6,8 +6,7 @@ INCS=		dpv.h
 MAN=		dpv.3
 MLINKS=		dpv.3 dpv_free.3
 
-DPADD=		${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL}
-LDADD=		-ldialog -lfigpar -lncursesw -lutil
+LIBADD=	dialog figpar util ncursesw
 
 SRCS=		dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c
 
diff --git a/lib/libdpv/Makefile.depend b/lib/libdpv/Makefile.depend
new file mode 100644
index 000000000000..c6e5e45d4bbb
--- /dev/null
+++ b/lib/libdpv/Makefile.depend
@@ -0,0 +1,25 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libdialog \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libfigpar \
+	lib/libutil \
+	lib/msun \
+	lib/ncurses/ncursesw \
+	usr.bin/xinstall.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libdpv/dpv.3 b/lib/libdpv/dpv.3
index 8c04ac31c07f..d16e6499c4f0 100644
--- a/lib/libdpv/dpv.3
+++ b/lib/libdpv/dpv.3
@@ -435,8 +435,8 @@ or desired values.
 .El
 .Sh SEE ALSO
 .Xr dialog 1 ,
-.Xr dialog 3 ,
-.Xr Xdialog 1
+.Xr Xdialog 1 ,
+.Xr dialog 3
 .Sh HISTORY
 The
 .Nm
@@ -502,7 +502,7 @@ This does not effect
 .Xr Xdialog 1 ,
 which renders the color escape sequences as plain text.
 See
-.Do Li
+.Do
 embedded "\\Z" sequences
 .Dc
 in