Index: head/lib/libform/Makefile
===================================================================
--- head/lib/libform/Makefile	(revision 60860)
+++ head/lib/libform/Makefile	(revision 60861)
@@ -1,20 +1,23 @@
 # Makefile for libform
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/form
 .PATH:	${NCURSES}/menu
 
 LIB=    form
 
-SRCS=	fty_regex.c fty_num.c fty_int.c fty_ipv4.c fty_enum.c fty_alpha.c \
-	fty_alnum.c \
-	frm_data.c frm_win.c frm_user.c frm_opts.c frm_hook.c frm_req_name.c \
-	fld_user.c fld_type.c fld_stat.c fld_def.c frm_def.c frm_driver.c
+SRCS=	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
 INCS=	${NCURSES}/form/form.h
 
 CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
 	-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/lib/libmenu/Makefile
===================================================================
--- head/lib/libmenu/Makefile	(revision 60860)
+++ head/lib/libmenu/Makefile	(revision 60861)
@@ -1,19 +1,20 @@
 # Makefile for libmenu
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/menu
 
 LIB=    menu
 
 SRCS=	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_use.c \
-	m_item_val.c m_item_vis.c m_items.c m_new.c m_opts.c m_post.c \
-	m_req_name.c m_spacing.c m_userptr.c m_win.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
 INCS=	${NCURSES}/menu/menu.h ${NCURSES}/menu/eti.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/menu -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/lib/libpanel/Makefile
===================================================================
--- head/lib/libpanel/Makefile	(revision 60860)
+++ head/lib/libpanel/Makefile	(revision 60861)
@@ -1,16 +1,18 @@
 # Makefile for libpanel
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/panel
 
 LIB=    panel
 
-SRCS=	panel.c
+SRCS=	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
 INCS=	${NCURSES}/panel/panel.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/panel -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/lib/ncurses/form/Makefile
===================================================================
--- head/lib/ncurses/form/Makefile	(revision 60860)
+++ head/lib/ncurses/form/Makefile	(revision 60861)
@@ -1,20 +1,23 @@
 # Makefile for libform
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/form
 .PATH:	${NCURSES}/menu
 
 LIB=    form
 
-SRCS=	fty_regex.c fty_num.c fty_int.c fty_ipv4.c fty_enum.c fty_alpha.c \
-	fty_alnum.c \
-	frm_data.c frm_win.c frm_user.c frm_opts.c frm_hook.c frm_req_name.c \
-	fld_user.c fld_type.c fld_stat.c fld_def.c frm_def.c frm_driver.c
+SRCS=	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
 INCS=	${NCURSES}/form/form.h
 
 CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
 	-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/lib/ncurses/menu/Makefile
===================================================================
--- head/lib/ncurses/menu/Makefile	(revision 60860)
+++ head/lib/ncurses/menu/Makefile	(revision 60861)
@@ -1,19 +1,20 @@
 # Makefile for libmenu
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/menu
 
 LIB=    menu
 
 SRCS=	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_use.c \
-	m_item_val.c m_item_vis.c m_items.c m_new.c m_opts.c m_post.c \
-	m_req_name.c m_spacing.c m_userptr.c m_win.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
 INCS=	${NCURSES}/menu/menu.h ${NCURSES}/menu/eti.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/menu -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/lib/ncurses/panel/Makefile
===================================================================
--- head/lib/ncurses/panel/Makefile	(revision 60860)
+++ head/lib/ncurses/panel/Makefile	(revision 60861)
@@ -1,16 +1,18 @@
 # Makefile for libpanel
 # $FreeBSD$
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 .PATH:	${NCURSES}/panel
 
 LIB=    panel
 
-SRCS=	panel.c
+SRCS=	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
 INCS=	${NCURSES}/panel/panel.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/panel -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>