groups/2*.native_packages_*.group: adds dependencies.

6 files changed, 124 insertions, 66 deletions

diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 065e6c48..9a92c93d 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -6,7 +6,7 @@ ${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} }
 bash bc busybox calcurse coreutils dash datamash dos2unix ed figlet
 findutils gawk grep mksh moon_buggy mpg123 ninvaders rc sbase screen
 sed sloccount tar tcsh the_silver_searcher toilet tree terminally_tetris
-ubase which w3m zsh";
+ubase which zsh";
 : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb};
 : ${PKG_BASH_VERSION:=4.4};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
@@ -94,6 +94,7 @@ ubase which w3m zsh";
 : ${PKG_NINVADERS_IN_TREE:=1};
 : ${PKG_NINVADERS_MAKEFLAGS_BUILD:="LIBS=-Wl,-L${PREFIX_NATIVE}/lib,-lncurses,-ltinfo"};
 : ${PKG_NINVADERS_SUBDIR:=ninvaders-${PKG_NINVADERS_VERSION}};
+: ${PKG_RC_DEPENDS:="libreadline ncurses"};
 : ${PKG_RC_SHA256SUM:=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8};
 : ${PKG_RC_VERSION:=1.7.4};
 : ${PKG_RC_URL:=http://static.tobold.org/rc/rc-${PKG_RC_VERSION}.tar.gz};
@@ -123,9 +124,11 @@ ubase which w3m zsh";
 : ${PKG_TAR_SHA256SUM:=b59549594d91d84ee00c99cf2541a3330fed3a42c440503326dab767f2fbb96c};
 : ${PKG_TAR_VERSION:=1.32};
 : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
+: ${PKG_TCSH_DEPENDS:="ncurses"};
 : ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d};
 : ${PKG_TCSH_VERSION:=6.20.00};
 : ${PKG_TCSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz};
+: ${PKG_THE_SILVER_SEARCHER_DEPENDS:="libz pcre xz"};
 : ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d4652bd91c3a05e87a15809c5f3f14ad2e5e1f80185af510e3fa4ad2038c15d4};
 : ${PKG_THE_SILVER_SEARCHER_VERSION:=2.1.0};
 : ${PKG_THE_SILVER_SEARCHER_URL:=http://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz};
@@ -154,15 +157,6 @@ ubase which w3m zsh";
 : ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad};
 : ${PKG_WHICH_VERSION:=2.21};
 : ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz};
-: ${PKG_W3M_DEPENDS:="ncurses"};
-: ${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_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};
-: ${PKG_W3M_MAKEFLAGS_BUILD:=-j1};
-: ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105};
 : ${PKG_ZSH_DEPENDS:="ncursesw"};
 : ${PKG_ZSH_SHA256SUM:=7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8};
 : ${PKG_ZSH_VERSION:=5.7.1};
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index 8ccf0fe0..b5373343 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -18,6 +18,7 @@ patchutils perl python2 python3 ruby smallbasic tk";
 : ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${DEFAULT_TARGET}-gcc HOSTSYSTEM=${DEFAULT_TARGET} CROSS_CHICKEN=1"};
 : ${PKG_CHICKEN_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= TARGET_PREFIX="};
 : ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=DESTDIR};
+: ${PKG_CPARSER_DEPENDS:="libfirm"};
 : ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${DEFAULT_GITROOT}/compilers/bcparser@main"};
 : ${PKG_CPARSER_BASE_DIR:=${BUILD_WORKDIR}/cparser+libfirm-native-${DEFAULT_TARGET}};
 : ${PKG_CPARSER_BUILD_DIR:=build/cparser};
@@ -105,6 +106,7 @@ patchutils perl python2 python3 ruby smallbasic tk";
 : ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
 : ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
 : ${PKG_SMALLBASIC_IN_TREE:=1};
+: ${PKG_TK_DEPENDS:="libX11 tcl"};
 : ${PKG_TK_SHA256SUM:=131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd};
 : ${PKG_TK_VERSION:=8.7a1};
 : ${PKG_TK_URL:=http://kuiper.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/tcl8_7/tk${PKG_TK_VERSION}-src.tar.gz};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 01de0442..e6c9d35d 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -4,15 +4,14 @@
 NATIVE_PACKAGES_PACKAGES="
 ${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} }
 alsa_lib apr apr_util bdwgc bmake bochs bzip2 ca_certificates classpath
-clzip cmake cron curl dante dbus debianutils emacs expat fetchmail ffmpeg
-file gdbm geoip gettext_tiny ghostscript giflib glib gnuchess gnutls gzip
-hastyhex hexcurse htop icecast imagemagick infounzip infozip isync jamvm
+clzip cmake cron curl dante dbus debianutils emacs expat ffmpeg file
+gdbm geoip gettext_tiny ghostscript giflib glib gnuchess gnutls gzip
+hastyhex hexcurse htop icecast imagemagick infounzip infozip jamvm
 john lcms2 less lmdb lolcode lua mc mintty mlogin musl_compat musl_fts
-nano ncdu ncurses ncursestw ncursesw npth nullmailer openbsd_baseutils
-openjpeg opensmtpd p7zip pcre popt procps_ng qemu qpdf qrencode rdesktop
-rpm rw rxvt_unicode shared_mime_info slang sqlite3 st tcl tdnf texinfo
-tiff tmux tzdb utf8proc util_linux vim w32api w32lib xcowsay xeyes
-xorriso xterm xwd xz yabasic zstd";
+nano ncdu ncurses ncursestw ncursesw npth openbsd_baseutils openjpeg
+opensmtpd p7zip pcre popt procps_ng qemu qpdf qrencode rpm rw
+shared_mime_info slang sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc
+util_linux vim w32api w32lib xorriso xterm xwd xz yabasic zstd";
 : ${PKG_ALSA_LIB_SHA256SUM:=3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf};
 : ${PKG_ALSA_LIB_VERSION:=1.1.8};
 : ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_ALSA_LIB_VERSION}.tar.bz2};
