X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/86cb84490d3885caeb3e1a363c4400d1f2345a2b..197daca251715e518bb8367c8e32a7c5fa99f9ea:/packages/ncurses/build.sh

diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index d6446f63..e5763662 100755
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -1,18 +1,49 @@
 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=20170610
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
-TERMUX_PKG_SRCURL=ftp://invisible-island.net/ncurses/current/ncurses-${_MAJOR_VERSION}-${_MINOR_VERSION}.tgz
-TERMUX_PKG_SHA256=4c196bd0f1bf0ce643c1547cc7fc25cee713d21299a660eeb9b5dfa8becacb45
+TERMUX_PKG_VERSION=6.1.20180203
+TERMUX_PKG_SHA256=fac9db9460f271ee632af386a5b502d43a25d7cf14138e3d3166d4bedc4f6cb0
+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:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-overwrite --enable-const --without-cxx-binding --without-normal --without-static --with-shared --without-debug --enable-widec --enable-ext-colors --enable-ext-mouse --enable-pc-files --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR --without-ada --without-tests --mandir=$TERMUX_PREFIX/share/man ac_cv_header_locale_h=no"
-TERMUX_PKG_RM_AFTER_INSTALL="bin/ncursesw6-config share/man/man1/ncursesw6-config.1 bin/infotocap share/man/man1/infotocap.1m bin/captoinfo share/man/man1/captoinfo.1m"
+# --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
+--enable-overwrite
+--enable-pc-files
+--enable-widec
+--mandir=$TERMUX_PREFIX/share/man
+--without-ada
+--without-cxx-binding
+--without-debug
+--without-normal
+--without-static
+--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
+share/man/man1/captoinfo.1*
+share/man/man1/infotocap.1*
+share/man/man5
+share/man/man7
+"
+
+termux_step_pre_configure() {
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
+}
 
 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)
@@ -44,7 +75,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