vars/build.vars:gdbm: updated to gdbm v1.15 (via Redfoxmoon.)

vars/build.vars:ncurses{,tw,w}:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-termlib (via Redfoxmoon.)
vars/build.vars:htop: updated to htop v2.2.0.
vars/build.vars:htop, vars/htop.vars: correctly build against ncursesw.
patches/htop-2.0.1.local.patch: removes obsolete patch.

3 files changed, 18 insertions, 18 deletions

diff --git a/patches/htop-2.0.1.local.patch b/patches/htop-2.0.1.local.patch
deleted file mode 100644
index 1799722e..00000000
--- a/patches/htop-2.0.1.local.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- htop-2.0.1/configure.orig	2016-03-07 21:12:35.000000000 +0000
-+++ htop-2.0.1/configure	2016-07-10 14:39:42.654635796 +0000
-@@ -13313,7 +13313,7 @@
-    fi
-    if test "x$htop_script_success" = xno; then
- 
--   htop_config_script=$("ncursesw5-config" --libs 2> /dev/null)
-+   htop_config_script=$("${PKG_PREFIX}/bin/ncursesw6-config" --libs 2> /dev/null)
-    htop_script_success=no
-    htop_save_LDFLAGS="$LDFLAGS"
-    if test ! "x$htop_config_script" = x; then
diff --git a/vars/build.vars b/vars/build.vars
index 1b78081c..f4094478 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -483,8 +483,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
 : ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
 : ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"};
-: ${PKG_GDBM_SHA256SUM:=cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f};
-: ${PKG_GDBM_VERSION:=1.14.1};
+: ${PKG_GDBM_SHA256SUM:=f9fde3207f67ed8a5a5ddd8ad5e7acf7b27c2cf0f20dfbdde876dcd6e3d2dc0e};
+: ${PKG_GDBM_VERSION:=1.15};
 : ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};
 : ${PKG_GEOIP_URLS_GIT:="geoip-api-c=https://github.com/maxmind/geoip-api-c@master"};
 : ${PKG_PCRE_SHA256SUM:=69acbc2fbdefb955d42a4c606dfde800c2885711d2979e356c0636efde9ec3b5};
@@ -562,15 +562,15 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
 : ${PKG_NCURSES_VERSION:=6.0};
 : ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
-: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --without-manpages --without-progs --without-tests --disable-widec --without-pthread"};
+: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --without-pthread"};
 : ${PKG_NCURSESTW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
 : ${PKG_NCURSESTW_VERSION:=6.0};
 : ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz};
-: ${PKG_NCURSESTW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --without-manpages --without-progs --without-tests --disable-widec --with-pthread"};
+: ${PKG_NCURSESTW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --with-pthread"};
 : ${PKG_NCURSESW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
 : ${PKG_NCURSESW_VERSION:=6.0};
 : ${PKG_NCURSESW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_VERSION}.tar.gz};
-: ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
+: ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
 : ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
 : ${PKG_LIBREADLINE_VERSION:=7.0};
@@ -1094,9 +1094,11 @@ p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xcowsay xeyes xorriso xterm xwd
 : ${PKG_DEBIANUTILS_INSTALL_FILES:="../obj/run-parts=bin/ ../debianutils/run-parts.8=share/man/man8/"};
 : ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
-: ${PKG_HTOP_SHA256SUM:=f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666};
-: ${PKG_HTOP_VERSION:=2.0.1};
+: ${PKG_HTOP_SHA256SUM:=d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57};
+: ${PKG_HTOP_VERSION:=2.2.0};
 : ${PKG_HTOP_URL:=http://hisham.hm/htop/releases/${PKG_HTOP_VERSION}/htop-${PKG_HTOP_VERSION}.tar.gz};
+: ${PKG_HTOP_CONFIGURE_ARGS_EXTRA:="--enable-proc --enable-unicode"};
+: ${PKG_HTOP_ENV_VARS_EXTRA:="HTOP_NCURSES_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncurses-config:HTOP_NCURSES6_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncurses6-config:HTOP_NCURSESW_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncursesw-config:HTOP_NCURSESW6_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncursesw6-config"}
 : ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master};
 : ${PKG_INFOUNZIP_IN_TREE:=1};
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
diff --git a/vars/htop.vars b/vars/htop.vars
new file mode 100644
index 00000000..a835dbe2
--- /dev/null
+++ b/vars/htop.vars
@@ -0,0 +1,9 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+: ${PKG_HTOP_CONFIG_CACHE_EXTRA:="
+ac_cv_lib_ncursesw6_addnwstr=yes
+ac_cv_lib_ncursesw_addnwstr=yes"};
+
+# vim:filetype=sh