diff --git a/ports/fontconfig/build.sh b/ports/fontconfig/build.sh
index 8a58d8b1..7a5174d5 100755
--- a/ports/fontconfig/build.sh
+++ b/ports/fontconfig/build.sh
@@ -3,7 +3,7 @@
 NAME='fontconfig'
 VERSION='2.17.1'
 DOWNLOAD_URL="https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/$VERSION/fontconfig-$VERSION.tar.gz#82e73b26adad651b236e5f5d4b3074daf8ff0910188808496326bd3449e5261d"
-DEPENDENCIES=('harfbuzz' 'freetype' 'expat' 'libiconv' 'dejavu-fonts-ttf')
+DEPENDENCIES=('freetype' 'expat' 'libiconv' 'dejavu-fonts-ttf')
 CONFIGURE_OPTIONS=(
 	'-Dprefix=/usr'
 	'-Dbuildtype=release'
diff --git a/ports/glib-networking/build.sh b/ports/glib-networking/build.sh
index b2e3ba99..0c6f5208 100755
--- a/ports/glib-networking/build.sh
+++ b/ports/glib-networking/build.sh
@@ -11,6 +11,7 @@ CONFIGURE_OPTIONS=(
 	'-Dgnome_proxy=disabled'
 	'-Dgnutls=disabled'
 	'-Dopenssl=enabled'
+	'-Dc_link_args=-lgcc_s' # something is messed up with my toolchain
 )
 
 configure() {
diff --git a/ports/gtk3/build.sh b/ports/gtk3/build.sh
index 2ae2ebfe..a4f479ea 100755
--- a/ports/gtk3/build.sh
+++ b/ports/gtk3/build.sh
@@ -1,8 +1,9 @@
 #!/bin/bash ../install.sh
 
-NAME='gtk'
+NAME='gtk3'
 VERSION='3.24.49'
 DOWNLOAD_URL="https://gitlab.gnome.org/GNOME/gtk/-/archive/$VERSION/gtk-$VERSION.tar.gz#a2958d82986c81794e953a3762335fa7c78948706d23cced421f7245ca544cbc"
+TAR_CONTENT="gtk-$VERSION"
 DEPENDENCIES=('glib' 'gdk-pixbuf' 'pango' 'libatk' 'libepoxy' 'libXrandr' 'libXcursor' 'libXinerama')
 CONFIGURE_OPTIONS=(
 	'-Dprefix=/usr'
diff --git a/ports/libXdamage/build.sh b/ports/libXdamage/build.sh
index b877996b..03e70932 100755
--- a/ports/libXdamage/build.sh
+++ b/ports/libXdamage/build.sh
@@ -4,7 +4,7 @@ NAME='libXdamage'
 VERSION='1.1.7'
 DOWNLOAD_URL="https://www.x.org/releases/individual/lib/libXdamage-$VERSION.tar.xz#127067f521d3ee467b97bcb145aeba1078e2454d448e8748eb984d5b397bde24"
 CONFIG_SUB=('config.sub')
-DEPENDENCIES=('libX11') # FIXME: check deps
+DEPENDENCIES=('libX11' 'libXfixes')
 CONFIGURE_OPTIONS=(
 	'--enable-shared=yes'
 	'--enable-static=no'
diff --git a/ports/nano/build.sh b/ports/nano/build.sh
index 3a4acd5d..e4b66848 100755
--- a/ports/nano/build.sh
+++ b/ports/nano/build.sh
@@ -7,6 +7,7 @@ DEPENDENCIES=('ncurses')
 CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	'ac_cv_header_glob_h=no'
+	'CFLAGS=-Dpthread_self=pthread_self'
 )
 
 pre_configure() {
diff --git a/ports/pango/build.sh b/ports/pango/build.sh
index 16fa5ba7..4378b611 100755
--- a/ports/pango/build.sh
+++ b/ports/pango/build.sh
@@ -3,7 +3,7 @@
 NAME='pango'
 VERSION='1.57.0'
 DOWNLOAD_URL="https://gitlab.gnome.org/GNOME/pango/-/archive/$VERSION/pango-$VERSION.tar.gz#1b2e2f683dfb5adec3faf17087ade8c648f10a5d3d0e17e421e0ac1a39e6740e"
-DEPENDENCIES=('glib' 'fontconfig' 'cairo' 'fribidi' 'libXft')
+DEPENDENCIES=('glib' 'harfbuzz' 'fontconfig' 'cairo' 'fribidi' 'libXft')
 CONFIGURE_OPTIONS=(
 	'-Dprefix=/usr'
 	'-Dbuildtype=release'
diff --git a/ports/poppler/build.sh b/ports/poppler/build.sh
index f7a8e18b..837dd4d3 100755
--- a/ports/poppler/build.sh
+++ b/ports/poppler/build.sh
@@ -3,7 +3,7 @@
 NAME='poppler'
 VERSION='26.03.0'
 DOWNLOAD_URL="https://poppler.freedesktop.org/poppler-$VERSION.tar.xz#8b3c5e2a9f2ab4c3ec5029f28af1b433c6b71f0d1e7b3997aa561cf1c0ca4ebe"
-DEPENDENCIES=('gtk3' 'cairo' 'boost' 'poppler-data')
+DEPENDENCIES=('gtk3' 'cairo' 'boost' 'curl' 'lcms2' 'libtiff' 'poppler-data')
 
 configure() {
 	cmake --fresh -B build -S . -G Ninja \
diff --git a/ports/xkeyboard-config/build.sh b/ports/xkeyboard-config/build.sh
index 2f047871..db6ad877 100755
--- a/ports/xkeyboard-config/build.sh
+++ b/ports/xkeyboard-config/build.sh
@@ -4,3 +4,4 @@ NAME='xkeyboard-config'
 VERSION='2.5.1'
 DOWNLOAD_URL="https://www.x.org/releases/individual/data/xkeyboard-config-$VERSION.tar.gz#8cf3cc94ba5ce146ecca1d5874c996a507872f076edba7c559ae2ce502382f0b"
 CONFIG_SUB=('config.sub')
+DEPENDENCIES=('libX11')