MFC r264400,r265836:

r264400:

  NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
  and finish the job. ncurses is now the only Makefile in the tree that
  uses it since it wasn't a simple mechanical change, and will be
  addressed in a future commit.

r265836:

  Remove last two NO_MAN= in the tree. In both of these cases, MAN= is
  what is needed.

10 files changed, 12 insertions, 12 deletions

diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index 4ec21f9..16a485a 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -2,7 +2,7 @@
 
 LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
 
-NO_MAN=yes
+MAN=
 
 PROG=libarchive_test
 INTERNALPROG=yes  # Don't install this; it's just for testing
diff --git a/lib/libauditd/Makefile b/lib/libauditd/Makefile
index 2487383..cee1850 100644
--- a/lib/libauditd/Makefile
+++ b/lib/libauditd/Makefile
@@ -19,6 +19,6 @@ CFLAGS+=	-I${OPENBSMDIR} -I${LIBBSMDIR}
 
 WARNS?=		3
 
-NO_MAN=
+MAN=
 
 .include <bsd.lib.mk>
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 898bb3a..49d9809 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -27,6 +27,6 @@ CFLAGS+=	-DNO_CXA_DEMANGLE
 
 SHLIB_MAJOR=	2
 
-WITHOUT_MAN=
+MAN=
 
 .include <bsd.lib.mk>
diff --git a/lib/libproc/test/t1-bkpt/Makefile b/lib/libproc/test/t1-bkpt/Makefile
index fd93fdd..eb5b37f 100644
--- a/lib/libproc/test/t1-bkpt/Makefile
+++ b/lib/libproc/test/t1-bkpt/Makefile
@@ -7,6 +7,6 @@ SRCS=	t1-bkpt.c
 LDADD=	-lproc -lelf -lrtld_db -lutil
 DPADD=	${LIBPROC} ${LIBELF}
 
-WITHOUT_MAN=
+MAN=
 
 .include <bsd.prog.mk>
diff --git a/lib/libproc/test/t2-name2map/Makefile b/lib/libproc/test/t2-name2map/Makefile
index 3dca51c..9002acc 100644
--- a/lib/libproc/test/t2-name2map/Makefile
+++ b/lib/libproc/test/t2-name2map/Makefile
@@ -7,6 +7,6 @@ SRCS=	t2-name2map.c
 LDADD=	-lproc -lelf -lrtld_db -lutil
 DPADD=	${LIBPROC} ${LIBELF}
 
-WITHOUT_MAN=
+MAN=
 
 .include <bsd.prog.mk>
diff --git a/lib/libproc/test/t3-name2sym/Makefile b/lib/libproc/test/t3-name2sym/Makefile
index 187f9c1..68e23c6 100644
--- a/lib/libproc/test/t3-name2sym/Makefile
+++ b/lib/libproc/test/t3-name2sym/Makefile
@@ -7,6 +7,6 @@ SRCS=	t3-name2sym.c
 LDADD=	-lproc -lelf -lrtld_db -lutil
 DPADD=	${LIBPROC} ${LIBELF}
 
-WITHOUT_MAN=
+MAN=
 
 .include <bsd.prog.mk>
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index aa12242..b79dc41 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -157,7 +157,7 @@ MLINKS=	form_cursor.3 pos_form_cursor.3 \
 	form_win.3 set_form_sub.3 \
 	form_win.3 set_form_win.3
 .else
-NO_MAN=
+MAN=
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 46bc023..3aac081 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -130,7 +130,7 @@ MLINKS=	menu_attributes.3 menu_back.3 \
 	mitem_value.3 set_item_value.3 \
 	mitem_visible.3 item_visible.3
 .else
-NO_MAN=
+MAN=
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 869fb2e..ee4d89e 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -536,12 +536,12 @@ MAN+=	\
 	curs_ins_wstr.3 \
 	curs_printw.3 \
 	curs_scanw.3
-.endif
-
-CLEANFILES+=	${MAN:M*.3}
 
 MAN+=	term.5 terminfo.5
 MAN+=	term.7
+.endif
+
+CLEANFILES+=	${MAN:M*.3}
 
 MLINKS=	ncurses.3 curses.3 \
 	curs_addch.3 addch.3 \
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 8e99767..7929aed 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -58,7 +58,7 @@ MLINKS=	panel.3 bottom_panel.3 \
 	panel.3 top_panel.3 \
 	panel.3 update_panels.3
 .else
-NO_MAN=
+MAN=
 .endif
 	
 .include <bsd.lib.mk>