- style.Makefile(9) fix

  - first line is $FreeBSD$
  - Reorder special variables: DPADD, LPADD, CFLAGS
  - Use = instead of += for variables that are initially empty
  - Use space instead of tab after :
  - Use one tab after =
- Use .SUFFIXES for section 3 manual page which simplifies Makefile a lot
- Use SHAREDIR instead of /usr/share
- Remove SRCDIR in INCS since we set .PATH properly
- Use plural in variable name when it stands for more that one source file

Reviewed by:	ru
Approved by:	delphij (mentor)

6 files changed, 934 insertions, 936 deletions

diff --git a/lib/ncurses/Makefile.inc b/lib/ncurses/Makefile.inc
index 54ff162..89c6348 100644
--- a/lib/ncurses/Makefile.inc
+++ b/lib/ncurses/Makefile.inc
@@ -1,4 +1,5 @@
-# This is to include src/lib/Makefile.inc
 # $FreeBSD$
 
+# This is to include src/lib/Makefile.inc
+
 .include "../Makefile.inc"
diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk
index fab0fd8..15d9547 100644
--- a/lib/ncurses/config.mk
+++ b/lib/ncurses/config.mk
@@ -1,7 +1,7 @@
-# This Makefile is shared by libncurses, libform, libmenu, libpanel.
-#
 # $FreeBSD$
 
+# This Makefile is shared by libncurses, libform, libmenu, libpanel.
+
 NCURSES_DIR=	${.CURDIR}/../../../contrib/ncurses
 
 NCURSES_CFG_H=	${.CURDIR}/ncurses_cfg.h
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index 6ef2aaa..d89b96b 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -1,165 +1,164 @@
-# Makefile for libform
 # $FreeBSD$
 
-.include	"${.CURDIR}/../config.mk"
+.include "${.CURDIR}/../config.mk"
 
-SRCDIR=		${NCURSES_DIR}/form
+SRCDIR=	${NCURSES_DIR}/form
 
-LIB=		form
-DPADD=		${LIBNCURSES}
-LDADD=		-lncurses
+LIB=	form
 
-.PATH:		${SRCDIR}
-SRCS=		\
-		ncurses_def.h \
-		fld_arg.c \
-		fld_attr.c \
-		fld_current.c \
-		fld_def.c \
-		fld_dup.c \
-		fld_ftchoice.c \
-		fld_ftlink.c \
-		fld_info.c \
-		fld_just.c \
-		fld_link.c \
-		fld_max.c \
-		fld_move.c \
-		fld_newftyp.c \
-		fld_opts.c \
-		fld_pad.c \
-		fld_page.c \
-		fld_stat.c \
-		fld_type.c \
-		fld_user.c \
-		frm_cursor.c \
-		frm_data.c \
-		frm_def.c \
-		frm_driver.c \
-		frm_hook.c \
-		frm_opts.c \
-		frm_page.c \
-		frm_post.c \
-		frm_req_name.c \
-		frm_scale.c \
-		frm_sub.c \
-		frm_user.c \
-		frm_win.c \
-		fty_alnum.c \
-		fty_alpha.c \
-		fty_enum.c \
-		fty_int.c \
-		fty_ipv4.c \
-		fty_num.c \
-		fty_regex.c
+.PATH: ${SRCDIR}
+SRCS=	\
+	ncurses_def.h \
+	fld_arg.c \
+	fld_attr.c \
+	fld_current.c \
+	fld_def.c \
+	fld_dup.c \
+	fld_ftchoice.c \
+	fld_ftlink.c \
+	fld_info.c \
+	fld_just.c \
+	fld_link.c \
+	fld_max.c \
+	fld_move.c \
+	fld_newftyp.c \
+	fld_opts.c \
+	fld_pad.c \
+	fld_page.c \
+	fld_stat.c \
+	fld_type.c \
+	fld_user.c \
+	frm_cursor.c \
+	frm_data.c \
+	frm_def.c \
+	frm_driver.c \
+	frm_hook.c \
+	frm_opts.c \
+	frm_page.c \
+	frm_post.c \
+	frm_req_name.c \
+	frm_scale.c \
+	frm_sub.c \
+	frm_user.c \
+	frm_win.c \
+	fty_alnum.c \
+	fty_alpha.c \
+	fty_enum.c \
+	fty_int.c \
+	fty_ipv4.c \
+	fty_num.c \
+	fty_regex.c
+
+CLEANFILES=	ncurses_def.h
 
 CFLAGS+=	-I${SRCDIR}
 CFLAGS+=	-I${NCURSES_DIR}/menu
 
-INCS=		${SRCDIR}/form.h
+DPADD=	${LIBNCURSES}
+LDADD=	-lncurses
+
+INCS=	form.h
 
-CLEANFILES+=	ncurses_def.h
+.PATH: ${NCURSES_DIR}/man
+MAN=	\
+	form.3 \
+	form_cursor.3 \
+	form_data.3 \
+	form_driver.3 \
+	form_field.3 \
+	form_field_attributes.3 \
+	form_field_buffer.3 \
+	form_field_info.3 \
+	form_field_just.3 \
+	form_field_new.3 \
+	form_field_opts.3 \
+	form_field_userptr.3 \
+	form_field_validation.3 \
+	form_fieldtype.3 \
+	form_hook.3 \
+	form_new.3 \
+	form_new_page.3 \
+	form_opts.3 \
+	form_page.3 \
+	form_post.3 \
+	form_requestname.3 \
+	form_userptr.3 \
+	form_win.3
 
-.PATH:		${NCURSES_DIR}/man
-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 \
-		form_field_validation.3x \
-		form_fieldtype.3x \
-		form_hook.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 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}
-	cat ${.ALLSRC} > ${.TARGET}
-.endfor
+CLEANFILES+=	${MAN:M*.3}
 
-MLINKS=		form_cursor.3 pos_form_cursor.3 \
-		form_data.3 data_ahead.3 \
-		form_data.3 data_behind.3 \
-		form_field.3 field_count.3 \
-		form_field.3 form_fields.3 \
-		form_field.3 move_field.3 \
-		form_field.3 set_form_fields.3 \
-		form_field_attributes.3 field_back.3 \
-		form_field_attributes.3 field_fore.3 \
-		form_field_attributes.3 field_pad.3 \
-		form_field_attributes.3 set_field_back.3 \
-		form_field_attributes.3 set_field_fore.3 \
-		form_field_attributes.3 set_field_pad.3 \
-		form_field_buffer.3 field_buffer.3 \
-		form_field_buffer.3 field_status.3 \
-		form_field_buffer.3 set_field_buffer.3 \
-		form_field_buffer.3 set_field_status.3 \
-		form_field_buffer.3 set_max_field.3 \
-		form_field_info.3 dynamic_fieldinfo.3 \
-		form_field_info.3 field_info.3 \
-		form_field_just.3 field_just.3 \
-		form_field_just.3 set_field_just.3 \
-		form_field_new.3 dup_field.3 \
-		form_field_new.3 free_field.3 \
-		form_field_new.3 link_field.3 \
-		form_field_new.3 new_field.3 \
-		form_field_opts.3 field_opts.3 \
-		form_field_opts.3 field_opts_off.3 \
-		form_field_opts.3 field_opts_on.3 \
-		form_field_opts.3 set_field_opts.3 \
-		form_field_userptr.3 field_userptr.3 \
-		form_field_userptr.3 set_field_userptr.3 \
-		form_field_validation.3 field_arg.3 \
-		form_field_validation.3 field_type.3 \
-		form_field_validation.3 set_field_type.3 \
-		form_fieldtype.3 free_fieldtype.3 \
-		form_fieldtype.3 link_fieldtype.3 \
-		form_fieldtype.3 new_fieldtype.3 \
-		form_fieldtype.3 set_fieldtype_arg.3 \
-		form_fieldtype.3 set_fieldtype_choice.3 \
-		form_hook.3 field_init.3 \
-		form_hook.3 field_term.3 \
-		form_hook.3 form_init.3 \
-		form_hook.3 form_term.3 \
-		form_hook.3 set_field_init.3 \
-		form_hook.3 set_field_term.3 \
-		form_hook.3 set_form_init.3 \
-		form_hook.3 set_form_term.3 \
-		form_new.3 free_form.3 \
-		form_new.3 new_form.3 \
-		form_new_page.3 new_page.3 \
-		form_new_page.3 set_new_page.3 \
-		form_opts.3 form_opts_off.3 \
-		form_opts.3 form_opts_on.3 \
-		form_opts.3 set_form_opts.3 \
-		form_page.3 current_field.3 \
-		form_page.3 field_index.3 \
-		form_page.3 set_current_field.3 \
-		form_page.3 set_form_page.3 \
-		form_post.3 post_form.3 \
-		form_post.3 unpost_form.3 \
-		form_requestname.3 form_request_by_name.3 \
-		form_requestname.3 form_request_name.3 \
-		form_userptr.3 set_form_userptr.3 \
-		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
+MLINKS=	form_cursor.3 pos_form_cursor.3 \
+	form_data.3 data_ahead.3 \
+	form_data.3 data_behind.3 \
+	form_field.3 field_count.3 \
+	form_field.3 form_fields.3 \
+	form_field.3 move_field.3 \
+	form_field.3 set_form_fields.3 \
+	form_field_attributes.3 field_back.3 \
+	form_field_attributes.3 field_fore.3 \
+	form_field_attributes.3 field_pad.3 \
+	form_field_attributes.3 set_field_back.3 \
+	form_field_attributes.3 set_field_fore.3 \
+	form_field_attributes.3 set_field_pad.3 \
+	form_field_buffer.3 field_buffer.3 \
+	form_field_buffer.3 field_status.3 \
+	form_field_buffer.3 set_field_buffer.3 \
+	form_field_buffer.3 set_field_status.3 \
+	form_field_buffer.3 set_max_field.3 \
+	form_field_info.3 dynamic_fieldinfo.3 \
+	form_field_info.3 field_info.3 \
+	form_field_just.3 field_just.3 \
+	form_field_just.3 set_field_just.3 \
+	form_field_new.3 dup_field.3 \
+	form_field_new.3 free_field.3 \
+	form_field_new.3 link_field.3 \
+	form_field_new.3 new_field.3 \
+	form_field_opts.3 field_opts.3 \
+	form_field_opts.3 field_opts_off.3 \
+	form_field_opts.3 field_opts_on.3 \
+	form_field_opts.3 set_field_opts.3 \
+	form_field_userptr.3 field_userptr.3 \
+	form_field_userptr.3 set_field_userptr.3 \
+	form_field_validation.3 field_arg.3 \
+	form_field_validation.3 field_type.3 \
+	form_field_validation.3 set_field_type.3 \
+	form_fieldtype.3 free_fieldtype.3 \
+	form_fieldtype.3 link_fieldtype.3 \
+	form_fieldtype.3 new_fieldtype.3 \
+	form_fieldtype.3 set_fieldtype_arg.3 \
+	form_fieldtype.3 set_fieldtype_choice.3 \
+	form_hook.3 field_init.3 \
+	form_hook.3 field_term.3 \
+	form_hook.3 form_init.3 \
+	form_hook.3 form_term.3 \
+	form_hook.3 set_field_init.3 \
+	form_hook.3 set_field_term.3 \
+	form_hook.3 set_form_init.3 \
+	form_hook.3 set_form_term.3 \
+	form_new.3 free_form.3 \
+	form_new.3 new_form.3 \
+	form_new_page.3 new_page.3 \
+	form_new_page.3 set_new_page.3 \
+	form_opts.3 form_opts_off.3 \
+	form_opts.3 form_opts_on.3 \
+	form_opts.3 set_form_opts.3 \
+	form_page.3 current_field.3 \
+	form_page.3 field_index.3 \
+	form_page.3 set_current_field.3 \
+	form_page.3 set_form_page.3 \
+	form_post.3 post_form.3 \
+	form_post.3 unpost_form.3 \
+	form_requestname.3 form_request_by_name.3 \
+	form_requestname.3 form_request_name.3 \
+	form_userptr.3 set_form_userptr.3 \
+	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>
+
+# Keep the .SUFFIXES line after the include of bsd.lib.mk
+.SUFFIXES: .3 .3x
+.3x.3:
+	cat ${.IMPSRC} > ${.TARGET}
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 71819a7..29dde8a 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -1,138 +1,137 @@
-# Makefile for libmenu
 # $FreeBSD$
 
