Index: lib/ncurses/Makefile
===================================================================
--- lib/ncurses/Makefile
+++ lib/ncurses/Makefile
@@ -1,13 +1,11 @@
 # $FreeBSD$
 
-SUBDIR=	ncurses form menu panel \
-	ncursesw formw menuw panelw
+SUBDIR=	ncurses form menu panel
 
 SUBDIR_PARALLEL=
 
-.for subdir in ${SUBDIR:Nncurses*:N*w}
+.for subdir in ${SUBDIR}
 SUBDIR_DEPEND_${subdir}=	ncurses
-SUBDIR_DEPEND_${subdir}w=	ncursesw
 .endfor
 
 .include <bsd.subdir.mk>
Index: lib/ncurses/form/Makefile
===================================================================
--- lib/ncurses/form/Makefile
+++ lib/ncurses/form/Makefile
@@ -4,7 +4,11 @@
 
 SRCDIR=	${NCURSES_DIR}/form
 
-LIB=	form${LIB_SUFFIX}
+LIB=	form
+SYMLINKS+=	libform.so ${LIBDIR}/libformw.so \
+		libform.a ${LIBDIR}/libformw.a \
+		libform_p.a ${LIBDIR}/libformw_p.a \
+		libform.so.${SHLIB_MAJOR} ${LIBDIR}/libformw.${SHLIB_MAJOR}
 
 .PATH: ${SRCDIR}
 SRCS=	\
@@ -54,9 +58,8 @@
 CFLAGS+=	-I${SRCDIR}
 CFLAGS+=	-I${NCURSES_DIR}/menu
 
-LIBADD+=	ncurses${LIB_SUFFIX}
+LIBADD+=	ncurses
 
-.if defined(ENABLE_WIDEC)
 INCS=	form.h
 
 .PATH: ${NCURSES_DIR}/man
@@ -156,9 +159,6 @@
 	form_win.3 scale_form.3 \
 	form_win.3 set_form_sub.3 \
 	form_win.3 set_form_win.3
-.else
-MAN=
-.endif
 
 .include <bsd.lib.mk>
 
Index: lib/ncurses/formw/Makefile
===================================================================
--- lib/ncurses/formw/Makefile
+++ lib/ncurses/formw/Makefile
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-ENABLE_WIDEC=
-
-.include "${.CURDIR:H}/form/Makefile"
Index: lib/ncurses/formw/Makefile.depend
===================================================================
--- lib/ncurses/formw/Makefile.depend
+++ lib/ncurses/formw/Makefile.depend
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/ncurses/ncursesw \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: lib/ncurses/menu/Makefile
===================================================================
--- lib/ncurses/menu/Makefile
+++ lib/ncurses/menu/Makefile
@@ -4,7 +4,11 @@
 
 SRCDIR=	${NCURSES_DIR}/menu
 
-LIB=	menu${LIB_SUFFIX}
+LIB=	menu
+SYMLINKS+=	libmenu.so ${LIBDIR}/libmenuw.so \
+		libmenu.a ${LIBDIR}/libmenuw.a \
+		libmenu_p.a ${LIBDIR}/libmenuw_p.a \
+		libmenu.so.${SHLIB_MAJOR} ${LIBDIR}/libmenuw.${SHLIB_MAJOR}
 
 .PATH: ${SRCDIR}
 SRCS=	\
@@ -40,9 +44,8 @@
 
 CFLAGS+=	-I${SRCDIR}
 
-LIBADD+=	ncurses${LIB_SUFFIX}
+LIBADD+=	ncurses
 
-.if defined(ENABLE_WIDEC)
 INCS=	menu.h eti.h
 
 .PATH: ${NCURSES_DIR}/man
@@ -128,9 +131,6 @@
 	mitem_value.3 item_value.3 \
 	mitem_value.3 set_item_value.3 \
 	mitem_visible.3 item_visible.3
-.else
-MAN=
-.endif
 
 .include <bsd.lib.mk>
 
Index: lib/ncurses/menuw/Makefile
===================================================================
--- lib/ncurses/menuw/Makefile
+++ lib/ncurses/menuw/Makefile
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-ENABLE_WIDEC=
-
-.include "${.CURDIR:H}/menu/Makefile"
Index: lib/ncurses/menuw/Makefile.depend
===================================================================
--- lib/ncurses/menuw/Makefile.depend
+++ lib/ncurses/menuw/Makefile.depend
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/ncurses/ncursesw \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: lib/ncurses/ncurses/Makefile
===================================================================
--- lib/ncurses/ncurses/Makefile
+++ lib/ncurses/ncurses/Makefile
@@ -3,16 +3,11 @@
 PACKAGE=	clibs
 SHLIBDIR?=	/lib
 