@@ -27,6 +26,7 @@ xorriso xterm xwd xz yabasic zstd";
 : ${PKG_APR_UTIL_URL:=https://archive.apache.org/dist/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
 : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
 : ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
+: ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
 : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
 : ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
 : ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
@@ -80,6 +80,7 @@ fi;
 : ${PKG_CURL_VERSION:=7.61.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
 : ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
+: ${PKG_DANTE_DEPENDS:="libtirpc"};
 : ${PKG_DANTE_SHA256SUM:=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7};
 : ${PKG_DANTE_VERSION:=1.4.2};
 : ${PKG_DANTE_URL:=http://www.inet.no/dante/files/dante-${PKG_DANTE_VERSION}.tar.gz};
@@ -104,10 +105,6 @@ fi;
 : ${PKG_EXPAT_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2};
 : ${PKG_EXPAT_VERSION:=2.2.6};
 : ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2};
-: ${PKG_FETCHMAIL_SHA256SUM:=c7500bed3b0bb85722f7cf2d980e74a879ac57b13cfd225d278179d671c0f5e8};
-: ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4};
-: ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz};
-: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"};
 : ${PKG_FFMPEG_SHA256SUM:=b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5};
 : ${PKG_FFMPEG_VERSION:=4.1};
 : ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2};