-.include	"${.CURDIR}/../config.mk"
+.include "${.CURDIR}/../config.mk"
 
-SRCDIR=		${NCURSES_DIR}/menu
+SRCDIR=	${NCURSES_DIR}/menu
 
-LIB=		menu
-DPADD=		${LIBNCURSES}
-LDADD=		-lncurses
+LIB=	menu
 
-.PATH:		${SRCDIR}
-SRCS=		\
-		ncurses_def.h \
-		m_attribs.c \
-		m_cursor.c \
-		m_driver.c \
-		m_format.c \
-		m_global.c \
-		m_hook.c \
-		m_item_cur.c \
-		m_item_nam.c \
-		m_item_new.c \
-		m_item_opt.c \
-		m_item_top.c \
-		m_item_use.c \
-		m_item_val.c \
-		m_item_vis.c \
-		m_items.c \
-		m_new.c \
-		m_opts.c \
-		m_pad.c \
-		m_pattern.c \
-		m_post.c \
-		m_req_name.c \
-		m_scale.c \
-		m_spacing.c \
-		m_sub.c \
-		m_userptr.c \
-		m_win.c
+.PATH: ${SRCDIR}
+SRCS=	\
+	ncurses_def.h \
+	m_attribs.c \
+	m_cursor.c \
+	m_driver.c \
+	m_format.c \
+	m_global.c \
+	m_hook.c \
+	m_item_cur.c \
+	m_item_nam.c \
+	m_item_new.c \
+	m_item_opt.c \
+	m_item_top.c \
+	m_item_use.c \
+	m_item_val.c \
+	m_item_vis.c \
+	m_items.c \
+	m_new.c \
+	m_opts.c \
+	m_pad.c \
+	m_pattern.c \
+	m_post.c \
+	m_req_name.c \
+	m_scale.c \
+	m_spacing.c \
+	m_sub.c \
+	m_userptr.c \
+	m_win.c
+
+CLEANFILES=	ncurses_def.h
 
 CFLAGS+=	-I${SRCDIR}
 
-INCS=		${SRCDIR}/menu.h ${SRCDIR}/eti.h
+DPADD=	${LIBNCURSES}
+LDADD=	-lncurses
 
-CLEANFILES+=	ncurses_def.h
+INCS=	menu.h eti.h
 
-.PATH:		${NCURSES_DIR}/man
-MANx=		\
-		menu.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 \
-		menu_userptr.3x \
-		menu_win.3x \
-		mitem_current.3x \
-		mitem_name.3x \
-		mitem_new.3x \
-		mitem_opts.3x \
-		mitem_userptr.3x \
-		mitem_value.3x \
-		mitem_visible.3x
+.PATH: ${NCURSES_DIR}/man
+MAN=	\
+	menu.3 \
+	menu_attributes.3 \
+	menu_cursor.3 \
+	menu_driver.3 \
+	menu_format.3 \
+	menu_hook.3 \
+	menu_items.3 \
+	menu_mark.3 \
+	menu_new.3 \
+	menu_opts.3 \
+	menu_pattern.3 \
+	menu_post.3 \
+	menu_requestname.3 \
+	menu_spacing.3 \
+	menu_userptr.3 \
+	menu_win.3 \
+	mitem_current.3 \
+	mitem_name.3 \
+	mitem_new.3 \
+	mitem_opts.3 \
+	mitem_userptr.3 \
+	mitem_value.3 \
+	mitem_visible.3
 
-# 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}
-	cat ${.ALLSRC} > ${.TARGET}
-.endfor
+CLEANFILES+=	${MAN:M*.3}
 
-MLINKS=		menu_attributes.3 menu_back.3 \
-		menu_attributes.3 menu_fore.3 \
-		menu_attributes.3 menu_grey.3 \
-		menu_attributes.3 menu_pad.3 \
-		menu_attributes.3 set_menu_back.3 \
-		menu_attributes.3 set_menu_fore.3 \
-		menu_attributes.3 set_menu_grey.3 \
-		menu_attributes.3 set_menu_pad.3 \
-		menu_cursor.3 pos_menu_cursor.3 \
-		menu_format.3 set_menu_format.3 \
-		menu_hook.3 item_init.3 \
-		menu_hook.3 item_term.3 \
-		menu_hook.3 menu_init.3 \
-		menu_hook.3 menu_term.3 \
-		menu_hook.3 set_item_init.3 \
-		menu_hook.3 set_item_term.3 \
-		menu_hook.3 set_menu_init.3 \
-		menu_hook.3 set_menu_term.3 \
-		menu_items.3 item_count.3 \
-		menu_items.3 set_menu_items.3 \
-		menu_mark.3 set_menu_mark.3 \
-		menu_new.3 free_menu.3 \
-		menu_new.3 new_menu.3 \
-		menu_opts.3 menu_opts_off.3 \
-		menu_opts.3 menu_opts_on.3 \
-		menu_opts.3 set_menu_opts.3 \
-		menu_pattern.3 set_menu_pattern.3 \
-		menu_post.3 post_menu.3 \
-		menu_post.3 unpost_menu.3 \
-		menu_requestname.3 menu_request_by_name.3 \
-		menu_requestname.3 menu_request_name.3 \
-		menu_spacing.3 set_menu_spacing.3 \
-		menu_userptr.3 set_menu_userptr.3 \
-		menu_win.3 menu_sub.3 \
-		menu_win.3 scale_menu.3 \
-		menu_win.3 set_menu_sub.3 \
-		menu_win.3 set_menu_win.3 \
-		mitem_current.3 current_item.3 \
-		mitem_current.3 item_index.3 \
-		mitem_current.3 set_current_item.3 \
-		mitem_current.3 set_top_row.3 \
-		mitem_current.3 top_row.3 \
-		mitem_name.3 item_description.3 \
-		mitem_name.3 item_name.3 \
-		mitem_new.3 free_item.3 \
-		mitem_new.3 new_item.3 \
-		mitem_opts.3 item_opts.3 \
-		mitem_opts.3 item_opts_off.3 \
-		mitem_opts.3 item_opts_on.3 \
-		mitem_opts.3 set_item_opts.3 \
-		mitem_userptr.3 item_userptr.3 \
-		mitem_userptr.3 set_item_userptr.3 \
-		mitem_value.3 item_value.3 \
-		mitem_value.3 set_item_value.3 \
-		mitem_visible.3 item_visible.3
+MLINKS=	menu_attributes.3 menu_back.3 \
+	menu_attributes.3 menu_fore.3 \
+	menu_attributes.3 menu_grey.3 \
+	menu_attributes.3 menu_pad.3 \
+	menu_attributes.3 set_menu_back.3 \
+	menu_attributes.3 set_menu_fore.3 \
+	menu_attributes.3 set_menu_grey.3 \
+	menu_attributes.3 set_menu_pad.3 \
+	menu_cursor.3 pos_menu_cursor.3 \
+	menu_format.3 set_menu_format.3 \
+	menu_hook.3 item_init.3 \
+	menu_hook.3 item_term.3 \
+	menu_hook.3 menu_init.3 \
+	menu_hook.3 menu_term.3 \
+	menu_hook.3 set_item_init.3 \
+	menu_hook.3 set_item_term.3 \
+	menu_hook.3 set_menu_init.3 \
+	menu_hook.3 set_menu_term.3 \
+	menu_items.3 item_count.3 \
+	menu_items.3 set_menu_items.3 \
+	menu_mark.3 set_menu_mark.3 \
+	menu_new.3 free_menu.3 \
+	menu_new.3 new_menu.3 \
+	menu_opts.3 menu_opts_off.3 \
+	menu_opts.3 menu_opts_on.3 \
+	menu_opts.3 set_menu_opts.3 \
+	menu_pattern.3 set_menu_pattern.3 \
+	menu_post.3 post_menu.3 \
+	menu_post.3 unpost_menu.3 \
+	menu_requestname.3 menu_request_by_name.3 \
+	menu_requestname.3 menu_request_name.3 \
+	menu_spacing.3 set_menu_spacing.3 \
+	menu_userptr.3 set_menu_userptr.3 \
+	menu_win.3 menu_sub.3 \
+	menu_win.3 scale_menu.3 \
+	menu_win.3 set_menu_sub.3 \
+	menu_win.3 set_menu_win.3 \
+	mitem_current.3 current_item.3 \
+	mitem_current.3 item_index.3 \
+	mitem_current.3 set_current_item.3 \
+	mitem_current.3 set_top_row.3 \
+	mitem_current.3 top_row.3 \
+	mitem_name.3 item_description.3 \
+	mitem_name.3 item_name.3 \
+	mitem_new.3 free_item.3 \
+	mitem_new.3 new_item.3 \
+	mitem_opts.3 item_opts.3 \
+	mitem_opts.3 item_opts_off.3 \
+	mitem_opts.3 item_opts_on.3 \
+	mitem_opts.3 set_item_opts.3 \
+	mitem_userptr.3 item_userptr.3 \
+	mitem_userptr.3 set_item_userptr.3 \
+	mitem_value.3 item_value.3 \
+	mitem_value.3 set_item_value.3 \
+	mitem_visible.3 item_visible.3
 
 .include <bsd.lib.mk>
