Merge ${PKG_CONFIG_CACHE_EXTRA} vars/* into groups/.

34 files changed, 63 insertions, 220 deletions

diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 3d06f446..9012181b 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -98,6 +98,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_MC_VERSION:=4.8.19};
 : ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz};
 : ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-DNCURSES_INTERNALS -I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"};
+: ${PKG_MC_CONFIG_CACHE_EXTRA:="ac_list_mounted_fs=found"};
 : ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"};
 : ${PKG_MC_LDFLAGS_BUILD_EXTRA:=-ltinfow};
 : ${PKG_MKSH_SHA256SUM:=8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013};
@@ -160,6 +161,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_PIXZ_SHA256SUM:=e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5};
 : ${PKG_PIXZ_VERSION:=1.0.7};
 : ${PKG_PIXZ_URL:=https://github.com/vasi/pixz/releases/download/v${PKG_PIXZ_VERSION}/pixz-${PKG_PIXZ_VERSION}.tar.xz};
+: ${PKG_PIXZ_CONFIG_CACHE_EXTRA:="ac_cv_file_src_pixz_1=yes"};
 : ${PKG_PIXZ_INSTALL_FILES:="../pixz-${PKG_PIXZ_VERSION}/src/pixz.1=share/man/man1/"};
 : ${PKG_PV_SHA256SUM:=608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1};
 : ${PKG_PV_VERSION:=1.6.6};
@@ -170,6 +172,10 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_RC_SHA256SUM:=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8};
 : ${PKG_RC_VERSION:=1.7.4};
 : ${PKG_RC_URL:=https://mirror.midipix.org/rc/rc-${PKG_RC_VERSION}.tar.gz};
+: ${PKG_RC_CONFIG_CACHE_EXTRA:="
+ac_cv_func_setpgrp_void=yes
+rc_cv_sys_dev_fd=yes
+rc_cv_sysv_sigcld=no"};
 : ${PKG_RC_CONFIGURE_ARGS_EXTRA:=--with-edit=readline};
 : ${PKG_RC_IN_TREE=1};
 : ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
@@ -234,6 +240,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_ZSH_SHA256SUM:=dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27};
 : ${PKG_ZSH_VERSION:=5.8};
 : ${PKG_ZSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz};
+: ${PKG_ZSH_CONFIG_CACHE_EXTRA:="zsh_cv_sys_elf=no"};
 : ${PKG_ZSH_CONFIGURE_ARGS_EXTRA:="--enable-libc-musl --mandir=/usr/share/man --infodir=/usr/share/info --sysconfdir=/etc --enable-etcdir=/etc/zsh --enable-multibyte --enable-function-subdirs --enable-zsh-secure-free --with-tcsetpgrp"};
 : ${PKG_ZSH_IN_TREE:=1};
 
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index 75e96d4c..8f6a14bf 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -9,6 +9,9 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")"
 : ${PKG_BISON_SHA256SUM:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf};
 : ${PKG_BISON_VERSION:=3.7.6};
 : ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_VERSION}.tar.xz};
+: ${PKG_BISON_CONFIG_CACHE_EXTRA:="
+ac_cv_path_M4=/bin/m4
+ac_cv_prog_gnu_m4_gnu=yes"};
 : ${PKG_CHICKEN_SHA256SUM:=819149c8ce7303a9b381d3fdc1d5765c5f9ac4dee6f627d1652f47966a8780fa};
 : ${PKG_CHICKEN_VERSION:=5.2.0};
 : ${PKG_CHICKEN_URL:=https://code.call-cc.org/releases/${PKG_CHICKEN_VERSION}/chicken-${PKG_CHICKEN_VERSION}.tar.gz};
@@ -77,6 +80,9 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")"
 : ${PKG_MAKE_SHA256SUM:=e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7};
 : ${PKG_MAKE_VERSION:=4.2.1};
 : ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.gz};
+: ${PKG_MAKE_CONFIG_CACHE_EXTRA:="
+ac_cv_func_gettimeofday=yes
+make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_MANDOC_DEPENDS:="libz"};
 : ${PKG_MANDOC_SHA256SUM:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7};
 : ${PKG_MANDOC_VERSION:=1.14.5};
@@ -144,6 +150,9 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")"
 : ${PKG_SBSIGNTOOLS_IN_TREE:=1};
 : ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
 : ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+: ${PKG_SMALLBASIC_CONFIG_CACHE_EXTRA:="
+ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
+ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"};
 : ${PKG_SMALLBASIC_IN_TREE:=1};
 : ${PKG_SMALLBASIC_DISABLED:=1};
 : ${PKG_TK_DEPENDS:="libX11 tcl"};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 5ed81a99..c35c77f5 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -205,11 +205,17 @@ zstd")";
 : ${PKG_HTOP_URL:=https://src.fedoraproject.org/lookaside/extras/htop/htop-2.2.0.tar.gz/sha512/ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e/htop-${PKG_HTOP_VERSION}.tar.gz};
 : ${PKG_HTOP_CONFIGURE_ARGS_EXTRA:="--enable-proc --enable-unicode --verbose"};
 : ${PKG_HTOP_CFLAGS_CONFIGURE_EXTRA:="--include=sys/sysmacros.h"};
+: ${PKG_HTOP_CONFIG_CACHE_EXTRA:="
+ac_cv_lib_ncursesw_addnwstr=yes
+ac_cv_lib_ncursesw6_addnwstr=yes"};
 : ${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_ICOUTILS_DEPENDS:="libpng"};
 : ${PKG_ICOUTILS_SHA256SUM:=17abe02d043a253b68b47e3af69c9fc755b895db68fdc8811786125df564c6e0};
 : ${PKG_ICOUTILS_VERSION:=0.32.3};
 : ${PKG_ICOUTILS_URL:=http://savannah.nongnu.org/download/icoutils/icoutils-${PKG_ICOUTILS_VERSION}.tar.bz2};
+: ${PKG_ICOUTILS_CONFIG_CACHE_EXTRA:="
+am_cv_func_working_getline=yes
+gl_cv_func_getopt_gnu=yes"};
 : ${PKG_IMAGEMAGICK_DEPENDS:="curl bzip2 libz xz zstd"};
 : ${PKG_IMAGEMAGICK_SHA256SUM:=67859f9cba97f2c06b5e416898216e49216be00c7cba3dd89896e49331aef96d};
 : ${PKG_IMAGEMAGICK_VERSION:=7.0.9-12};
@@ -317,6 +323,7 @@ zstd")";
 : ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
 : ${PKG_OPENJAZZ_DEPENDS:="sdl1"};
 : ${PKG_OPENJAZZ_URLS_GIT:=openjazz=https://github.com/AlisterT/openjazz.git@master};
+: ${PKG_OPENJAZZ_CONFIG_CACHE_EXTRA:="ac_cv_prog_POD2MAN="};
 : ${PKG_OPENJAZZ_FORCE_AUTORECONF:=1};
 : ${PKG_OPENJPEG_DEPENDS:="lcms2 libpng libz tiff"};
 : ${PKG_OPENJPEG_SHA256SUM:=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d};
@@ -352,6 +359,9 @@ zstd")";
 : ${PKG_PHP_SHA256SUM:=71a01b2b56544e20e28696ad5b366e431a0984eaa39aa5e35426a4843e172010};
 : ${PKG_PHP_VERSION:=8.0.9};
 : ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
+: ${PKG_PHP_CONFIG_CACHE_EXTRA:="
+ac_cv_c_bigendian_php=no
+ac_cv_write_stdout=yes"};
 : ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --with-gmp --disable-opcache --disable-phar"};
 : ${PKG_PHP_LIBTOOL:=rdlibtool};
 : ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1};
@@ -366,6 +376,7 @@ zstd")";
 : ${PKG_PROCPS_NG_VERSION:=3.3.15};
 : ${PKG_PROCPS_NG_URL:=http://mirror.internode.on.net/pub/slackware/slackware64/patches/source/procps-ng/procps-ng-${PKG_PROCPS_NG_VERSION}.tar.xz};
 : ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
+: ${PKG_PROCPS_NG_CONFIG_CACHE_EXTRA:="ac_cv_func_realloc_0_nonnull=yes"};
 : ${PKG_PROCPS_NG_IN_TREE:=1};
 : ${PKG_PROCPS_NG_MAKEFLAGS_BUILD:="LIBS=-Wl,-lncurses,-ltinfo"};
 : ${PKG_PROCPS_NG_FNAME:=procps_ng-${PKG_PROCPS_NG_VERSION}.tar.xz};
@@ -417,6 +428,9 @@ zstd")";
 : ${PKG_TCL_SHA256SUM:=2bbd4e0bbdebeaf5dc6cc823d0805afb45c764292f6667d9ce2b9fcf5399e0dc};
 : ${PKG_TCL_VERSION:=8.7a1};
 : ${PKG_TCL_URL:=http://kuiper.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/tcl8_7/tcl${PKG_TCL_VERSION}-src.tar.gz};
+: ${PKG_TCL_CONFIG_CACHE_EXTRA:="
+tcl_cv_strtod_buggy=false
+tcl_cv_strtod_unbroken=true"};
 : ${PKG_TCL_SUBDIR:=tcl${PKG_TCL_VERSION}/unix};
 : ${PKG_TDNF_DEPENDS:="libmetalink libressl curl gpgme libsolv"};
 : ${PKG_TDNF_SHA256SUM:=1ca20b176939f32c212f8dec7bfacd99995f1cb16c7f176b90394378ea854b0b};
@@ -449,6 +463,11 @@ zstd")";
 : ${PKG_UTIL_LINUX_URL:=https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION%.*}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.xz};
 : ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-lslogins --disable-wall --disable-write --disable-nologin --disable-sulogin --disable-hwclock --disable-schedutils};
 : ${PKG_UTIL_LINUX_CFLAGS_CONFIGURE_EXTRA:=-std=c99};
+: ${PKG_UTIL_LINUX_CONFIG_CACHE_EXTRA:="
+ac_cv_func_timer_create=no
+ac_cv_lib_rt_timer_create=no
+ac_cv_search_timer_create=no
+ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"};
 : ${PKG_VIM_DEPENDS:="ncursesw"};
 : ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67};
 : ${PKG_VIM_VERSION:=7.4.1952};
@@ -486,6 +505,7 @@ zstd")";
 : ${PKG_YABASIC_SHA256SUM:=24eaca1a520817ec266d132d89b4a657d5adf3e6bad54f13b103991afdca6d40};
 : ${PKG_YABASIC_VERSION:=2.83.0};
 : ${PKG_YABASIC_URL:=http://www.yabasic.de/download/yabasic-${PKG_YABASIC_VERSION}.tar.gz};
+: ${PKG_YABASIC_CONFIG_CACHE_EXTRA:="ac_cv_func_strtod=yes"};
 : ${PKG_YABASIC_DISABLED:=1};
 : ${PKG_ZSTD_SHA256SUM:=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9};
 : ${PKG_ZSTD_VERSION:=1.3.4};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index ec1dab70..c5d400bd 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -50,6 +50,9 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_GIT_SHA256SUM:=8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61};
 : ${PKG_GIT_VERSION:=2.30.0};
 : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
+: ${PKG_GIT_CONFIG_CACHE_EXTRA:="
+ac_cv_fread_reads_directories=1
+ac_cv_snprintf_returns_bogus=0"};
 : ${PKG_GIT_CONFIG_CACHE_LOCAL:="ac_cv_iconv_omits_bom=false"};
 : ${PKG_GIT_IN_TREE:=1};
 : ${PKG_GIT_MAKEFLAGS_BUILD:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"};
@@ -70,11 +73,15 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_GNUTLS_SHA256SUM:=646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752};
 : ${PKG_GNUTLS_VERSION:=3.7.2};
 : ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
+: ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:="
+gl_cv_func_working_getdelim=yes
+gl_cv_ld_output_def=no"};
 : ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-static --disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --without-p11-kit --disable-hardware-acceleration --enable-guile=no --with-default-trust-store-dir=/etc/ssl/certs"};
 : ${PKG_GNUTLS_LIBTOOL:=rdlibtool};
 : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
 : ${PKG_HTTPD_VERSION:=2.4.25};
 : ${PKG_HTTPD_URL:=https://archive.apache.org/dist/httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
+: ${PKG_HTTPD_CONFIG_CACHE_EXTRA:="ap_cv_void_ptr_lt_long=no"};
 : ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre=${PREFIX_NATIVE}/bin/pcre-config --with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config"};
 : ${PKG_HTTPD_ENV_VARS_EXTRA:="PCRE_LIBS=-L${PREFIX_NATIVE}/lib -lpcre"};
 : ${PKG_HTTPD_DISABLED:=1};
@@ -110,6 +117,9 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_LIGHTTPD_SHA256SUM:=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5};
 : ${PKG_LIGHTTPD_VERSION:=1.4.59};
 : ${PKG_LIGHTTPD_URL:=https://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz};
+: ${PKG_LIGHTTPD_CONFIG_CACHE_EXTRA:="
+ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
+ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"};
 : ${PKG_LIGHTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre=${PREFIX_NATIVE}"};
 : ${PKG_LINKS_DEPENDS:="bzip2 libz libpng libX11 libressl tiff libjpeg_turbo xz zstd"};
 : ${PKG_LINKS_SHA256SUM:=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63};
@@ -136,6 +146,10 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_MUTT_SHA256SUM:=4ae6d60f7f19854c375cc1c27b5768b71e9f450c2adc10c22e45de8a27de524a};
 : ${PKG_MUTT_VERSION:=2.1.1};
 : ${PKG_MUTT_URL:=http://ftp.mutt.org/pub/mutt/mutt-${PKG_MUTT_VERSION}.tar.gz};
+: ${PKG_MUTT_CONFIG_CACHE_EXTRA:="
+mutt_cv_c99_snprintf=yes
+mutt_cv_c99_vsnprintf=yes
+mutt_cv_regex_broken=no"};
 : ${PKG_MUTT_CONFIGURE_ARGS_EXTRA:="--enable-imap --enable-pop --enable-smtp --enable-sidebar --with-curses --with-mailpath=/var/spool/mail --without-included-gettext --with-gnutls --disable-doc"};
 : ${PKG_NGINX_DEPENDS:="libz pcre"};
 : ${PKG_NGINX_SHA256SUM:=4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610};
@@ -154,6 +168,7 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_NULLMAILER_SHA256SUM:=6d277f69f1999c86df0ca9a97a4f14f9bb431c50fd4e016918290b84ff679241}
 : ${PKG_NULLMAILER_VERSION:=2.2}
 : ${PKG_NULLMAILER_URL:=https://github.com/bruceg/nullmailer/archive/${PKG_NULLMAILER_VERSION}.tar.gz};
+: ${PKG_NULLMAILER_CONFIG_CACHE_EXTRA:="local_cv_flag_NAMEDPIPEBUG=no"};
 : ${PKG_NULLMAILER_CONFIGURE_ARGS_EXTRA:="--enable-tls"}
 : ${PKG_NULLMAILER_FORCE_AUTORECONF:=1};
 : ${PKG_NULLMAILER_IN_TREE:=1}
@@ -210,6 +225,7 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_W3M_SHA256SUM:=0467bb5429b75749205a3f57b9f5e8abba49929272aeab6fce94ff17953f0784};
 : ${PKG_W3M_VERSION:=0.5.3+git20190105};
 : ${PKG_W3M_URL:=https://github.com/tats/w3m/archive/v${PKG_W3M_VERSION}.tar.gz};
+: ${PKG_W3M_CONFIG_CACHE_EXTRA:="ac_cv_func_setpgrp_void=yes"};
 : ${PKG_W3M_CONFIGURE_ARGS_EXTRA:="--with-ssl --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"};
 : ${PKG_W3M_ENV_VARS_EXTRA:="LIBS=-ltinfo"};
 : ${PKG_W3M_IN_TREE:=1};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index b5abed8e..cdb9af64 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -66,6 +66,7 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LIBEVENT_SHA256SUM:=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb};
 : ${PKG_LIBEVENT_VERSION:=2.1.12-stable};
 : ${PKG_LIBEVENT_URL:=https://github.com/libevent/libevent/releases/download/release-${PKG_LIBEVENT_VERSION}/libevent-${PKG_LIBEVENT_VERSION}.tar.gz};
+: ${PKG_LIBEVENT_CONFIG_CACHE_EXTRA:="ac_pe_target=true"};
 : ${PKG_LIBFASTJSON_SHA256SUM:=3544c757668b4a257825b3cbc26f800f59ef3c1ff2a260f40f96b48ab1d59e07};
 : ${PKG_LIBFASTJSON_VERSION:=0.99.8};
 : ${PKG_LIBFASTJSON_URL:=http://download.rsyslog.com/libfastjson/libfastjson-${PKG_LIBFASTJSON_VERSION}.tar.gz};
@@ -98,6 +99,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LIBGCRYPT_SHA256SUM:=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd};
 : ${PKG_LIBGCRYPT_VERSION:=1.9.3};
 : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
+: ${PKG_LIBGCRYPT_CONFIG_CACHE_EXTRA:="
+gcry_cv_broken_visibility_attribute=no
+gcry_cv_visibility_attribute=yes"};
 : ${PKG_LIBGCRYPT_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE} --disable-asm --disable-padlock-support --disable-aesni-support --disable-pclmul-support --disable-sse41-support --disable-drng-support --disable-avx-support --disable-avx2-support --disable-amd64-as-feature-detection};
 : ${PKG_LIBGPG_ERROR_SHA256SUM:=64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742};
 : ${PKG_LIBGPG_ERROR_VERSION:=1.41};
@@ -123,6 +127,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LIBKSBA_SHA256SUM:=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b};
 : ${PKG_LIBKSBA_VERSION:=1.6.0};
 : ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
+: ${PKG_LIBKSBA_CONFIG_CACHE_EXTRA:="
+ksba_cv_broken_visibility_attribute=no
+ksba_cv_visibility_attribute=yes"};
 : ${PKG_LIBKSBA_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE}};
 : ${PKG_LIBMAD_SHA256SUM:=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690};
 : ${PKG_LIBMAD_VERSION:=0.15.1b};
@@ -143,6 +150,7 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LIBPCAP_SHA256SUM:=8ac670de8dd6eff39441580c67f0520f326773422bbf89fdffcd269bd0cfddde};
 : ${PKG_LIBPCAP_VERSION:=1.9.1};
 : ${PKG_LIBPCAP_URL:=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-${PKG_LIBPCAP_VERSION}.tar.gz};
+: ${PKG_LIBPCAP_CONFIG_CACHE_EXTRA:="ac_cv_lbl_unaligned_fail=no"};
 : ${PKG_LIBPCAP_SUBDIR:="libpcap-libpcap-${PKG_LIBPCAP_VERSION}"};
 : ${PKG_LIBPIPELINE_SHA256SUM:=5dbf08faf50fad853754293e57fd4e6c69bb8e486f176596d682c67e02a0adb0};
 : ${PKG_LIBPIPELINE_VERSION:=1.5.3};
@@ -344,6 +352,7 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_SDL2_SHA256SUM:=349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863};
 : ${PKG_SDL2_VERSION:=2.0.12};
 : ${PKG_SDL2_URL:=https://www.libsdl.org/release/SDL2-${PKG_SDL2_VERSION}.tar.gz};
+: ${PKG_SDL2_CONFIG_CACHE_EXTRA:="ac_cv_func_strtod=yes"};
 : ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static --disable-power"};
 : ${PKG_SDL2_CFLAGS_CONFIGURE_EXTRA:="-DWINAPI_UTF16_DEFAULT -DUNICODE -DWINVER=0x0601 -I${PREFIX_NATIVE}/include/w32api.ports -DSDL_DISABLE_WINDOWS_IME"};
 : ${PKG_SDL2_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -lkernel32 -luser32 -lgdi32 -limm32 -lshell32 -lu16ports"};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index c2dc2abb..37a767f7 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -42,6 +42,7 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_GDK_VERSION:=2.36.10};
 : ${PKG_GDK_SHA256SUM:=f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace};
 : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz};
+: ${PKG_GDK_CONFIG_CACHE_EXTRA:="enable_gio_sniffing=yes"};
 : ${PKG_GLEW_DEPENDS:="libX11 mesa"};
 : ${PKG_GLEW_SHA256SUM:=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95};
 : ${PKG_GLEW_VERSION:=2.1.0};
@@ -205,6 +206,7 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_XCB_VERSION:=1.12};
 : ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.bz2};
 : ${PKG_XCB_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+: ${PKG_XCB_CONFIG_CACHE_EXTRA:="ac_cv_search_sendmsg=no"};
 : ${PKG_XCB_CONFIGURE_ARGS_EXTRA:=--disable-randr};
 : ${PKG_XCB_PROTO_SHA256SUM:=5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906};
 : ${PKG_XCB_PROTO_VERSION:=1.12};
diff --git a/vars/bison.vars b/vars/bison.vars
deleted file mode 100644
index 252b781a..00000000
--- a/vars/bison.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_BISON_CONFIG_CACHE_EXTRA:="
-ac_cv_path_M4=/bin/m4
-ac_cv_prog_gnu_m4_gnu=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/gdk.vars b/vars/gdk.vars
index c1449292..30df95cc 100644
--- a/vars/gdk.vars
+++ b/vars/gdk.vars
@@ -2,9 +2,6 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-: ${PKG_GDB_CONFIG_CACHE_EXTRA:="
-enable_gio_sniffing=yes"};
-
 pkg_gdk_install_files_post() {
 	local _pc_path="";
 	for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do
diff --git a/vars/git.vars b/vars/git.vars
index b44ff74f..bcdda80b 100644
--- a/vars/git.vars
+++ b/vars/git.vars
@@ -2,10 +2,6 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-: ${PKG_GIT_CONFIG_CACHE_EXTRA:="
-ac_cv_fread_reads_directories=1
-ac_cv_snprintf_returns_bogus=0"};
-
 pkg_git_install_make_post() {
 	local _fname="" _fname_new="";
 	for _fname in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do
diff --git a/vars/gnutls.vars b/vars/gnutls.vars
deleted file mode 100644
index 41832dea..00000000
--- a/vars/gnutls.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:="
-gl_cv_func_working_getdelim=yes
-gl_cv_ld_output_def=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/htop.vars b/vars/htop.vars
deleted file mode 100644
index 3d6203d7..00000000
--- a/vars/htop.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_HTOP_CONFIG_CACHE_EXTRA:="
-ac_cv_lib_ncursesw_addnwstr=yes
-ac_cv_lib_ncursesw6_addnwstr=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/httpd.vars b/vars/httpd.vars
deleted file mode 100644
index 7735e2d4..00000000
--- a/vars/httpd.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_HTTPD_CONFIG_CACHE_EXTRA:="
-ap_cv_void_ptr_lt_long=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/icoutils.vars b/vars/icoutils.vars
deleted file mode 100644
index 1c69380d..00000000
--- a/vars/icoutils.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_ICOUTILS_CONFIG_CACHE_EXTRA:="
-am_cv_func_working_getline=yes
-gl_cv_func_getopt_gnu=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/libevent.vars b/vars/libevent.vars
deleted file mode 100644
index 2e83eb3e..00000000
--- a/vars/libevent.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_LIBEVENT_CONFIG_CACHE_EXTRA:="
-ac_pe_target=true"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/libgcrypt.vars b/vars/libgcrypt.vars
deleted file mode 100644
index 847eab80..00000000
--- a/vars/libgcrypt.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_LIBGCRYPT_CONFIG_CACHE_EXTRA:="
-gcry_cv_broken_visibility_attribute=no
-gcry_cv_visibility_attribute=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/libksba.vars b/vars/libksba.vars
deleted file mode 100644
index 1948e3da..00000000
--- a/vars/libksba.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_LIBKSBA_CONFIG_CACHE_EXTRA:="
-ksba_cv_broken_visibility_attribute=no
-ksba_cv_visibility_attribute=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/libpcap.vars b/vars/libpcap.vars
deleted file mode 100644
index 2edff37b..00000000
--- a/vars/libpcap.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_LIBPCAP_CONFIG_CACHE_EXTRA:="
-ac_cv_lbl_unaligned_fail=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/lighttpd.vars b/vars/lighttpd.vars
deleted file mode 100644
index b6386d10..00000000
--- a/vars/lighttpd.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_LIGHTTPD_CONFIG_CACHE_EXTRA:="
-ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
-ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/make.vars b/vars/make.vars
deleted file mode 100644
index adac8fcc..00000000
--- a/vars/make.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_MAKE_CONFIG_CACHE_EXTRA:="
-ac_cv_func_gettimeofday=yes
-make_cv_synchronous_posix_spawn=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/mc.vars b/vars/mc.vars
deleted file mode 100644
index 01dcb124..00000000
--- a/vars/mc.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_MC_CONFIG_CACHE_EXTRA:="
-ac_list_mounted_fs=found"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/mutt.vars b/vars/mutt.vars
deleted file mode 100644
index f9d27c82..00000000
--- a/vars/mutt.vars
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_MUTT_CONFIG_CACHE_EXTRA:="
-mutt_cv_c99_snprintf=yes
-mutt_cv_c99_vsnprintf=yes
-mutt_cv_regex_broken=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/nullmailer.vars b/vars/nullmailer.vars
index 07138bb2..e6e0dd71 100644
--- a/vars/nullmailer.vars
+++ b/vars/nullmailer.vars
@@ -2,9 +2,6 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-: ${PKG_NULLMAILER_CONFIG_CACHE_EXTRA:="
-local_cv_flag_NAMEDPIPEBUG=no"};
-
 pkg_nullmailer_configure_autotools_pre() {
 	if ! touch "${PKG_BUILD_DIR}/ChangeLog"; then
 		return 1;
diff --git a/vars/openjazz.vars b/vars/openjazz.vars
deleted file mode 100644
index a1a5c40c..00000000
--- a/vars/openjazz.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_OPENJAZZ_CONFIG_CACHE_EXTRA:="
-ac_cv_prog_POD2MAN="};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/php.vars b/vars/php.vars
index 7b7ee4b1..2ff2d6e8 100644
--- a/vars/php.vars
+++ b/vars/php.vars
@@ -2,10 +2,6 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-: ${PKG_PHP_CONFIG_CACHE_EXTRA:="
-ac_cv_c_bigendian_php=no
-ac_cv_write_stdout=yes"};
-
 pkg_php_configure_pre() {
 	export INSTALL_ROOT=${PKG_DESTDIR};
 };
diff --git a/vars/pixz.vars b/vars/pixz.vars
deleted file mode 100644
index fa4c078f..00000000
--- a/vars/pixz.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_PIXZ_CONFIG_CACHE_EXTRA:="
-ac_cv_file_src_pixz_1=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/procps_ng.vars b/vars/procps_ng.vars
deleted file mode 100644
index fcd2fd45..00000000
--- a/vars/procps_ng.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_PROCPS_NG_CONFIG_CACHE_EXTRA:="
-ac_cv_func_realloc_0_nonnull=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/rc.vars b/vars/rc.vars
deleted file mode 100644
index 43941295..00000000
--- a/vars/rc.vars
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_RC_CONFIG_CACHE_EXTRA:="
-ac_cv_func_setpgrp_void=yes
-rc_cv_sys_dev_fd=yes
-rc_cv_sysv_sigcld=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/sdl2.vars b/vars/sdl2.vars
deleted file mode 100644
index e2ea261d..00000000
--- a/vars/sdl2.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_SDL2_CONFIG_CACHE_EXTRA:="
-ac_cv_func_strtod=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/smallbasic.vars b/vars/smallbasic.vars
deleted file mode 100644
index 86e765cc..00000000
--- a/vars/smallbasic.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_SMALLBASIC_CONFIG_CACHE_EXTRA:="
-ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
-ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/tcl.vars b/vars/tcl.vars
deleted file mode 100644
index a4465917..00000000
--- a/vars/tcl.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_TCL_CONFIG_CACHE_EXTRA:="
-tcl_cv_strtod_buggy=false
-tcl_cv_strtod_unbroken=true"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/w3m.vars b/vars/w3m.vars
deleted file mode 100644
index dab204ab..00000000
--- a/vars/w3m.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_W3M_CONFIG_CACHE_EXTRA:="
-ac_cv_func_setpgrp_void=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/xcb.vars b/vars/xcb.vars
deleted file mode 100644
index e62caa87..00000000
--- a/vars/xcb.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_XCB_CONFIG_CACHE_EXTRA:="
-ac_cv_search_sendmsg=no"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/yabasic.vars b/vars/yabasic.vars
deleted file mode 100644
index 4a32c37e..00000000
--- a/vars/yabasic.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_YABASIC_CONFIG_CACHE_EXTRA:="
-ac_cv_func_strtod=yes"};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/zsh.vars b/vars/zsh.vars
deleted file mode 100644
index 45e79593..00000000
--- a/vars/zsh.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_ZSH_CONFIG_CACHE_EXTRA:="
-zsh_cv_sys_elf=no"};
-
-# vim:filetype=sh textwidth=0