@@ -187,10 +184,6 @@ fi;
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INFOZIP_IN_TREE:=1};
 : ${PKG_INFOZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
-: ${PKG_ISYNC_SHA256SUM:=8d5f583976e3119705bdba27fa4fc962e807ff5996f24f354957178ffa697c9c};
-: ${PKG_ISYNC_VERSION:=1.3.0};
-: ${PKG_ISYNC_URL:=https://sources.voidlinux.org/isync-${PKG_ISYNC_VERSION}/isync-${PKG_ISYNC_VERSION}.tar.gz};
-: ${PKG_ISYNC_CONFIGURE_ARGS_EXTRA:=--disable-compat};
 : ${PKG_JAMVM_SHA256SUM:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da};
 : ${PKG_JAMVM_VERSION:=2.0.0};
 : ${PKG_JAMVM_URL:=http://sourceforge.mirrorservice.org/j/ja/jamvm/jamvm/JamVM%20${PKG_JAMVM_VERSION}/jamvm-${PKG_JAMVM_VERSION}.tar.gz};
@@ -232,6 +225,7 @@ fi;
 : ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-DNCURSES_INTERNALS -I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"};
 : ${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_MINTTY_DEPENDS:="w32api w32lib"};
 : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"};
 : ${PKG_MINTTY_CONFIGURE:=bmintty/configure};
 : ${PKG_MINTTY_CONFIGURE_ARGS:="--debug --strict --target=${DEFAULT_TARGET} --source-dir=../mintty --prefix="};
@@ -272,12 +266,6 @@ fi;
 : ${PKG_NPTH_SHA256SUM:=294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2};
 : ${PKG_NPTH_VERSION:=1.5};
 : ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
-: ${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_CONFIGURE_ARGS_EXTRA:="--enable-tls"}
-: ${PKG_NULLMAILER_IN_TREE:=1}
-: ${PKG_NULLMAILER_SUBDIR:=nullmailer-${PKG_NULLMAILER_VERSION}};
 : ${PKG_OPENBSD_BASEUTILS_URLS_GIT:="baseutils=https://github.com/ibara/baseutils.git@master"};
 : ${PKG_OPENBSD_BASEUTILS_BUILD_DIR:=baseutils};
 : ${PKG_OPENBSD_BASEUTILS_ENV_VARS_EXTRA:="MANDIR=${PREFIX_NATIVE}/share/man"};
@@ -285,6 +273,7 @@ fi;
 : ${PKG_OPENJPEG_VERSION:=2.3.1};
 : ${PKG_OPENJPEG_URL:=https://github.com/uclouvain/openjpeg/archive/v${PKG_OPENJPEG_VERSION}.tar.gz};
 : ${PKG_OPENJPEG_SUBDIR:=openjpeg-${PKG_OPENJPEG_VERSION}};
+: ${PKG_OPENSMTPD_DEPENDS:="musl_fts"};
 : ${PKG_OPENSMTPD_SHA256SUM:=eb1bedbfb23d9f08f509d92d8efcaf51d56fb2f44492f40ec059d41124a2f1d9};
 : ${PKG_OPENSMTPD_VERSION:=6.6.1p1};
 : ${PKG_OPENSMTPD_URL:=https://www.opensmtpd.org/archives/opensmtpd-${PKG_OPENSMTPD_VERSION}.tar.gz}
@@ -313,20 +302,17 @@ fi;
 : ${PKG_QEMU_VERSION:=3.1.0};
 : ${PKG_QEMU_URL:=https://download.qemu.org/qemu-${PKG_QEMU_VERSION}.tar.xz};
 : ${PKG_QEMU_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix="" --cc=${DEFAULT_TARGET}-gcc --disable-strip"};
+: ${PKG_QPDF_DEPENDS:="libz pcre"};
 : ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
 : ${PKG_QPDF_VERSION:=6.0.0};
 : ${PKG_QPDF_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/qpdf/qpdf-${PKG_QPDF_VERSION}.tar.gz};
 : ${PKG_QPDF_CONFIGURE_ARGS_EXTRA:=--with-random=/dev/urandom};
 : ${PKG_QPDF_IN_TREE:=1};
+: ${PKG_QRENCODE_DEPENDS:="libpng"};
 : ${PKG_QRENCODE_SHA256SUM:=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5};
 : ${PKG_QRENCODE_VERSION:=3.4.4};
 : ${PKG_QRENCODE_URL:=https://fukuchi.org/works/qrencode/qrencode-${PKG_QRENCODE_VERSION}.tar.bz2};
 : ${PKG_QRENCODE_CONFIGURE_ARGS_EXTRA:=--disable-sdltest};
-: ${PKG_RDESKTOP_SHA256SUM:=9b98b8e73aa83e93aa1d9ae82ce38c08395f64b67799edc24821bb26a84dcd2d};
-: ${PKG_RDESKTOP_VERSION:=1.8.4};
-: ${PKG_RDESKTOP_URL:=https://github.com/rdesktop/rdesktop/releases/download/v${PKG_RDESKTOP_VERSION}/rdesktop-${PKG_RDESKTOP_VERSION}.tar.gz};
-: ${PKG_RDESKTOP_IN_TREE:=1};
-: ${PKG_RDESKTOP_CONFIGURE_ARGS_EXTRA:="ALSA_LIBS=-lasound --disable-credssp --disable-smartcard --with-openssl=${PREFIX_NATIVE}"};
 : ${PKG_RPM_DEPENDS:="curl"};
 : ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};
 : ${PKG_RPM_VERSION:=4.15.1};
@@ -337,10 +323,7 @@ fi;
 : ${PKG_RW_VERSION:=1.0};
 : ${PKG_RW_URL:=https://sortix.org/rw/release/rw-portable-${PKG_RW_VERSION}.tar.gz}
 : ${PKG_RW_BUILD_DIR:=rw-portable-${PKG_RW_VERSION}};
-: ${PKG_RXVT_UNICODE_SHA256SUM:=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd};
-: ${PKG_RXVT_UNICODE_VERSION:=9.22};
-: ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};
-: ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp};
+: ${PKG_SHARED_MIME_INFO_DEPENDS:="libxml2"};
 : ${PKG_SHARED_MIME_INFO_SHA256SUM:=2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9};
 : ${PKG_SHARED_MIME_INFO_VERSION:=1.8};
 : ${PKG_SHARED_MIME_INFO_URL:=http://freedesktop.org/~hadess/shared-mime-info-${PKG_SHARED_MIME_INFO_VERSION}.tar.xz};
@@ -357,14 +340,6 @@ fi;
 : ${PKG_SQLITE3_VERSION:=3160200};
 : ${PKG_SQLITE3_URL:=https://sqlite.org/2017/sqlite-autoconf-${PKG_SQLITE3_VERSION}.tar.gz};
 : ${PKG_SQLITE3_CONFIGURE_ARGS_EXTRA:=--disable-static-shell};
-: ${PKG_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
-: ${PKG_ST_VERSION:=0.7};
-: ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
-: ${PKG_ST_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include};
-: ${PKG_ST_IN_TREE:=1};
-: ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/};
-: ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
 : ${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};
@@ -383,7 +358,7 @@ fi;
 : ${PKG_TIFF_VERSION:=4.0.10};
 : ${PKG_TIFF_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/tiff/tiff-${PKG_TIFF_VERSION}.tar.gz};
 : ${PKG_TIFF_CONFIGURE_ARGS_EXTRA:=--disable-cxx};
-: ${PKG_TMUX_DEPENDS:="ncurses"};
+: ${PKG_TMUX_DEPENDS:="libevent ncurses"};
 : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
 : ${PKG_TMUX_VERSION:=2.3};
 : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz};
@@ -414,12 +389,6 @@ fi;
 : ${PKG_W32API_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_W32LIB_URLS_GIT:="w32lib=git://git.midipix.org/w32lib"};
 : ${PKG_W32LIB_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_XCOWSAY_SHA256SUM:=c7e261ba0262c3821c106ccb6d6f984e3c2da999ad10151364e55d1c699f8e51};
-: ${PKG_XCOWSAY_VERSION:=1.4};
-: ${PKG_XCOWSAY_URL:=http://www.nickg.me.uk/files/xcowsay-${PKG_XCOWSAY_VERSION}.tar.gz};
-: ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};
-: ${PKG_XEYES_VERSION:=1.1.1};
-: ${PKG_XEYES_URL:=https://www.x.org/releases/individual/app/xeyes-${PKG_XEYES_VERSION}.tar.bz2};
 : ${PKG_XORRISO_SHA256SUM:=a93fa7ae5bb1902198cddfec25201388156932f36f2f5da829bf4fcae9a6062b};
 : ${PKG_XORRISO_VERSION:=1.5.0};
 : ${PKG_XORRISO_URL:=https://www.gnu.org/software/xorriso/xorriso-${PKG_XORRISO_VERSION}.tar.gz};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 197350a3..c9c9f594 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -3,9 +3,10 @@
 #
 NATIVE_PACKAGES_PACKAGES="
 ${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} }
-apk_tools aria2 bind dropbear git gnupg httpd inetutils irssi ldns
-lighttpd lynx mailutils microsocks mtr mutt nginx openlitespeed openssh
-pacman rsync socat thttpd weechat wget whois";
+apk_tools aria2 bind dropbear fetchmail git gnupg httpd inetutils irssi
+isync ldns lighttpd lynx mailutils microsocks mtr mutt nginx nullmailer
+openlitespeed openssh pacman rsync socat thttpd w3m weechat wget whois";
+: ${PKG_APK_TOOLS_DEPENDS:="libressl"};
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
 : ${PKG_APK_TOOLS_VERSION:=2.6.8};
 : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2};
@@ -22,10 +23,16 @@ pacman rsync socat thttpd weechat wget whois";
 : ${PKG_BIND_URL:=https://ftp.isc.org/isc/bind/${PKG_BIND_VERSION}/bind-${PKG_BIND_VERSION}.tar.gz};
 : ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-libtool --disable-backtrace --with-eddsa=no --with-ecdsa=yes --with-gssapi=no --with-libxml2=no --with-libjson=no --with-openssl=${PREFIX_NATIVE} BUILD_CC=gcc"};
 : ${PKG_BIND_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_DROPBEAR_DEPENDS:="libz"};
 : ${PKG_DROPBEAR_SHA256SUM:=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4};
 : ${PKG_DROPBEAR_VERSION:=2019.78};
 : ${PKG_DROPBEAR_URL:=https://matt.ucc.asn.au/dropbear/releases/dropbear-${PKG_DROPBEAR_VERSION}.tar.bz2};
 : ${PKG_DROPBEAR_CONFIGURE_ARGS_EXTRA:=--disable-loginfunc};
+: ${PKG_FETCHMAIL_DEPENDS:="libressl"};
+: ${PKG_FETCHMAIL_SHA256SUM:=c7500bed3b0bb85722f7cf2d980e74a879ac57b13cfd225d278179d671c0f5e8};
+: ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4};
+: ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz};
+: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"};
 : ${PKG_GIT_DEPENDS:="curl"};
 : ${PKG_GIT_SHA256SUM:=690f12cc5691e5adaf2dd390eae6f5acce68ae0d9bd9403814f8a1433833f02a};
 : ${PKG_GIT_VERSION:=2.17.1};
@@ -52,6 +59,12 @@ pacman rsync socat thttpd weechat wget whois";
 : ${PKG_IRSSI_VERSION:=1.2.2};
 : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz};
 : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}};
+: ${PKG_ISYNC_DEPENDS:="libressl"};
+: ${PKG_ISYNC_SHA256SUM:=8d5f583976e3119705bdba27fa4fc962e807ff5996f24f354957178ffa697c9c};
+: ${PKG_ISYNC_VERSION:=1.3.0};
+: ${PKG_ISYNC_URL:=https://sources.voidlinux.org/isync-${PKG_ISYNC_VERSION}/isync-${PKG_ISYNC_VERSION}.tar.gz};
+: ${PKG_ISYNC_CONFIGURE_ARGS_EXTRA:=--disable-compat};
+: ${PKG_LDNS_DEPENDS:="libressl"};
 : ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc};
 : ${PKG_LDNS_VERSION:=1.7.0};
 : ${PKG_LDNS_URL:=https://www.nlnetlabs.nl/downloads/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz};
@@ -85,6 +98,7 @@ pacman rsync socat thttpd weechat wget whois";
 : ${PKG_MUTT_VERSION:=1.10.1};
 : ${PKG_MUTT_URL:=ftp://ftp.mutt.org/pub/mutt/mutt-${PKG_MUTT_VERSION}.tar.gz};
 : ${PKG_MUTT_CONFIGURE_ARGS_EXTRA:="--enable-imap --enable-pop --enable-smtp --enable-sidebar --with-curses --with-mailpath=/var/spool/mail --without-included-gettext --with-ssl --disable-doc"};
+: ${PKG_NGINX_DEPENDS:="libz pcre"};
 : ${PKG_NGINX_SHA256SUM:=4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610};
 : ${PKG_NGINX_VERSION:=1.11.3};
 : ${PKG_NGINX_URL:=http://nginx.org/download/nginx-${PKG_NGINX_VERSION}.tar.gz};
@@ -92,6 +106,13 @@ pacman rsync socat thttpd weechat wget whois";
 : ${PKG_NGINX_CONFIGURE_ARGS:="--prefix="};
 : ${PKG_NGINX_ENV_VARS_EXTRA:=CC=${DEFAULT_TARGET}-gcc};
 : ${PKG_NGINX_IN_TREE:=1};
+: ${PKG_NULLMAILER_DEPENDS:="gnutls"};
+: ${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_CONFIGURE_ARGS_EXTRA:="--enable-tls"}
+: ${PKG_NULLMAILER_IN_TREE:=1}
+: ${PKG_NULLMAILER_SUBDIR:=nullmailer-${PKG_NULLMAILER_VERSION}};
 : ${PKG_OPENLITESPEED_SHA256SUM:=11cea34ebb0d72e5c620c61dce9ee4982474311dc5f35e0737a6b6d760bcf577};
 : ${PKG_OPENLITESPEED_VERSION:=1.4.27};
 : ${PKG_OPENLITESPEED_URL:=http://open.litespeedtech.com/packages/openlitespeed-${PKG_OPENLITESPEED_VERSION}.tgz};
@@ -130,6 +151,15 @@ pacman rsync socat thttpd weechat wget whois";
 : ${PKG_THTTPD_IN_TREE:=1};
 : ${PKG_THTTPD_MAKEFLAGS_BUILD_EXTRA:=-j1};
 : ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix};
+: ${PKG_W3M_DEPENDS:="imlib2 libressl ncurses"};
+: ${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_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};
+: ${PKG_W3M_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105};
 : ${PKG_WEECHAT_DEPENDS:="curl ncursesw"};
 : ${PKG_WEECHAT_SHA256SUM:=5038a47c6e87e56fcd937acc159d89f76845a4128923c100700abaa7c5db7aed};
 : ${PKG_WEECHAT_VERSION:=2.7};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 5a13048a..17da64d7 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -40,6 +40,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBEVENT_SHA256SUM:=e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0};
 : ${PKG_LIBEVENT_VERSION:=2.1.10-stable};
 : ${PKG_LIBEVENT_URL:=https://github.com/libevent/libevent/releases/download/release-${PKG_LIBEVENT_VERSION}/libevent-${PKG_LIBEVENT_VERSION}.tar.gz};
+: ${PKG_LIBFETCH_DEPENDS:="libressl"};
 : ${PKG_LIBFETCH_SHA256SUM:=3226f53d5ad29cc27510db968ef0d37bf4554b8aaaeadcd56e23067213b08943};
 : ${PKG_LIBFETCH_VERSION:=2.33};
 : ${PKG_LIBFETCH_URL:=https://sources.archlinux.org/other/libfetch/libfetch-${PKG_LIBFETCH_VERSION}.tar.gz};
@@ -62,6 +63,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBFLAC_SHA256SUM:=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748};
 : ${PKG_LIBFLAC_VERSION:=1.3.3};
 : ${PKG_LIBFLAC_URL:=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${PKG_LIBFLAC_VERSION}.tar.xz};
+: ${PKG_LIBGCRYPT_DEPENDS:="libgpg_error"};
 : ${PKG_LIBGCRYPT_SHA256SUM:=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3};
 : ${PKG_LIBGCRYPT_VERSION:=1.8.5};
 : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
@@ -73,6 +75,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBJPEG_TURBO_SHA256SUM:=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed};
 : ${PKG_LIBJPEG_TURBO_VERSION:=2.0.2};
 : ${PKG_LIBJPEG_TURBO_URL:=https://sourceforge.mirrorservice.org/l/li/libjpeg-turbo/${PKG_LIBJPEG_TURBO_VERSION}/libjpeg-turbo-${PKG_LIBJPEG_TURBO_VERSION}.tar.gz};
+: ${PKG_LIBKSBA_DEPENDS:="libgpg_error"};
 : ${PKG_LIBKSBA_SHA256SUM:=41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340};
 : ${PKG_LIBKSBA_VERSION:=1.3.5};
 : ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
@@ -93,6 +96,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBPIPELINE_VERSION:=1.4.1};
 : ${PKG_LIBPIPELINE_URL:=http://download.savannah.gnu.org/releases/libpipeline/libpipeline-${PKG_LIBPIPELINE_VERSION}.tar.gz};
 : ${PKG_LIBPIPELINE_CFLAGS_BUILD_EXTRA:=-Dprogram_name=program_invocation_name};
+: ${PKG_LIBPNG_DEPENDS:="libz"};
 : ${PKG_LIBPNG_SHA256SUM:=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca};
 : ${PKG_LIBPNG_VERSION:=1.6.37};
 : ${PKG_LIBPNG_URL:=https://sourceforge.mirrorservice.org/l/li/libpng/libpng16/${PKG_LIBPNG_VERSION}/libpng-${PKG_LIBPNG_VERSION}.tar.xz};
@@ -125,6 +129,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBSNDFILE_SHA256SUM:=1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9};
 : ${PKG_LIBSNDFILE_VERSION:=1.0.28};
 : ${PKG_LIBSNDFILE_URL:=http://www.mega-nerd.com/libsndfile/files/libsndfile-${PKG_LIBSNDFILE_VERSION}.tar.gz};
+: ${PKG_LIBSOLV_DEPENDS:="libxml2"};
 : ${PKG_LIBSOLV_SHA256SUM:=153eb48814ffdbac396c98126037cf45c07e2b7087a61f86eb18a75ea1ab134b};
 : ${PKG_LIBSOLV_VERSION:=0.6.34};
 : ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz};
@@ -148,9 +153,11 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBUV_SHA256SUM:=7cbcf2017e7116cf9da8ec1c6a146d578536b1e479458438873c991f984a53d7};
 : ${PKG_LIBUV_VERSION:=1.19.2};
 : ${PKG_LIBUV_URL:=https://dist.libuv.org/dist/v${PKG_LIBUV_VERSION}/libuv-v${PKG_LIBUV_VERSION}.tar.gz};
+: ${PKG_LIBVORBIS_DEPENDS:="libogg"};
 : ${PKG_LIBVORBIS_SHA256SUM:=af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415};
 : ${PKG_LIBVORBIS_VERSION:=1.3.6};
 : ${PKG_LIBVORBIS_URL:=https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-${PKG_LIBVORBIS_VERSION}.tar.xz};
+: ${PKG_LIBXML2_DEPENDS:="xz"};
 : ${PKG_LIBXML2_SHA256SUM:=94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871};
 : ${PKG_LIBXML2_VERSION:=2.9.9};
 : ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz};
@@ -164,6 +171,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
 : ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET} --enable-shared"};
 : ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_LIBZIP_DEPENDS:="bzip2"};
 : ${PKG_LIBZIP_SHA256SUM:=a6cd804b4b3cffd997bd563fec693eb7eb052c225909a98a620689c2befb699b};
 : ${PKG_LIBZIP_VERSION:=1.6.0};
 : ${PKG_LIBZIP_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_VERSION}.tar.xz};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index 0f91f1c8..6a6c2724 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -3,16 +3,19 @@
 #
 NATIVE_PACKAGES_PACKAGES="
 ${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} }
-atk at_spi2_atk at_spi2_core cairo dbus_glib fontconfig freetype fribidi
-gdk glew gtk2 gtk3 harfbuzz imlib2 libass libcaca libepoxy libfontenc
-libICE libpthread_stubs libSM libX11 libXau libXaw libXdamage libXdmcp
-libXext libxfce4ui libxfce4util libXfixes libXfont2 libXft libXi
-libxkbfile libXmu libXpm libXt libXtst mesa pango pixman sdl1 sdl2
-util_macros xcb xcb_proto xcb_util xcb_util_image xcb_util_wm xfconf
-xorgproto Xrender xtrans xwin";
+atk at_spi2_atk at_spi2_core cairo dbus_glib fontconfig freetype
+fribidi gdk glew gtk2 gtk3 harfbuzz imlib2 libass libcaca libepoxy
+libfontenc libICE libpthread_stubs libSM libX11 libXau libXaw libXdamage
+libXdmcp libXext libxfce4ui libxfce4util libXfixes libXfont2 libXft
+libXi libxkbfile libXmu libXpm libXt libXtst mesa pango pixman
+rdesktop rxvt_unicode sdl1 sdl2 st util_macros xcb xcb_proto xcb_util
+xcb_util_image xcb_util_wm xcowsay xeyes xfconf xorgproto Xrender
+xtrans xwin";
+: ${PKG_ATK_DEPENDS:="glib"};
 : ${PKG_ATK_VERSION:=2.26.0};
 : ${PKG_ATK_SHA256SUM:=eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827};
 : ${PKG_ATK_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/${PKG_ATK_VERSION%.*}/atk-${PKG_ATK_VERSION}.tar.xz};
+: ${PKG_AT_SPI2_ATK_DEPENDS:="atk dbus glib"};
 : ${PKG_AT_SPI2_ATK_VERSION:=2.26.1};
 : ${PKG_AT_SPI2_ATK_SHA256SUM:=b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75};
 : ${PKG_AT_SPI2_ATK_URL:=https://download.gnome.org/sources/at-spi2-atk/${PKG_AT_SPI2_ATK_VERSION%.*}/at-spi2-atk-${PKG_AT_SPI2_ATK_VERSION}.tar.xz};
@@ -23,10 +26,12 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
 : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
 : ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_DBUS_GLIB_DEPENDS:="dbus expat glib"};
 : ${PKG_DBUS_GLIB_SHA256SUM:=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825};
 : ${PKG_DBUS_GLIB_VERSION:=0.110};
 : ${PKG_DBUS_GLIB_URL:=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PKG_DBUS_GLIB_VERSION}.tar.gz};
 : ${PKG_DBUS_GLIB_CONFIGURE_ARGS_EXTRA:="--with-dbus-binding-tool=${PREFIX}/bin/dbus-binding-tool --enable-bash-completion=no"};
+: ${PKG_FONTCONFIG_DEPENDS:="freetype"};
 : ${PKG_FONTCONFIG_SHA256SUM:=0d297ce6bbad897c91c248aeeeeb401dbc62e0960cfa958e87ec32fd5c2270c1};
 : ${PKG_FONTCONFIG_VERSION:=2.12.93};
 : ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2};
@@ -38,9 +43,11 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_FRIBIDI_SHA256SUM:=6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce};
 : ${PKG_FRIBIDI_VERSION:=1.0.5};
 : ${PKG_FRIBIDI_URL:=https://github.com/fribidi/fribidi/releases/download/v${PKG_FRIBIDI_VERSION}/fribidi-${PKG_FRIBIDI_VERSION}.tar.bz2};
+: ${PKG_GDK_DEPENDS:="tiff"};
 : ${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_GLEW_DEPENDS:="libX11"};
 : ${PKG_GLEW_SHA256SUM:=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95};
 : ${PKG_GLEW_VERSION:=2.1.0};
 : ${PKG_GLEW_URL:=http://sourceforge.mirrorservice.org/g/gl/glew/glew/${PKG_GLEW_VERSION}/glew-${PKG_GLEW_VERSION}.tgz};
@@ -66,6 +73,7 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_HARFBUZZ_SHA256SUM:=84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563};
 : ${PKG_HARFBUZZ_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"};
 : ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:=--with-icu=no};
+: ${PKG_IMLIB2_DEPENDS:="freetype"};
 : ${PKG_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272};
 : ${PKG_IMLIB2_VERSION:=1.4.10};
 : ${PKG_IMLIB2_URL:=http://sources.buildroot.net/imlib2/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2};
@@ -93,15 +101,19 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_LIBPTHREAD_STUBS_SHA256SUM:=e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733};
 : ${PKG_LIBPTHREAD_STUBS_VERSION:=0.4};
 : ${PKG_LIBPTHREAD_STUBS_URL:=https://xcb.freedesktop.org/dist/libpthread-stubs-${PKG_LIBPTHREAD_STUBS_VERSION}.tar.bz2};
+: ${PKG_LIBSM_DEPENDS:="libICE xtrans"};
 : ${PKG_LIBSM_SHA256SUM:=0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd};
 : ${PKG_LIBSM_VERSION:=1.2.2};
 : ${PKG_LIBSM_URL:=https://www.x.org/releases/individual/lib/libSM-${PKG_LIBSM_VERSION}.tar.bz2};
+: ${PKG_LIBX11_DEPENDS:="xcb xorgproto xtrans"};
 : ${PKG_LIBX11_SHA256SUM:=b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441};
 : ${PKG_LIBX11_VERSION:=1.6.4};
 : ${PKG_LIBX11_URL:=https://www.x.org/releases/individual/lib/libX11-${PKG_LIBX11_VERSION}.tar.bz2};
+: ${PKG_LIBXAU_DEPENDS:="xorgproto"};
 : ${PKG_LIBXAU_SHA256SUM:=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2};
 : ${PKG_LIBXAU_VERSION:=1.0.8};
 : ${PKG_LIBXAU_URL:=https://www.x.org/releases/individual/lib/libXau-${PKG_LIBXAU_VERSION}.tar.bz2};
+: ${PKG_LIBXAW_DEPENDS:="libX11 libXext libXmu libXt"};
 : ${PKG_LIBXAW_SHA256SUM:=8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd};
 : ${PKG_LIBXAW_VERSION:=1.0.13};
 : ${PKG_LIBXAW_URL:=https://www.x.org/releases/individual/lib/libXaw-${PKG_LIBXAW_VERSION}.tar.bz2};
@@ -111,39 +123,48 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_LIBXDMCP_SHA256SUM:=81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2};
 : ${PKG_LIBXDMCP_VERSION:=1.1.2};
 : ${PKG_LIBXDMCP_URL:=https://x.org/releases/individual/lib/libXdmcp-${PKG_LIBXDMCP_VERSION}.tar.bz2};
+: ${PKG_LIBXEXT_DEPENDS:="libX11 xorgproto"};
 : ${PKG_LIBXEXT_SHA256SUM:=b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35};
 : ${PKG_LIBXEXT_VERSION:=1.3.3};
 : ${PKG_LIBXEXT_URL:=https://www.x.org/releases/individual/lib/libXext-${PKG_LIBXEXT_VERSION}.tar.bz2};
+: ${PKG_LIBXFCE4UI_DEPENDS:="libX11"};
 : ${PKG_LIBXFCE4UI_SHA256SUM:=011d9532337a8d0c4d6d2c4dfc854b4f298dbad0e9513b3495a573673b863987};
 : ${PKG_LIBXFCE4UI_VERSION:=4.12.0};
 : ${PKG_LIBXFCE4UI_URL:=http://mirror.sobukus.de/files/grimoire/xfce/libxfce4ui-${PKG_LIBXFCE4UI_VERSION}.tar.bz2};
 : ${PKG_LIBXFCE4UI_CONFIGURE_ARGS_EXTRA:=--disable-gtk3};
+: ${PKG_LIBXFCE4UTIL_DEPENDS:="glib"};
 : ${PKG_LIBXFCE4UTIL_SHA256SUM:=876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d};
 : ${PKG_LIBXFCE4UTIL_VERSION:=4.12.1};
 : ${PKG_LIBXFCE4UTIL_URL:=https://ftp.osuosl.org/pub/blfs/7.9/l/libxfce4util-${PKG_LIBXFCE4UTIL_VERSION}.tar.bz2};
 : ${PKG_LIBXFIXES_SHA256SUM:=9ab6c13590658501ce4bd965a8a5d32ba4d8b3bb39a5a5bc9901edffc5666570};
 : ${PKG_LIBXFIXES_VERSION:=5.0.3};
 : ${PKG_LIBXFIXES_URL:=https://x.org/releases/individual/lib/libXfixes-${PKG_LIBXFIXES_VERSION}.tar.gz};
+: ${PKG_LIBXFONT2_DEPENDS:="freetype"};
 : ${PKG_LIBXFONT2_SHA256SUM:=0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e};
 : ${PKG_LIBXFONT2_VERSION:=2.0.3};
 : ${PKG_LIBXFONT2_URL:=https://x.org/releases/individual/lib/libXfont2-${PKG_LIBXFONT2_VERSION}.tar.bz2};
 : ${PKG_LIBXFONT2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_LIBXFT_DEPENDS:=" libX11 util_macros Xrender"};
 : ${PKG_LIBXFT_SHA256SUM:=7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd};
 : ${PKG_LIBXFT_VERSION:=2.3.1};
 : ${PKG_LIBXFT_URL:=https://www.x.org/releases/individual/lib/libXft-${PKG_LIBXFT_VERSION}.tar.bz2};
 : ${PKG_LIBXFT_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_LIBXI_DEPENDS:="libX11 xorgproto"};
 : ${PKG_LIBXI_SHA256SUM:=463cc5370191404bc0f8a450fdbf6d9159efbbf274e5e0f427a60191fed9cf4b};
 : ${PKG_LIBXI_VERSION:=1.7.9};
 : ${PKG_LIBXI_URL:=https://x.org/releases/individual/lib/libXi-${PKG_LIBXI_VERSION}.tar.gz};
 : ${PKG_LIBXKBFILE_SHA256SUM:=51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a};
 : ${PKG_LIBXKBFILE_VERSION:=1.0.9};
 : ${PKG_LIBXKBFILE_URL:=https://www.x.org/releases/individual/lib/libxkbfile-${PKG_LIBXKBFILE_VERSION}.tar.bz2};
+: ${PKG_LIBXMU_DEPENDS:="libXext libXt libX11 xorgproto"};
 : ${PKG_LIBXMU_SHA256SUM:=756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b};
 : ${PKG_LIBXMU_VERSION:=1.1.2};
 : ${PKG_LIBXMU_URL:=https://www.x.org/releases/individual/lib/libXmu-${PKG_LIBXMU_VERSION}.tar.bz2};
+: ${PKG_LIBXPM_DEPENDS:="libX11 xorgproto"};
 : ${PKG_LIBXPM_SHA256SUM:=c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c};
 : ${PKG_LIBXPM_VERSION:=3.5.11};
 : ${PKG_LIBXPM_URL:=https://www.x.org/releases/individual/lib/libXpm-${PKG_LIBXPM_VERSION}.tar.bz2};
+: ${PKG_LIBXT_DEPENDS:="libICE libSM libX11"};
 : ${PKG_LIBXT_SHA256SUM:=46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a};
 : ${PKG_LIBXT_VERSION:=1.1.5};
 : ${PKG_LIBXT_URL:=https://www.x.org/releases/individual/lib/libXt-${PKG_LIBXT_VERSION}.tar.bz2};
@@ -159,6 +180,7 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_MESA_CONFIGURE_ARGS_EXTRA:="--enable-glx=xlib --with-platforms=x11 --disable-dri --disable-gbm --disable-egl --with-gallium-drivers= --disable-llvm --disable-asm"};
 : ${PKG_MESA_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
 : ${PKG_MESA_LIBTOOL:=slibtool-shared};
+: ${PKG_PANGO_DEPENDS:="cairo harfbuzz"};
 : ${PKG_PANGO_VERSION:=1.40.11};
 : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e};
 : ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz};
@@ -166,6 +188,17 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_PIXMAN_VERSION:=0.34.0};
 : ${PKG_PIXMAN_URL:=https://www.cairographics.org/releases/pixman-${PKG_PIXMAN_VERSION}.tar.gz};
 : ${PKG_PIXMAN_SHA256SUM:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e};
+: ${PKG_RDESKTOP_DEPENDS:="libX11"};
+: ${PKG_RDESKTOP_SHA256SUM:=9b98b8e73aa83e93aa1d9ae82ce38c08395f64b67799edc24821bb26a84dcd2d};
+: ${PKG_RDESKTOP_VERSION:=1.8.4};
+: ${PKG_RDESKTOP_URL:=https://github.com/rdesktop/rdesktop/releases/download/v${PKG_RDESKTOP_VERSION}/rdesktop-${PKG_RDESKTOP_VERSION}.tar.gz};
+: ${PKG_RDESKTOP_IN_TREE:=1};
+: ${PKG_RDESKTOP_CONFIGURE_ARGS_EXTRA:="ALSA_LIBS=-lasound --disable-credssp --disable-smartcard --with-openssl=${PREFIX_NATIVE}"};
+: ${PKG_RXVT_UNICODE_DEPENDS:="libX11"};
+: ${PKG_RXVT_UNICODE_SHA256SUM:=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd};
+: ${PKG_RXVT_UNICODE_VERSION:=9.22};
+: ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};
+: ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp};
 : ${PKG_SDL1_SHA256SUM:=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00};
 : ${PKG_SDL1_VERSION:=1.2.15};
 : ${PKG_SDL1_URL:=https://www.libsdl.org/release/SDL-${PKG_SDL1_VERSION}.tar.gz};
@@ -178,9 +211,19 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_SDL2_URL:=https://www.libsdl.org/release/SDL2-${PKG_SDL2_VERSION}.tar.gz};
 : ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static"};
 : ${PKG_SDL2_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_ST_DEPENDS:="libX11"};
+: ${PKG_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
+: ${PKG_ST_VERSION:=0.7};
+: ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
+: ${PKG_ST_BUILD_STEPS_DISABLE:=install_make};
+: ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include};
+: ${PKG_ST_IN_TREE:=1};
+: ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/};
+: ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
 : ${PKG_UTIL_MACROS_SHA256SUM:=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712};
 : ${PKG_UTIL_MACROS_VERSION:=1.19.2};
 : ${PKG_UTIL_MACROS_URL:=https://www.x.org/archive/individual/util/util-macros-${PKG_UTIL_MACROS_VERSION}.tar.bz2};
+: ${PKG_XCB_DEPENDS:="libpthread_stubs libXau xcb_proto"};
 : ${PKG_XCB_SHA256SUM:=4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b};
 : ${PKG_XCB_VERSION:=1.12};
 : ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.bz2};
@@ -189,15 +232,27 @@ xorgproto Xrender xtrans xwin";
 : ${PKG_XCB_PROTO_SHA256SUM:=5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906};
 : ${PKG_XCB_PROTO_VERSION:=1.12};
 : ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/xcb/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.bz2};
+: ${PKG_XCB_UTIL_DEPENDS:="xcb"};
 : ${PKG_XCB_UTIL_SHA256SUM:=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9};
 : ${PKG_XCB_UTIL_VERSION:=0.4.0};
 : ${PKG_XCB_UTIL_URL:=https://x.org/releases/individual/xcb/xcb-util-${PKG_XCB_UTIL_VERSION}.tar.bz2};
+: ${PKG_XCB_UTIL_IMAGE_DEPENDS:="xcb"};
 : ${PKG_XCB_UTIL_IMAGE_SHA256SUM:=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc};
 : ${PKG_XCB_UTIL_IMAGE_VERSION:=0.4.0};
 : ${PKG_XCB_UTIL_IMAGE_URL:=https://x.org/releases/individual/xcb/xcb-util-image-${PKG_XCB_UTIL_IMAGE_VERSION}.tar.bz2};
+: ${PKG_XCB_UTIL_WM_DEPENDS:="xcb"};
 : ${PKG_XCB_UTIL_WM_SHA256SUM:=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f};
 : ${PKG_XCB_UTIL_WM_VERSION:=0.4.1};
 : ${PKG_XCB_UTIL_WM_URL:=https://x.org/releases/individual/xcb/xcb-util-wm-${PKG_XCB_UTIL_WM_VERSION}.tar.bz2};
+: ${PKG_XCOWSAY_DEPENDS:="gdk gtk2"};
+: ${PKG_XCOWSAY_SHA256SUM:=c7e261ba0262c3821c106ccb6d6f984e3c2da999ad10151364e55d1c699f8e51};
+: ${PKG_XCOWSAY_VERSION:=1.4};
+: ${PKG_XCOWSAY_URL:=http://www.nickg.me.uk/files/xcowsay-${PKG_XCOWSAY_VERSION}.tar.gz};
+: ${PKG_XEYES_DEPENDS:="libX11 libXext libXmu libXt"};
+: ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};
+: ${PKG_XEYES_VERSION:=1.1.1};
+: ${PKG_XEYES_URL:=https://www.x.org/releases/individual/app/xeyes-${PKG_XEYES_VERSION}.tar.bz2};
+: ${PKG_XFCONF_DEPENDS:="glib libxfce4util"};
 : ${PKG_XFCONF_SHA256SUM:=9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156};
 : ${PKG_XFCONF_VERSION:=4.12.0};
 : ${PKG_XFCONF_URL:=http://ftp.osuosl.org/pub/blfs/conglomeration/xfconf/xfconf-${PKG_XFCONF_VERSION}.tar.bz2};