+
+# Keep the .SUFFIXES line after the include of bsd.lib.mk
+.SUFFIXES: .3 .3x
+.3x.3:
+	cat ${.IMPSRC} > ${.TARGET}
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 04a905f..81b89b6 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib
 
 .include <bsd.own.mk>
 
-.include	"${.CURDIR}/../config.mk"
+.include "${.CURDIR}/../config.mk"
 
 LIB=		ncurses
 SHLIB_MAJOR=	6
@@ -46,207 +46,207 @@ TYPEOF_MMASK_T=		long
 TYPE_OF_BOOL=		unsigned char
 USE_CXX_BOOL=		defined(__cplusplus)
 
-CFLAGS+=	-DFREEBSD_NATIVE -DTERMIOS
-
-GENSRC=		\
-		codes.c \
-		expanded.c \
-		fallback.c \
-		lib_gen.c \
-		lib_keyname.c \
-		names.c \
-		unctrl.c
-
-GENHDR=		\
-		curses.h \
-		hashsize.h \
-		init_keytry.h \
-		ncurses_def.h \
-		nomacros.h \
-		parametrized.h \
-		term.h \
-		termcap.h \
-		unctrl.h
-
-# Installed
-HEADERS=	curses.h term.h termcap.h unctrl.h
-SRCHDRS=	ncurses_dll.h
-INCS=		${HEADERS} ${SRCHDRS}
-INCSLINKS=	curses.h ${INCLUDEDIR}/ncurses.h
-
-# Components of names.c and codes.c
-NAMESRC=	boolnames boolfnames numnames numfnames strnames strfnames
-CODESRC=	boolcodes numcodes strcodes
-
-SRCS=		${GENHDR} ${GENSRC}
-
-.PATH:		${NCURSES_DIR}/ncurses/base
-SRCS+=		\
-		define_key.c \
-		key_defined.c \
-		keybound.c \
-		keyok.c \
-		legacy_coding.c \
-		lib_addch.c \
-		lib_addstr.c \
-		lib_beep.c \
-		lib_bkgd.c \
-		lib_box.c \
-		lib_chgat.c \
-		lib_clear.c \
-		lib_clearok.c \
-		lib_clrbot.c \
-		lib_clreol.c \
-		lib_color.c \
-		lib_colorset.c \
-		lib_delch.c \
-		lib_delwin.c \
-		lib_dft_fgbg.c \
-		lib_echo.c \
-		lib_endwin.c \
-		lib_erase.c \
-		lib_flash.c \
-		lib_freeall.c \
-		lib_getch.c \
-		lib_getstr.c \
-		lib_hline.c \
-		lib_immedok.c \
-		lib_inchstr.c \
-		lib_initscr.c \
-		lib_insch.c \
-		lib_insdel.c \
-		lib_insnstr.c \
-		lib_instr.c \
-		lib_isendwin.c \
-		lib_leaveok.c \
-		lib_mouse.c \
-		lib_move.c \
-		lib_mvwin.c \
-		lib_newterm.c \
-		lib_newwin.c \
-		lib_nl.c \
-		lib_overlay.c \
-		lib_pad.c \
-		lib_printw.c \
-		lib_redrawln.c \
-		lib_refresh.c \
-		lib_restart.c \
-		lib_scanw.c \
-		lib_screen.c \
-		lib_scroll.c \
-		lib_scrollok.c \
-		lib_scrreg.c \
-		lib_set_term.c \
-		lib_slk.c \
-		lib_slkatr_set.c \
-		lib_slkatrof.c \
-		lib_slkatron.c \
-		lib_slkatrset.c \
-		lib_slkattr.c \
-		lib_slkclear.c \
-		lib_slkcolor.c \
-		lib_slkinit.c \
-		lib_slklab.c \
-		lib_slkrefr.c \
-		lib_slkset.c \
-		lib_slktouch.c \
-		lib_touch.c \
-		lib_ungetch.c \
-		lib_vline.c \
-		lib_wattroff.c \
-		lib_wattron.c \
-		lib_winch.c \
-		lib_window.c \
-		memmove.c \
-		nc_panel.c \
-		resizeterm.c \
-		safe_sprintf.c \
-		tries.c \
-		version.c \
-		vsscanf.c \
-		wresize.c
-
-.PATH:		${NCURSES_DIR}/ncurses/tinfo
-SRCS+=		\
-		access.c \
-		add_tries.c \
-		alloc_entry.c \
-		alloc_ttype.c \
-		captoinfo.c \
-		comp_captab.c \
-		comp_error.c \
-		comp_expand.c \
-		comp_hash.c \
-		comp_parse.c \
-		comp_scan.c \
-		db_iterator.c \
-		doalloc.c \
-		free_ttype.c \
-		getenv_num.c \
-		hashed_db.c \
-		home_terminfo.c \
-		init_keytry.c \
-		lib_acs.c \
-		lib_baudrate.c \
-		lib_cur_term.c \
-		lib_data.c \
-		lib_has_cap.c \
-		lib_kernel.c \
-		lib_longname.c \
-		lib_napms.c \
-		lib_options.c \
-		lib_print.c \
-		lib_raw.c \
-		lib_setup.c \
-		lib_termcap.c \
-		lib_termname.c \
-		lib_tgoto.c \
-		lib_ti.c \
-		lib_tparm.c \
-		lib_tputs.c \
-		lib_ttyflags.c \
-		name_match.c \
-		parse_entry.c \
-		read_entry.c \
-		setbuf.c \
-		strings.c \
-		trim_sgr0.c \
-		write_entry.c
-
-.PATH:		${NCURSES_DIR}/ncurses/tty
-SRCS+=		\
-		hardscroll.c \
-		hashmap.c \
-		lib_mvcur.c \
-		lib_tstp.c \
-		lib_twait.c \
-		lib_vidattr.c \
-		tty_update.c
-
-.PATH:		${NCURSES_DIR}/ncurses/trace
-SRCS+=		\
-		lib_trace.c \
-		visbuf.c
+GENSRCS=	\
+	codes.c \
+	expanded.c \
+	fallback.c \
+	lib_gen.c \
+	lib_keyname.c \
+	names.c \
+	unctrl.c
+
+GENHDRS=	\
+	curses.h \
+	hashsize.h \
+	init_keytry.h \
+	ncurses_def.h \
+	nomacros.h \
+	parametrized.h \
+	term.h \
+	termcap.h \
+	unctrl.h
+
+SRCS=	${GENHDRS} ${GENSRCS}
+
+.PATH: ${NCURSES_DIR}/ncurses/base
+SRCS+=	\
+	define_key.c \
+	key_defined.c \
+	keybound.c \
+	keyok.c \
+	legacy_coding.c \
+	lib_addch.c \
+	lib_addstr.c \
+	lib_beep.c \
+	lib_bkgd.c \
+	lib_box.c \
+	lib_chgat.c \
+	lib_clear.c \
+	lib_clearok.c \
+	lib_clrbot.c \
+	lib_clreol.c \
+	lib_color.c \
+	lib_colorset.c \
+	lib_delch.c \
+	lib_delwin.c \
+	lib_dft_fgbg.c \
+	lib_echo.c \
+	lib_endwin.c \
+	lib_erase.c \
+	lib_flash.c \
+	lib_freeall.c \
+	lib_getch.c \
+	lib_getstr.c \
+	lib_hline.c \
+	lib_immedok.c \
+	lib_inchstr.c \
+	lib_initscr.c \
+	lib_insch.c \
+	lib_insdel.c \
+	lib_insnstr.c \
+	lib_instr.c \
+	lib_isendwin.c \
+	lib_leaveok.c \
+	lib_mouse.c \
+	lib_move.c \
+	lib_mvwin.c \
+	lib_newterm.c \
+	lib_newwin.c \
+	lib_nl.c \
+	lib_overlay.c \
+	lib_pad.c \
+	lib_printw.c \
+	lib_redrawln.c \
+	lib_refresh.c \
+	lib_restart.c \
+	lib_scanw.c \
+	lib_screen.c \
+	lib_scroll.c \
+	lib_scrollok.c \
+	lib_scrreg.c \
+	lib_set_term.c \
+	lib_slk.c \
+	lib_slkatr_set.c \
+	lib_slkatrof.c \
+	lib_slkatron.c \
+	lib_slkatrset.c \
+	lib_slkattr.c \
+	lib_slkclear.c \
+	lib_slkcolor.c \
+	lib_slkinit.c \
+	lib_slklab.c \
+	lib_slkrefr.c \
+	lib_slkset.c \
+	lib_slktouch.c \
+	lib_touch.c \
+	lib_ungetch.c \
+	lib_vline.c \
+	lib_wattroff.c \
+	lib_wattron.c \
+	lib_winch.c \
+	lib_window.c \
+	memmove.c \
+	nc_panel.c \
+	resizeterm.c \
+	safe_sprintf.c \
+	tries.c \
+	version.c \
+	vsscanf.c \
+	wresize.c
+
+.PATH: ${NCURSES_DIR}/ncurses/tinfo
+SRCS+=	\
+	access.c \
+	add_tries.c \
+	alloc_entry.c \
+	alloc_ttype.c \
+	captoinfo.c \
+	comp_captab.c \
+	comp_error.c \
+	comp_expand.c \
+	comp_hash.c \
+	comp_parse.c \
+	comp_scan.c \
+	db_iterator.c \
+	doalloc.c \
+	free_ttype.c \
+	getenv_num.c \
+	hashed_db.c \
+	home_terminfo.c \
+	init_keytry.c \
+	lib_acs.c \
+	lib_baudrate.c \
+	lib_cur_term.c \
+	lib_data.c \
+	lib_has_cap.c \
+	lib_kernel.c \
+	lib_longname.c \
+	lib_napms.c \
+	lib_options.c \
+	lib_print.c \
+	lib_raw.c \
+	lib_setup.c \
+	lib_termcap.c \
+	lib_termname.c \
+	lib_tgoto.c \
+	lib_ti.c \
+	lib_tparm.c \
+	lib_tputs.c \
+	lib_ttyflags.c \
+	name_match.c \
+	parse_entry.c \
+	read_entry.c \
+	setbuf.c \
+	strings.c \
+	trim_sgr0.c \
+	write_entry.c
+
+.PATH: ${NCURSES_DIR}/ncurses/tty
+SRCS+=	\
+	hardscroll.c \
+	hashmap.c \
+	lib_mvcur.c \
+	lib_tstp.c \
+	lib_twait.c \
+	lib_vidattr.c \
+	tty_update.c
+
+.PATH: ${NCURSES_DIR}/ncurses/trace
+SRCS+=	\
+	lib_trace.c \
+	visbuf.c
 
 # Currently unused, for debugging libncurses itself.
