4 files changed, 390 insertions, 124 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index f217fd96ff25..89d0b2db148e 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -7,33 +7,48 @@
 
 PORTNAME=		ncurses
 PORTVERSION=		5.5
+PORTREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		garga@FreeBSD.org
+MAINTAINER=		rafan@infor.org
 COMMENT=		Library for terminal-independent, full-screen output
 
-LIB_DEPENDS=		utf-8:${PORTSDIR}/converters/libutf-8
-
 NO_FILTER_SHLIBS=	no
 
 GNU_CONFIGURE=	yes
+CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
 		--with-profile --with-shared --without-debug \
 		--without-curses-h --with-termlib --program-prefix= \
 		--enable-safe-sprintf --disable-root-environ \
-		--with-manpage-format=gzip  #--enable-widec
+		--with-manpage-format=gzip --srcdir=../
 # needed by devel/py-ncurses port
 .if defined(WITH_TRACE)
 CONFIGURE_ARGS+=	--with-trace
 .endif
 
+LDFLAGS+=	-rpath ${PREFIX}/lib
+
 CONFIGURE_ENV=	gnat_exists="no" \
-		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
+		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib" \
+		LDFLAGS="${LDFLAGS}"
+
+WIDEC_WRKSRC=	${WRKSRC}/build.widec
+NOWIDEC_WRKSRC=	${WRKSRC}/build.nowidec
+WIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/widec
+NOWIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/nowidec
+EXAMPLES_TARGETS=	NOWIDEC
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
+BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
+INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \
+		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,}
 
 INSTALLS_SHLIB=	yes
 MANCOMPRESSED=	yes
@@ -207,17 +222,55 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
 MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 .endif
 
