X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1370734dafb824ca333b6b6c77407184916bd98c..e87ab524ccbc30498f59e043dc6c4a94d4105708:/packages/ncurses/build.sh

diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index 3ea6c2f7..23dc2572 100755
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -1,24 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://invisible-island.net/ncurses/
 TERMUX_PKG_DESCRIPTION="Library for text-based user interfaces in a terminal-independent manner"
-_MAJOR_VERSION=5.9
-# This is the patch number used for fetching a patch from ftp://invisible-island.net/ncurses/5.9/
-# in termux_step_post_extract_package below:
-_MINOR_VERSION=20141206
+_MAJOR_VERSION=6.0
+_MINOR_VERSION=20170114
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/ncurses/ncurses-${_MAJOR_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=ftp://invisible-island.net/ncurses/current/ncurses-${_MAJOR_VERSION}-${_MINOR_VERSION}.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"
 
-termux_step_post_extract_package () {
-	cd $TERMUX_PKG_SRCDIR
-	_PATCH_FILENAME=ncurses-${_MAJOR_VERSION}-${_MINOR_VERSION}-patch.sh
-	_PATCHFILE=$TERMUX_PKG_CACHEDIR/$_PATCH_FILENAME
-	test ! -f $_PATCHFILE && curl "ftp://invisible-island.net/ncurses/${_MAJOR_VERSION}/${_PATCH_FILENAME}.bz2" | bunzip2 - > $_PATCHFILE
-	sh $_PATCHFILE
-}
-
 termux_step_post_make_install () {
 	cd $TERMUX_PREFIX/lib
 	for lib in form menu ncurses panel; do
@@ -39,7 +28,7 @@ termux_step_post_make_install () {
 		cd $TERMUX_PREFIX/share/terminfo
 		for l in *; do 
 			if [ ${#l} -eq 2 ]; then
-				char=`echo 0x$l | awk '{printf "%c\n", $1}'`
+				char=`echo 0x$l | /usr/bin/awk '{printf "%c\n", $1}'`
 				rm -Rf $char
 				mv $l $char
 			fi
@@ -53,14 +42,16 @@ termux_step_post_massage () {
 	# Strip away 30 years of cruft to decrease size.
 	local TI=./$TERMUX_PREFIX/share/terminfo
 	mv $TI $TERMUX_PKG_TMPDIR/full-terminfo
-	mkdir -p $TI/{a,d,n,l,p,r,s,v,x}
+	mkdir -p $TI/{a,d,e,n,l,p,r,s,t,v,x}
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/a/ansi $TI/a/
-	cp $TERMUX_PKG_TMPDIR/full-terminfo/d/dtterm $TI/d/
+	cp $TERMUX_PKG_TMPDIR/full-terminfo/d/{dtterm,dumb} $TI/d/
+	cp $TERMUX_PKG_TMPDIR/full-terminfo/e/eterm-color $TI/e/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/n/nsterm $TI/n/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/l/linux $TI/l/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/p/putty{,-256color} $TI/p/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/r/rxvt{,-256color} $TI/r/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/s/screen{,2,-256color} $TI/s/
+	cp $TERMUX_PKG_TMPDIR/full-terminfo/t/tmux{,-256color} $TI/t/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/v/{vt52,vt100,vt102} $TI/v/
 	cp $TERMUX_PKG_TMPDIR/full-terminfo/x/xterm{,-color,-new,-16color,-256color,+256color} $TI/x/
 }