-DBGSRCS=	\
-		lib_traceatr.c \
-		lib_tracebits.c \
-		lib_tracechr.c \
-		lib_tracedmp.c \
-		lib_tracemse.c \
-		trace_buf.c \
-		trace_tries.c \
-		trace_xnames.c \
-		varargs.c
+DBGSRCS= \
+	lib_traceatr.c \
+	lib_tracebits.c \
+	lib_tracechr.c \
+	lib_tracedmp.c \
+	lib_tracemse.c \
+	trace_buf.c \
+	trace_tries.c \
+	trace_xnames.c \
+	varargs.c
 
 # From our old libtermcap.
 # Used instead of the hideous read_termcap.c abomination.
-SRCS+=		termcap.c
+SRCS+=	termcap.c
 
-CLEANFILES+=	${GENSRC} ${GENHDR} keys.list make_hash term.h.new \
+# Components of names.c and codes.c
+NAMESRCS=	boolnames boolfnames numnames numfnames strnames strfnames
+CODESRCS=	boolcodes numcodes strcodes
+
+CLEANFILES=	${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \
 		make_keys MKterm.h.awk comp_captab.c curses.head \
-		namehdr nameftr codeftr ${NAMESRC} ${CODESRC}
+		namehdr nameftr codeftr ${NAMESRCS} ${CODESRCS}
+
+CFLAGS+=	-DFREEBSD_NATIVE -DTERMIOS
+
+# Installed
+HEADERS=	curses.h term.h termcap.h unctrl.h
+SRCHDRS=	ncurses_dll.h
+INCS=		${HEADERS} ${SRCHDRS}
+INCSLINKS=	curses.h ${INCLUDEDIR}/ncurses.h
 
 .if !defined(NO_INSTALLLIB)
 SYMLINKS+=	libncurses.a ${LIBDIR}/libcurses.a
@@ -268,67 +268,67 @@ SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtermlib_p.a
 SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtinfo_p.a
 .endif
 
-DOCSDIR=	/usr/share/doc/ncurses
+DOCSDIR=	${SHAREDIR}/doc/ncurses
 DOCS=		ncurses-intro.html hackguide.html
 
 .if ${MK_HTML} != "no"
-.PATH:		${NCURSES_DIR}/doc/html
+.PATH: ${NCURSES_DIR}/doc/html
 FILESGROUPS=	DOCS
 .endif
 
 # Generated source
-namehdr nameftr codeftr ${NAMESRC} ${CODESRC}: MKnames.awk Caps
+namehdr nameftr codeftr ${NAMESRCS} ${CODESRCS}: MKnames.awk Caps
 	${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk ${NCURSES_DIR}/include/Caps
 
-.ORDER: namehdr ${NAMESRC} ${CODESRC} nameftr codeftr names.c codes.c
+.ORDER: namehdr ${NAMESRCS} ${CODESRCS} nameftr codeftr names.c codes.c
 
-names.c:	 namehdr ${NAMESRC} nameftr
-	cat namehdr ${NAMESRC} nameftr > $@
+names.c: namehdr ${NAMESRCS} nameftr
+	cat namehdr ${NAMESRCS} nameftr > $@
 
-codes.c:	 namehdr ${CODESRC} codeftr
-	cat namehdr ${CODESRC} codeftr > $@
+codes.c: namehdr ${CODESRCS} codeftr
+	cat namehdr ${CODESRCS} codeftr > $@
 
-lib_gen.c:	MKlib_gen.sh curses.h
+lib_gen.c: MKlib_gen.sh curses.h
 	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
 	    "${AWK}" generated < curses.h >$@
 
-lib_keyname.c:	keys.list MKkeyname.awk
+lib_keyname.c: keys.list MKkeyname.awk
 	${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk keys.list > lib_keyname.c
 
-unctrl.c:	MKunctrl.awk
+unctrl.c: MKunctrl.awk
 	echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk > unctrl.c
 
-comp_captab.c:	MKcaptab.awk Caps make_hash
+comp_captab.c: MKcaptab.awk Caps make_hash
 	sh ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.awk "${AWK}" \
 	    ${NCURSES_DIR}/include/Caps > comp_captab.c
 
-expanded.c:	MKexpanded.sh
+expanded.c: MKexpanded.sh
 	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC} -E" ${CFLAGS} >expanded.c
 
-fallback.c:	MKfallback.sh
+fallback.c: MKfallback.sh
 	sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh > fallback.c
 
 # Generated headers
-nomacros.h:	MKlib_gen.sh curses.h
+nomacros.h: MKlib_gen.sh curses.h
 	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
 	    "${AWK}" generated < curses.h | fgrep undef > $@
 
-init_keytry.h:	keys.list make_keys
+init_keytry.h: keys.list make_keys
 	./make_keys keys.list > init_keytry.h
 
-hashsize.h:	MKhashsize.sh Caps
+hashsize.h: MKhashsize.sh Caps
 	sh ${NCURSES_DIR}/include/MKhashsize.sh ${NCURSES_DIR}/include/Caps > $@
 
-parametrized.h:	MKparametrized.sh Caps
+parametrized.h: MKparametrized.sh Caps
 	AWK=${AWK} sh ${NCURSES_DIR}/include/MKparametrized.sh \
 	    ${NCURSES_DIR}/include/Caps > $@
 
-term.h:		MKterm.h.awk edit_cfg.sh Caps
+term.h: MKterm.h.awk edit_cfg.sh Caps
 	${AWK} -f MKterm.h.awk ${NCURSES_DIR}/include/Caps > $@.new
 	sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new
 	mv -f $@.new $@
 
-curses.h:	curses.head MKkey_defs.sh Caps
+curses.h: curses.head MKkey_defs.sh Caps
 	cat curses.head > $@.new
 	AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \
 	    ${NCURSES_DIR}/include/Caps >> $@.new
@@ -336,22 +336,22 @@ curses.h:	curses.head MKkey_defs.sh Caps
 	mv -f $@.new $@
 
 # Generated intermediate files
-keys.list:	MKkeys_list.sh Caps
+keys.list: MKkeys_list.sh Caps
 	AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \
 	    ${NCURSES_DIR}/include/Caps | LC_ALL=C sort > keys.list
 
 # Build tools
 build-tools: make_hash make_keys
 
-make_keys:	make_keys.c names.c ncurses_def.h ${HEADERS}
+make_keys: make_keys.c names.c ncurses_def.h ${HEADERS}
 	${CC} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
 
-make_hash:	comp_hash.c hashsize.h ncurses_def.h ${HEADERS}
+make_hash: comp_hash.c hashsize.h ncurses_def.h ${HEADERS}
 	${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
 		${NCURSES_DIR}/ncurses/tinfo/comp_hash.c
 
 # ./configure generated
-MKterm.h.awk:	MKterm.h.awk.in
+MKterm.h.awk: MKterm.h.awk.in
 	sed <${NCURSES_DIR}/include/MKterm.h.awk.in >$@ \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \
@@ -363,14 +363,14 @@ MKterm.h.awk:	MKterm.h.awk.in
 	    -e "/@HAVE_TERMIO_H@/s%%${HAVE_TERMIO_H}%" \
 	    -e "/@HAVE_TCGETATTR@/s%%${HAVE_TCGETATTR}%"
 
-termcap.h:	termcap.h.in
+termcap.h: termcap.h.in
 	sed <${NCURSES_DIR}/include/termcap.h.in >$@ \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \
 	    -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \
 	    -e "/@NCURSES_OSPEED@/s%%${NCURSES_OSPEED}%"
 
-curses.head:	curses.h.in
+curses.head: curses.h.in
 	sed <${NCURSES_DIR}/include/curses.h.in >$@ \
 	    -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \
 	    -e "/@HAVE_VSSCANF@/s%%${HAVE_VSSCANF}%" \
@@ -401,13 +401,13 @@ curses.head:	curses.h.in
 	    -e "s/ _WCHAR_T/ __wchar_t/g" \
 	    -e "s/ _WINT_T/ __wint_t/g"
 
-unctrl.h:	unctrl.h.in
+unctrl.h: unctrl.h.in
 	sed <${NCURSES_DIR}/include/$@.in >$@ \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%"
 
 # MAN page gunk
-terminfo.5:	MKterminfo.sh terminfo.head Caps
+terminfo.5: MKterminfo.sh terminfo.head Caps
 	sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \
 	    ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@
 
@@ -415,389 +415,389 @@ CLEANFILES+=	terminfo.5
 MANFILTER=      sed -e 's%@TERMINFO@%${TERMINFODIR}/terminfo%g' \
 		    -e 's%@NCURSES_OSPEED@%${NCURSES_OSPEED}%g'
 
-.PATH:		${NCURSES_DIR}/man
-MANx=		\
-		curs_addch.3x \
-		curs_addchstr.3x \
-		curs_addstr.3x \
-		curs_attr.3x \
-		curs_beep.3x \
-		curs_bkgd.3x \
-		curs_bkgrnd.3x \
-		curs_border.3x \
-		curs_border_set.3x \
-		curs_clear.3x \
-		curs_color.3x \
-		curs_delch.3x \
-		curs_deleteln.3x \
-		curs_extend.3x \
-		curs_getcchar.3x \
-		curs_getch.3x \
-		curs_getstr.3x \
-		curs_getyx.3x \
-		curs_inch.3x \
-		curs_inchstr.3x \
-		curs_initscr.3x \
-		curs_inopts.3x \
-		curs_insch.3x \
-		curs_insstr.3x \
-		curs_instr.3x \
-		curs_inwstr.3x \
-		curs_kernel.3x \
-		curs_mouse.3x \
-		curs_move.3x \
-		curs_outopts.3x \
-		curs_overlay.3x \
-		curs_pad.3x \
-		curs_print.3x \
-		curs_refresh.3x \
-		curs_scr_dump.3x \
-		curs_scroll.3x \
-		curs_slk.3x \
-		curs_termattrs.3x \
-		curs_termcap.3x \
-		curs_terminfo.3x \
-		curs_touch.3x \
-		curs_trace.3x \
-		curs_util.3x \
-		curs_window.3x \
-		default_colors.3x \
-		define_key.3x \
-		key_defined.3x \
-		keybound.3x \
-		keyok.3x \
-		legacy_coding.3x \
-		ncurses.3x \
-		resizeterm.3x \
-		wresize.3x
-
-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}
-	cat ${.ALLSRC} > ${.TARGET}
-.endfor
-
-MLINKS=		ncurses.3 curses.3 \
-		curs_addch.3 addch.3 \
-		curs_addch.3 echochar.3 \
-		curs_addch.3 mvaddch.3 \
-		curs_addch.3 mvwaddch.3 \
-		curs_addch.3 waddch.3 \
-		curs_addch.3 wechochar.3 \
-		curs_addchstr.3 addchnstr.3 \
-		curs_addchstr.3 addchstr.3 \
-		curs_addchstr.3 mvaddchnstr.3 \
-		curs_addchstr.3 mvaddchstr.3 \
-		curs_addchstr.3 mvwaddchnstr.3 \
-		curs_addchstr.3 mvwaddchstr.3 \
-		curs_addchstr.3 waddchnstr.3 \
-		curs_addchstr.3 waddchstr.3 \
-		curs_addstr.3 addnstr.3 \
-		curs_addstr.3 addstr.3 \
-		curs_addstr.3 mvaddnstr.3\
-		curs_addstr.3 mvaddstr.3 \
-		curs_addstr.3 mvwaddnstr.3 \
-		curs_addstr.3 mvwaddstr.3 \
-		curs_addstr.3 waddnstr.3 \
-		curs_addstr.3 waddstr.3 \
-		curs_attr.3 PAIR_NUMBER.3 \
-		curs_attr.3 attr_get.3 \
-		curs_attr.3 attr_off.3 \
-		curs_attr.3 attr_on.3 \
-		curs_attr.3 attr_set.3 \
-		curs_attr.3 attroff.3 \
-		curs_attr.3 attron.3 \
-		curs_attr.3 attrset.3 \
-		curs_attr.3 chgat.3 \
-		curs_attr.3 color_set.3 \
-		curs_attr.3 mvchgat.3 \
-		curs_attr.3 mvwchgat.3 \
-		curs_attr.3 standend.3 \
-		curs_attr.3 standout.3 \
-		curs_attr.3 wattr_get.3 \
-		curs_attr.3 wattr_off.3 \
-		curs_attr.3 wattr_on.3 \
-		curs_attr.3 wattr_set.3 \
-		curs_attr.3 wattroff.3 \
-		curs_attr.3 wattron.3 \
-		curs_attr.3 wattrset.3 \
-		curs_attr.3 wchgat.3 \
-		curs_attr.3 wcolor_set.3 \
-		curs_attr.3 wstandend.3 \
-		curs_attr.3 wstandout.3 \
-		curs_beep.3 beep.3 \
-		curs_beep.3 flash.3 \
-		curs_bkgd.3 bkgd.3 \
-		curs_bkgd.3 bkgdset.3 \
-		curs_bkgd.3 getbkgd.3 \
-		curs_bkgd.3 wbkgd.3 \
-		curs_bkgd.3 wbkgdset.3 \
-		curs_border.3 border.3 \
-		curs_border.3 box.3 \
-		curs_border.3 hline.3 \
-		curs_border.3 mvhline.3 \
-		curs_border.3 mvvline.3 \
-		curs_border.3 mvwhline.3 \
-		curs_border.3 mvwvline.3 \
-		curs_border.3 vline.3 \
-		curs_border.3 wborder.3 \
-		curs_border.3 whline.3 \
-		curs_border.3 wvline.3 \
-		curs_border_set.3 border_set.3 \
-		curs_border_set.3 box_set.3 \
-		curs_border_set.3 hline_set.3 \
-		curs_border_set.3 mvhline_set.3 \
-		curs_border_set.3 mvvline_set.3 \
-		curs_border_set.3 mvwhline_set.3 \
-		curs_border_set.3 mvwvline_set.3 \
-		curs_border_set.3 vline_set.3 \
-		curs_border_set.3 wborder_set.3 \
-		curs_border_set.3 whline_set.3 \
-		curs_border_set.3 wvline_set.3 \
-		curs_clear.3 clear.3 \
-		curs_clear.3 clrtobot.3 \
-		curs_clear.3 clrtoeol.3 \
-		curs_clear.3 erase.3 \
-		curs_clear.3 wclear.3 \
-		curs_clear.3 wclrtobot.3 \
-		curs_clear.3 wclrtoeol.3 \
-		curs_clear.3 werase.3 \
-		curs_color.3 COLOR_PAIR.3 \
-		curs_color.3 can_change_color.3 \
-		curs_color.3 color_content.3 \
-		curs_color.3 has_colors.3 \
-		curs_color.3 init_color.3 \
-		curs_color.3 init_pair.3 \
-		curs_color.3 pair_content.3 \
-		curs_color.3 start_color.3 \
-		curs_delch.3 delch.3 \
-		curs_delch.3 mvdelch.3 \
-		curs_delch.3 mvwdelch.3 \
-		curs_delch.3 wdelch.3 \
-		curs_deleteln.3 deleteln.3 \
-		curs_deleteln.3 insdelln.3 \
-		curs_deleteln.3 insertln.3 \
-		curs_deleteln.3 wdeleteln.3 \
-		curs_deleteln.3 winsdelln.3 \
-		curs_deleteln.3 winsertln.3 \
-		curs_extend.3 curses_version.3 \
-		curs_extend.3 use_extended_names.3 \
-		curs_getcchar.3 getcchar.3 \
-		curs_getcchar.3 setcchar.3 \
-		curs_getch.3 getch.3 \
-		curs_getch.3 has_key.3 \
-		curs_getch.3 mvgetch.3 \
-		curs_getch.3 mvwgetch.3 \
-		curs_getch.3 ungetch.3 \
-		curs_getch.3 wgetch.3 \
-		curs_getstr.3 getnstr.3 \
-		curs_getstr.3 getstr.3 \
-		curs_getstr.3 mvgetnstr.3 \
-		curs_getstr.3 mvgetstr.3 \
-		curs_getstr.3 mvwgetnstr.3 \
-		curs_getstr.3 mvwgetstr.3 \
-		curs_getstr.3 wgetnstr.3 \
-		curs_getstr.3 wgetstr.3 \
-		curs_getyx.3 getbegyx.3 \
-		curs_getyx.3 getmaxyx.3 \
-		curs_getyx.3 getparyx.3 \
-		curs_getyx.3 getyx.3 \
-		curs_inch.3 inch.3 \
-		curs_inch.3 mvinch.3 \
-		curs_inch.3 mvwinch.3 \
-		curs_inch.3 winch.3 \
-		curs_inchstr.3 inchnstr.3 \
-		curs_inchstr.3 inchstr.3 \
-		curs_inchstr.3 mvinchnstr.3 \
-		curs_inchstr.3 mvinchstr.3 \
-		curs_inchstr.3 mvwinchnstr.3 \
-		curs_inchstr.3 mvwinchstr.3 \
-		curs_inchstr.3 winchnstr.3 \
-		curs_inchstr.3 winchstr.3 \
-		curs_initscr.3 delscreen.3 \
-		curs_initscr.3 endwin.3 \
-		curs_initscr.3 initscr.3 \
-		curs_initscr.3 isendwin.3 \
-		curs_initscr.3 newterm.3 \
-		curs_initscr.3 set_term.3 \
-		curs_inopts.3 cbreak.3 \
-		curs_inopts.3 echo.3 \
-		curs_inopts.3 halfdelay.3 \
-		curs_inopts.3 intrflush.3 \
-		curs_inopts.3 keypad.3 \
-		curs_inopts.3 meta.3 \
-		curs_inopts.3 nocbreak.3 \
-		curs_inopts.3 nodelay.3 \
-		curs_inopts.3 noecho.3 \
-		curs_inopts.3 noqiflush.3 \
-		curs_inopts.3 noraw.3 \
-		curs_inopts.3 notimeout.3 \
-		curs_inopts.3 qiflush.3 \
-		curs_inopts.3 raw.3 \
-		curs_inopts.3 timeout.3 \
-		curs_inopts.3 typeahead.3 \
-		curs_inopts.3 wtimeout.3 \
-		curs_insch.3 insch.3 \
-		curs_insch.3 mvinsch.3 \
-		curs_insch.3 mvwinsch.3 \
-		curs_insch.3 winsch.3 \
-		curs_insstr.3 insnstr.3 \
-		curs_insstr.3 insstr.3 \
-		curs_insstr.3 mvinsnstr.3 \
-		curs_insstr.3 mvinsstr.3 \
-		curs_insstr.3 mvwinsnstr.3 \
-		curs_insstr.3 mvwinsstr.3 \
-		curs_insstr.3 winsnstr.3 \
-		curs_insstr.3 winsstr.3 \
-		curs_instr.3 innstr.3 \
-		curs_instr.3 instr.3 \
-		curs_instr.3 mvinnstr.3 \
-		curs_instr.3 mvinstr.3 \
-		curs_instr.3 mvwinnstr.3 \
-		curs_instr.3 mvwinstr.3 \
-		curs_instr.3 winnstr.3 \
-		curs_instr.3 winstr.3 \
-		curs_kernel.3 curs_set.3 \
-		curs_kernel.3 def_prog_mode.3 \
-		curs_kernel.3 def_shell_mode.3 \
-		curs_kernel.3 getsyx.3 \
-		curs_kernel.3 napms.3 \
-		curs_kernel.3 reset_prog_mode.3 \
-		curs_kernel.3 reset_shell_mode.3 \
-		curs_kernel.3 resetty.3 \
-		curs_kernel.3 ripoffline.3 \
-		curs_kernel.3 savetty.3 \
-		curs_kernel.3 setsyx.3 \
-		curs_mouse.3 getmouse.3 \
-		curs_mouse.3 mouse_trafo.3 \
-		curs_mouse.3 mouseinterval.3 \
-		curs_mouse.3 mousemask.3 \
-		curs_mouse.3 ungetmouse.3 \
-		curs_mouse.3 wenclose.3 \
-		curs_mouse.3 wmouse_trafo.3 \
-		curs_move.3 move.3 \
-		curs_move.3 wmove.3 \
-		curs_outopts.3 clearok.3 \
-		curs_outopts.3 idcok.3 \
-		curs_outopts.3 idlok.3 \
-		curs_outopts.3 immedok.3 \
-		curs_outopts.3 leaveok.3 \
-		curs_outopts.3 nl.3 \
-		curs_outopts.3 nonl.3 \
-		curs_outopts.3 scrollok.3 \
-		curs_outopts.3 setscrreg.3 \
-		curs_outopts.3 wsetscrreg.3 \
-		curs_overlay.3 copywin.3 \
-		curs_overlay.3 overlay.3 \
-		curs_overlay.3 overwrite.3 \
-		curs_pad.3 newpad.3 \
-		curs_pad.3 pecho_wchar.3 \
-		curs_pad.3 pechochar.3 \
-		curs_pad.3 pnoutrefresh.3 \
-		curs_pad.3 prefresh.3 \
-		curs_pad.3 subpad.3 \
-		curs_print.3 mcprint.3 \
-		curs_refresh.3 doupdate.3 \
-		curs_refresh.3 redrawwin.3 \
-		curs_refresh.3 refresh.3 \
-		curs_refresh.3 wnoutrefresh.3 \
-		curs_refresh.3 wredrawln.3 \
-		curs_refresh.3 wrefresh.3 \
-		curs_scr_dump.3 scr_dump.3 \
-		curs_scr_dump.3 scr_init.3 \
-		curs_scr_dump.3 scr_restore.3 \
-		curs_scr_dump.3 scr_set.3 \
-		curs_scroll.3 scrl.3 \
-		curs_scroll.3 scroll.3 \
-		curs_scroll.3 wscrl.3 \
-		curs_slk.3 slk_attr.3 \
-		curs_slk.3 slk_attr_off.3 \
-		curs_slk.3 slk_attr_on.3 \
-		curs_slk.3 slk_attr_set.3 \
-		curs_slk.3 slk_attroff.3 \
-		curs_slk.3 slk_attron.3 \
-		curs_slk.3 slk_attrset.3 \
-		curs_slk.3 slk_clear.3 \
-		curs_slk.3 slk_color.3 \
-		curs_slk.3 slk_init.3 \
-		curs_slk.3 slk_label.3 \
-		curs_slk.3 slk_noutrefresh.3 \
-		curs_slk.3 slk_refresh.3 \
-		curs_slk.3 slk_restore.3 \
-		curs_slk.3 slk_set.3 \
-		curs_slk.3 slk_touch.3 \
-		curs_termattrs.3 baudrate.3 \
-		curs_termattrs.3 erasechar.3 \
-		curs_termattrs.3 erasewchar.3 \
-		curs_termattrs.3 has_ic.3 \
-		curs_termattrs.3 has_il.3 \
-		curs_termattrs.3 killchar.3 \
-		curs_termattrs.3 killwchar.3 \
-		curs_termattrs.3 longname.3 \
-		curs_termattrs.3 term_attrs.3 \
-		curs_termattrs.3 termattrs.3 \
-		curs_termattrs.3 termname.3 \
-		curs_termcap.3 termcap.3 \
-		curs_termcap.3 tgetent.3 \
-		curs_termcap.3 tgetflag.3 \
-		curs_termcap.3 tgetnum.3 \
-		curs_termcap.3 tgetstr.3 \
-		curs_termcap.3 tgoto.3 \
-		curs_termcap.3 tputs.3 \
-		curs_terminfo.3 del_curterm.3 \
-		curs_terminfo.3 mvcur.3 \
-		curs_terminfo.3 putp.3 \
-		curs_terminfo.3 restartterm.3 \
-		curs_terminfo.3 set_curterm.3 \
-		curs_terminfo.3 setterm.3 \
-		curs_terminfo.3 setupterm.3 \
-		curs_terminfo.3 tigetflag.3 \
-		curs_terminfo.3 tigetnum.3 \
-		curs_terminfo.3 tigetstr.3 \
-		curs_terminfo.3 tparm.3 \
-		curs_terminfo.3 tputs.3 \
-		curs_terminfo.3 vid_attr.3 \
-		curs_terminfo.3 vid_puts.3 \
-		curs_terminfo.3 vidattr.3 \
-		curs_terminfo.3 vidputs.3 \
-		curs_touch.3 is_linetouched.3 \
-		curs_touch.3 is_wintouched.3 \
-		curs_touch.3 touchline.3 \
-		curs_touch.3 touchwin.3 \
-		curs_touch.3 untouchwin.3 \
-		curs_touch.3 wtouchln.3 \
-		curs_util.3 delay_output.3 \
-		curs_util.3 filter.3 \
-		curs_util.3 flushinp.3 \
-		curs_util.3 getwin.3 \
-		curs_util.3 key_name.3 \
-		curs_util.3 keyname.3 \
-		curs_util.3 nofilter.3 \
-		curs_util.3 putwin.3 \
-		curs_util.3 unctrl.3 \
-		curs_util.3 use_env.3 \
-		curs_util.3 wunctrl.3 \
-		curs_window.3 delwin.3 \
-		curs_window.3 derwin.3 \
-		curs_window.3 dupwin.3 \
-		curs_window.3 mvderwin.3 \
-		curs_window.3 mvwin.3 \
-		curs_window.3 newwin.3 \
-		curs_window.3 subwin.3 \
-		curs_window.3 syncok.3 \
-		curs_window.3 wcursyncup.3 \
-		curs_window.3 wsyncdown.3 \
-		curs_window.3 wsyncup.3 \
-		default_colors.3 assume_default_colors.3 \
-		default_colors.3 use_default_colors.3 \
-		key_defined.3 define_key.3 \
-		legacy_coding.3 use_legacy_coding.3 \
-		resizeterm.3 is_term_resized.3 \
-		resizeterm.3 resize_term.3
+.PATH: ${NCURSES_DIR}/man
+MAN=	\
+	curs_addch.3 \
+	curs_addchstr.3 \
+	curs_addstr.3 \
+	curs_attr.3 \
+	curs_beep.3 \
+	curs_bkgd.3 \
+	curs_bkgrnd.3 \
+	curs_border.3 \
+	curs_border_set.3 \
+	curs_clear.3 \
+	curs_color.3 \
+	curs_delch.3 \
+	curs_deleteln.3 \
+	curs_extend.3 \
+	curs_getcchar.3 \
+	curs_getch.3 \
+	curs_getstr.3 \
+	curs_getyx.3 \
+	curs_inch.3 \
+	curs_inchstr.3 \
+	curs_initscr.3 \
+	curs_inopts.3 \
+	curs_insch.3 \
+	curs_insstr.3 \
+	curs_instr.3 \
+	curs_inwstr.3 \
+	curs_kernel.3 \
+	curs_mouse.3 \
+	curs_move.3 \
+	curs_outopts.3 \
+	curs_overlay.3 \
+	curs_pad.3 \
+	curs_print.3 \
+	curs_refresh.3 \
+	curs_scr_dump.3 \
+	curs_scroll.3 \
+	curs_slk.3 \
+	curs_termattrs.3 \
+	curs_termcap.3 \
+	curs_terminfo.3 \
+	curs_touch.3 \
+	curs_trace.3 \
+	curs_util.3 \
+	curs_window.3 \
+	default_colors.3 \
+	define_key.3 \
+	key_defined.3 \
+	keybound.3 \
+	keyok.3 \
+	legacy_coding.3 \
+	ncurses.3 \
+	resizeterm.3 \
+	wresize.3
+
+CLEANFILES+=	${MAN:M*.3}
+
+MAN+=	term.5 terminfo.5
+MAN+=	term.7
+
+
+MLINKS=	ncurses.3 curses.3 \
+	curs_addch.3 addch.3 \
+	curs_addch.3 echochar.3 \
+	curs_addch.3 mvaddch.3 \
+	curs_addch.3 mvwaddch.3 \
+	curs_addch.3 waddch.3 \
+	curs_addch.3 wechochar.3 \
+	curs_addchstr.3 addchnstr.3 \
+	curs_addchstr.3 addchstr.3 \
+	curs_addchstr.3 mvaddchnstr.3 \
+	curs_addchstr.3 mvaddchstr.3 \
+	curs_addchstr.3 mvwaddchnstr.3 \
+	curs_addchstr.3 mvwaddchstr.3 \
+	curs_addchstr.3 waddchnstr.3 \
+	curs_addchstr.3 waddchstr.3 \
+	curs_addstr.3 addnstr.3 \
+	curs_addstr.3 addstr.3 \
+	curs_addstr.3 mvaddnstr.3\
+	curs_addstr.3 mvaddstr.3 \
+	curs_addstr.3 mvwaddnstr.3 \
+	curs_addstr.3 mvwaddstr.3 \
+	curs_addstr.3 waddnstr.3 \
+	curs_addstr.3 waddstr.3 \
+	curs_attr.3 PAIR_NUMBER.3 \
+	curs_attr.3 attr_get.3 \
+	curs_attr.3 attr_off.3 \
+	curs_attr.3 attr_on.3 \
+	curs_attr.3 attr_set.3 \
+	curs_attr.3 attroff.3 \
+	curs_attr.3 attron.3 \
+	curs_attr.3 attrset.3 \
+	curs_attr.3 chgat.3 \
+	curs_attr.3 color_set.3 \
+	curs_attr.3 mvchgat.3 \
+	curs_attr.3 mvwchgat.3 \
+	curs_attr.3 standend.3 \
+	curs_attr.3 standout.3 \
+	curs_attr.3 wattr_get.3 \
+	curs_attr.3 wattr_off.3 \
+	curs_attr.3 wattr_on.3 \
+	curs_attr.3 wattr_set.3 \
+	curs_attr.3 wattroff.3 \
+	curs_attr.3 wattron.3 \
+	curs_attr.3 wattrset.3 \
+	curs_attr.3 wchgat.3 \
+	curs_attr.3 wcolor_set.3 \
+	curs_attr.3 wstandend.3 \
+	curs_attr.3 wstandout.3 \
+	curs_beep.3 beep.3 \
+	curs_beep.3 flash.3 \
+	curs_bkgd.3 bkgd.3 \
+	curs_bkgd.3 bkgdset.3 \
+	curs_bkgd.3 getbkgd.3 \
+	curs_bkgd.3 wbkgd.3 \
+	curs_bkgd.3 wbkgdset.3 \
+	curs_border.3 border.3 \
+	curs_border.3 box.3 \
+	curs_border.3 hline.3 \
+	curs_border.3 mvhline.3 \
+	curs_border.3 mvvline.3 \
+	curs_border.3 mvwhline.3 \
+	curs_border.3 mvwvline.3 \
+	curs_border.3 vline.3 \
+	curs_border.3 wborder.3 \
+	curs_border.3 whline.3 \
+	curs_border.3 wvline.3 \
+	curs_border_set.3 border_set.3 \
+	curs_border_set.3 box_set.3 \
+	curs_border_set.3 hline_set.3 \
+	curs_border_set.3 mvhline_set.3 \
+	curs_border_set.3 mvvline_set.3 \
+	curs_border_set.3 mvwhline_set.3 \
+	curs_border_set.3 mvwvline_set.3 \
+	curs_border_set.3 vline_set.3 \
+	curs_border_set.3 wborder_set.3 \
+	curs_border_set.3 whline_set.3 \
+	curs_border_set.3 wvline_set.3 \
+	curs_clear.3 clear.3 \
+	curs_clear.3 clrtobot.3 \
+	curs_clear.3 clrtoeol.3 \
+	curs_clear.3 erase.3 \
+	curs_clear.3 wclear.3 \
+	curs_clear.3 wclrtobot.3 \
+	curs_clear.3 wclrtoeol.3 \
+	curs_clear.3 werase.3 \
+	curs_color.3 COLOR_PAIR.3 \
+	curs_color.3 can_change_color.3 \
+	curs_color.3 color_content.3 \
+	curs_color.3 has_colors.3 \
+	curs_color.3 init_color.3 \
+	curs_color.3 init_pair.3 \
+	curs_color.3 pair_content.3 \
+	curs_color.3 start_color.3 \
+	curs_delch.3 delch.3 \
+	curs_delch.3 mvdelch.3 \
+	curs_delch.3 mvwdelch.3 \
+	curs_delch.3 wdelch.3 \
+	curs_deleteln.3 deleteln.3 \
+	curs_deleteln.3 insdelln.3 \
+	curs_deleteln.3 insertln.3 \
+	curs_deleteln.3 wdeleteln.3 \
+	curs_deleteln.3 winsdelln.3 \
+	curs_deleteln.3 winsertln.3 \
+	curs_extend.3 curses_version.3 \
+	curs_extend.3 use_extended_names.3 \
+	curs_getcchar.3 getcchar.3 \
+	curs_getcchar.3 setcchar.3 \
+	curs_getch.3 getch.3 \
+	curs_getch.3 has_key.3 \
+	curs_getch.3 mvgetch.3 \
+	curs_getch.3 mvwgetch.3 \
+	curs_getch.3 ungetch.3 \
+	curs_getch.3 wgetch.3 \
+	curs_getstr.3 getnstr.3 \
+	curs_getstr.3 getstr.3 \
+	curs_getstr.3 mvgetnstr.3 \
+	curs_getstr.3 mvgetstr.3 \
+	curs_getstr.3 mvwgetnstr.3 \
+	curs_getstr.3 mvwgetstr.3 \
+	curs_getstr.3 wgetnstr.3 \
+	curs_getstr.3 wgetstr.3 \
+	curs_getyx.3 getbegyx.3 \
+	curs_getyx.3 getmaxyx.3 \
+	curs_getyx.3 getparyx.3 \
+	curs_getyx.3 getyx.3 \
+	curs_inch.3 inch.3 \
+	curs_inch.3 mvinch.3 \
+	curs_inch.3 mvwinch.3 \
+	curs_inch.3 winch.3 \
+	curs_inchstr.3 inchnstr.3 \
+	curs_inchstr.3 inchstr.3 \
+	curs_inchstr.3 mvinchnstr.3 \
+	curs_inchstr.3 mvinchstr.3 \
+	curs_inchstr.3 mvwinchnstr.3 \
+	curs_inchstr.3 mvwinchstr.3 \
+	curs_inchstr.3 winchnstr.3 \
+	curs_inchstr.3 winchstr.3 \
+	curs_initscr.3 delscreen.3 \
+	curs_initscr.3 endwin.3 \
+	curs_initscr.3 initscr.3 \
+	curs_initscr.3 isendwin.3 \
+	curs_initscr.3 newterm.3 \
+	curs_initscr.3 set_term.3 \
+	curs_inopts.3 cbreak.3 \
+	curs_inopts.3 echo.3 \
+	curs_inopts.3 halfdelay.3 \
+	curs_inopts.3 intrflush.3 \
+	curs_inopts.3 keypad.3 \
+	curs_inopts.3 meta.3 \
+	curs_inopts.3 nocbreak.3 \
+	curs_inopts.3 nodelay.3 \
+	curs_inopts.3 noecho.3 \
+	curs_inopts.3 noqiflush.3 \
+	curs_inopts.3 noraw.3 \
+	curs_inopts.3 notimeout.3 \
+	curs_inopts.3 qiflush.3 \
+	curs_inopts.3 raw.3 \
+	curs_inopts.3 timeout.3 \
+	curs_inopts.3 typeahead.3 \
+	curs_inopts.3 wtimeout.3 \
+	curs_insch.3 insch.3 \
+	curs_insch.3 mvinsch.3 \
+	curs_insch.3 mvwinsch.3 \
+	curs_insch.3 winsch.3 \
+	curs_insstr.3 insnstr.3 \
+	curs_insstr.3 insstr.3 \
+	curs_insstr.3 mvinsnstr.3 \
+	curs_insstr.3 mvinsstr.3 \
+	curs_insstr.3 mvwinsnstr.3 \
+	curs_insstr.3 mvwinsstr.3 \
+	curs_insstr.3 winsnstr.3 \
+	curs_insstr.3 winsstr.3 \
+	curs_instr.3 innstr.3 \
+	curs_instr.3 instr.3 \
+	curs_instr.3 mvinnstr.3 \
+	curs_instr.3 mvinstr.3 \
+	curs_instr.3 mvwinnstr.3 \
+	curs_instr.3 mvwinstr.3 \
+	curs_instr.3 winnstr.3 \
+	curs_instr.3 winstr.3 \
+	curs_kernel.3 curs_set.3 \
+	curs_kernel.3 def_prog_mode.3 \
+	curs_kernel.3 def_shell_mode.3 \
+	curs_kernel.3 getsyx.3 \
+	curs_kernel.3 napms.3 \
+	curs_kernel.3 reset_prog_mode.3 \
+	curs_kernel.3 reset_shell_mode.3 \
+	curs_kernel.3 resetty.3 \
+	curs_kernel.3 ripoffline.3 \
+	curs_kernel.3 savetty.3 \
+	curs_kernel.3 setsyx.3 \
+	curs_mouse.3 getmouse.3 \
+	curs_mouse.3 mouse_trafo.3 \
+	curs_mouse.3 mouseinterval.3 \
+	curs_mouse.3 mousemask.3 \
+	curs_mouse.3 ungetmouse.3 \
+	curs_mouse.3 wenclose.3 \
+	curs_mouse.3 wmouse_trafo.3 \
+	curs_move.3 move.3 \
+	curs_move.3 wmove.3 \
+	curs_outopts.3 clearok.3 \
+	curs_outopts.3 idcok.3 \
+	curs_outopts.3 idlok.3 \
+	curs_outopts.3 immedok.3 \
+	curs_outopts.3 leaveok.3 \
+	curs_outopts.3 nl.3 \
+	curs_outopts.3 nonl.3 \
+	curs_outopts.3 scrollok.3 \
+	curs_outopts.3 setscrreg.3 \
+	curs_outopts.3 wsetscrreg.3 \
+	curs_overlay.3 copywin.3 \
+	curs_overlay.3 overlay.3 \
+	curs_overlay.3 overwrite.3 \
+	curs_pad.3 newpad.3 \
+	curs_pad.3 pecho_wchar.3 \
+	curs_pad.3 pechochar.3 \
+	curs_pad.3 pnoutrefresh.3 \
+	curs_pad.3 prefresh.3 \
+	curs_pad.3 subpad.3 \
+	curs_print.3 mcprint.3 \
+	curs_refresh.3 doupdate.3 \
+	curs_refresh.3 redrawwin.3 \
+	curs_refresh.3 refresh.3 \
+	curs_refresh.3 wnoutrefresh.3 \
+	curs_refresh.3 wredrawln.3 \
+	curs_refresh.3 wrefresh.3 \
+	curs_scr_dump.3 scr_dump.3 \
+	curs_scr_dump.3 scr_init.3 \
+	curs_scr_dump.3 scr_restore.3 \
+	curs_scr_dump.3 scr_set.3 \
+	curs_scroll.3 scrl.3 \
+	curs_scroll.3 scroll.3 \
+	curs_scroll.3 wscrl.3 \
+	curs_slk.3 slk_attr.3 \
+	curs_slk.3 slk_attr_off.3 \
+	curs_slk.3 slk_attr_on.3 \
+	curs_slk.3 slk_attr_set.3 \
+	curs_slk.3 slk_attroff.3 \
+	curs_slk.3 slk_attron.3 \
+	curs_slk.3 slk_attrset.3 \
+	curs_slk.3 slk_clear.3 \
+	curs_slk.3 slk_color.3 \
+	curs_slk.3 slk_init.3 \
+	curs_slk.3 slk_label.3 \
+	curs_slk.3 slk_noutrefresh.3 \
+	curs_slk.3 slk_refresh.3 \
+	curs_slk.3 slk_restore.3 \
+	curs_slk.3 slk_set.3 \
+	curs_slk.3 slk_touch.3 \
+	curs_termattrs.3 baudrate.3 \
+	curs_termattrs.3 erasechar.3 \
+	curs_termattrs.3 erasewchar.3 \
+	curs_termattrs.3 has_ic.3 \
+	curs_termattrs.3 has_il.3 \
+	curs_termattrs.3 killchar.3 \
+	curs_termattrs.3 killwchar.3 \
+	curs_termattrs.3 longname.3 \
+	curs_termattrs.3 term_attrs.3 \
+	curs_termattrs.3 termattrs.3 \
+	curs_termattrs.3 termname.3 \
+	curs_termcap.3 termcap.3 \
+	curs_termcap.3 tgetent.3 \
+	curs_termcap.3 tgetflag.3 \
+	curs_termcap.3 tgetnum.3 \
+	curs_termcap.3 tgetstr.3 \
+	curs_termcap.3 tgoto.3 \
+	curs_termcap.3 tputs.3 \
+	curs_terminfo.3 del_curterm.3 \
+	curs_terminfo.3 mvcur.3 \
+	curs_terminfo.3 putp.3 \
+	curs_terminfo.3 restartterm.3 \
+	curs_terminfo.3 set_curterm.3 \
+	curs_terminfo.3 setterm.3 \
+	curs_terminfo.3 setupterm.3 \
+	curs_terminfo.3 tigetflag.3 \
+	curs_terminfo.3 tigetnum.3 \
+	curs_terminfo.3 tigetstr.3 \
+	curs_terminfo.3 tparm.3 \
+	curs_terminfo.3 tputs.3 \
+	curs_terminfo.3 vid_attr.3 \
+	curs_terminfo.3 vid_puts.3 \
+	curs_terminfo.3 vidattr.3 \
+	curs_terminfo.3 vidputs.3 \
+	curs_touch.3 is_linetouched.3 \
+	curs_touch.3 is_wintouched.3 \
+	curs_touch.3 touchline.3 \
+	curs_touch.3 touchwin.3 \
+	curs_touch.3 untouchwin.3 \
+	curs_touch.3 wtouchln.3 \
+	curs_util.3 delay_output.3 \
+	curs_util.3 filter.3 \
+	curs_util.3 flushinp.3 \
+	curs_util.3 getwin.3 \
+	curs_util.3 key_name.3 \
+	curs_util.3 keyname.3 \
+	curs_util.3 nofilter.3 \
+	curs_util.3 putwin.3 \
+	curs_util.3 unctrl.3 \
+	curs_util.3 use_env.3 \
+	curs_util.3 wunctrl.3 \
+	curs_window.3 delwin.3 \
+	curs_window.3 derwin.3 \
+	curs_window.3 dupwin.3 \
+	curs_window.3 mvderwin.3 \
+	curs_window.3 mvwin.3 \
+	curs_window.3 newwin.3 \
+	curs_window.3 subwin.3 \
+	curs_window.3 syncok.3 \
+	curs_window.3 wcursyncup.3 \
+	curs_window.3 wsyncdown.3 \
+	curs_window.3 wsyncup.3 \
+	default_colors.3 assume_default_colors.3 \
+	default_colors.3 use_default_colors.3 \
+	key_defined.3 define_key.3 \
+	legacy_coding.3 use_legacy_coding.3 \
+	resizeterm.3 is_term_resized.3 \
+	resizeterm.3 resize_term.3
 
 .include <bsd.lib.mk>
+
+# Keep the .SUFFIXES line after the include of bsd.lib.mk
+.SUFFIXES: .3 .3x
+.3x.3:
+	cat ${.IMPSRC} > ${.TARGET}
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 977215a..c47ad62 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -1,66 +1,65 @@
-# Makefile for libpanel
 # $FreeBSD$
 
-.include	"${.CURDIR}/../config.mk"
+.include "${.CURDIR}/../config.mk"
 
-SRCDIR=		${NCURSES_DIR}/panel
+SRCDIR=	${NCURSES_DIR}/panel
 
-LIB=		panel
-DPADD=		${LIBNCURSES}
-LDADD=		-lncurses
+LIB=	panel
 
-.PATH:		${SRCDIR}
-SRCS=		\
-		ncurses_def.h \
-		p_above.c \
-		p_below.c \
-		p_bottom.c \
-		p_delete.c \
-		p_hidden.c \
-		p_hide.c \
-		p_move.c \
-		p_new.c \
-		p_replace.c \
-		p_show.c \
-		p_top.c \
-		p_update.c \
-		p_user.c \
-		p_win.c \
-		panel.c
+.PATH: ${SRCDIR}
+SRCS=	\
+	ncurses_def.h \
+	p_above.c \
+	p_below.c \
+	p_bottom.c \
+	p_delete.c \
+	p_hidden.c \
+	p_hide.c \
+	p_move.c \
+	p_new.c \
+	p_replace.c \
+	p_show.c \
+	p_top.c \
+	p_update.c \
+	p_user.c \
+	p_win.c \
+	panel.c
+
+CLEANFILES=	ncurses_def.h
 
 CFLAGS+=	-I${SRCDIR}
 
-INCS=		${SRCDIR}/panel.h
+DPADD=	${LIBNCURSES}
+LDADD=	-lncurses
 
-CLEANFILES+=	ncurses_def.h
+INCS=	panel.h
 
 # generate MAN
-.PATH:		${NCURSES_DIR}/man
-MANx=		\
-		panel.3x
+.PATH: ${NCURSES_DIR}/man
+MAN=	\
+	panel.3
 
-# 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}
-	cat ${.ALLSRC} > ${.TARGET}
-.endfor
+CLEANFILES+=	${MAN:M*.3}
 
-MLINKS=		panel.3 bottom_panel.3 \
-		panel.3 del_panel.3 \
-		panel.3 hide_panel.3 \
-		panel.3 move_panel.3 \
-		panel.3 new_panel.3 \
-		panel.3 panel_above.3 \
-		panel.3 panel_below.3 \
-		panel.3 panel_hidden.3 \
-		panel.3 panel_userptr.3 \
-		panel.3 panel_window.3 \
-		panel.3 replace_panel.3 \
-		panel.3 set_panel_userptr.3 \
-		panel.3 show_panel.3 \
-		panel.3 top_panel.3 \
-		panel.3 update_panels.3
+MLINKS=	panel.3 bottom_panel.3 \
+	panel.3 del_panel.3 \
+	panel.3 hide_panel.3 \
+	panel.3 move_panel.3 \
+	panel.3 new_panel.3 \
+	panel.3 panel_above.3 \
+	panel.3 panel_below.3 \
+	panel.3 panel_hidden.3 \
+	panel.3 panel_userptr.3 \
+	panel.3 panel_window.3 \
+	panel.3 replace_panel.3 \
+	panel.3 set_panel_userptr.3 \
+	panel.3 show_panel.3 \
+	panel.3 top_panel.3 \
+	panel.3 update_panels.3
 	
 .include <bsd.lib.mk>
+
+# Keep the .SUFFIXES line after the include of bsd.lib.mk
+.SUFFIXES: .3 .3x
+.3x.3:
+	cat ${.IMPSRC} > ${.TARGET}