-.if !defined(ENABLE_WIDEC)
-# Override any MAN= setting below..
-MK_MAN=no
-.endif
-
 .include <src.opts.mk>
 
 .include "${.CURDIR:H}/config.mk"
 
-LIB=		ncurses${LIB_SUFFIX}
+LIB=		ncurses
 SHLIB_MAJOR=	8
 
 NO_LINT=
@@ -21,16 +16,9 @@
 NCURSES_MINOR!=	egrep 'NCURSES_MINOR[ 	]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%'
 NCURSES_PATCH!=	egrep 'NCURSES_PATCH[ 	]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%'
 
-# From autoconf (!)
-.if defined(ENABLE_WIDEC)
 NCURSES_CH_T=		cchar_t
 NCURSES_OK_WCHAR_T=	1
 NEED_WCHAR_H=		1
-.else
-NCURSES_CH_T=		chtype
-NCURSES_OK_WCHAR_T=
-NEED_WCHAR_H=		0
-.endif
 NCURSES_CONST=		const
 NCURSES_EXT_COLORS=	0
 NCURSES_EXT_FUNCS=	1
@@ -229,7 +217,6 @@
 	lib_vidattr.c \
 	tty_update.c
 
-.if defined(ENABLE_WIDEC)
 .PATH: ${NCURSES_DIR}/ncurses/widechar
 SRCS+=	\
 	charable.c \
@@ -252,7 +239,6 @@
 	lib_vline_set.c \
 	lib_wacs.c \
 	lib_wunctrl.c
-.endif
 
 .PATH: ${NCURSES_DIR}/ncurses/trace
 SRCS+=	\
@@ -285,42 +271,52 @@
 SRCHDRS=	ncurses_dll.h
 CLEANFILES+=	ncurses_dll.h
 
-.if defined(ENABLE_WIDEC)
 INCS=		${HEADERS} ${SRCHDRS}
 INCSLINKS=	curses.h ${INCLUDEDIR}/ncurses.h
-.endif
 
 .if ${MK_INSTALLLIB} != "no"
-SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtinfo${LIB_SUFFIX}.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libcurses.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libcursesw.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtermcap.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtermcapw.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtermlib.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtermlibw.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtinfo.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libtinfow.a
+SYMLINKS+=	libncurses.a ${LIBDIR}/libncursesw.so.a
 .endif
 .if !defined(NO_PIC)
 # no need for major at all, it's an ld-time redirection only
-SYMLINKS+=	libncurses${LIB_SUFFIX}.so ${LIBDIR}/libcurses${LIB_SUFFIX}.so
-SYMLINKS+=	libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermcap${LIB_SUFFIX}.so
-SYMLINKS+=	libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermlib${LIB_SUFFIX}.so
-SYMLINKS+=	libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtinfo${LIB_SUFFIX}.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libcurses.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libcursesw.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtermcap.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtermcapw.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtermlib.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtermlibw.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtinfo.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libtinfow.so
+SYMLINKS+=	libncurses.so ${LIBDIR}/libncursesw.so
+SYMLINKS+=	libncurses.so.${SHLIB_MAJOR} ${LIBDIR}/libncursesw.so.${SHLIB_MAJOR}
 .endif
 .if ${MK_PROFILE} != "no"
-SYMLINKS+=	libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libcurses${LIB_SUFFIX}_p.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermcap${LIB_SUFFIX}_p.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermlib${LIB_SUFFIX}_p.a
-SYMLINKS+=	libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libcurses_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libcursesw_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtermcap_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtermcapw_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtermlib_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtermlibw_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtinfo_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libtinfow_p.a
+SYMLINKS+=	libncurses_p.a ${LIBDIR}/libncursesw_p.a
 .endif
 
-.if ${.CURDIR:T} == "ncursesw"
-.if defined(ENABLE_WIDEC)
 DOCSDIR=	${SHAREDIR}/doc/ncurses
 DOCS=		ncurses-intro.html hackguide.html
-.endif
 
 .if ${MK_HTML} != "no"
 .PATH: ${NCURSES_DIR}/doc/html
 FILESGROUPS=	DOCS
 .endif
-.endif
 
 # Generated source
 .ORDER: names.c codes.c
@@ -377,9 +373,7 @@
 	cat curses.head > $@.new
 	AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \
 	    ${NCURSES_DIR}/include/Caps >> $@.new
