Update for ncurses5 aftermath..

1 files changed, 6 insertions, 15 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8fae8e8..d2ca1fe 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -586,13 +586,11 @@ includes:
 	cd ${.CURDIR}/lib/libc;			${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcalendar;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcam;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libcurses;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libdisk;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libftpio;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libmytinfo;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
 .if !defined(WANT_CSRG_LIBM)
 	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
 .endif
@@ -604,7 +602,6 @@ includes:
 	cd ${.CURDIR}/lib/libskey;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libstand;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libtacplus;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libtermcap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss;		${MAKE} -B hdrs beforeinstall
 	cd ${.CURDIR}/lib/libutil;		${MAKE} beforeinstall
@@ -673,12 +670,10 @@ lib-tools:
 # libm must be built before libstdc++.
 # libmd must be built before libatm, libopie, libradius, libskey,
 # libtacplus and libcrypt.
-# libmytinfo must be built before libdialog and libncurses.
-# libncurses must be built before libdialog.
+# libncurses must be built before libdialog, libedit, libreadline.
 # libradius must be built before libpam.
 # libskey must be built before libpam.
 # libtacplus must be built before libpam.
-# libtermcap must be built before libcurses, libedit and libreadline.
 #
 # Some libraries are built conditionally and/or are in inconsistently
 # named directories:
@@ -718,9 +713,7 @@ _libperl=		gnu/usr.bin/perl/libperl
 #
 # Build csu early so that some tools get linked to the new
 # version (too late for the main tools, however).  Then build the
-# necessary prerequisite libraries (libtermcap just needs to be before
-# libcurses, and this only matters for the NOCLEAN case when NOPIC is
-# not set).
+# necessary prerequisite libraries.
 #
 # This is mostly wrong.  The build tools must run on the host system,
 # so they should use host libraries.  We depend on the target being
@@ -728,9 +721,9 @@ _libperl=		gnu/usr.bin/perl/libperl
 # host.
 #
 bootstrap-libraries:
-.for _lib in ${_csu} lib/libtermcap \
-    gnu/lib/libregex gnu/lib/libreadline lib/libc \
-    lib/libcurses lib/libedit ${_libm} \
+.for _lib in ${_csu} lib/libc lib/libncurses \
+    gnu/lib/libregex gnu/lib/libreadline \
+    lib/libedit ${_libm} \
     lib/libmd lib/libcrypt lib/libutil lib/libz usr.bin/lex/lib \
     ${_libperl}
 .if exists(${.CURDIR}/${_lib})
@@ -750,7 +743,6 @@ bootstrap-libraries:
 #
 libraries:
 .for _lib in ${_csu} lib/libcom_err ${_libm} lib/libmd ${_libcrypt} \
-    lib/libmytinfo lib/libncurses lib/libtermcap \
     lib/libradius lib/libskey lib/libtacplus \
     ${_secure_lib} ${_kerberosIV_lib} \
     gnu/lib ${_libperl} lib usr.bin/lex/lib \
@@ -879,7 +871,6 @@ build-tools:
 		${_hack}		\
 		${_phantasia}		\
 		gnu/usr.bin/cc/cc_tools	\
-		lib/libmytinfo		\
 		${_linux}		\
 		${_kldlinux}		\
 		${_scrnmaps}		\