diff --git a/common/shlibs b/common/shlibs index 42bb0996d24..e0994cf183d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -69,16 +69,11 @@ libppl_c.so.4 ppl-0.11_1 libstdc++.so.6 libstdc++-4.4.0_1 libssp.so.0 libssp-4.4.0_1 libncurses.so.6 ncurses-libs-6.0_1 ignore -libncurses.so.5 ncurses-libs-6.0_1 ignore libncursesw.so.6 ncurses-libs-5.8_1 ignore -libncursesw.so.5 ncurses-libs-5.8_1 ignore libtinfo.so.6 ncurses-libtinfo-libs-6.2_2 libnetcdf.so.15 netcdf-4.7.0_1 -libformw.so.5 ncurses-libs-5.9_13 ignore libformw.so.6 ncurses-libs-5.8_1 ignore -libpanelw.so.5 ncurses-libs-5.9_13 ignore libpanelw.so.6 ncurses-libs-5.8_1 ignore -libmenuw.so.5 ncurses-libs-5.9_13 ignore libmenuw.so.6 ncurses-libs-5.8_1 ignore libobjc.so.4 libobjc-4.7.3_12 libgomp.so.1 libgomp-4.4.0_1 diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index eb0b4fcafc7..d1bb2ae3aa8 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template file for 'ncurses' pkgname=ncurses version=6.2 -revision=2 +revision=3 bootstrap=yes configure_args="--enable-big-core" short_desc="System V Release 4.0 curses emulation library" @@ -78,6 +78,8 @@ do_install() { cd ${wrksrc}/ncurses-build install -Dm755 lib/libncurses.so.${version} \ ${DESTDIR}/usr/lib/libncurses.so.${version} + ln -sf libncurses.so.${version} \ + ${DESTDIR}/usr/lib/libncurses.so.${version:0:1} # Create libtinfo symlinks. ln -sfr ${DESTDIR}/usr/lib/libncursesw.so \ @@ -89,25 +91,15 @@ do_install() { ln -sfr ${DESTDIR}/usr/lib/pkgconfig/ncursesw.pc \ ${DESTDIR}/usr/lib/pkgconfig/tinfo.pc - # Create compat symlinks. - for f in ncurses form panel menu; do - ln -sfr ${DESTDIR}/usr/lib/lib${f}w.so.6 \ - ${DESTDIR}/usr/lib/lib${f}w.so.5 - done - # Remove broken symlink. rm -f ${DESTDIR}/usr/lib/terminfo - ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config - ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config - if [ "$CROSS_BUILD" ]; then sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config fi } ncurses-libs_package() { - shlib_provides="libformw.so.5 libmenuw.so.5 libpanelw.so.5 libncursesw.so.5" short_desc+=" -- shared libraries" pkg_install() { vmove "usr/lib/libform*.so.*"