MAN[1-9] -> MAN.

4 files changed, 23 insertions, 32 deletions

diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index e274b5bb4e2d..308e97be16c9 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -28,7 +28,7 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-MAN3x=	form.3x form_cursor.3x form_data.3x form_driver.3x \
+MANx=	form.3x form_cursor.3x form_data.3x form_driver.3x \
 	form_field.3x form_field_attributes.3x form_field_buffer.3x \
 	form_field_info.3x form_field_just.3x form_field_new.3x \
 	form_field_opts.3x form_field_userptr.3x \
@@ -36,12 +36,11 @@ MAN3x=	form.3x form_cursor.3x form_data.3x form_driver.3x \
 	form_new.3x form_new_page.3x form_opts.3x form_page.3x \
 	form_post.3x form_requestname.3x form_userptr.3x form_win.3x
 
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -92,5 +91,3 @@ MLINKS+=form_win.3 form_sub.3 form_win.3 scale_form.3 \
 	form_win.3 set_form_sub.3 form_win.3 set_form_win.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index eb8b5197330b..df7ce042713d 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -25,7 +25,7 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-MAN3x=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
+MANx=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
 	menu_driver.3x menu_format.3x menu_hook.3x menu_items.3x \
 	menu_mark.3x menu_new.3x menu_opts.3x menu_pattern.3x \
 	menu_post.3x menu_requestname.3x menu_spacing.3x \
@@ -33,12 +33,11 @@ MAN3x=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
 	mitem_new.3x mitem_opts.3x mitem_userptr.3x mitem_value.3x \
 	mitem_visible.3x
 
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -77,5 +76,3 @@ MLINKS+=mitem_value.3 item_value.3 mitem_value.3 set_item_value.3
 MLINKS+=mitem_visible.3 item_visible.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index c39dd77b11a0..fc14e0b58fea 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -376,7 +376,7 @@ terminfo.5:	MKterminfo.sh terminfo.head Caps
 CLEANFILES+=	terminfo.5
 MANFILTER=	sed -e 's\#@DATADIR@\#${TERMINFODIR}/terminfo\#g'
 
-MAN3x=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
+MANx=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_beep.3x curs_bkgd.3x curs_border.3x curs_clear.3x curs_color.3x \
 	curs_delch.3x curs_deleteln.3x curs_extend.3x curs_getch.3x \
 	curs_getstr.3x \
@@ -389,15 +389,14 @@ MAN3x=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_touch.3x curs_trace.3x curs_util.3x curs_window.3x \
 	default_colors.3x define_key.3x \
 	dft_fgbg.3x keybound.3x keyok.3x ncurses.3x resizeterm.3x wresize.3x
-MAN5=	term.5 terminfo.5
-MAN7=	term.7
-
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+MAN=	term.5 terminfo.5
+MAN+=	term.7
+
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -545,5 +544,3 @@ MLINKS+=default_colors.3 assume_default_colors.3 \
 	default_colors.3 use_default_colors.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index c6c99f10a115..423b73dbc88c 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -23,9 +23,9 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-# generate MAN3
+# generate MAN
 CLEANFILES+=	panel.3
-MAN3=		panel.3
+MAN=		panel.3
 all-man: panel.3
 panel.3: panel.3x
 	ln -s ${.ALLSRC} ${.TARGET}