INCS="$INCS -I${includedir}"
- 		fi
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-@@ -229,7 +229,7 @@ ENDECHO
+@@ -98,7 +98,7 @@ if [ "$includesubdir" != "/usr/include" ]; then
+ CFLAGS="@PKG_CFLAGS@"
+ if [ "$includesubdir" != "/usr/include" ]; then
+ 	CFLAGS="$CFLAGS -I${includesubdir}"
+-	if [ "$includedir" != "/usr/include" ]; then
++	if [ "$includedir" != "%%PREFIX%%/include" ]; then
+ 		[ x@WITH_OVERWRITE@ = xno ] && CFLAGS="$CFLAGS -I${includedir}"
+ 	fi
+ fi
+@@ -318,7 +318,7 @@ while [ $# -gt 0 ]; do
  		INCS=
  		if [ "x@WITH_OVERWRITE@" = xno ]; then
  			INCS="${includesubdir}"
@@ -17,4 +17,4 @@
 +		elif [ "${includedir}" != %%PREFIX%%/include ]; then
  			INCS="${includedir}"
  		fi
- 		echo $INCS
+ 		echo "$INCS"
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index bfa7798788ac..b6696f3c5d9a 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -79,7 +79,9 @@ libdata/pkgconfig/tinfo.pc
 %%MANPAGES%%share/man/man1/toe.1m.gz
 %%MANPAGES%%share/man/man1/tput.1.gz
 %%MANPAGES%%share/man/man1/tset.1.gz
+%%MANPAGES%%share/man/man3/A_COLOR.3x.gz
 %%MANPAGES%%share/man/man3/BC.3x.gz
+%%MANPAGES%%share/man/man3/CCHARW_MAX.3x.gz
 %%MANPAGES%%share/man/man3/COLORS.3x.gz
 %%MANPAGES%%share/man/man3/COLOR_BLACK.3x.gz
 %%MANPAGES%%share/man/man3/COLOR_BLUE.3x.gz
@@ -96,6 +98,7 @@ libdata/pkgconfig/tinfo.pc
 %%MANPAGES%%share/man/man3/ESCDELAY.3x.gz
 %%MANPAGES%%share/man/man3/FALSE.3x.gz
 %%MANPAGES%%share/man/man3/LINES.3x.gz
+%%MANPAGES%%share/man/man3/MEVENT.3x.gz
 %%MANPAGES%%share/man/man3/NCURSES_SCREEN_CB.3x.gz
 %%MANPAGES%%share/man/man3/NCURSES_WINDOW_CB.3x.gz
 %%MANPAGES%%share/man/man3/OK.3x.gz
@@ -534,6 +537,7 @@ libdata/pkgconfig/tinfo.pc
 %%MANPAGES%%share/man/man3/mitem_userptr.3x.gz
 %%MANPAGES%%share/man/man3/mitem_value.3x.gz
 %%MANPAGES%%share/man/man3/mitem_visible.3x.gz
+%%MANPAGES%%share/man/man3/mmask_t.3x.gz
 %%MANPAGES%%share/man/man3/mouse_trafo.3x.gz
 %%MANPAGES%%share/man/man3/mouseinterval.3x.gz
 %%MANPAGES%%share/man/man3/mouseinterval_sp.3x.gz