mc: multple fixes (#2367)

[termux-packages] / packages / ncurses / build.sh

diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index 0cfcd47..f709dca 100755 (executable)
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -1,13 +1,14 @@
 TERMUX_PKG_HOMEPAGE=http://invisible-island.net/ncurses/
 TERMUX_PKG_DESCRIPTION="Library for text-based user interfaces in a terminal-independent manner"
-_MAJOR_VERSION=6.0
-_MINOR_VERSION=20170722
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
-TERMUX_PKG_SRCURL=http://invisible-mirror.net/archives/ncurses/current/ncurses-${_MAJOR_VERSION}-${_MINOR_VERSION}.tgz
-TERMUX_PKG_SHA256=5551eb34a75012a28dc500bf0b5b9cacce45763a0c843f2d5e8b1680be5edfd7
+TERMUX_PKG_VERSION=6.1.20180331
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=031337b0f1b7a2b4a0752deb4dde78f5c21a6dd1c3880e2a8da15796767169b7
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ncurses-${TERMUX_PKG_VERSION:0:3}-${TERMUX_PKG_VERSION:4}.tgz
 # --without-normal disables static libraries:
+# --disable-stripping to disable -s argument to install which does not work when cross compiling:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_header_locale_h=no
+--disable-stripping
 --enable-const
 --enable-ext-colors
 --enable-ext-mouse
@@ -23,13 +24,17 @@ ac_cv_header_locale_h=no
 --without-tests
 --with-shared
 "
+TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="
+share/man/man1/ncursesw6-config.1*
+bin/ncursesw6-config
+"
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/captoinfo
 bin/infotocap
-bin/ncursesw6-config
-share/man/man1/captoinfo.1m
-share/man/man1/infotocap.1m
-share/man/man1/ncursesw6-config.1
+share/man/man1/captoinfo.1*
+share/man/man1/infotocap.1*
+share/man/man5
+share/man/man7
 "
 
 termux_step_pre_configure() {
@@ -39,18 +44,20 @@ termux_step_pre_configure() {
 termux_step_post_make_install () {
        cd $TERMUX_PREFIX/lib
        for lib in form menu ncurses panel; do
-               for file in lib${lib}w.so*; do 
+               for file in lib${lib}w.so*; do
                        ln -s -f $file `echo $file | sed 's/w//'`
                done
                (cd pkgconfig && ln -s -f ${lib}w.pc `echo $lib | sed 's/w//'`.pc)
        done
+       # some packages want libcurses while building/compiling
+       ln -sf libncurses.so libcurses.so
 
-       # Some packages wants this:
+       # Some packages want these:
        cd $TERMUX_PREFIX/include/
-       rm -Rf ncursesw
-       mkdir ncursesw
-       cd ncursesw
-       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} .
+       rm -Rf ncurses{,w}
+       mkdir ncurses{,w}
+       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncurses
+       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncursesw
 }
 
 termux_step_post_massage () {
@@ -71,7 +78,7 @@ termux_step_post_massage () {
        cp $TERMUX_PKG_TMPDIR/full-terminfo/x/xterm{,-color,-new,-16color,-256color,+256color} $TI/x/
 
        local RXVT_TAR=$TERMUX_PKG_CACHEDIR/rxvt-unicode-9.22.tar.bz2
-       termux_download http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2 \
+       termux_download https://fossies.org/linux/misc/rxvt-unicode-9.22.tar.bz2 \
                $RXVT_TAR \
                e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd
        cd $TERMUX_PKG_TMPDIR