-.if defined(ENABLE_WIDEC)
 	cat ${NCURSES_DIR}/include/curses.wide >> $@.new
-.endif
 	cat ${NCURSES_DIR}/include/curses.tail >> $@.new
 	mv -f $@.new $@
 
@@ -480,7 +474,6 @@
 
 CLEANFILES+=	terminfo.5
 
-.if defined(ENABLE_WIDEC)
 .PATH: ${NCURSES_DIR}/man
 MAN=	\
 	curs_addch.3 \
@@ -559,7 +552,6 @@
 
 MAN+=	term.5 terminfo.5
 MAN+=	term.7
-.endif
 
 CLEANFILES+=	${MAN:M*.3}
 
@@ -1039,7 +1031,6 @@
 	resizeterm.3 is_term_resized.3 \
 	resizeterm.3 resize_term.3
 
-.if defined(ENABLE_WIDEC)
 MLINKS+=curs_add_wch.3 add_wch.3 \
 	curs_add_wch.3 echo_wchar.3 \
 	curs_add_wch.3 mvadd_wch.3 \
@@ -1119,7 +1110,6 @@
 	curs_scanw.3 vw_scanw.3 \
 	curs_scanw.3 vwscanw.3 \
 	curs_scanw.3 wscanw.3
-.endif
 
 
 .include <bsd.lib.mk>
Index: lib/ncurses/ncurses/ncurses_cfg.h
===================================================================
--- lib/ncurses/ncurses/ncurses_cfg.h
+++ lib/ncurses/ncurses/ncurses_cfg.h
@@ -188,7 +188,6 @@
  * Begin FreeBSD-specific changes
  */
 /* Support ENABLE_WIDEC */
-#ifdef ENABLE_WIDEC
 #define USE_WIDEC_SUPPORT 1
 #define NCURSES_WIDECHAR 1
 #define HAVE_PUTWC 1
@@ -205,7 +204,6 @@
 #define HAVE_MBSTOWCS 1
 #define NEED_WCHAR_H 1
 #define SIZEOF_WCHAR_T 4
-#endif
 /*
  * End FreeBSD-specific changes
  */
Index: lib/ncurses/ncursesw/Makefile
===================================================================
--- lib/ncurses/ncursesw/Makefile
+++ lib/ncurses/ncursesw/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-ENABLE_WIDEC=
-
-.PATH: ${.CURDIR:H}/ncurses
-
-.include "${.CURDIR:H}/ncurses/Makefile"
Index: lib/ncurses/ncursesw/Makefile.depend
===================================================================
--- lib/ncurses/ncursesw/Makefile.depend
+++ lib/ncurses/ncursesw/Makefile.depend
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: lib/ncurses/panel/Makefile
===================================================================
--- lib/ncurses/panel/Makefile
+++ lib/ncurses/panel/Makefile
@@ -4,7 +4,11 @@
 
 SRCDIR=	${NCURSES_DIR}/panel
 
-LIB=	panel${LIB_SUFFIX}
+LIB=	panel
+SYMLINKS+=	libpanel.so ${LIBDIR}/libpanelw.so \
+		libpanel.a ${LIBDIR}/libpanelw.a \
+		libpanel_p.a ${LIBDIR}/libpanelw_p.a \
+		libpanel.so.${SHLIB_MAJOR} ${LIBDIR}/libpanelw.${SHLIB_MAJOR}
 
 .PATH: ${SRCDIR}
 SRCS=	\
@@ -29,9 +33,8 @@
 
 CFLAGS+=	-I${SRCDIR}
 
-LIBADD+=	ncurses${LIB_SUFFIX}
+LIBADD+=	ncurses
 
-.if defined(ENABLE_WIDEC)
 INCS=	panel.h
 
 # generate MAN
@@ -56,9 +59,6 @@
 	panel.3 show_panel.3 \
 	panel.3 top_panel.3 \
 	panel.3 update_panels.3
-.else
-MAN=
-.endif
 	
 .include <bsd.lib.mk>
 
Index: lib/ncurses/panelw/Makefile
===================================================================
--- lib/ncurses/panelw/Makefile
+++ lib/ncurses/panelw/Makefile
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-ENABLE_WIDEC=
-
-.include "${.CURDIR:H}/panel/Makefile"
Index: lib/ncurses/panelw/Makefile.depend
===================================================================
--- lib/ncurses/panelw/Makefile.depend
+++ lib/ncurses/panelw/Makefile.depend
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/ncurses/ncursesw \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif