diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5569e5bbe8ff..378925d262c5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070201: remove libmytinfo link +OLD_FILES+=usr/lib/libmytinfo.a +OLD_FILES+=usr/lib/libmytinfo.so # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig # 20070125: objformat bites the dust diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 6221057b5058..04a905f37aff 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -252,7 +252,6 @@ CLEANFILES+= ${GENSRC} ${GENHDR} keys.list make_hash term.h.new \ SYMLINKS+= libncurses.a ${LIBDIR}/libcurses.a SYMLINKS+= libncurses.a ${LIBDIR}/libtermcap.a SYMLINKS+= libncurses.a ${LIBDIR}/libtermlib.a -SYMLINKS+= libncurses.a ${LIBDIR}/libmytinfo.a SYMLINKS+= libncurses.a ${LIBDIR}/libtinfo.a .endif .if !defined(NO_PIC) @@ -260,14 +259,12 @@ SYMLINKS+= libncurses.a ${LIBDIR}/libtinfo.a SYMLINKS+= libncurses.so ${LIBDIR}/libcurses.so SYMLINKS+= libncurses.so ${LIBDIR}/libtermcap.so SYMLINKS+= libncurses.so ${LIBDIR}/libtermlib.so -SYMLINKS+= libncurses.so ${LIBDIR}/libmytinfo.so SYMLINKS+= libncurses.so ${LIBDIR}/libtinfo.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+= libncurses_p.a ${LIBDIR}/libcurses_p.a SYMLINKS+= libncurses_p.a ${LIBDIR}/libtermcap_p.a SYMLINKS+= libncurses_p.a ${LIBDIR}/libtermlib_p.a -SYMLINKS+= libncurses_p.a ${LIBDIR}/libmytinfo_p.a SYMLINKS+= libncurses_p.a ${LIBDIR}/libtinfo_p.a .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index deda217be0bf..a5b4837ffbc7 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -81,7 +81,6 @@ LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a .endif LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a -LIBMYTINFO?= "don't use LIBMYTINFO, use LIBNCURSES" .if ${MK_NCP} != "no" LIBNCP?= ${DESTDIR}${LIBDIR}/libncp.a .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 225f522143f0..494498ac3e56 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1008,6 +1008,7 @@ OLD_FILES+=usr/lib/libmemstat_p.a OLD_FILES+=usr/lib/libmenu_p.a OLD_FILES+=usr/lib/libmilter_p.a OLD_FILES+=usr/lib/libmp_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a OLD_FILES+=usr/lib/libncp_p.a OLD_FILES+=usr/lib/libncurses_p.a OLD_FILES+=usr/lib/libnetgraph_p.a