1 files changed, 45 insertions, 6 deletions
diff --git a/data/ncurses/make.sh b/data/ncurses/make.sh
index c96ec2565..5fde07689 100644
--- a/data/ncurses/make.sh
+++ b/data/ncurses/make.sh
@@ -1,15 +1,48 @@
 shopt -s extglob
-pkg:setup
+pkg:extract
+cd ncurses*
+pkg:patch
 cd ..
-dir=$(echo *)
+dir=$(echo ncurses*)
+
+(
+    # make tic
+    mkdir bld-host
+    cd bld-host
+    ../${dir}/configure
+    cd include
+    make -j
+    cd ../ncurses
+    make -j
+    cd ../progs
+    make -j tic
+) &
+ticpid=$!
+
+flags="--with-shared --without-normal --without-debug --enable-sigwinch --disable-mixed-case --enable-termcap --enable-pc-files --with-pkg-config-libdir=${PKG_TAPF}/lib/pkgconfig ac_cv_path_TIC_PATH=${PWD}/bld-host/progs/tic"
+
 mkdir bld-ncurses{,w}
+(
 cd bld-ncurses
-flags="--with-shared --without-normal --without-debug --enable-sigwinch --disable-mixed-case --enable-termcap --enable-pc-files --with-pkg-config-libdir=${PKG_TAPF}/lib/pkgconfig"
 PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags}
+) &
+ncursespid=$!
+
+(
+cd bld-ncursesw
+PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags} --disable-overwrite --enable-widec
+) &
+ncurseswpid=$!
+
+wait ${ncursespid}
+wait ${ticpid}
+cd bld-ncurses
 make -j8
 pkg:install
-cd ../bld-ncursesw
-PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags} --disable-overwrite --enable-widec
+cd ..
+
+wait ${ncurseswpid}
+cd bld-ncursesw
 make -j8
 pkg:install
 
@@ -25,8 +58,14 @@ pkg: ln -s libncurses.6.dylib /usr/lib/libncurses6.dylib
 pkg: ln -s libncursesw.6.dylib /usr/lib/libncursesw6.dylib
 rm -f "${PKG_DEST}"/usr/lib/*.a
 
+for ti in ../debian/{xterm,hurd,rxvt,rxvt-unicode}; do \
+    TERMINFO="${PKG_DEST}"/usr/share/terminfo \
+    ../bld-host/progs/tic -x ../debian/${ti}.ti; \
+done
+
+
 for ti in "${PKG_DEST}"/usr/share/terminfo/*/*; do
-    if [[ ${ti} == */@(?(pc)ansi|cons25|cygwin|dumb|linux|mach|rxvt|screen|sun|vt@(52|100|102|220)|swvt25?(m)|[Exe]term|putty|konsole|gnome|apple|Apple_Terminal|unknown)?([-+.]*) ]]; then
+    if [[ ${ti} == */@(?(pc)ansi|cons25|cygwin|dumb|linux|mach|rxvt|screen|sun|tmux|vt@(52|100|102|220)|swvt25?(m)|[Exe]term|putty|konsole|gnome|apple|Apple_Terminal|unknown)?([-+.]*) ]]; then
         echo "keeping terminfo: ${ti}"
     else
         rm -f "${ti}"