- Correctly substitute variables like @NCURSES_MAJOR@ in manual pages

PR:		doc/114711
Submitted by:	Yuri Pankov <yuri at darklight.org.ru>
Approved by:	re (bmah)
MFC after:	3 days

lib/ncurses/config.mk

@@ -42,3 +42,13 @@ TERMINFODIR?=	${SHAREDIR}/misc
 ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES_DIR}/include/MKncurses_def.sh \
 	    ${NCURSES_DIR}/include/ncurses_defs > ncurses_def.h
+
+# Manual pages filter
+MANFILTER=	sed -e 's%@TERMINFO@%${TERMINFODIR}/terminfo%g' \
+		    -e 's%@DATADIR@%/usr/share%g' \
+		    -e 's%@NCURSES_OSPEED@%${NCURSES_OSPEED}%g' \
+		    -e 's%@NCURSES_MAJOR@%${NCURSES_MAJOR}%g' \
+		    -e 's%@NCURSES_MINOR@%${NCURSES_MINOR}%g' \
+		    -e 's%@NCURSES_PATCH@%${NCURSES_PATCH}%g' \
+		    -e 's%@TIC@%tic%g' \
+		    -e 's%@INFOCMP@%infocmp%g'

lib/ncurses/ncurses/Makefile

@@ -447,8 +447,6 @@ terminfo.5: MKterminfo.sh terminfo.head Caps
 	    ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@
 
 CLEANFILES+=	terminfo.5
-MANFILTER=      sed -e 's%@TERMINFO@%${TERMINFODIR}/terminfo%g' \
-		    -e 's%@NCURSES_OSPEED@%${NCURSES_OSPEED}%g'
 
 .PATH: ${NCURSES_DIR}/man
 MAN=	\