+.if ${OSVERSION} < 503000
+WITHOUT_WIDEC=	yes
+PLIST_SUB+=	WIDEC="@comment "
+.else
+PLIST_SUB+=	WIDEC=""
+EXAMPLES_TARGETS+=	WIDEC
+.endif
+
+post-extract:
+	@${MKDIR} ${WIDEC_WRKSRC}
+	@${MKDIR} ${NOWIDEC_WRKSRC}
+
+post-configure:
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} CONFIGURE_WRKSRC=${WIDEC_WRKSRC} \
+	    CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-widec" \
+	    do-configure
+.endif
+.for d in test c++
+.if !defined(WITHOUT_WIDEC)
+	${CP} ${WRKSRC}/${d}/* ${WIDEC_WRKSRC}/${d}/
+.endif
+	${CP} ${WRKSRC}/${d}/* ${NOWIDEC_WRKSRC}/${d}/
+.endfor
+
+post-build:
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} BUILD_WRKSRC=${WIDEC_WRKSRC} do-build
+.endif
+
 post-install:
-	${MKDIR} ${EXAMPLESDIR}/c++
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} INSTALL_WRKSRC=${WIDEC_WRKSRC} do-install
+.endif
+
 	${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
 		${PREFIX}/share/misc/terminfo
+
+.for i in ${EXAMPLES_TARGETS}
+	${MKDIR} ${${i}_EXAMPLESDIR}/c++
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/test/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${${i}_WRKSRC}/test/${f} ${${i}_EXAMPLESDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/test/tracemunch ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${${i}_WRKSRC}/test/tracemunch ${${i}_EXAMPLESDIR}
 .for f in ${EXAMPLES_CPP}
-	${INSTALL_DATA} ${WRKSRC}/c++/${f} ${EXAMPLESDIR}/c++
+	${INSTALL_DATA} ${${i}_WRKSRC}/c++/${f} ${${i}_EXAMPLESDIR}/c++
 .endfor
+.endfor
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 . for f in ${DOCS}
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index 1ac69a3714e3..76ea0d988b88 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -50,57 +50,134 @@ lib/libtinfo.so
 lib/libtinfo.so.5
 lib/libtinfo.so.%%PORTVERSION%%
 lib/libtinfo_p.a
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/blue.c
-%%EXAMPLESDIR%%/bs.6
-%%EXAMPLESDIR%%/bs.c
-%%EXAMPLESDIR%%/c++/Makefile
-%%EXAMPLESDIR%%/c++/NEWS
-%%EXAMPLESDIR%%/c++/PROBLEMS
-%%EXAMPLESDIR%%/c++/README-first
-%%EXAMPLESDIR%%/c++/cursesapp.cc
-%%EXAMPLESDIR%%/c++/cursesapp.h
-%%EXAMPLESDIR%%/c++/cursesf.cc
-%%EXAMPLESDIR%%/c++/cursesf.h
-%%EXAMPLESDIR%%/c++/cursesm.cc
-%%EXAMPLESDIR%%/c++/cursesm.h
-%%EXAMPLESDIR%%/c++/cursesmain.cc
-%%EXAMPLESDIR%%/c++/cursesp.cc
-%%EXAMPLESDIR%%/c++/cursesp.h
-%%EXAMPLESDIR%%/c++/cursesw.cc
-%%EXAMPLESDIR%%/c++/cursesw.h
-%%EXAMPLESDIR%%/c++/cursslk.cc
-%%EXAMPLESDIR%%/c++/cursslk.h
-%%EXAMPLESDIR%%/c++/demo.cc
-%%EXAMPLESDIR%%/c++/etip.h
-%%EXAMPLESDIR%%/c++/internal.h
-%%EXAMPLESDIR%%/cardfile.c
-%%EXAMPLESDIR%%/cardfile.dat
-%%EXAMPLESDIR%%/ditto.c
-%%EXAMPLESDIR%%/dots.c
-%%EXAMPLESDIR%%/filter.c
-%%EXAMPLESDIR%%/firework.c
-%%EXAMPLESDIR%%/firstlast.c
-%%EXAMPLESDIR%%/gdc.6
-%%EXAMPLESDIR%%/gdc.c
-%%EXAMPLESDIR%%/hanoi.c
-%%EXAMPLESDIR%%/hashtest.c
-%%EXAMPLESDIR%%/knight.c
-%%EXAMPLESDIR%%/lrtest.c
-%%EXAMPLESDIR%%/ncurses.c
-%%EXAMPLESDIR%%/newdemo.c
-%%EXAMPLESDIR%%/railroad.c
-%%EXAMPLESDIR%%/rain.c
-%%EXAMPLESDIR%%/tclock.c
-%%EXAMPLESDIR%%/test.priv.h
-%%EXAMPLESDIR%%/testaddch.c
-%%EXAMPLESDIR%%/testcurs.c
-%%EXAMPLESDIR%%/testscanw.c
-%%EXAMPLESDIR%%/tracemunch
-%%EXAMPLESDIR%%/view.c
-%%EXAMPLESDIR%%/worm.c
-%%EXAMPLESDIR%%/xmas.c
+%%WIDEC%%lib/libformw.a
+%%WIDEC%%lib/libformw.so
+%%WIDEC%%lib/libformw.so.5
+%%WIDEC%%lib/libformw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libformw_p.a
+%%WIDEC%%lib/libmenuw.a
+%%WIDEC%%lib/libmenuw.so
+%%WIDEC%%lib/libmenuw.so.5
+%%WIDEC%%lib/libmenuw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libmenuw_p.a
+%%WIDEC%%lib/libncurses++w.a
+%%WIDEC%%lib/libncursesw.a
+%%WIDEC%%lib/libncursesw.so
+%%WIDEC%%lib/libncursesw.so.5
+%%WIDEC%%lib/libncursesw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libncursesw_p.a
+%%WIDEC%%lib/libpanelw.a
+%%WIDEC%%lib/libpanelw.so
+%%WIDEC%%lib/libpanelw.so.5
+%%WIDEC%%lib/libpanelw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libpanelw_p.a
+%%WIDEC%%lib/libtinfow.a
+%%WIDEC%%lib/libtinfow.so
+%%WIDEC%%lib/libtinfow.so.5
+%%WIDEC%%lib/libtinfow.so.%%PORTVERSION%%
+%%WIDEC%%lib/libtinfow_p.a
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/Makefile
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/README
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/blue.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.6
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/Makefile
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/NEWS
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/PROBLEMS
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/README-first
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/demo.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/etip.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/internal.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.dat
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ditto.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/dots.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/filter.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firework.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firstlast.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.6
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hanoi.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hashtest.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/knight.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/lrtest.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ncurses.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/newdemo.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/railroad.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/rain.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tclock.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/test.priv.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testaddch.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testcurs.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testscanw.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tracemunch
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/view.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/worm.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/xmas.c
+%%NOWIDEC_EXAMPLESDIR%%/Makefile
+%%NOWIDEC_EXAMPLESDIR%%/README
+%%NOWIDEC_EXAMPLESDIR%%/blue.c
+%%NOWIDEC_EXAMPLESDIR%%/bs.6
+%%NOWIDEC_EXAMPLESDIR%%/bs.c
+%%NOWIDEC_EXAMPLESDIR%%/c++/Makefile
+%%NOWIDEC_EXAMPLESDIR%%/c++/NEWS
+%%NOWIDEC_EXAMPLESDIR%%/c++/PROBLEMS
+%%NOWIDEC_EXAMPLESDIR%%/c++/README-first
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/demo.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/etip.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/internal.h
+%%NOWIDEC_EXAMPLESDIR%%/cardfile.c
+%%NOWIDEC_EXAMPLESDIR%%/cardfile.dat
+%%NOWIDEC_EXAMPLESDIR%%/ditto.c
+%%NOWIDEC_EXAMPLESDIR%%/dots.c
+%%NOWIDEC_EXAMPLESDIR%%/filter.c
+%%NOWIDEC_EXAMPLESDIR%%/firework.c
+%%NOWIDEC_EXAMPLESDIR%%/firstlast.c
+%%NOWIDEC_EXAMPLESDIR%%/gdc.6
+%%NOWIDEC_EXAMPLESDIR%%/gdc.c
+%%NOWIDEC_EXAMPLESDIR%%/hanoi.c
+%%NOWIDEC_EXAMPLESDIR%%/hashtest.c
+%%NOWIDEC_EXAMPLESDIR%%/knight.c
+%%NOWIDEC_EXAMPLESDIR%%/lrtest.c
+%%NOWIDEC_EXAMPLESDIR%%/ncurses.c
+%%NOWIDEC_EXAMPLESDIR%%/newdemo.c
+%%NOWIDEC_EXAMPLESDIR%%/railroad.c
+%%NOWIDEC_EXAMPLESDIR%%/rain.c
+%%NOWIDEC_EXAMPLESDIR%%/tclock.c
+%%NOWIDEC_EXAMPLESDIR%%/test.priv.h
+%%NOWIDEC_EXAMPLESDIR%%/testaddch.c
+%%NOWIDEC_EXAMPLESDIR%%/testcurs.c
+%%NOWIDEC_EXAMPLESDIR%%/testscanw.c
+%%NOWIDEC_EXAMPLESDIR%%/tracemunch
+%%NOWIDEC_EXAMPLESDIR%%/view.c
+%%NOWIDEC_EXAMPLESDIR%%/worm.c
+%%NOWIDEC_EXAMPLESDIR%%/xmas.c
 share/misc/tabset/std
 share/misc/tabset/stdcrt
 share/misc/tabset/vt100
@@ -2648,6 +2725,9 @@ share/misc/terminfo/z/ztx11
 @dirrm share/misc/terminfo/1
 @dirrm share/misc/terminfo
 @dirrm share/misc/tabset
-@dirrm %%EXAMPLESDIR%%/c++
+%%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%/c++
+%%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%
+@dirrm %%NOWIDEC_EXAMPLESDIR%%/c++
+@dirrm %%NOWIDEC_EXAMPLESDIR%%
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/ncurses
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index f217fd96ff25..89d0b2db148e 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -7,33 +7,48 @@
 
 PORTNAME=		ncurses
 PORTVERSION=		5.5
+PORTREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		garga@FreeBSD.org
+MAINTAINER=		rafan@infor.org
 COMMENT=		Library for terminal-independent, full-screen output
 
-LIB_DEPENDS=		utf-8:${PORTSDIR}/converters/libutf-8
-
 NO_FILTER_SHLIBS=	no
 
 GNU_CONFIGURE=	yes
+CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
 		--with-profile --with-shared --without-debug \
 		--without-curses-h --with-termlib --program-prefix= \
 		--enable-safe-sprintf --disable-root-environ \
-		--with-manpage-format=gzip  #--enable-widec
+		--with-manpage-format=gzip --srcdir=../
 # needed by devel/py-ncurses port
 .if defined(WITH_TRACE)
 CONFIGURE_ARGS+=	--with-trace
 .endif
 
+LDFLAGS+=	-rpath ${PREFIX}/lib
+
 CONFIGURE_ENV=	gnat_exists="no" \
-		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
+		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib" \
+		LDFLAGS="${LDFLAGS}"
+
+WIDEC_WRKSRC=	${WRKSRC}/build.widec
+NOWIDEC_WRKSRC=	${WRKSRC}/build.nowidec
+WIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/widec
+NOWIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/nowidec
+EXAMPLES_TARGETS=	NOWIDEC
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
+BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
+INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \
+		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,}
 
 INSTALLS_SHLIB=	yes
 MANCOMPRESSED=	yes
@@ -207,17 +222,55 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
 MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 .endif
 
+.if ${OSVERSION} < 503000
+WITHOUT_WIDEC=	yes
+PLIST_SUB+=	WIDEC="@comment "
+.else
+PLIST_SUB+=	WIDEC=""
+EXAMPLES_TARGETS+=	WIDEC
+.endif
+
+post-extract:
+	@${MKDIR} ${WIDEC_WRKSRC}
+	@${MKDIR} ${NOWIDEC_WRKSRC}
+
+post-configure:
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} CONFIGURE_WRKSRC=${WIDEC_WRKSRC} \
+	    CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-widec" \
+	    do-configure
+.endif
+.for d in test c++
+.if !defined(WITHOUT_WIDEC)
+	${CP} ${WRKSRC}/${d}/* ${WIDEC_WRKSRC}/${d}/
+.endif
+	${CP} ${WRKSRC}/${d}/* ${NOWIDEC_WRKSRC}/${d}/
+.endfor
+
+post-build:
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} BUILD_WRKSRC=${WIDEC_WRKSRC} do-build
+.endif
+
 post-install:
-	${MKDIR} ${EXAMPLESDIR}/c++
+.if !defined(WITHOUT_WIDEC)
+	${MAKE} INSTALL_WRKSRC=${WIDEC_WRKSRC} do-install
+.endif
+
 	${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
 		${PREFIX}/share/misc/terminfo
+
+.for i in ${EXAMPLES_TARGETS}
+	${MKDIR} ${${i}_EXAMPLESDIR}/c++
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/test/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${${i}_WRKSRC}/test/${f} ${${i}_EXAMPLESDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/test/tracemunch ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${${i}_WRKSRC}/test/tracemunch ${${i}_EXAMPLESDIR}
 .for f in ${EXAMPLES_CPP}
-	${INSTALL_DATA} ${WRKSRC}/c++/${f} ${EXAMPLESDIR}/c++
+	${INSTALL_DATA} ${${i}_WRKSRC}/c++/${f} ${${i}_EXAMPLESDIR}/c++
 .endfor
+.endfor
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 . for f in ${DOCS}
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index 1ac69a3714e3..76ea0d988b88 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -50,57 +50,134 @@ lib/libtinfo.so
 lib/libtinfo.so.5
 lib/libtinfo.so.%%PORTVERSION%%
 lib/libtinfo_p.a
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/blue.c
-%%EXAMPLESDIR%%/bs.6
-%%EXAMPLESDIR%%/bs.c
-%%EXAMPLESDIR%%/c++/Makefile
-%%EXAMPLESDIR%%/c++/NEWS
-%%EXAMPLESDIR%%/c++/PROBLEMS
-%%EXAMPLESDIR%%/c++/README-first
-%%EXAMPLESDIR%%/c++/cursesapp.cc
-%%EXAMPLESDIR%%/c++/cursesapp.h
-%%EXAMPLESDIR%%/c++/cursesf.cc
-%%EXAMPLESDIR%%/c++/cursesf.h
-%%EXAMPLESDIR%%/c++/cursesm.cc
-%%EXAMPLESDIR%%/c++/cursesm.h
-%%EXAMPLESDIR%%/c++/cursesmain.cc
-%%EXAMPLESDIR%%/c++/cursesp.cc
-%%EXAMPLESDIR%%/c++/cursesp.h
-%%EXAMPLESDIR%%/c++/cursesw.cc
-%%EXAMPLESDIR%%/c++/cursesw.h
-%%EXAMPLESDIR%%/c++/cursslk.cc
-%%EXAMPLESDIR%%/c++/cursslk.h
-%%EXAMPLESDIR%%/c++/demo.cc
-%%EXAMPLESDIR%%/c++/etip.h
-%%EXAMPLESDIR%%/c++/internal.h
-%%EXAMPLESDIR%%/cardfile.c
-%%EXAMPLESDIR%%/cardfile.dat
-%%EXAMPLESDIR%%/ditto.c
-%%EXAMPLESDIR%%/dots.c
-%%EXAMPLESDIR%%/filter.c
-%%EXAMPLESDIR%%/firework.c
-%%EXAMPLESDIR%%/firstlast.c
-%%EXAMPLESDIR%%/gdc.6
-%%EXAMPLESDIR%%/gdc.c
-%%EXAMPLESDIR%%/hanoi.c
-%%EXAMPLESDIR%%/hashtest.c
-%%EXAMPLESDIR%%/knight.c
-%%EXAMPLESDIR%%/lrtest.c
-%%EXAMPLESDIR%%/ncurses.c
-%%EXAMPLESDIR%%/newdemo.c
-%%EXAMPLESDIR%%/railroad.c
-%%EXAMPLESDIR%%/rain.c
-%%EXAMPLESDIR%%/tclock.c
-%%EXAMPLESDIR%%/test.priv.h
-%%EXAMPLESDIR%%/testaddch.c
-%%EXAMPLESDIR%%/testcurs.c
-%%EXAMPLESDIR%%/testscanw.c
-%%EXAMPLESDIR%%/tracemunch
-%%EXAMPLESDIR%%/view.c
-%%EXAMPLESDIR%%/worm.c
-%%EXAMPLESDIR%%/xmas.c
+%%WIDEC%%lib/libformw.a
+%%WIDEC%%lib/libformw.so
+%%WIDEC%%lib/libformw.so.5
+%%WIDEC%%lib/libformw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libformw_p.a
+%%WIDEC%%lib/libmenuw.a
+%%WIDEC%%lib/libmenuw.so
+%%WIDEC%%lib/libmenuw.so.5
+%%WIDEC%%lib/libmenuw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libmenuw_p.a
+%%WIDEC%%lib/libncurses++w.a
+%%WIDEC%%lib/libncursesw.a
+%%WIDEC%%lib/libncursesw.so
+%%WIDEC%%lib/libncursesw.so.5
+%%WIDEC%%lib/libncursesw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libncursesw_p.a
+%%WIDEC%%lib/libpanelw.a
+%%WIDEC%%lib/libpanelw.so
+%%WIDEC%%lib/libpanelw.so.5
+%%WIDEC%%lib/libpanelw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libpanelw_p.a
+%%WIDEC%%lib/libtinfow.a
+%%WIDEC%%lib/libtinfow.so
+%%WIDEC%%lib/libtinfow.so.5
+%%WIDEC%%lib/libtinfow.so.%%PORTVERSION%%
+%%WIDEC%%lib/libtinfow_p.a
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/Makefile
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/README
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/blue.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.6
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/Makefile
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/NEWS
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/PROBLEMS
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/README-first
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/demo.cc
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/etip.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/internal.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.dat
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ditto.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/dots.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/filter.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firework.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firstlast.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.6
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hanoi.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hashtest.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/knight.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/lrtest.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ncurses.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/newdemo.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/railroad.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/rain.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tclock.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/test.priv.h
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testaddch.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testcurs.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testscanw.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tracemunch
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/view.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/worm.c
+%%WIDEC%%%%WIDEC_EXAMPLESDIR%%/xmas.c
+%%NOWIDEC_EXAMPLESDIR%%/Makefile
+%%NOWIDEC_EXAMPLESDIR%%/README
+%%NOWIDEC_EXAMPLESDIR%%/blue.c
+%%NOWIDEC_EXAMPLESDIR%%/bs.6
+%%NOWIDEC_EXAMPLESDIR%%/bs.c
+%%NOWIDEC_EXAMPLESDIR%%/c++/Makefile
+%%NOWIDEC_EXAMPLESDIR%%/c++/NEWS
+%%NOWIDEC_EXAMPLESDIR%%/c++/PROBLEMS
+%%NOWIDEC_EXAMPLESDIR%%/c++/README-first
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/demo.cc
+%%NOWIDEC_EXAMPLESDIR%%/c++/etip.h
+%%NOWIDEC_EXAMPLESDIR%%/c++/internal.h
+%%NOWIDEC_EXAMPLESDIR%%/cardfile.c
+%%NOWIDEC_EXAMPLESDIR%%/cardfile.dat
+%%NOWIDEC_EXAMPLESDIR%%/ditto.c
+%%NOWIDEC_EXAMPLESDIR%%/dots.c
+%%NOWIDEC_EXAMPLESDIR%%/filter.c
+%%NOWIDEC_EXAMPLESDIR%%/firework.c
+%%NOWIDEC_EXAMPLESDIR%%/firstlast.c
+%%NOWIDEC_EXAMPLESDIR%%/gdc.6
+%%NOWIDEC_EXAMPLESDIR%%/gdc.c
+%%NOWIDEC_EXAMPLESDIR%%/hanoi.c
+%%NOWIDEC_EXAMPLESDIR%%/hashtest.c
+%%NOWIDEC_EXAMPLESDIR%%/knight.c
+%%NOWIDEC_EXAMPLESDIR%%/lrtest.c
+%%NOWIDEC_EXAMPLESDIR%%/ncurses.c
+%%NOWIDEC_EXAMPLESDIR%%/newdemo.c
+%%NOWIDEC_EXAMPLESDIR%%/railroad.c
+%%NOWIDEC_EXAMPLESDIR%%/rain.c
+%%NOWIDEC_EXAMPLESDIR%%/tclock.c
+%%NOWIDEC_EXAMPLESDIR%%/test.priv.h
+%%NOWIDEC_EXAMPLESDIR%%/testaddch.c
+%%NOWIDEC_EXAMPLESDIR%%/testcurs.c
+%%NOWIDEC_EXAMPLESDIR%%/testscanw.c
+%%NOWIDEC_EXAMPLESDIR%%/tracemunch
+%%NOWIDEC_EXAMPLESDIR%%/view.c
+%%NOWIDEC_EXAMPLESDIR%%/worm.c
+%%NOWIDEC_EXAMPLESDIR%%/xmas.c
 share/misc/tabset/std
 share/misc/tabset/stdcrt
 share/misc/tabset/vt100
@@ -2648,6 +2725,9 @@ share/misc/terminfo/z/ztx11
 @dirrm share/misc/terminfo/1
 @dirrm share/misc/terminfo
 @dirrm share/misc/tabset
-@dirrm %%EXAMPLESDIR%%/c++
+%%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%/c++
+%%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%
+@dirrm %%NOWIDEC_EXAMPLESDIR%%/c++
+@dirrm %%NOWIDEC_EXAMPLESDIR%%
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/ncurses