nvidia-32: updated to version 390.67

2018-06-06 15:43:44 -05:00
823 changed files with 6992 additions and 11802 deletions
--- a/alsa-lib-32/.footprint
+++ b/alsa-lib-32/.footprint
@ -4,10 +4,5 @@ drwxr-xr-x	root/root	usr/lib32/
 lrwxrwxrwx	root/root	usr/lib32/libasound.so -> libasound.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib32/libasound.so.2 -> libasound.so.2.0.0
 -rwxr-xr-x	root/root	usr/lib32/libasound.so.2.0.0
-rwxr-xr-x	root/root	usr/lib32/libatopology.la
-lrwxrwxrwx	root/root	usr/lib32/libatopology.so -> libatopology.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib32/libatopology.so.2 -> libatopology.so.2.0.0
-rwxr-xr-x	root/root	usr/lib32/libatopology.so.2.0.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/alsa-topology.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/alsa.pc
--- a/alsa-lib-32/.md5sum
+++ b/alsa-lib-32/.md5sum
@ -0,0 +1 @@
+2f981a8f7897c59ec2ddc44916d33788  alsa-lib-1.1.6.tar.bz2
--- a/alsa-lib-32/.signature
+++ b/alsa-lib-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXX/xsM6YC3CiwB8wqH8H0rD7HYaJWUn58CKYY6Ee9pZt9bxwL572+a3ObCDcibzkDe1QPwQpGrudbiVQ1sGgcQ8=
-SHA256 (Pkgfile) = 4b3e5b7d80c094bfa430ca3921747539657a77ba1e3135c15dbf9f2ffcbbf140
-SHA256 (.footprint) = c93d9e18fbf514e682c42d7ebdc3c935d52eacb5b87ad99765d7b23a223578b9
-SHA256 (alsa-lib-1.2.11.tar.bz2) = 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d
+RWSwxGo/zH7eXfJL3dmfxGLrIz6EbTc/r+WvDGaw0q5vDnVHyVW0Vvtny6zjKu5pDpITOuPKDJJQ9PmbXQ6BkDjv56ODxco7/g0=
+SHA256 (Pkgfile) = cd7ee1edcebb0ba6e0fc32fa49ff4eb5feb5cbef9e5d735c79fd48f76ef40faf
+SHA256 (.footprint) = dc1060a96796380b5749e8110478f019be658bec92ecd867c4d210b12dac81db
+SHA256 (alsa-lib-1.1.6.tar.bz2) = 5f2cd274b272cae0d0d111e8a9e363f08783329157e8dd68b3de0c096de6d724
--- a/alsa-lib-32/Pkgfile
+++ b/alsa-lib-32/Pkgfile
@ -4,9 +4,9 @@
 # Depends on: alsa-lib

 name=alsa-lib-32
-version=1.2.11
+version=1.1.6
 release=1
-source=(https://www.alsa-project.org/files/pub/lib/alsa-lib-$version.tar.bz2)
+source=(ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${version}.tar.bz2)

 build() {
 	cd alsa-lib-$version
--- a/alsa-plugins-32/.footprint
+++ b/alsa-plugins-32/.footprint
@ -1,19 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/alsa-lib/
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_ctl_arcam_av.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_ctl_arcam_av.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_ctl_oss.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_ctl_oss.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_oss.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_oss.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_upmix.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_upmix.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_usb_stream.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_usb_stream.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_vdownmix.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_pcm_vdownmix.so
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_rate_speexrate.la
-rwxr-xr-x	root/root	usr/lib32/alsa-lib/libasound_module_rate_speexrate.so
-lrwxrwxrwx	root/root	usr/lib32/alsa-lib/libasound_module_rate_speexrate_best.so -> libasound_module_rate_speexrate.so
-lrwxrwxrwx	root/root	usr/lib32/alsa-lib/libasound_module_rate_speexrate_medium.so -> libasound_module_rate_speexrate.so
--- a/alsa-plugins-32/.signature
+++ b/alsa-plugins-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXWOtqOBGz9PUXcASGoy62xHk7MpE4yN5U0pDG2lDcUAtsN8yT8lumSNYdPIYk+lb4WkCmEh9f4Lq/Xbq3EvxeAM=
-SHA256 (Pkgfile) = 7e4340e02391ed4c09ef76cb2e682a6b608b4c2f5065d3c784dcb583770d072c
-SHA256 (.footprint) = 1230b600ca74ee7479052e2622c8a3eb80b2edd161215b5eb657df71ac709fff
-SHA256 (alsa-plugins-1.2.7.1.tar.bz2) = 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511
--- a/alsa-plugins-32/Pkgfile
+++ b/alsa-plugins-32/Pkgfile
@ -1,23 +0,0 @@
-# Description: ALSA Plugins contains plugins for various audio libraries and sound servers.
-# URL: https://www.alsa-project.org/
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: alsa-lib-32 alsa-plugins
-
-name=alsa-plugins-32
-version=1.2.7.1
-release=1
-source=(ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${version}.tar.bz2)
-
-build() {
-	cd alsa-plugins-${version}
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--sysconfdir=/etc
-
-	make
-	make DESTDIR=$PKG install
-
-	rm -r $PKG/{etc,usr/share}
-}
--- a/alsa-plugins-32/.32bit
+++ b/alsa-plugins-32/.32bit
--- a/apulse-32/.footprint
+++ b/apulse-32/.footprint
@ -0,0 +1,9 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/apulse-32
+drwxr-xr-x	root/root	usr/lib32/
+lrwxrwxrwx	root/root	usr/lib32/libpulse-simple.so -> libpulse-simple.so.0
+-rwxr-xr-x	root/root	usr/lib32/libpulse-simple.so.0
+lrwxrwxrwx	root/root	usr/lib32/libpulse.so -> libpulse.so.0
+-rwxr-xr-x	root/root	usr/lib32/libpulse.so.0
+-rwxr-xr-x	root/root	usr/lib32/libpulsecommon-5.0.so
--- a/apulse-32/.md5sum
+++ b/apulse-32/.md5sum
@ -0,0 +1 @@
+1d38f3052107b77188f82d4c128fd7d0  v0.1.2.tar.gz
--- a/apulse-32/.signature
+++ b/apulse-32/.signature
@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/compat-32.pub
+RWSwxGo/zH7eXbWuF/NHt8Sll4wcSgMcx2COVar7bjgFni8yF9b/rduz8Jk4P3zcm9XmWyUSNK2vmhT5XAnjDqdefWq9Vaz59gI=
+SHA256 (Pkgfile) = d8520a39b02116e2481567b28707d86c31646d9859deb7bdc06c8ca0fe5a3d32
+SHA256 (.footprint) = e9bc94685f8a2d07fb590e862596f0854363c9c0a85d3d9862b3eef065ab33e4
+SHA256 (v0.1.2.tar.gz) = 7e066199d962cf0d30dfc9d09dfe636698d0bc880a63b8e5fc5f721e91322009
--- a/apulse-32/Pkgfile
+++ b/apulse-32/Pkgfile
@ -0,0 +1,25 @@
+# Description: PulseAudio emulation for ALSA.
+# URL:         https://github.com/i-rinat/apulse
+# Maintainer:  CRUX compat-32 Team, compat-32-ports at crux dot nu
+# Packager:    Thomas Penteker, tek at serverop dot de
+# Depends on:  cmake glib-32 alsa-lib-32
+
+name=apulse-32
+version=0.1.2
+release=1
+source=(https://github.com/i-rinat/apulse/archive/v${version}.tar.gz)
+
+build() {
+  cd apulse-$version
+  sed -i -e "s:/lib/apulse:/lib32:" CMakeLists.txt
+
+  mkdir build
+  cd build
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+
+  make
+  make DESTDIR=$PKG install
+
+  mv $PKG/usr/bin/apulse $PKG/usr/bin/apulse-32
+}
--- a/at-spi2-core-32/.footprint
+++ b/at-spi2-core-32/.footprint
@ -1,24 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/at-spi2/
-rwxr-xr-x	root/root	usr/lib32/at-spi2/at-spi-bus-launcher
-rwxr-xr-x	root/root	usr/lib32/at-spi2/at-spi2-registryd
-drwxr-xr-x	root/root	usr/lib32/gnome-settings-daemon-3.0/
-drwxr-xr-x	root/root	usr/lib32/gnome-settings-daemon-3.0/gtk-modules/
-rw-r--r--	root/root	usr/lib32/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-drwxr-xr-x	root/root	usr/lib32/gtk-2.0/
-drwxr-xr-x	root/root	usr/lib32/gtk-2.0/modules/
-rwxr-xr-x	root/root	usr/lib32/gtk-2.0/modules/libatk-bridge.so
-lrwxrwxrwx	root/root	usr/lib32/libatk-1.0.so -> libatk-1.0.so.0
-lrwxrwxrwx	root/root	usr/lib32/libatk-1.0.so.0 -> libatk-1.0.so.0.25209.1
-rwxr-xr-x	root/root	usr/lib32/libatk-1.0.so.0.25209.1
-lrwxrwxrwx	root/root	usr/lib32/libatk-bridge-2.0.so -> libatk-bridge-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib32/libatk-bridge-2.0.so.0 -> libatk-bridge-2.0.so.0.0.0
-rwxr-xr-x	root/root	usr/lib32/libatk-bridge-2.0.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib32/libatspi.so -> libatspi.so.0
-lrwxrwxrwx	root/root	usr/lib32/libatspi.so.0 -> libatspi.so.0.0.1
-rwxr-xr-x	root/root	usr/lib32/libatspi.so.0.0.1
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/atk-bridge-2.0.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/atk.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/atspi-2.pc
--- a/at-spi2-core-32/.signature
+++ b/at-spi2-core-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXc+OvLaVHQ3bzCBl4teGNot8G2X41lZnJLot9w/R5dZ9OKpa1uCe/jomx6ZXw0RJH12fRkvPsS9GeUzU3R2dVwg=
-SHA256 (Pkgfile) = 07fde18cf7f5250f8a597c721581b49e1208752a9f748805892be1fa3af9cf0e
-SHA256 (.footprint) = f15e46ec3d582c30f794b00e7d13934c3abb610ea4a319750f9f060ff6fb0d63
-SHA256 (at-spi2-core-2.52.0.tar.xz) = 0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab
--- a/at-spi2-core-32/Pkgfile
+++ b/at-spi2-core-32/Pkgfile
@ -1,27 +0,0 @@
-# Description: Protocol definitions and daemon for D-Bus at-spi
-# URL: https://gitlab.gnome.org/GNOME/at-spi2-core
-# Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: at-spi2-core dbus-32 glib-32 xorg-libxtst-32
-
-name=at-spi2-core-32
-version=2.52.0
-release=1
-source=(https://download.gnome.org/sources/at-spi2-core/${version:0:4}/at-spi2-core-$version.tar.xz)
-
-build() {
-	meson setup build at-spi2-core-$version \
-		--prefix /usr \
-		--sysconfdir=/usr/etc \
-		--libdir=/usr/lib32 \
-		--libexecdir=/usr/lib32/at-spi2 \
-		--buildtype=plain \
-		--wrap-mode nodownload \
-		-D b_lto=true \
-		-D b_pie=true \
-		-D introspection=disabled
-
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
-
-	rm -r $PKG/usr/{include,etc,share,lib}
-}
--- a/at-spi2-core-32/.32bit
+++ b/at-spi2-core-32/.32bit
--- a/atk-32/.footprint
+++ b/atk-32/.footprint
@ -0,0 +1,8 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib32/
+-rwxr-xr-x	root/root	usr/lib32/libatk-1.0.la
+lrwxrwxrwx	root/root	usr/lib32/libatk-1.0.so -> libatk-1.0.so.0.22810.1
+lrwxrwxrwx	root/root	usr/lib32/libatk-1.0.so.0 -> libatk-1.0.so.0.22810.1
+-rwxr-xr-x	root/root	usr/lib32/libatk-1.0.so.0.22810.1
+drwxr-xr-x	root/root	usr/lib32/pkgconfig/
+-rw-r--r--	root/root	usr/lib32/pkgconfig/atk.pc
--- a/atk-32/.md5sum
+++ b/atk-32/.md5sum
@ -0,0 +1 @@
+dfb5e7474220afa3f4ca7e45af9f3a11  atk-2.28.1.tar.xz
--- a/atk-32/.signature
+++ b/atk-32/.signature
@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/compat-32.pub
+RWSwxGo/zH7eXUIAhkeJuKMrQ/80ZMq7rYCXfozTSBQcO7pFdzHOCu4CA16OyaUmXQyigkenY6u/1RZ1QLhgO8/QjECvjnRsFgg=
+SHA256 (Pkgfile) = caf67cb9badabbe801ae62589a0127ff6be14843391da207deaf7566efc4ed75
+SHA256 (.footprint) = 4ce941243b857551173d9174d9c3435e3486ff66cc121548d0d316ed28383bf6
+SHA256 (atk-2.28.1.tar.xz) = cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc
--- a/atk-32/Pkgfile
+++ b/atk-32/Pkgfile
@ -0,0 +1,17 @@
+# Description: A set of interfaces for accessibility
+# URL: https://www.gtk.org/
+# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
+# Depends on: glib-32 atk
+
+name=atk-32
+version=2.28.1
+release=1
+source=(https://download.gnome.org/sources/${name%-*}/${version:0:4}/${name%-*}-$version.tar.xz)
+
+build() {
+	cd ${name%-*}-$version
+	./configure --prefix=/usr --libdir=/usr/lib32
+	make
+	make DESTDIR=$PKG install
+	rm -r $PKG/usr/{include,share}
+}
--- a/attr-32/.footprint
+++ b/attr-32/.footprint
@ -1,9 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libattr.a
-rwxr-xr-x	root/root	usr/lib32/libattr.la
-lrwxrwxrwx	root/root	usr/lib32/libattr.so -> libattr.so.1.1.2502
-lrwxrwxrwx	root/root	usr/lib32/libattr.so.1 -> libattr.so.1.1.2502
-rwxr-xr-x	root/root	usr/lib32/libattr.so.1.1.2502
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/libattr.pc
+-rw-r--r--	root/root	usr/lib32/libattr.la
+lrwxrwxrwx	root/root	usr/lib32/libattr.so -> libattr.so.1
+lrwxrwxrwx	root/root	usr/lib32/libattr.so.1 -> libattr.so.1.1.0
+-rw-r--r--	root/root	usr/lib32/libattr.so.1.1.0
--- a/attr-32/.md5sum
+++ b/attr-32/.md5sum
@ -0,0 +1 @@
+84f58dec00b60f2dc8fd1c9709291cc7  attr-2.4.47.src.tar.gz
--- a/attr-32/.signature
+++ b/attr-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXYpfDiAf53ujfw3L/cTyWW33wUHROqRslrsBiY5I8C5u3LwnJ9P+F8hR0mrtnFine0bftTgPiaC5nPBwq2jfrgM=
-SHA256 (Pkgfile) = 0499b3212ccfd096a307059f0f530eabe8a06255dd81410e26330b8eabcf97ce
-SHA256 (.footprint) = fca751ffd25783d818b69c5ed9f9b4f85cc9f13358e06161fb3ea04a8b400a12
-SHA256 (attr-2.5.2.tar.gz) = 39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87
+RWSwxGo/zH7eXZAaOSSkgU+sYq3NBJ/JmSzxsZjNziYgp96V4QKAWUGe9WWRAPTKvFxFnRUZrXLdAGemrsrfg5vjxV73P7/+2Ag=
+SHA256 (Pkgfile) = d229add4f58bc801091305240a250a38c8a6ae590b3fb5ee156cf7701e5db368
+SHA256 (.footprint) = d52eb7103d5c6b6b672a8d6ae97bd1148b20fd9cf781665ea285553a9731cb74
+SHA256 (attr-2.4.47.src.tar.gz) = 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
--- a/attr-32/Pkgfile
+++ b/attr-32/Pkgfile
@ -3,21 +3,25 @@
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu

 name=attr-32
-version=2.5.2
+version=2.4.47
 release=1
-source=(http://download-mirror.savannah.gnu.org/releases/${name%-*}/${name%-*}-$version.tar.gz)
+source=(http://download-mirror.savannah.gnu.org/releases/attr/attr-$version.src.tar.gz)

 build() {
-	cd ${name%-*}-$version
+	cd attr-$version
+
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=$CFLAGS

 	./configure \
 		--prefix=/usr \
 		--bindir=/bin \
-		--sysconfdir=/etc \
-		--libdir=/usr/lib32
+		--mandir=/usr/man \
+		--libdir=/usr/lib32 \
+		--libexecdir=/usr/lib32

 	make
-	make DESTDIR=$PKG install
+	make DIST_ROOT=$PKG install install-lib install-dev

-	rm -r $PKG/{bin,etc} $PKG/usr/{include,share}
+	rm -r $PKG/bin $PKG/usr/{include,man,share}
 }
--- a/avahi-32/.footprint
+++ b/avahi-32/.footprint
@ -1,45 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/avahi/
-rw-r--r--	root/root	usr/lib32/libavahi-client.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-client.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-client.so -> libavahi-client.so.3.2.9
-lrwxrwxrwx	root/root	usr/lib32/libavahi-client.so.3 -> libavahi-client.so.3.2.9
-rwxr-xr-x	root/root	usr/lib32/libavahi-client.so.3.2.9
-rw-r--r--	root/root	usr/lib32/libavahi-common.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-common.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-common.so -> libavahi-common.so.3.5.4
-lrwxrwxrwx	root/root	usr/lib32/libavahi-common.so.3 -> libavahi-common.so.3.5.4
-rwxr-xr-x	root/root	usr/lib32/libavahi-common.so.3.5.4
-rw-r--r--	root/root	usr/lib32/libavahi-core.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-core.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-core.so -> libavahi-core.so.7.1.0
-lrwxrwxrwx	root/root	usr/lib32/libavahi-core.so.7 -> libavahi-core.so.7.1.0
-rwxr-xr-x	root/root	usr/lib32/libavahi-core.so.7.1.0
-rw-r--r--	root/root	usr/lib32/libavahi-glib.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-glib.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-glib.so -> libavahi-glib.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib32/libavahi-glib.so.1 -> libavahi-glib.so.1.0.2
-rwxr-xr-x	root/root	usr/lib32/libavahi-glib.so.1.0.2
-rw-r--r--	root/root	usr/lib32/libavahi-gobject.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-gobject.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-gobject.so -> libavahi-gobject.so.0.0.5
-lrwxrwxrwx	root/root	usr/lib32/libavahi-gobject.so.0 -> libavahi-gobject.so.0.0.5
-rwxr-xr-x	root/root	usr/lib32/libavahi-gobject.so.0.0.5
-rw-r--r--	root/root	usr/lib32/libavahi-libevent.a
-rwxr-xr-x	root/root	usr/lib32/libavahi-libevent.la
-lrwxrwxrwx	root/root	usr/lib32/libavahi-libevent.so -> libavahi-libevent.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libavahi-libevent.so.1 -> libavahi-libevent.so.1.0.0
-rwxr-xr-x	root/root	usr/lib32/libavahi-libevent.so.1.0.0
-rw-r--r--	root/root	usr/lib32/libdns_sd.a
-rwxr-xr-x	root/root	usr/lib32/libdns_sd.la
-lrwxrwxrwx	root/root	usr/lib32/libdns_sd.so -> libdns_sd.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libdns_sd.so.1 -> libdns_sd.so.1.0.0
-rwxr-xr-x	root/root	usr/lib32/libdns_sd.so.1.0.0
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-client.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-compat-libdns_sd.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-core.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-glib.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-gobject.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/avahi-libevent.pc
--- a/avahi-32/.signature
+++ b/avahi-32/.signature
@ -1,7 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXZ7Thl9iGG5oeFKGcyp23d/3BRA9LPmwK9hoJ7ST4+FM6n+KaiI45pCNN2sG1C7/3ebNo/WAhY+22H8T2Hl2xQo=
-SHA256 (Pkgfile) = 217f28b57408d98b7f36bb5d41710740c40e76cf5d6ac3307b7c82d6a9028c6b
-SHA256 (.footprint) = 72baed23d6e6598de90dec8a3db81f29cb89850df72c2db38afa392e5d9089da
-SHA256 (avahi-0.8.tar.gz) = 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
-SHA256 (avahi-0.8-ipv6_race_condition_fix-1.patch) = 218c909581d0ca2c86c8145bb0797050d987a6b0ae3417949dbe2a6d55c49360
-SHA256 (reverse-move-to-run.patch) = a333bcf15dd3e72ac99b2e883202e7170d2ff27bf61820413235bc9f3c9c2605
--- a/avahi-32/Pkgfile
+++ b/avahi-32/Pkgfile
@ -1,43 +0,0 @@
-# Description: A system which facilitates service discovery on a local network via the mDNS/DNS-SD protocol suite
-# URL: https://www.avahi.org/
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: avahi dbus-32 gdbm-32 glib-32 libcap-32 libdaemon-32 libevent-32
-
-name=avahi-32
-version=0.8
-release=3
-source=(https://github.com/lathiat/avahi/releases/download/v$version/avahi-$version.tar.gz
-	avahi-0.8-ipv6_race_condition_fix-1.patch
-	reverse-move-to-run.patch)
-
-build() {
-	cd avahi-$version
-
-	patch -p1 -i $SRC/reverse-move-to-run.patch
-	patch -p1 -i $SRC/avahi-0.8-ipv6_race_condition_fix-1.patch
-
-	NOCONFIGURE=1 ./autogen.sh
-
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32 \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-distro=none \
-		--disable-gtk \
-		--disable-gtk3 \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-qt5 \
-		--disable-python \
-		--disable-pygobject \
-		--disable-python-dbus \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-nls \
-		--enable-compat-libdns_sd
-
-	make
-	make DESTDIR=$PKG install
-
-	rm -r $PKG/usr/{bin,sbin,include,share} $PKG/{etc,var}
-}
--- a/avahi-32/avahi-0.8-ipv6_race_condition_fix-1.patch
+++ b/avahi-32/avahi-0.8-ipv6_race_condition_fix-1.patch
@ -1,51 +0,0 @@
-Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date:                    2020-10-19
-Initial Package Version: 0.8
-Upstream Status:         PR, not applied
-Origin:                  Upstream PR (github.com/lathiat/avahi/pull/309)
-Description:             Fixes a race condition when multiple NICs are in use
-                         when IPv6 is enabled. This will exhibit behavior where
-                         messages about withdrawing address records, registering
-                         access records, and new hostname announcements are
-                         spammed to the log every second.
-
-diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c
--- avahi-0.8.orig/avahi-core/server.c	2020-02-16 21:41:24.939967558 -0600
-+++ avahi-0.8/avahi-core/server.c	2020-10-19 11:07:22.054861721 -0500
-@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer *
-         withdraw_entry(s, e);
- }
- 
-static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) {
-+static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) {
-     AvahiEntry *e, *n;
-     int ours = 0, won = 0, lost = 0;
- 
-@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer *
-         if (e->dead)
-             continue;
- 
-        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) {
-+        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) {
-             ours = 1;
-             break;
-         } else {
-@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer
-             if (!avahi_key_is_pattern(record->key)) {
-                 if (!from_local_iface)
-                     reflect_probe(s, i, record);
-                incoming_probe(s, record, i);
-+                incoming_probe(s, record, i, from_local_iface);
-             }
- 
-             avahi_record_unref(record);
-@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer
-         return;
- 
-     /* We don't want to reflect local traffic, so we check if this packet is generated locally. */
-    if (s->config.enable_reflector)
-        from_local_iface = originates_from_local_iface(s, iface, src_address, port);
-+    from_local_iface = originates_from_local_iface(s, iface, src_address, port);
- 
-     if (avahi_dns_packet_check_valid_multicast(p) < 0) {
-         avahi_log_debug("Received invalid packet.");
--- a/avahi-32/reverse-move-to-run.patch
+++ b/avahi-32/reverse-move-to-run.patch
@ -1,23 +0,0 @@
-From 60bd97ceeb1f7924df2b347b5ac18fa5949898cc Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Thu, 28 Jan 2016 00:26:34 +0100
-Subject: [PATCH] Move to /run
-
-on modern, systemd based systems, the default directory is /run, no longer /var/run
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 607d3343..6c353c35 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -957,7 +957,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for runnin
- #
- # Avahi runtime dir
- #
-+avahi_runtime_dir="${localstatedir}/run"
-avahi_runtime_dir="/run"
- avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
- AC_SUBST(avahi_runtime_dir)
- AC_SUBST(avahi_socket)
--- a/brotli-32/.footprint
+++ b/brotli-32/.footprint
@ -1,15 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libbrotlicommon.so -> libbrotlicommon.so.1
-lrwxrwxrwx	root/root	usr/lib32/libbrotlicommon.so.1 -> libbrotlicommon.so.1.1.0
-rwxr-xr-x	root/root	usr/lib32/libbrotlicommon.so.1.1.0
-lrwxrwxrwx	root/root	usr/lib32/libbrotlidec.so -> libbrotlidec.so.1
-lrwxrwxrwx	root/root	usr/lib32/libbrotlidec.so.1 -> libbrotlidec.so.1.1.0
-rwxr-xr-x	root/root	usr/lib32/libbrotlidec.so.1.1.0
-lrwxrwxrwx	root/root	usr/lib32/libbrotlienc.so -> libbrotlienc.so.1
-lrwxrwxrwx	root/root	usr/lib32/libbrotlienc.so.1 -> libbrotlienc.so.1.1.0
-rwxr-xr-x	root/root	usr/lib32/libbrotlienc.so.1.1.0
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/libbrotlicommon.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/libbrotlidec.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/libbrotlienc.pc
--- a/brotli-32/.signature
+++ b/brotli-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXV+LgE3hGgCliUQJU8MGFeaaObcv/O7d96f6FyMnF7eJqYOytPkQciEejf6CJ/3xqWl9nTQWwouMCN06Db4//wc=
-SHA256 (Pkgfile) = 7f5c3ddf23e4c6456dcc5283a89ad9dfebf1209970c8590b1d4de398f0950702
-SHA256 (.footprint) = 2013a03e4261ff1912f8a4c5f48a8f4d8c2e19bebcc431649a7b6de6bd1f1bf2
-SHA256 (brotli-v1.1.0.tar.gz) = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
--- a/brotli-32/Pkgfile
+++ b/brotli-32/Pkgfile
@ -1,20 +0,0 @@
-# Description: Brotli compression library
-# URL: https://github.com/google/brotli
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: brotli
-
-name=brotli-32
-version=1.1.0
-release=1
-source=(https://github.com/google/${name%-*}/archive/v$version/${name%-*}-v$version.tar.gz)
-
-build() {
-	cmake -S${name%-*}-$version -Bbuild -GNinja \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		-DCMAKE_INSTALL_LIBDIR="/usr/lib32"
-
-	cmake --build build
-	DESTDIR=$PKG cmake --install build
-
-	rm -r $PKG/usr/{bin,include}
-}
--- a/bzip2-32/.footprint
+++ b/bzip2-32/.footprint
@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libbz2.a
-lrwxrwxrwx	root/root	usr/lib32/libbz2.so -> libbz2.so.1.0.8
-lrwxrwxrwx	root/root	usr/lib32/libbz2.so.1.0 -> libbz2.so.1.0.8
-rw-r--r--	root/root	usr/lib32/libbz2.so.1.0.8
+lrwxrwxrwx	root/root	usr/lib32/libbz2.so -> libbz2.so.1.0
+lrwxrwxrwx	root/root	usr/lib32/libbz2.so.1.0 -> libbz2.so.1.0.6
+-rwxr-xr-x	root/root	usr/lib32/libbz2.so.1.0.6
--- a/bzip2-32/.md5sum
+++ b/bzip2-32/.md5sum
@ -0,0 +1,2 @@
+00b516f4704d4a7cb50a1d97e6e8e15b  bzip2-1.0.6.tar.gz
+21bba891a5e515d69fa6ca6b11eac726  bzip2.patch
--- a/bzip2-32/.signature
+++ b/bzip2-32/.signature
@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXXquFG3j7u6B5yrAlURNNpoN68J37rxuWJdQwbdXtgFqt/HVVOb1Tgbv+DquDNadyIoPVvHrG0pFlFc9A85wzAQ=
-SHA256 (Pkgfile) = c0ed5c49f8dcea522731e3a4f46c4e36971b4829fbccc756ad799063ee0580c7
-SHA256 (.footprint) = ae64a6b0f0690f2699e12f5d0abbfd0b9ad60e9cea31f76641a43e00c749a5e8
-SHA256 (bzip2-1.0.8.tar.gz) = ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+RWSwxGo/zH7eXdBNhGS2wUIB+vrItt3sy0lfMdyrmv6h8k6v48iI5+nOthqHdDzLLYW8KFFK0S7MCX3oS1ej7k7SqLHJZ2UVPgk=
+SHA256 (Pkgfile) = 765399b75bb6bf22746d2aee13d9c8243426420d41eb877d77ee900e7bbc0930
+SHA256 (.footprint) = 14e78943cc31fbae38e4ec6c8b3aeaa7afdc2dd29948006833478f1a52707f89
+SHA256 (bzip2-1.0.6.tar.gz) = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
+SHA256 (bzip2.patch) = 45715e151b26b7c9731bd59934ae6aa6f1b5d48332f23aed2d71667eada1fb76
--- a/bzip2-32/Pkgfile
+++ b/bzip2-32/Pkgfile
@ -3,20 +3,24 @@
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu

 name=bzip2-32
-version=1.0.8
+version=1.0.6
 release=1
-source=(https://sourceware.org/pub/${name%-*}/${name%-*}-$version.tar.gz)
+source=(http://www.bzip.org/$version/bzip2-$version.tar.gz \
+        bzip2.patch)

 build() {
-	cd ${name%-*}-$version
+	cd bzip2-$version

-	install -d $PKG/usr/lib32
+	patch -Np1 -i $SRC/bzip2.patch

-	make -f Makefile-libbz2_so CC="gcc $CFLAGS $LDFLAGS"
-	install -m 0644 libbz2.so.$version $PKG/usr/lib32
-	ln -s libbz2.so.$version $PKG/usr/lib32/libbz2.so
-	ln -s libbz2.so.$version $PKG/usr/lib32/libbz2.so.1.0
+	sed -i -e 's,$(PREFIX)/lib,$(PREFIX)/lib32,g' Makefile{,-libbz2_so}

-	make libbz2.a CC="gcc $CFLAGS $LDFLAGS"
-	install -m 0644 libbz2.a $PKG/usr/lib32
+	make
+	make PREFIX=$PKG/usr install
+
+	sed -i -e '38s,$(CC) ,$(CC) $(CFLAGS) ,' Makefile-libbz2_so
+
+	make -f Makefile-libbz2_so
+	make -f Makefile-libbz2_so PREFIX=$PKG/usr install
+	rm -rf $PKG/usr/{bin,include,man}
 }
--- a/bzip2-32/bzip2.patch
+++ b/bzip2-32/bzip2.patch
@ -0,0 +1,162 @@
+diff -aur bzip2-1.0.6.orig/Makefile bzip2-1.0.6/Makefile
+--- bzip2-1.0.6.orig/Makefile	2008-02-14 13:39:18.000000000 +0100
+++ bzip2-1.0.6/Makefile	2009-06-14 13:49:03.889599030 +0200
+@@ -21,7 +21,7 @@
+ LDFLAGS=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+CFLAGS+=-fpic -Wall -Winline $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -70,43 +70,36 @@
+ 	@cat words3
+ 
+ install: bzip2 bzip2recover
+-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+-	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+-	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+-	cp -f bzip2 $(PREFIX)/bin/bzip2
+-	cp -f bzip2 $(PREFIX)/bin/bunzip2
+-	cp -f bzip2 $(PREFIX)/bin/bzcat
+-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+-	chmod a+x $(PREFIX)/bin/bzip2
+-	chmod a+x $(PREFIX)/bin/bunzip2
+-	chmod a+x $(PREFIX)/bin/bzcat
+-	chmod a+x $(PREFIX)/bin/bzip2recover
+-	cp -f bzip2.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzip2.1
+-	cp -f bzlib.h $(PREFIX)/include
+-	chmod a+r $(PREFIX)/include/bzlib.h
+-	cp -f libbz2.a $(PREFIX)/lib
+-	chmod a+r $(PREFIX)/lib/libbz2.a
+-	cp -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+-	chmod a+x $(PREFIX)/bin/bzgrep
+-	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+-	chmod a+x $(PREFIX)/bin/bzmore
+-	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+-	chmod a+x $(PREFIX)/bin/bzdiff
+-	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+-	chmod a+r $(PREFIX)/man/man1/bzmore.1
+-	chmod a+r $(PREFIX)/man/man1/bzdiff.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+-	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+-	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+	install -d $(PREFIX)/bin \
+	           $(PREFIX)/lib \
+	           $(PREFIX)/man/man1 \
+	           $(PREFIX)/include
+	install -m 755 bzip2 \
+	               bzip2recover \
+	               bzgrep \
+	               bzmore \
+	               bzdiff \
+	               $(PREFIX)/bin
+	install -m 644 bzlib.h $(PREFIX)/include
+	install -m 644 libbz2.a $(PREFIX)/lib
+	ln -sf bzip2 $(PREFIX)/bin/bunzip2
+	ln -sf bzip2 $(PREFIX)/bin/bzcat
+	ln -sf bzgrep $(PREFIX)/bin/bzegrep
+	ln -sf bzgrep $(PREFIX)/bin/bzfgrep
+	ln -sf bzmore $(PREFIX)/bin/bzless
+	ln -sf bzdiff $(PREFIX)/bin/bzcmp
+	install -m 644 bzip2.1 \
+	               bzgrep.1 \
+	               bzmore.1 \
+	               bzdiff.1 \
+	               $(PREFIX)/man/man1
+	ln -sf bzgrep.1 $(PREFIX)/man/man1/bzegrep.1
+	ln -sf bzgrep.1 $(PREFIX)/man/man1/bzfgrep.1
+	ln -sf bzmore.1 $(PREFIX)/man/man1/bzless.1
+	ln -sf bzdiff.1 $(PREFIX)/man/man1/bzcmp.1
+	ln -sf bzip2.1 $(PREFIX)/man/man1/bunzip2.1
+	ln -sf bzip2.1 $(PREFIX)/man/man1/bzcat.1
+	ln -sf bzip2.1 $(PREFIX)/man/man1/bzip2recover.1
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
+diff -aur bzip2-1.0.6.orig/Makefile-libbz2_so bzip2-1.0.6/Makefile-libbz2_so
+--- bzip2-1.0.6.orig/Makefile-libbz2_so	2007-12-09 14:00:50.000000000 +0100
+++ bzip2-1.0.6/Makefile-libbz2_so	2009-06-14 13:48:27.519580669 +0200
+@@ -24,7 +24,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+CFLAGS+=-fpic -Wall -Winline $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -37,11 +37,15 @@
+ all: $(OBJS)
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
+
+install:
+	install -d $(PREFIX)/lib
+	install -m 755 libbz2.so.1.0.6 $(PREFIX)/lib
+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
+	ln -sf libbz2.so.1.0 $(PREFIX)/lib/libbz2.so
+ 
+ clean: 
+-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 bzip2-shared
+ 
+ blocksort.o: blocksort.c
+ 	$(CC) $(CFLAGS) -c blocksort.c
+diff -aur bzip2-1.0.6.orig/bzlib_private.h bzip2-1.0.6/bzlib_private.h
+--- bzip2-1.0.6.orig/bzlib_private.h	2007-12-09 15:00:46.000000000 +0100
+++ bzip2-1.0.6/bzlib_private.h	2009-06-14 13:53:28.200579230 +0200
+@@ -128,7 +128,7 @@
+ 
+ /*-- Stuff for randomising repetitive blocks. --*/
+ 
+-extern Int32 BZ2_rNums[512];
+extern const Int32 BZ2_rNums[512];
+ 
+ #define BZ_RAND_DECLS                          \
+    Int32 rNToGo;                               \
+@@ -152,7 +152,7 @@
+ 
+ /*-- Stuff for doing CRCs. --*/
+ 
+-extern UInt32 BZ2_crc32Table[256];
+extern const UInt32 BZ2_crc32Table[256];
+ 
+ #define BZ_INITIALISE_CRC(crcVar)              \
+ {                                              \
+diff -aur bzip2-1.0.6.orig/crctable.c bzip2-1.0.6/crctable.c
+--- bzip2-1.0.6.orig/crctable.c	2007-12-09 13:29:49.000000000 +0100
+++ bzip2-1.0.6/crctable.c	2009-06-14 13:52:33.248830630 +0200
+@@ -28,7 +28,7 @@
+   comp.compression FAQ.
+ --*/
+ 
+-UInt32 BZ2_crc32Table[256] = {
+const UInt32 BZ2_crc32Table[256] = {
+ 
+    /*-- Ugly, innit? --*/
+ 
+diff -aur bzip2-1.0.6.orig/randtable.c bzip2-1.0.6/randtable.c
+--- bzip2-1.0.6.orig/randtable.c	2007-12-09 13:32:55.000000000 +0100
+++ bzip2-1.0.6/randtable.c	2009-06-14 13:53:38.063580427 +0200
+@@ -23,7 +23,7 @@
+ 
+ 
+ /*---------------------------------------------*/
+-Int32 BZ2_rNums[512] = { 
+const Int32 BZ2_rNums[512] = { 
+    619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
+    985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
+    733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
--- a/cairo-32/.footprint
+++ b/cairo-32/.footprint
@ -1,17 +1,30 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/cairo/
-rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-fdr.so
+-rw-r--r--	root/root	usr/lib32/cairo/cairo-fdr.a
+-rwxr-xr-x	root/root	usr/lib32/cairo/cairo-fdr.la
+-rwxr-xr-x	root/root	usr/lib32/cairo/cairo-fdr.so
+-rw-r--r--	root/root	usr/lib32/cairo/cairo-sphinx.a
+-rwxr-xr-x	root/root	usr/lib32/cairo/cairo-sphinx.la
+-rwxr-xr-x	root/root	usr/lib32/cairo/cairo-sphinx.so
+-rw-r--r--	root/root	usr/lib32/cairo/libcairo-trace.a
+-rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-trace.la
 -rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-trace.so
-lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so -> libcairo-gobject.so.2
-lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11800.0
-rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.so.2.11800.0
-lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2
-lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11800.0
-rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.so.2.11800.0
-lrwxrwxrwx	root/root	usr/lib32/libcairo.so -> libcairo.so.2
-lrwxrwxrwx	root/root	usr/lib32/libcairo.so.2 -> libcairo.so.2.11800.0
-rwxr-xr-x	root/root	usr/lib32/libcairo.so.2.11800.0
+-rw-r--r--	root/root	usr/lib32/libcairo-gobject.a
+-rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.la
+lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so -> libcairo-gobject.so.2.11510.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11510.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.so.2.11510.0
+-rw-r--r--	root/root	usr/lib32/libcairo-script-interpreter.a
+-rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.la
+lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11510.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11510.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.so.2.11510.0
+-rw-r--r--	root/root	usr/lib32/libcairo.a
+-rwxr-xr-x	root/root	usr/lib32/libcairo.la
+lrwxrwxrwx	root/root	usr/lib32/libcairo.so -> libcairo.so.2.11510.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo.so.2 -> libcairo.so.2.11510.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo.so.2.11510.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-fc.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-ft.pc
@ -19,7 +32,6 @@ drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-pdf.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-png.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-ps.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-script-interpreter.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-script.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-svg.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-tee.pc
--- a/cairo-32/.md5sum
+++ b/cairo-32/.md5sum
@ -0,0 +1 @@
+f060381576d67c855fad03e327fc9a69  cairo-1.15.10.tar.xz
--- a/cairo-32/.signature
+++ b/cairo-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXUKNPfx6qgsOqAAU91eTZT/FhQ5VhYFp7W1bRZFAQUOCoHkWpphtrzTwQdxhPWtcSZBNS52RIiHzLh2H3AFITw0=
-SHA256 (Pkgfile) = d06397f40d50bacc7b982bd744571b0e5b5b14b9f79c573d12865a854c810170
-SHA256 (.footprint) = 2dad4f64d941072f964da50c2ee75400ee23d7e3ea929ef7d79b867f2137216c
-SHA256 (cairo-1.18.0.tar.bz2) = abf8fba4d510086a492783c3e0828e90b32734738fd80906595617d229d02bab
+RWSwxGo/zH7eXRDuoQJrXhPnV6AvG1R5E7zwI8LCGWZXmdcDiLkP06c6z2U4zYPoRxiY9BasfZYQvwzaiiUI/B9CxIbTPwVFxAc=
+SHA256 (Pkgfile) = 930dedf595b2c54720de1060d659565ad649cc05f656c0d31070b20c2f9d4579
+SHA256 (.footprint) = 702ee8c2bd4c2679d7c93150054713b2fba77660bfa15d29304b85131e403ca8
+SHA256 (cairo-1.15.10.tar.xz) = 62ca226134cf2f1fd114bea06f8b374eb37f35d8e22487eaa54d5e9428958392
--- a/cairo-32/Pkgfile
+++ b/cairo-32/Pkgfile
@ -1,25 +1,26 @@
 # Description: A 2D graphics library with support for multiple output devices
-# URL: https://www.cairographics.org/
+# URL: http://www.cairographics.org/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: cairo fontconfig-32 glib-32 xorg-libpixman-32 xorg-libxext-32 xorg-libxrender-32 xorg-xcb-util-32

 name=cairo-32
-version=1.18.0
+version=1.15.10
 release=1
-source=(https://gitlab.freedesktop.org/cairo/cairo/-/archive/$version/cairo-$version.tar.bz2)
+source=(https://cairographics.org/snapshots/${name%-*}-$version.tar.xz)

 build() {
-	meson setup build ${name%-*}-$version \
-		--prefix=/usr \
-		--libdir=lib32 \
-		--buildtype=plain \
-		-D dwrite=disabled \
-		-D spectre=disabled \
-		-D symbol-lookup=disabled \
-		-D tests=disabled
+	cd ${name%-*}-$version

-	meson compile -C build
-	DESTDIR=$PKG meson install -C build
+	./configure --prefix=/usr \
+		--libdir=/usr/lib32 \
+		--enable-xcb=yes \
+		--enable-ps \
+		--enable-pdf \
+		--disable-gtk-doc \
+		--enable-tee=yes

-	rm -r $PKG/usr/{bin,include}
+	make
+	make DESTDIR=$PKG install
+
+	rm -r $PKG/usr/{bin,include,share}
 }
--- a/cdparanoia-32/.footprint
+++ b/cdparanoia-32/.footprint
@ -3,10 +3,8 @@ drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libcdda_interface.a
 lrwxrwxrwx	root/root	usr/lib32/libcdda_interface.so -> libcdda_interface.so.0.10.2
 lrwxrwxrwx	root/root	usr/lib32/libcdda_interface.so.0 -> libcdda_interface.so.0.10.2
-rwxr-xr-x	root/root	usr/lib32/libcdda_interface.so.0.10.2
+-rw-r--r--	root/root	usr/lib32/libcdda_interface.so.0.10.2
 -rw-r--r--	root/root	usr/lib32/libcdda_paranoia.a
 lrwxrwxrwx	root/root	usr/lib32/libcdda_paranoia.so -> libcdda_paranoia.so.0.10.2
 lrwxrwxrwx	root/root	usr/lib32/libcdda_paranoia.so.0 -> libcdda_paranoia.so.0.10.2
-rwxr-xr-x	root/root	usr/lib32/libcdda_paranoia.so.0.10.2
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/cdparanoia-3.pc
+-rw-r--r--	root/root	usr/lib32/libcdda_paranoia.so.0.10.2
--- a/cdparanoia-32/.md5sum
+++ b/cdparanoia-32/.md5sum
@ -0,0 +1,3 @@
+aa57d4e1b897fdf12f1e7fbb4747ec43  cdparanoia-10.2-gcc43.patch
+af737d5ebac45b7006111fe3c59bced5  cdparanoia-10.2-ldflags.patch
+b304bbe8ab63373924a744eac9ebc652  cdparanoia-III-10.2.src.tgz
--- a/cdparanoia-32/.signature
+++ b/cdparanoia-32/.signature
@ -1,12 +1,7 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXVidHZmZiRgZLYvkZcdeUTUVVZgZFLlnxi63SRX4m/Chh08rFYAkUnPDJB9nhPEgomA7hJwJ7l+dBnMUq4cimgg=
-SHA256 (Pkgfile) = 1004fd79b809ea4b2e8894246f0bee435039d318e20bba3fc5dbda9eeb38703b
-SHA256 (.footprint) = ec2dacfb229d2e3580d3dc27f399aa41e47962d7cca61c17ba41ef502c1c3102
+RWSwxGo/zH7eXf6UCIwgLlNh/Dv1WU/xGBj3DBoJfGY/IsJAdllXS+cjj/bXsXZLCS4nSFYdjotaGNfkDEhWGLLG1Fs0TOzNNQA=
+SHA256 (Pkgfile) = 3da39d4045ca848e1b07a7560fa1df97293e0618763f87ead8d35a2581f58ce3
+SHA256 (.footprint) = c6b28ac040cba3e244417b0e477c037b9a077586edf2509fffd25f91deb9b7a5
 SHA256 (cdparanoia-III-10.2.src.tgz) = 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
-SHA256 (cdparanoia-10.2-463009.patch) = bb7d0256b57b2ae630bfb9f78be7bda6e1abaed809f0238112b850fb9ca3e7ef
-SHA256 (cdparanoia-10.2-endian.patch) = da764568a0466cd856c8e4dac09be2be4e7a2104125db4b60de873217a0dece8
-SHA256 (cdparanoia-10.2-install.patch) = 807c72330ebde3fc0c26a10ed7236870f49ae11df75dd8bd2be9c593e774806a
-SHA256 (cdparanoia-10.2-format-security.patch) = a6f80215c801190dfcade6751d12235a1878ab6b5762260086e7f0ce1296bef4
-SHA256 (cdparanoia-use-proper-gnu-config-files.patch) = dc4b2540552f53a563c1f2ba6e279c70049fdd13e066d87e126370e54148e30d
-SHA256 (cdparanoia-10.2-ldflags.patch) = 9b352a93ebedc7c523c76213756f98139ea3912162ee719ab0c5cc6648f94fe2
-SHA256 (cdparanoia-10.2-add-pkgconfig.patch) = f8e09fd0a05723ae8f16ab186394d807d5ec61dfcdcf815accd7aae755182dee
+SHA256 (cdparanoia-10.2-gcc43.patch) = d055d86056809dee6e861af77d766fb0f17084bb19e44d9d99be8a0c11892a18
+SHA256 (cdparanoia-10.2-ldflags.patch) = 11db67bf65f4cb1e6bb33e5166ef081ac0e57bed9703149135a5c83a55481f9f
--- a/cdparanoia-32/Pkgfile
+++ b/cdparanoia-32/Pkgfile
@ -1,38 +1,29 @@
 # Description: CDDA extraction tool with jitter correction
-# URL:         https://xiph.org/paranoia/
+# URL:         http://xiph.org/paranoia/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: cdparanoia

 name=cdparanoia-32
 version=10.2
-release=3
-source=(https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$version.src.tgz
-	cdparanoia-10.2-463009.patch
-	cdparanoia-10.2-endian.patch
-	cdparanoia-10.2-install.patch
-	cdparanoia-10.2-format-security.patch
-	cdparanoia-use-proper-gnu-config-files.patch
-	cdparanoia-10.2-ldflags.patch
-	cdparanoia-10.2-add-pkgconfig.patch)
+release=2
+source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$version.src.tgz
+	cdparanoia-$version-gcc43.patch
+	cdparanoia-$version-ldflags.patch)

 build() {
 	cd cdparanoia-III-$version
-	patch -p3 -i $SRC/cdparanoia-10.2-463009.patch
-	patch -p1 -i $SRC/cdparanoia-10.2-endian.patch
-	patch -p1 -i $SRC/cdparanoia-10.2-install.patch
-	patch -p1 -i $SRC/cdparanoia-10.2-format-security.patch
-	patch -p1 -i $SRC/cdparanoia-use-proper-gnu-config-files.patch
-	patch -p1 -i $SRC/cdparanoia-10.2-ldflags.patch
-	patch -p1 -i $SRC/cdparanoia-10.2-add-pkgconfig.patch
-	autoreconf -ifv
+	patch -p 0 -i $SRC/cdparanoia-$version-gcc43.patch
+	patch -p 1 -i $SRC/cdparanoia-$version-ldflags.patch
+	autoreconf

 	./configure \
 		--prefix=/usr \
-		--libdir=/usr/lib32 \
+		--mandir=$PKG/usr/man \
+		--libdir=$PKG/usr/lib32 \
 		--host=i686-pc-linux-gnu

    make -j 1
-	make DESTDIR=$PKG install
+    make prefix=$PKG/usr install

-	rm -r  $PKG/usr/{bin,include,share}
+    rm -rf $PKG/{etc,var} $PKG/usr/{bin,etc,include,man,sbin,share}
 }
--- a/cdparanoia-32/cdparanoia-10.2-add-pkgconfig.patch
+++ b/cdparanoia-32/cdparanoia-10.2-add-pkgconfig.patch
@ -1,91 +0,0 @@
-From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001
-From: xiphmont <xiphmont@0101bb08-14d6-0310-b084-bc0e0c8e3800>
-Date: Fri, 11 Jun 2010 15:42:00 +0000
-Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706
-
-git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
- Makefile.in        |  7 +++++--
- cdparanoia-3.pc.in | 12 ++++++++++++
- configure.in       |  5 ++++-
- 3 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 cdparanoia-3.pc.in
-
-diff --git a/Makefile.in b/Makefile.in
-index 25c91ce..bfef153 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -3,7 +3,7 @@
- # DO NOT EDIT BELOW! ##########################################################
- # (unless, of course, you know what you are doing :) ##########################
- 
-VERSION=10.2
-+VERSION=@VERSION@
- VPATH=@srcdir@
- srcdir=@srcdir@
- 
-@@ -23,6 +23,7 @@ BINDIR=@bindir@
- MANDIR=@mandir@
- INCLUDEDIR=@includedir@
- LIBDIR=@libdir@
-+PKGCONFIGDIR=@libdir@/pkgconfig
- PWD = $(shell pwd)
- 
- OFILES = main.o report.o header.o buffering_write.o cachetest.o
-@@ -85,6 +86,8 @@ install:
- 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
- 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
- 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR) 
-+	$(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR) 
- 
- cdparanoia:	$(OFILES) $(LIBDEP)
- 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
-@@ -104,6 +107,6 @@ distclean:
- 	cd interface && $(MAKE) distclean
- 	cd paranoia && $(MAKE) distclean
- 	-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
-		Makefile verify_test core gmon.out
-+		Makefile verify_test core gmon.out cdparanoia-3.pc
- 
- .PHONY: all debug test lib slib install clean distclean
-diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in
-new file mode 100644
-index 0000000..3a15099
--- /dev/null
-+++ b/cdparanoia-3.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@ 
-+exec_prefix=@exec_prefix@ 
-+libdir=@libdir@ 
-+includedir=@includedir@ 
-+
-+Name: Cdparanoia III 
-+Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library 
-+Requires: 
-+Version: @VERSION@ 
-+Libs: -L${libdir} -lcdda_interface -lcdda_paranoia 
-+Cflags: -I${includedir} 
-+
-diff --git a/configure.in b/configure.in
-index 3ad98ca..3ae6989 100644
--- a/configure.in
-+++ b/configure.in
-@@ -1,5 +1,8 @@
- AC_INIT(interface/interface.c)
- 
-+VERSION="10.2" 
-+AC_SUBST(VERSION) 
-+
- AC_CANONICAL_HOST
- 
- if test -z "$CC"; then
-@@ -67,4 +70,4 @@ AC_SUBST(OPT)
- AC_SUBST(DEBUG)
- AC_SUBST(CC)
- 
-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
-+AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)
-- 
-2.26.2
-
--- a/cdparanoia-32/cdparanoia-10.2-endian.patch
+++ b/cdparanoia-32/cdparanoia-10.2-endian.patch
@ -1,12 +0,0 @@
-diff -up cdparanoia-III-10.2/interface/interface.c.jx cdparanoia-III-10.2/interface/interface.c
--- cdparanoia-III-10.2/interface/interface.c.jx	2009-02-10 14:25:02.000000000 -0500
-+++ cdparanoia-III-10.2/interface/interface.c	2009-02-10 14:25:49.000000000 -0500
-@@ -115,7 +115,7 @@ long cdda_read_timed(cdrom_drive *d, voi
- 
-       if(sectors>0){
- 	/* byteswap? */
-	if(d->bigendianp==-1) /* not determined yet */
-+	if(buffer && d->bigendianp==-1) /* not determined yet */
- 	  d->bigendianp=data_bigendianp(d);
- 	
- 	if(d->bigendianp!=bigendianp()){
--- a/cdparanoia-32/cdparanoia-10.2-format-security.patch
+++ b/cdparanoia-32/cdparanoia-10.2-format-security.patch
@ -1,16 +0,0 @@
-diff -Naur cdparanoia-III-10.2.orig/main.c cdparanoia-III-10.2/main.c
--- cdparanoia-III-10.2.orig/main.c	2008-09-11 23:11:02.000000000 +0200
-+++ cdparanoia-III-10.2/main.c	2014-04-14 21:24:10.023000000 +0200
-@@ -588,10 +588,10 @@
- 	    buffer[aheadposition+19]='>';
- 	}
-    
-	fprintf(stderr,buffer);
-+	fprintf(stderr, "%s", buffer);
-        
- 	if (logfile != NULL && function==-1) {
-	  fprintf(logfile,buffer+1);
-+	  fprintf(logfile, "%s", buffer+1);
- 	  fprintf(logfile,"\n\n");
- 	  fflush(logfile);
- 	}
--- a/cdparanoia-32/cdparanoia-10.2-463009.patch
+++ b/cdparanoia-32/cdparanoia-10.2-463009.patch
@ -1,8 +1,12 @@
-Index: /trunk/cdparanoia/interface/test_interface.c
+# http://bugs.gentoo.org/show_bug.cgi?id=238378
+# https://trac.xiph.org/changeset/15338
+
+Index: interface/test_interface.c
 ===================================================================
--- /trunk/cdparanoia/interface/test_interface.c (revision 15299)
-+++ /trunk/cdparanoia/interface/test_interface.c (revision 15338)
-@@ -67,7 +67,7 @@
+--- interface/test_interface.c	(revision 15337)
+++ interface/test_interface.c	(revision 15338)
+@@ -66,9 +66,9 @@
+   if(!fd)fd=fdopen(d->cdda_fd,"r");
 
   if(begin<lastread)
 -    d->private->last_milliseconds=20;
@ -12,22 +16,26 @@ Index: /trunk/cdparanoia/interface/test_interface.c
 +    d->private_data->last_milliseconds=sectors;
 
 #ifdef CDDA_TEST_UNDERRUN
-Index: /trunk/cdparanoia/interface/cdda_interface.h
+   sectors-=1;
+Index: interface/cdda_interface.h
 ===================================================================
--- /trunk/cdparanoia/interface/cdda_interface.h (revision 15290)
-+++ /trunk/cdparanoia/interface/cdda_interface.h (revision 15338)
-@@ -85,5 +85,5 @@
+--- interface/cdda_interface.h	(revision 15337)
+++ interface/cdda_interface.h	(revision 15338)
+@@ -84,7 +84,7 @@
+   int is_atapi;
   int is_mmc;
 
 -  cdda_private_data_t *private;
 +  cdda_private_data_t *private_data;
   void         *reserved;
   unsigned char inqbytes[4];
-Index: /trunk/cdparanoia/interface/interface.c
+ 
+Index: interface/interface.c
 ===================================================================
--- /trunk/cdparanoia/interface/interface.c (revision 15314)
-+++ /trunk/cdparanoia/interface/interface.c (revision 15338)
-@@ -40,7 +40,7 @@
+--- interface/interface.c	(revision 15337)
+++ interface/interface.c	(revision 15338)
+@@ -39,9 +39,9 @@
+     if(d->drive_model)free(d->drive_model);
     if(d->cdda_fd!=-1)close(d->cdda_fd);
     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
 -    if(d->private){
@ -38,18 +46,22 @@ Index: /trunk/cdparanoia/interface/interface.c
 +      free(d->private_data);
     }
 
-@@ -128,5 +128,5 @@
+     free(d);
+@@ -127,7 +127,7 @@
+ 	}
       }	
     }
 -    if(ms)*ms=d->private->last_milliseconds;
 +    if(ms)*ms=d->private_data->last_milliseconds;
     return(sectors);
   }
-Index: /trunk/cdparanoia/interface/scsi_interface.c
+   
+Index: interface/scsi_interface.c
 ===================================================================
--- /trunk/cdparanoia/interface/scsi_interface.c (revision 15314)
-+++ /trunk/cdparanoia/interface/scsi_interface.c (revision 15338)
-@@ -16,11 +16,11 @@
+--- interface/scsi_interface.c	(revision 15337)
+++ interface/scsi_interface.c	(revision 15338)
+@@ -15,13 +15,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
   struct timespec tv1;
   struct timespec tv2;
 -  int ret1=clock_gettime(d->private->clock,&tv1);
@ -65,56 +77,72 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
   }
   return ret2;
-@@ -97,5 +97,5 @@
+ }
+@@ -96,7 +96,7 @@
+ static void clear_garbage(cdrom_drive *d){
   fd_set fdset;
   struct timeval tv;
 -  struct sg_header *sg_hd=d->private->sg_hd;
 +  struct sg_header *sg_hd=d->private_data->sg_hd;
   int flag=0;
 
-@@ -186,5 +186,5 @@
+   /* clear out any possibly preexisting garbage */
+@@ -185,7 +185,7 @@
+   struct timespec tv2;
   int tret1,tret2;
   int status = 0;
 -  struct sg_header *sg_hd=d->private->sg_hd;
 +  struct sg_header *sg_hd=d->private_data->sg_hd;
   long writebytes=SG_OFF+cmd_len+in_size;
 
-@@ -196,5 +196,5 @@
+   /* generic scsi device services */
+@@ -195,7 +195,7 @@
+ 
   memset(sg_hd,0,sizeof(sg_hd)); 
   memset(sense_buffer,0,SG_MAX_SENSE); 
 -  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
 +  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
   sg_hd->twelve_byte = cmd_len == 12;
   sg_hd->result = 0;
-@@ -210,5 +210,5 @@
+   sg_hd->reply_len = SG_OFF + out_size;
+@@ -209,7 +209,7 @@
+      tell if the command failed.  Scared yet? */
 
   if(bytecheck && out_size>in_size){
 -    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
 +    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
     /* the size does not remove cmd_len due to the way the kernel
        driver copies buffers */
-@@ -244,5 +244,5 @@
+     writebytes+=(out_size-in_size);
+@@ -243,7 +243,7 @@
+   }
 
   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
 -  tret1=clock_gettime(d->private->clock,&tv1);  
 +  tret1=clock_gettime(d->private_data->clock,&tv1);  
   errno=0;
   status = write(d->cdda_fd, sg_hd, writebytes );
-@@ -290,5 +290,5 @@
+ 
+@@ -289,7 +289,7 @@
+     }
   }
 
 -  tret2=clock_gettime(d->private->clock,&tv2);  
 +  tret2=clock_gettime(d->private_data->clock,&tv2);  
   errno=0;
   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
-@@ -314,5 +314,5 @@
+   sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
+@@ -313,7 +313,7 @@
+   if(bytecheck && in_size+cmd_len<out_size){
     long i,flag=0;
     for(i=in_size;i<out_size;i++)
 -      if(d->private->sg_buffer[i]!=bytefill){
 +      if(d->private_data->sg_buffer[i]!=bytefill){
 	flag=1;
 	break;
-@@ -327,7 +327,7 @@
+       }
+@@ -326,9 +326,9 @@
+ 
   errno=0;
   if(tret1<0 || tret2<0){
 -    d->private->last_milliseconds=-1;
@ -124,35 +152,45 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
   }
   return(0);
-@@ -348,5 +348,5 @@
+ }
+@@ -347,7 +347,7 @@
+ 
   memset(&hdr,0,sizeof(hdr));
   memset(sense,0,sizeof(sense));
 -  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
 +  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
 
   hdr.cmdp = cmd;
-@@ -356,5 +356,5 @@
+   hdr.cmd_len = cmd_len;
+@@ -355,7 +355,7 @@
+   hdr.mx_sb_len = SG_MAX_SENSE;
   hdr.timeout = 50000;
   hdr.interface_id = 'S';
 -  hdr.dxferp =  d->private->sg_buffer;
 +  hdr.dxferp =  d->private_data->sg_buffer;
   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
 
-@@ -401,5 +401,5 @@
+   /* scary buffer fill hack */
+@@ -400,7 +400,7 @@
+   if(bytecheck && in_size<out_size){
     long i,flag=0;
     for(i=in_size;i<out_size;i++)
 -      if(d->private->sg_buffer[i]!=bytefill){
 +      if(d->private_data->sg_buffer[i]!=bytefill){
 	flag=1;
 	break;
-@@ -413,5 +413,5 @@
+       }
+@@ -412,7 +412,7 @@
+   }
 
   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
 -  /* d->private->last_milliseconds = hdr.duration; */
 +  /* d->private_data->last_milliseconds = hdr.duration; */
 
   errno = 0;
-@@ -446,7 +446,7 @@
+   return 0;
+@@ -445,9 +445,9 @@
+ 
   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
 
 -  key = d->private->sg_buffer[2] & 0xf;
@ -163,14 +201,18 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +  ASCQ = d->private_data->sg_buffer[13];
   
   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
-@@ -493,5 +493,5 @@
+   return 1;
+@@ -492,7 +492,7 @@
+   if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
 
   {
 -    unsigned char *b=d->private->sg_buffer;
 +    unsigned char *b=d->private_data->sg_buffer;
     if(b[0])return(1); /* Handles only up to 256 bytes */
     if(b[6])return(1); /* Handles only up to 256 bytes */
-@@ -605,6 +605,6 @@
+ 
+@@ -604,8 +604,8 @@
+ static unsigned int get_orig_sectorsize(cdrom_drive *d){
   if(mode_sense(d,12,0x01))return(-1);
 
 -  d->orgdens = d->private->sg_buffer[4];
@ -179,7 +221,9 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
 }
 
-@@ -665,6 +665,6 @@
+ /* switch CDROM scsi drives to given sector size  */
+@@ -664,8 +664,8 @@
+     return(-4);
   }
 
 -  first=d->private->sg_buffer[2];
@ -188,28 +232,36 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +  last=d->private_data->sg_buffer[3];
   tracks=last-first+1;
 
-@@ -684,5 +684,5 @@
+   if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
+@@ -683,7 +683,7 @@
+       return(-5);
     }
     {
 -      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
 +      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
 
       d->disc_toc[i-first].bFlags=toc->bFlags;
-@@ -705,5 +705,5 @@
+       d->disc_toc[i-first].bTrack=i;
+@@ -704,7 +704,7 @@
+     return(-2);
   }
   {
 -    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
 +    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
     
     d->disc_toc[i-first].bFlags=toc->bFlags;
-@@ -739,5 +739,5 @@
+     d->disc_toc[i-first].bTrack=0xAA;
+@@ -738,7 +738,7 @@
+   }
 
   /* copy to our structure and convert start sector */
 -  tracks = d->private->sg_buffer[1];
 +  tracks = d->private_data->sg_buffer[1];
   if (tracks > MAXTRK) {
     cderror(d,"003: CDROM reporting illegal number of tracks\n");
-@@ -755,31 +755,31 @@
+     return(-3);
+@@ -754,33 +754,33 @@
+       return(-5);
     }
     
 -    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
@ -256,140 +308,180 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +       (d->private_data->sg_buffer[9]))));
 
 
-@@ -818,5 +818,5 @@
+   d->cd_extra = FixupTOC(d,tracks+1);
+@@ -817,7 +817,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -837,5 +837,5 @@
+ 
+@@ -836,7 +836,7 @@
+   cmd[9] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -855,5 +855,5 @@
+ 
+@@ -854,7 +854,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -873,5 +873,5 @@
+ 
+@@ -872,7 +872,7 @@
+   cmd[9] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -891,5 +891,5 @@
+ 
+@@ -890,7 +890,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -909,5 +909,5 @@
+ 
+@@ -908,7 +908,7 @@
+   cmd[9] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -923,5 +923,5 @@
+ 
+@@ -922,7 +922,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -937,5 +937,5 @@
+ 
+@@ -936,7 +936,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -951,5 +951,5 @@
+ 
+@@ -950,7 +950,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -965,5 +965,5 @@
+ 
+@@ -964,7 +964,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -979,5 +979,5 @@
+ 
+@@ -978,7 +978,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -993,5 +993,5 @@
+ 
+@@ -992,7 +992,7 @@
+   cmd[8] = sectors;
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -1027,5 +1027,5 @@
+ 
+@@ -1026,7 +1026,7 @@
+ 
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -1040,5 +1040,5 @@
+ 
+@@ -1039,7 +1039,7 @@
+ 
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -1053,5 +1053,5 @@
+ 
+@@ -1052,7 +1052,7 @@
+   
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
-@@ -1276,5 +1276,5 @@
+ 
+@@ -1275,7 +1275,7 @@
+ static int count_2352_bytes(cdrom_drive *d){
   long i;
   for(i=2351;i>=0;i--)
 -    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
 +    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
       return(((i+3)>>2)<<2);
 
-@@ -1285,5 +1285,5 @@
+   return(0);
+@@ -1284,7 +1284,7 @@
+ static int verify_nonzero(cdrom_drive *d){
   long i,flag=0;
   for(i=0;i<2352;i++)
 -    if(d->private->sg_buffer[i]!=0){
 +    if(d->private_data->sg_buffer[i]!=0){
       flag=1;
       break;
-@@ -1622,5 +1622,5 @@
+     }
+@@ -1621,7 +1621,7 @@
+   d->is_mmc=0;
   if(mode_sense(d,22,0x2A)==0){
   
 -    b=d->private->sg_buffer;
 +    b=d->private_data->sg_buffer;
     b+=b[3]+4;
     
-@@ -1670,5 +1670,5 @@
+     if((b[0]&0x3F)==0x2A){
+@@ -1669,7 +1669,7 @@
+     cderror(d,"008: Unable to identify CDROM model\n");
     return(NULL);
   }
 -  return (d->private->sg_buffer);
 +  return (d->private_data->sg_buffer);
 }
 
-@@ -1726,6 +1726,6 @@
+ int scsi_init_drive(cdrom_drive *d){
+@@ -1725,8 +1725,8 @@
+   check_cache(d);
 
   d->error_retry=1;
 -  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
@ -398,11 +490,13 @@ Index: /trunk/cdparanoia/interface/scsi_interface.c
 +  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
   d->report_all=1;
   return(0);
-Index: /trunk/cdparanoia/interface/cooked_interface.c
+ }
+Index: interface/cooked_interface.c
 ===================================================================
--- /trunk/cdparanoia/interface/cooked_interface.c (revision 15202)
-+++ /trunk/cdparanoia/interface/cooked_interface.c (revision 15338)
-@@ -14,11 +14,11 @@
+--- interface/cooked_interface.c	(revision 15337)
+++ interface/cooked_interface.c	(revision 15338)
+@@ -13,13 +13,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
   struct timespec tv1;
   struct timespec tv2;
 -  int ret1=clock_gettime(d->private->clock,&tv1);
@ -418,11 +512,13 @@ Index: /trunk/cdparanoia/interface/cooked_interface.c
 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
   }
   return ret2;
-Index: /trunk/cdparanoia/interface/scan_devices.c
+ }
+Index: interface/scan_devices.c
 ===================================================================
--- /trunk/cdparanoia/interface/scan_devices.c (revision 15202)
-+++ /trunk/cdparanoia/interface/scan_devices.c (revision 15338)
-@@ -265,9 +265,9 @@
+--- interface/scan_devices.c	(revision 15337)
+++ interface/scan_devices.c	(revision 15338)
+@@ -264,11 +264,11 @@
+   d->interface=COOKED_IOCTL;
   d->bigendianp=-1; /* We don't know yet... */
   d->nsectors=-1;
 -  d->private=calloc(1,sizeof(*d->private));
@ -434,7 +530,9 @@ Index: /trunk/cdparanoia/interface/scan_devices.c
 +    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
   }
   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
-@@ -675,13 +675,13 @@
+   return(d);
+@@ -674,15 +674,15 @@
+   d->bigendianp=-1; /* We don't know yet... */
   d->nsectors=-1;
   d->messagedest = messagedest;
 -  d->private=calloc(1,sizeof(*d->private));
@ -451,7 +549,9 @@ Index: /trunk/cdparanoia/interface/scan_devices.c
 +    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
     g_fd=d->cdda_fd=dup(d->ioctl_fd);
   }else{
-@@ -697,6 +697,6 @@
+     version=verify_SG_version(d,messagedest,messages);
+@@ -696,8 +696,8 @@
+     }
 
     /* malloc our big buffer for scsi commands */
 -    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
@ -460,7 +560,9 @@ Index: /trunk/cdparanoia/interface/scan_devices.c
 +    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
   }
 
-@@ -773,7 +773,7 @@
+   {
+@@ -772,9 +772,9 @@
+   if(i_fd!=-1)close(i_fd);
   if(g_fd!=-1)close(g_fd);
   if(d){
 -    if(d->private){
@ -471,10 +573,13 @@ Index: /trunk/cdparanoia/interface/scan_devices.c
 +      free(d->private_data);
     }
     free(d);
-@@ -822,5 +822,5 @@
+   }
+@@ -821,7 +821,7 @@
+   d->interface=TEST_INTERFACE;
   d->bigendianp=-1; /* We don't know yet... */
   d->nsectors=-1;
 -  d->private=calloc(1,sizeof(*d->private));
 +  d->private_data=calloc(1,sizeof(*d->private_data));
   d->drive_model=copystring("File based test interface");
   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
+   
--- a/cdparanoia-32/cdparanoia-10.2-install.patch
+++ b/cdparanoia-32/cdparanoia-10.2-install.patch
@ -1,50 +0,0 @@
-diff -Naupr cdparanoia-III-10.2.orig/Makefile.in cdparanoia-III-10.2/Makefile.in
--- cdparanoia-III-10.2.orig/Makefile.in	2008-09-11 22:33:30.000000000 +0200
-+++ cdparanoia-III-10.2/Makefile.in	2008-12-22 22:31:45.578372040 +0100
-@@ -63,28 +63,28 @@ slib:
- 	cd paranoia && $(MAKE) slib
- 
- install:
-	$(INSTALL) -d -m 0755 $(BINDIR)
-	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR)
-	$(INSTALL) -d -m 0755 $(MANDIR)
-	$(INSTALL) -d -m 0755 $(MANDIR)/man1
-	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
-	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
-	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
-	$(INSTALL) -d -m 0755 $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0755 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -m 0755 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
- 	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so.0
-+		$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
- 	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so
-+		$(DESTDIR)$(LIBDIR)/libcdda_interface.so
- 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so.0
-+		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
- 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so
-+		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
- 
- cdparanoia:	$(OFILES) $(LIBDEP)
- 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
--- a/cdparanoia-32/cdparanoia-10.2-ldflags.patch
+++ b/cdparanoia-32/cdparanoia-10.2-ldflags.patch
@ -1,24 +1,24 @@
-diff -up cdparanoia-III-10.2/interface/Makefile.in.jx cdparanoia-III-10.2/interface/Makefile.in
--- cdparanoia-III-10.2/interface/Makefile.in.jx	2008-08-21 12:08:54.000000000 -0400
-+++ cdparanoia-III-10.2/interface/Makefile.in	2018-03-07 13:12:53.999947802 -0500
+diff -pruN cdparanoia-III-10.2.orig/interface/Makefile.in cdparanoia-III-10.2/interface/Makefile.in
+--- cdparanoia-III-10.2.orig/interface/Makefile.in	2011-12-30 16:30:42.292074083 +1100
+++ cdparanoia-III-10.2/interface/Makefile.in	2011-12-30 16:30:59.983074083 +1100
@@ -46,7 +46,7 @@ libcdda_interface.a: 	$(OFILES)
 	$(RANLIB) libcdda_interface.a
 
 libcdda_interface.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
+	$(CC) -fpic -shared $(LDFLAGS) -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
 
-diff -up cdparanoia-III-10.2/paranoia/Makefile.in.jx cdparanoia-III-10.2/paranoia/Makefile.in
--- cdparanoia-III-10.2/paranoia/Makefile.in.jx	2008-09-04 15:02:47.000000000 -0400
-+++ cdparanoia-III-10.2/paranoia/Makefile.in	2018-03-07 13:12:39.352765050 -0500
+diff -pruN cdparanoia-III-10.2.orig/paranoia/Makefile.in cdparanoia-III-10.2/paranoia/Makefile.in
+--- cdparanoia-III-10.2.orig/paranoia/Makefile.in	2011-12-30 16:30:42.292074083 +1100
+++ cdparanoia-III-10.2/paranoia/Makefile.in	2011-12-30 16:31:53.520074087 +1100
@@ -44,7 +44,7 @@ libcdda_paranoia.a: 	$(OFILES)
 	$(RANLIB) libcdda_paranoia.a
 
 libcdda_paranoia.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
+	$(CC) -fpic -shared $(LDFLAGS) -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
 
--- a/cdparanoia-32/cdparanoia-use-proper-gnu-config-files.patch
+++ b/cdparanoia-32/cdparanoia-use-proper-gnu-config-files.patch
@ -1,27 +0,0 @@
-Index: cdparanoia-III-10.2/configure
-===================================================================
--- cdparanoia-III-10.2.orig/configure
-+++ cdparanoia-III-10.2/configure
-@@ -1289,9 +1289,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
-cp $srcdir/configure.guess $srcdir/config.guess
-cp $srcdir/configure.sub $srcdir/config.sub
-
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-Index: cdparanoia-III-10.2/configure.in
-===================================================================
--- cdparanoia-III-10.2.orig/configure.in
-+++ cdparanoia-III-10.2/configure.in
-@@ -1,8 +1,5 @@
- AC_INIT(interface/interface.c)
- 
-cp $srcdir/configure.guess $srcdir/config.guess
-cp $srcdir/configure.sub $srcdir/config.sub
-
- AC_CANONICAL_HOST
- 
- if test -z "$CC"; then
--- a/cups-32/.footprint
+++ b/cups-32/.footprint
@ -1,6 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libcups.so -> libcups.so.2
-rwxr-xr-x	root/root	usr/lib32/libcups.so.2
-lrwxrwxrwx	root/root	usr/lib32/libcupsimage.so -> libcupsimage.so.2
-rwxr-xr-x	root/root	usr/lib32/libcupsimage.so.2
--- a/cups-32/.signature
+++ b/cups-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXbTbaRTL142Hx3556twRyc0pN+JDm53UW9JN293PK6pPyvOe+PBivKTpFw/BQSePupBbPEJ6N3im4h0w1XZTxg4=
-SHA256 (Pkgfile) = 0be19206e08049c0497e0029fe49ee5059fdb55e5cee270db161d26616f4ad27
-SHA256 (.footprint) = ff78e3e8d17ff0381702ecdbfc3dd895283af42f5254b78fb90ace1749a4337d
-SHA256 (cups-2.4.8-source.tar.gz) = 75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0
--- a/cups-32/Pkgfile
+++ b/cups-32/Pkgfile
@ -1,39 +0,0 @@
-# Description: CUPS - Common UNIX Printing System
-# URL: https://www.cups.org
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: avahi-32 cups
-# Optional: dbus-32 gnutls-32
-
-name=cups-32
-version=2.4.8
-release=1
-source=(https://github.com/OpenPrinting/cups/releases/download/v$version/${name%-*}-$version-source.tar.gz)
-
-build() {
-	cd ${name%-*}-$version
-
-	PKGMK_CUPS=' --with-tls=openssl'
-	prt-get isinst gnutls-32 && PKGMK_CUPS=' --with-tls=gnutls'
-
-
-	CC=cc CXX=c++ \
-	./configure \
-		--prefix=/usr $PKGMK_CUPS \
-		--sysconfdir=/etc \
-		--libdir=/usr/lib32 \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/doc \
-		--with-logdir=/var/log/cups \
-		--with-cups-user=daemon \
-		--with-cups-group=lp \
-		--with-languages="" \
-		--without-{java,perl,php,python} \
-		--without-rcdir \
-		--with-optim="$CFLAGS" \
-		--enable-acl \
-		--disable-{pam,dbus,dnssd,systemd} \
-		--without-systemd
-
-	make
-	make BUILDROOT=$PKG install-libs
-}
--- a/curl-32/.footprint
+++ b/curl-32/.footprint
@ -2,8 +2,8 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libcurl.a
 -rwxr-xr-x	root/root	usr/lib32/libcurl.la
-lrwxrwxrwx	root/root	usr/lib32/libcurl.so -> libcurl.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib32/libcurl.so.4 -> libcurl.so.4.8.0
-rwxr-xr-x	root/root	usr/lib32/libcurl.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib32/libcurl.so -> libcurl.so.4.5.0
+lrwxrwxrwx	root/root	usr/lib32/libcurl.so.4 -> libcurl.so.4.5.0
+-rwxr-xr-x	root/root	usr/lib32/libcurl.so.4.5.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libcurl.pc
--- a/curl-32/.md5sum
+++ b/curl-32/.md5sum
@ -0,0 +1 @@
+04c00832fa62d443b8745b056464fb30  curl-7.59.0.tar.xz
--- a/curl-32/.signature
+++ b/curl-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXfjDb5KmY6W7StRkuZ15QWlXCB0CvSy8F6NAa7c9LhIqvBSH7V5NH1Dy6rMoXUbo8vaPJILtjNO2w5ZFPFjn1ws=
-SHA256 (Pkgfile) = 602e5341deace4258d67adf8c4e5901a74a0d7c6694b79698f18e69d434ed32a
-SHA256 (.footprint) = 1f49d30883c63da2e3d72a616a65fa40806923dd3c80aa299aebe1ceb544379b
-SHA256 (curl-8.8.0.tar.xz) = 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400
+RWSwxGo/zH7eXVLrDS294Iq2fQpwYC/E4/BIFmY6nm/g8HW3t+St895ZXdCD+HrDkaMEeWWoupcg5OR04Dj/TYH2Fkj8ujZJPgw=
+SHA256 (Pkgfile) = d1ccba0e99a4177ec883973d989caecb313d74bf81f15a65f9352d9c0f1b28e3
+SHA256 (.footprint) = 4c65049c40bc744f5d6bf6fddd45c9c4f536cdbde44c6b536a68d45d6ec7bc40
+SHA256 (curl-7.59.0.tar.xz) = e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc
--- a/curl-32/Pkgfile
+++ b/curl-32/Pkgfile
@ -1,29 +1,22 @@
 # Description: A tool for transfering files with URL syntax
 # Maintainer:  CRUX compat-32 Team, compat-32-ports at crux dot nu
-# URL: https://curl.se/
-# Depends on: curl openssl-32 zstd-32
-# Optional: brotli-32
+# URL:         https://curl.haxx.se/
+# Depends on:  openssl-32 zlib-32 curl

 name=curl-32
-version=8.8.0
+version=7.59.0
 release=1
-source=(https://curl.se/download/${name%-*}-$version.tar.xz)
+source=(https://curl.haxx.se/download/${name%-*}-$version.tar.xz)

 build() {
    cd ${name%-*}-$version

-  prt-get isinst brotli && ! prt-get isinst brotli-32 && printf "\e[031mbrotli is detected on your system, please run:
-  prt-get depinst brotli-32
-  before continuing with curl-32.\033[0m\n" &&
-  exit 1
-
    ./configure --prefix=/usr \
 		--libdir=/usr/lib32 \
                --enable-ipv6 \
-    --without-libidn2 \
-    --with-openssl \
+                --without-libidn \
+                --without-cyassl \
                --enable-threaded-resolver \
-    --without-libpsl \
                --with-ca-bundle=/etc/ssl/cert.pem
    make
    make DESTDIR=$PKG install
--- a/db-32/.md5sum
+++ b/db-32/.md5sum
@ -0,0 +1 @@
+b99454564d5b4479750567031d66fe24  db-5.3.28.tar.gz
--- a/db-32/.signature
+++ b/db-32/.signature
@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXaf9DbwK6/mMIQa09AxY9Fh3s474XP9tc9PLadby1edVu8NqNMr4VeabJ5YZwODNmU+970k/bcQB3yY5IUPDkAs=
-SHA256 (Pkgfile) = bbc4f26b7d3c6a73b74a4c5589679410f8123a6b3f67fc80d59bff4531d56249
+RWSwxGo/zH7eXWOSLkooYU5c0RyiuGdYvuPq0n0xH6vP85HvpNWJD69sEoxDBb5tegNLMNheTvaUpegWjFBoa0hMpO1ePxCcaQY=
+SHA256 (Pkgfile) = 79e5b8d329ce333a6b38ba21ea6a05fbbcbab6951f89df0fb30c8713b4028b4c
 SHA256 (.footprint) = f48dabc8d96d2d29b1e4772033c3f0056ebfe7498829bbb79da1db9267f16314
 SHA256 (db-5.3.28.tar.gz) = e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628
-SHA256 (0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch) = 696ac5af5473f0d85ecc6af44a85333c91500721fb5c33028c05e843429058d1
--- a/db-32/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+++ b/db-32/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
@ -1,45 +0,0 @@
-From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 22 Mar 2017 15:32:26 +0000
-Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash
- with builtins
-
-Helps building with clang
-
-Fixes
-
-../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange'
-static inline int __atomic_compare_exchange(
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/dbinc/atomic.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
-index 6a858f7..1b49de5 100644
--- a/src/dbinc/atomic.h
-+++ b/src/dbinc/atomic.h
-@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
- #define	atomic_inc(env, p)	__atomic_inc(p)
- #define	atomic_dec(env, p)	__atomic_dec(p)
- #define	atomic_compare_exchange(env, p, o, n)	\
-	__atomic_compare_exchange((p), (o), (n))
-+	__db_atomic_compare_exchange((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- 	int	temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
-  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
-  * which configure could be changed to use.
-  */
-static inline int __atomic_compare_exchange(
-+static inline int __db_atomic_compare_exchange(
- 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- 	atomic_value_t was;
-- 
-1.8.3.1
-
--- a/db-32/Pkgfile
+++ b/db-32/Pkgfile
@ -4,15 +4,11 @@

 name=db-32
 version=5.3.28
-release=2
-source=(https://download.oracle.com/berkeley-db/db-$version.tar.gz
-	0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch)
+release=1
+source=(http://download.oracle.com/berkeley-db/db-$version.tar.gz)

 build() {
    cd db-$version/build_unix
-
-    patch -p1 -d .. -i $SRC/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
-
    ../dist/configure --prefix=/usr \
 		--libdir=/usr/lib32 \
 		--enable-compat185 \
--- a/dbus-32/.footprint
+++ b/dbus-32/.footprint
@ -12,8 +12,8 @@ drwxr-xr-x	root/root	usr/lib32/dbus/
 -rwsr-x---	root/messagebus	usr/lib32/dbus/dbus-daemon-launch-helper
 -rw-r--r--	root/root	usr/lib32/libdbus-1.a
 -rwxr-xr-x	root/root	usr/lib32/libdbus-1.la
-lrwxrwxrwx	root/root	usr/lib32/libdbus-1.so -> libdbus-1.so.3.32.4
-lrwxrwxrwx	root/root	usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.32.4
-rwxr-xr-x	root/root	usr/lib32/libdbus-1.so.3.32.4
+lrwxrwxrwx	root/root	usr/lib32/libdbus-1.so -> libdbus-1.so.3.19.7
+lrwxrwxrwx	root/root	usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.19.7
+-rwxr-xr-x	root/root	usr/lib32/libdbus-1.so.3.19.7
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/dbus-1.pc
--- a/dbus-32/.md5sum
+++ b/dbus-32/.md5sum
@ -0,0 +1 @@
+2764bf150e5aa8005b7bc0d6c388756a  dbus-1.12.8.tar.gz
--- a/dbus-32/.signature
+++ b/dbus-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXbXF/0Fk7s0hxgcj+bPJGfE9J8BClUYKyKlsurp5J+lbUXZ+CjXBYmie61n5n5B2GmDsqQHoeAjOqpyvFjNy2ws=
-SHA256 (Pkgfile) = 958e16c1454c0f05b821364a8275d987d8b4e05bf4fb925dba9969e6a5f34902
-SHA256 (.footprint) = 6c98219856ef3c6450692966f285f8f47e0615025c59a26ba804c819c3fa149c
-SHA256 (dbus-1.14.10.tar.xz) = ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f
+RWSwxGo/zH7eXWw8s3hzW/j1leX1gvQT4Z8vB6qYETqzgYJbyFmPnEvPKXERXADeepIaRVfZi3EML/YvtfzudnCgr2Z0SgtuRgc=
+SHA256 (Pkgfile) = d1006df4b620ded80c90b58438802a72dca0547901e0d6ee2e49df746204ffaf
+SHA256 (.footprint) = b0b63d3467c24bc34a05490da5ca8ae32e06409206fd30a535ac08613f02175d
+SHA256 (dbus-1.12.8.tar.gz) = e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3
--- a/dbus-32/Pkgfile
+++ b/dbus-32/Pkgfile
@ -1,12 +1,12 @@
 # Description: A message bus system
 # URL: https://freedesktop.org/wiki/Software/dbus
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: dbus expat-32
+# Depends on: expat-32 dbus

 name=dbus-32
-version=1.14.10
+version=1.12.8
 release=1
-source=(https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.xz)
+source=(https://${name%-*}.freedesktop.org/releases/${name%-*}/${name%-*}-$version.tar.gz)

 build() {
 	cd ${name%-*}-$version
--- a/dbus-glib-32/.footprint
+++ b/dbus-glib-32/.footprint
@ -1,9 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-rw-r--r--	root/root	usr/lib32/libdbus-glib-1.a
-rwxr-xr-x	root/root	usr/lib32/libdbus-glib-1.la
-lrwxrwxrwx	root/root	usr/lib32/libdbus-glib-1.so -> libdbus-glib-1.so.2.3.5
-lrwxrwxrwx	root/root	usr/lib32/libdbus-glib-1.so.2 -> libdbus-glib-1.so.2.3.5
-rwxr-xr-x	root/root	usr/lib32/libdbus-glib-1.so.2.3.5
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/dbus-glib-1.pc
--- a/dbus-glib-32/.signature
+++ b/dbus-glib-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXcVuhAcdkDXthSVgj1BNwVxsI3DNQPOc/zlzsyLspmSbWmUKWWxk45GxserB5Nvy9qu34GUGbqSZKITKDZ5bZA8=
-SHA256 (Pkgfile) = cde24bdddb74b1590f34af867f083e21e46eae1c6a993963564098aac5f7e3ae
-SHA256 (.footprint) = 0189fcd5a060d938378dcee6aa783881d03c0aff73af9bfb235c622f50c82edb
-SHA256 (dbus-glib-0.112.tar.gz) = 7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a
--- a/dbus-glib-32/Pkgfile
+++ b/dbus-glib-32/Pkgfile
@ -1,23 +0,0 @@
-# Description: D-Bus GLib bindings
-# URL: http://freedesktop.org/wiki/Software/DBusBindings
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: dbus-32 dbus-glib glib-32
-
-name=dbus-glib-32
-version=0.112
-release=1
-source=(https://dbus.freedesktop.org/releases/${name%-*}/${name%-*}-$version.tar.gz)
-
-build() {
-	cd ${name%-*}-$version
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--enable-bash-completion=no
-
-	make
-	make DESTDIR=$PKG install
-
-	rm -r $PKG/usr/{bin,share,include}
-}
--- a/elfutils-32/.footprint
+++ b/elfutils-32/.footprint
@ -1,18 +1,47 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-rwxr-xr-x	root/root	usr/lib32/libasm-0.191.so
+drwxr-xr-x	root/root	usr/lib32/elfutils/
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_aarch64-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_aarch64.so -> libebl_aarch64-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_alpha-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_alpha.so -> libebl_alpha-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_arm-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_arm.so -> libebl_arm-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_bpf-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_bpf.so -> libebl_bpf-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_i386-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_i386.so -> libebl_i386-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_ia64-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_ia64.so -> libebl_ia64-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_m68k-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_m68k.so -> libebl_m68k-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_ppc-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_ppc.so -> libebl_ppc-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_ppc64-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_ppc64.so -> libebl_ppc64-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_s390-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_s390.so -> libebl_s390-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_sh-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_sh.so -> libebl_sh-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_sparc-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_sparc.so -> libebl_sparc-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_tilegx-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_tilegx.so -> libebl_tilegx-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/elfutils/libebl_x86_64-0.169.so
+lrwxrwxrwx	root/root	usr/lib32/elfutils/libebl_x86_64.so -> libebl_x86_64-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/libasm-0.169.so
 -rw-r--r--	root/root	usr/lib32/libasm.a
 lrwxrwxrwx	root/root	usr/lib32/libasm.so -> libasm.so.1
-lrwxrwxrwx	root/root	usr/lib32/libasm.so.1 -> libasm-0.191.so
-rwxr-xr-x	root/root	usr/lib32/libdw-0.191.so
+lrwxrwxrwx	root/root	usr/lib32/libasm.so.1 -> libasm-0.169.so
+-rwxr-xr-x	root/root	usr/lib32/libdw-0.169.so
 -rw-r--r--	root/root	usr/lib32/libdw.a
 lrwxrwxrwx	root/root	usr/lib32/libdw.so -> libdw.so.1
-lrwxrwxrwx	root/root	usr/lib32/libdw.so.1 -> libdw-0.191.so
-rwxr-xr-x	root/root	usr/lib32/libelf-0.191.so
+lrwxrwxrwx	root/root	usr/lib32/libdw.so.1 -> libdw-0.169.so
+-rw-r--r--	root/root	usr/lib32/libebl.a
+-rwxr-xr-x	root/root	usr/lib32/libelf-0.169.so
 -rw-r--r--	root/root	usr/lib32/libelf.a
 lrwxrwxrwx	root/root	usr/lib32/libelf.so -> libelf.so.1
-lrwxrwxrwx	root/root	usr/lib32/libelf.so.1 -> libelf-0.191.so
+lrwxrwxrwx	root/root	usr/lib32/libelf.so.1 -> libelf-0.169.so
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libdw.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libelf.pc
-drwxr-xr-x	root/root	usr/share/
--- a/elfutils-32/.md5sum
+++ b/elfutils-32/.md5sum
@ -0,0 +1 @@
+1ce77c5315d6bba7d883c3c4f0c2697e  elfutils-0.169.tar.bz2
--- a/elfutils-32/.signature
+++ b/elfutils-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXQ/fn8FtaC2/WTzrXEVUwETLV4g7J6UQa22VVAsR6dwugNjXWX1c9OtVIvXi2cBchxQUAyugFGyt0iYCRdnXAgw=
-SHA256 (Pkgfile) = 486531f6cb02c0ed34965d44bc9aa097b2247dbc2c2eebeee385a7d0c1cbccb2
-SHA256 (.footprint) = 3722c045802d9c7b9225c9c6143cc848d2e36a1a1a03fa0e105903ccc0380183
-SHA256 (elfutils-0.191.tar.bz2) = df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871
+RWSwxGo/zH7eXXPZO3/5NnzApbnbj6R4UEVxzEtSSrKmQPs0HetSLNRnByQXO++6uPaXqQmR7Zewx/Jns4o+9qNdGUH26u/eUw4=
+SHA256 (Pkgfile) = c3c8c55a11ad75b246fb72dee97409efdabfd74a0b04fc2f96b3766177d5317c
+SHA256 (.footprint) = c721e305dcb5d3d54845e61b5ec2e7cfd89e7e58f9e3f04b62552b177c7e954b
+SHA256 (elfutils-0.169.tar.bz2) = 9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2
--- a/elfutils-32/Pkgfile
+++ b/elfutils-32/Pkgfile
@ -1,10 +1,10 @@
 # Description: A collection of utilities to handle ELF objects.
 # URL: https://sourceware.org/elfutils/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: bzip2-32 xz-32 zlib-32
+# Depends on: bzip2-32 xz-32 zlib-32 elfutils

 name=elfutils-32
-version=0.191
+version=0.169
 release=1
 source=(https://sourceware.org/${name%-*}/ftp/$version/${name%-*}-$version.tar.bz2)

@ -15,12 +15,10 @@ build() {
 		--prefix=/usr \
 		--libdir=/usr/lib32 \
 		--program-prefix=eu- \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
 		--disable-nls

 	make
 	make DESTDIR=$PKG install

-	rm -r $PKG/usr/{bin,include,share/man}
+	rm -r $PKG/usr/{bin,include}
 }
--- a/eudev-32/.md5sum
+++ b/eudev-32/.md5sum
@ -0,0 +1 @@
+6ca08c0e14380f87df8e8aceac123671  eudev-3.2.5.tar.gz
--- a/eudev-32/.signature
+++ b/eudev-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXYrpVKisw11NmAtNIHrFJe2ushkQyyfBUYCcdkekRED3UktOXU6RcQqpx/uvZuZpiO8D9XTBDRKl0pB9QTVxEAc=
-SHA256 (Pkgfile) = fd1af29ae21d91b20556671f3b77e1d5eb330d9403ea99ba8ad252e49b1a1eab
+RWSwxGo/zH7eXd3uvachVpHFjlYY1RX3qZFM3ucPeFMVBX6eKT97kEcctflD/3i7lovAHcIgw36d10USuXwstyyr60PIKll7/Aw=
+SHA256 (Pkgfile) = eba1380f2eeb45af6670f9bc6c0ad264b6ee0694d3ef8c3b4c7b9f4c456c7c04
 SHA256 (.footprint) = 0441d880458916404fe99e70ccea4bfee33658be8c1f50471bbe55ecd4f85efd
-SHA256 (eudev-3.2.14.tar.gz) = 8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f
+SHA256 (eudev-3.2.5.tar.gz) = 49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af
--- a/eudev-32/Pkgfile
+++ b/eudev-32/Pkgfile
@ -1,12 +1,12 @@
 # Description: Userspace device management daemon
-# URL: https://github.com/eudev-project/eudev
+# URL: https://wiki.gentoo.org/wiki/Project:Eudev
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: eudev kmod-32
+# Depends on: kmod-32 eudev

 name=eudev-32
-version=3.2.14
+version=3.2.5
 release=1
-source=(https://github.com/eudev-project/eudev/releases/download/v$version/eudev-$version.tar.gz)
+source=(https://dev.gentoo.org/~blueness/eudev/eudev-$version.tar.gz)

 build() {
    cd eudev-$version
@ -14,6 +14,12 @@ build() {
    # needed for static linking, e.g. dmsetup.static
    sed -i '/^Libs:/s/-ludev/-ludev -lrt/' src/libudev/libudev.pc.in

+    # fix for gperf 3.1
+    # https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60
+    sed -i '/*keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c
+
+    autoreconf --force --install
+
    ./configure --prefix=/usr \
                --libdir=/usr/lib32 \
                --sbindir=/sbin --bindir=/sbin \
--- a/expat-32/.footprint
+++ b/expat-32/.footprint
@ -1,15 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/cmake/
-drwxr-xr-x	root/root	usr/lib32/cmake/expat-2.6.2/
-rw-r--r--	root/root	usr/lib32/cmake/expat-2.6.2/expat-config-version.cmake
-rw-r--r--	root/root	usr/lib32/cmake/expat-2.6.2/expat-config.cmake
-rw-r--r--	root/root	usr/lib32/cmake/expat-2.6.2/expat-noconfig.cmake
-rw-r--r--	root/root	usr/lib32/cmake/expat-2.6.2/expat.cmake
 -rw-r--r--	root/root	usr/lib32/libexpat.a
 -rwxr-xr-x	root/root	usr/lib32/libexpat.la
-lrwxrwxrwx	root/root	usr/lib32/libexpat.so -> libexpat.so.1.9.2
-lrwxrwxrwx	root/root	usr/lib32/libexpat.so.1 -> libexpat.so.1.9.2
-rwxr-xr-x	root/root	usr/lib32/libexpat.so.1.9.2
+lrwxrwxrwx	root/root	usr/lib32/libexpat.so -> libexpat.so.1.6.7
+lrwxrwxrwx	root/root	usr/lib32/libexpat.so.1 -> libexpat.so.1.6.7
+-rwxr-xr-x	root/root	usr/lib32/libexpat.so.1.6.7
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/expat.pc
--- a/expat-32/.md5sum
+++ b/expat-32/.md5sum
@ -0,0 +1 @@
+789e297f547980fc9ecc036f9a070d49  expat-2.2.5.tar.bz2
--- a/expat-32/.signature
+++ b/expat-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXVTej2JX0mKOPOJ1Rsq5cU7GfwA89hiNUA9Q0dIC7/iWbddyTz+35ZFyJsL44mWX7hcIUPvEI097BpSPHJwd7QE=
-SHA256 (Pkgfile) = 53d425e192870f5f4fd8018edc708ec63803905ca08838cdbe36f3e5cd720d88
-SHA256 (.footprint) = e9f34b69f90a1827e3cd7d6cd697dda96d18f336481e17ed1c9c677f91738fb9
-SHA256 (expat-2.6.2.tar.bz2) = 9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0
+RWSwxGo/zH7eXfN+Vm6rXJVXJlrm82uu4G3jmVnJwBIMc30ab63biUJCgTvSkBglek3hUHSvaM8H+jWdao5NglSpLBxYd2duXQw=
+SHA256 (Pkgfile) = ce708e8c3cd2e8584614a77d18c5160e61b71941bbe2b2419fe674f450fea57a
+SHA256 (.footprint) = 1408b874e0e2688866cd58ebb944f8e051c06226a8bfc487bf937115e8b09da3
+SHA256 (expat-2.2.5.tar.bz2) = d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
--- a/expat-32/Pkgfile
+++ b/expat-32/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: expat

 name=expat-32
-version=2.6.2
+version=2.2.5
 release=1
 source=(https://downloads.sourceforge.net/project/${name%-*}/${name%-*}/$version/${name%-*}-$version.tar.bz2)

@ -18,6 +18,6 @@ build() {
 	make
 	make DESTDIR=$PKG install

-	rm -r $PKG/usr/{bin,include,share/doc,share/man}
+	rm -r $PKG/usr/{bin,include,share/man,share/doc}
 	rmdir $PKG/usr/share
 }
--- a/faudio-32/.footprint
+++ b/faudio-32/.footprint
@ -1,12 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/cmake/
-drwxr-xr-x	root/root	usr/lib32/cmake/FAudio/
-rw-r--r--	root/root	usr/lib32/cmake/FAudio/FAudio-targets-release.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FAudio/FAudio-targets.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FAudio/FAudioConfig.cmake
-lrwxrwxrwx	root/root	usr/lib32/libFAudio.so -> libFAudio.so.0
-lrwxrwxrwx	root/root	usr/lib32/libFAudio.so.0 -> libFAudio.so.0.24.05
-rwxr-xr-x	root/root	usr/lib32/libFAudio.so.0.24.05
-drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-rw-r--r--	root/root	usr/lib32/pkgconfig/FAudio.pc
--- a/faudio-32/.signature
+++ b/faudio-32/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXY+7y7M/0vmUHXP14jViZn7lLQVHSEDAuFNK39pFiKm8JHS/QD9V/CxsEg70ledywJ9Z5SkQjdACA7qlFsBF7w0=
-SHA256 (Pkgfile) = 41317109b6ada24a720eeb861bbed7610567dcb8bf1e51e5925089c3344a10c1
-SHA256 (.footprint) = d0c25e6f407ff0b7d778aa3e5fbc7caed16c0e1f62a8d3610f94edd65443b8cf
-SHA256 (faudio-24.05.tar.gz) = 9c5eb554a83325cb7b99bcffc02662c681b681679a11b78c66c21f1e1044beeb
--- a/faudio-32/Pkgfile
+++ b/faudio-32/Pkgfile
@ -1,22 +0,0 @@
-# Description: XAudio2 reimplementation
-# URL: https://github.com/FNA-XNA/FAudio/
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: libsdl2-32 faudio
-
-name=faudio-32
-version=24.05
-release=1
-source=(https://github.com/FNA-XNA/FAudio/archive/$version/faudio-$version.tar.gz)
-
-build() {
-	cmake -S FAudio-$version -B build -G Ninja \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_INSTALL_LIBDIR=lib32 \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS"
-
-	cmake --build build
-	DESTDIR=$PKG cmake --build build --target install
-
-	rm -r $PKG/usr/include
-}
--- a/flac-32/.footprint
+++ b/flac-32/.footprint
@ -1,17 +1,13 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/cmake/
-drwxr-xr-x	root/root	usr/lib32/cmake/FLAC/
-rw-r--r--	root/root	usr/lib32/cmake/FLAC/flac-config-version.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FLAC/flac-config.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FLAC/targets-release.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FLAC/targets.cmake
-lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so -> libFLAC++.so.10
-lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so.10 -> libFLAC++.so.10.0.1
-rwxr-xr-x	root/root	usr/lib32/libFLAC++.so.10.0.1
-lrwxrwxrwx	root/root	usr/lib32/libFLAC.so -> libFLAC.so.12
-lrwxrwxrwx	root/root	usr/lib32/libFLAC.so.12 -> libFLAC.so.12.1.0
-rwxr-xr-x	root/root	usr/lib32/libFLAC.so.12.1.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC++.la
+lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so -> libFLAC++.so.6.3.0
+lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so.6 -> libFLAC++.so.6.3.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC++.so.6.3.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC.la
+lrwxrwxrwx	root/root	usr/lib32/libFLAC.so -> libFLAC.so.8.3.0
+lrwxrwxrwx	root/root	usr/lib32/libFLAC.so.8 -> libFLAC.so.8.3.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC.so.8.3.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/flac++.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/flac.pc
--- a/flac-32/.md5sum
+++ b/flac-32/.md5sum
@ -0,0 +1 @@
+454f1bfa3f93cc708098d7890d0499bd  flac-1.3.2.tar.xz
--- a/flac-32/.signature
+++ b/flac-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXRdCXYPcCGDIqRH9C+CR3cTGQvtK/r00ISXQKHILNgeSmhq79+ZtxHuuYD7Q/gKaqsjnBBTIEM69U9SzL1ObvAc=
-SHA256 (Pkgfile) = 24b34d774b0e8ec6a6c5dfef27903191b772f545985e312a560c67395834ff50
-SHA256 (.footprint) = ca12f4924823a2cf507a1fe4ba79f55214d8c4a952b7ef2c426aaa5e6102fb76
-SHA256 (flac-1.4.3.tar.xz) = 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70
+RWSwxGo/zH7eXUPNfegjmfM9KXb0Z9mzTYmvsa3VNEMqsuPsr2rDcxFGuCzsJJvbn4T/c4ysqPxfhkH4RBgvNs/Tw6hUdPTCkQM=
+SHA256 (Pkgfile) = 57789d2cb8f56028080ad9076dd0796bc38522b6729f79b063fdcf8dd8a9f2da
+SHA256 (.footprint) = ddf7c066da838a3140e2af330bf928f93914f0a6d2cef090ed691c0ecca38cac
+SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f
--- a/flac-32/Pkgfile
+++ b/flac-32/Pkgfile
@ -1,27 +1,25 @@
 # Description: Free Lossless Audio Codec.
-# URL: https://xiph.org/flac/
+# URL: http://xiph.org/flac/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: libogg-32

 name=flac-32
-version=1.4.3
+version=1.3.2
 release=1
-source=(https://downloads.xiph.org/releases/flac/flac-$version.tar.xz)
+source=(http://downloads.xiph.org/releases/flac/flac-$version.tar.xz)

 build() {
-	cmake -S flac-$version -B build -G Ninja \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_INSTALL_LIBDIR=lib32 \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D BUILD_SHARED_LIBS=ON \
-		-D BUILD_EXAMPLES=OFF \
-		-D BUILD_TESTING=OFF \
-		-Wno-dev
-	cmake --build build
-	DESTDIR=$PKG cmake --install build
+	cd flac-$version

-	rm -r $PKG/usr/{bin,include,share/man}
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib32 \
+		--host=i686-pc-linux-gnu \
+		--with-ogg-libraries=/usr/lib32
+
+	make
+	make DESTDIR=$PKG install
+	
+	rm -r $PKG/usr/{bin,include,share/{aclocal,doc,man}}
 	rmdir $PKG/usr/share
 }
--- a/fontconfig-32/.footprint
+++ b/fontconfig-32/.footprint
@ -1,7 +1,8 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libfontconfig.so -> libfontconfig.so.1
-lrwxrwxrwx	root/root	usr/lib32/libfontconfig.so.1 -> libfontconfig.so.1.14.0
-rwxr-xr-x	root/root	usr/lib32/libfontconfig.so.1.14.0
+-rwxr-xr-x	root/root	usr/lib32/libfontconfig.la
+lrwxrwxrwx	root/root	usr/lib32/libfontconfig.so -> libfontconfig.so.1.11.1
+lrwxrwxrwx	root/root	usr/lib32/libfontconfig.so.1 -> libfontconfig.so.1.11.1
+-rwxr-xr-x	root/root	usr/lib32/libfontconfig.so.1.11.1
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/fontconfig.pc
--- a/fontconfig-32/.md5sum
+++ b/fontconfig-32/.md5sum
@ -0,0 +1 @@
+60d2394a79d3b2e5db2daea55193fa47  fontconfig-2.13.0.tar.bz2
--- a/fontconfig-32/.signature
+++ b/fontconfig-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXZL1I0McLoi/QPs7MVp6CPE+xPvhQgAM2ykpWAlJq55z4h92douzHcxRQDtsPCS8XJiuVjGLed3+3gfRdV6mGAY=
-SHA256 (Pkgfile) = 9c5a2abca201283c2691d133b483dcf44404532b45fca4bd80052535b522d346
-SHA256 (.footprint) = 0c1780e322098d1fe5c5813a21b4dc001a7fe5aa1f652a2767fb23e1ebcd31cd
-SHA256 (fontconfig-2.15.0.tar.xz) = 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
+RWSwxGo/zH7eXTLI+5YDMLOXYFazTW9E+Nzb1W8M0Ie6iML0+Drj6+bpmB9wL0KQabREpRev4L+l/XEtIzTUDMTcjaQdX5V9owM=
+SHA256 (Pkgfile) = 11e443f646ee4fc31d271a13f9a06abd6106f75521567cb0a36fb2e56a67d616
+SHA256 (.footprint) = 97df26a3f74e157331d7935104e62a1753cdccef72cc09573a1c73b10d5c1e0d
+SHA256 (fontconfig-2.13.0.tar.bz2) = 91dde8492155b7f34bb95079e79be92f1df353fcc682c19be90762fd3e12eeb9
--- a/fontconfig-32/Pkgfile
+++ b/fontconfig-32/Pkgfile
@ -1,28 +1,25 @@
 # Description: A library for configuring and customizing font access
-# URL: https://www.freedesktop.org/wiki/Software/fontconfig/
+# URL:         http://fontconfig.org/wiki/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: expat-32 fontconfig freetype-32 util-linux-32
+# Depends on:  freetype-32 expat-32 bzip2-32 util-linux-32 fontconfig

 name=fontconfig-32
-version=2.15.0
+version=2.13.0
 release=1
-source=(https://fontconfig.org/release/fontconfig-$version.tar.xz)
+source=(https://fontconfig.org/release/fontconfig-$version.tar.bz2)

 build() {
-	meson setup fontconfig-$version build \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--buildtype=plain \
-		--wrap-mode=nodownload \
-		-D b_lto=true \
-		-D b_pie=true \
-		-D doc-man=enabled \
-		-D doc=disabled \
-		-D nls=disabled \
-		-D tests=disabled \
-		-D cache-build=disabled
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
+    cd fontconfig-$version

-	rm -r $PKG/usr/{bin,include,share} $PKG/etc
+    ./configure --prefix=/usr \
+		--libdir=/usr/lib32 \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-xmldir=/etc/fonts \
+		--with-templatedir=/etc/fonts/conf.avail
+
+    make
+    make DESTDIR=$PKG install
+
+    rm -r $PKG/usr/{bin,include,share/man,share} $PKG/{etc,var}
 }
--- a/freeglut-32/.footprint
+++ b/freeglut-32/.footprint
@ -1,15 +1,8 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/cmake/
-drwxr-xr-x	root/root	usr/lib32/cmake/FreeGLUT/
-rw-r--r--	root/root	usr/lib32/cmake/FreeGLUT/FreeGLUTConfig.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FreeGLUT/FreeGLUTConfigVersion.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FreeGLUT/FreeGLUTTargets-release.cmake
-rw-r--r--	root/root	usr/lib32/cmake/FreeGLUT/FreeGLUTTargets.cmake
 -rw-r--r--	root/root	usr/lib32/libglut.a
 lrwxrwxrwx	root/root	usr/lib32/libglut.so -> libglut.so.3
-lrwxrwxrwx	root/root	usr/lib32/libglut.so.3 -> libglut.so.3.12.0
-rwxr-xr-x	root/root	usr/lib32/libglut.so.3.12.0
+lrwxrwxrwx	root/root	usr/lib32/libglut.so.3 -> libglut.so.3.10.0
+-rwxr-xr-x	root/root	usr/lib32/libglut.so.3.10.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
-lrwxrwxrwx	root/root	usr/lib32/pkgconfig/freeglut.pc -> glut.pc
-rw-r--r--	root/root	usr/lib32/pkgconfig/glut.pc
+-rw-r--r--	root/root	usr/lib32/pkgconfig/freeglut.pc
--- a/freeglut-32/.md5sum
+++ b/freeglut-32/.md5sum
@ -0,0 +1 @@
+90c3ca4dd9d51cf32276bc5344ec9754  freeglut-3.0.0.tar.gz
--- a/freeglut-32/.signature
+++ b/freeglut-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXbt3vOr2eBpYow2+ngjcWNnVx6GWdNA5LkyMmdpvHwJDjeNrhXpPuRd9mOkogLwl4O/qRYhfu2Bz81BpI/NjRgs=
-SHA256 (Pkgfile) = cfbc805c3c45169ec6f81195af7981572a2cdc42b6fb2f8ccf353b9ce4cbfa69
-SHA256 (.footprint) = 2f4cb6893d06c24a133afc1c552c82f8cafaf1533b3702f5bf8587834e7896d2
-SHA256 (freeglut-3.4.0.tar.gz) = 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec
+RWSwxGo/zH7eXb+1Ld9b+ZFPl1HqDdII4zfhxOckJbQm1NukM2EwX2StzlS15cWNO3Wg6N0CliTnl0cNRSTnwlwjfOC9eqs16QM=
+SHA256 (Pkgfile) = ef8c83be37b8502bae1fcaf0cd0db2a18f772d1f597ba9df27cea2045ddd92b7
+SHA256 (.footprint) = b4c42ac0e5eb49f4b9ef9ed7329c7a01d2bb5783a910fc7432ecfa9eaaa5d5bc
+SHA256 (freeglut-3.0.0.tar.gz) = 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2
--- a/freeglut-32/Pkgfile
+++ b/freeglut-32/Pkgfile
@ -1,24 +1,26 @@
 # Description: a free alternative to the OpenGL Utility Toolkit (GLUT) library
-# URL: https://freeglut.sourceforge.net/
+# URL: https://freeglut.sourceforge.net
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: freeglut glu-32 xorg-libxi-32
+# Depends on: glu-32 xorg-libxi-32 freeglut xorg-libxxf86vm-32

 name=freeglut-32
-version=3.4.0
+version=3.0.0
 release=1
-source=(https://downloads.sourceforge.net/project/freeglut/freeglut/$version/freeglut-$version.tar.gz)
+source=(https://download.sourceforge.net/freeglut/freeglut-$version.tar.gz)

 build() {
+	cd freeglut-$version

-	cmake -Sfreeglut-$version -Bbuild -GNinja \
+	install -d build
+	cd build
+
+	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib32 \
 		-DCMAKE_BUILD_TYPE=Release

-	cmake --build build
-	DESTDIR=$PKG cmake --install build
-
-	ln -s glut.pc $PKG/usr/lib32/pkgconfig/freeglut.pc
+	make
+	make DESTDIR=$PKG install

 	rm -r $PKG/usr/include
 }
--- a/freetype-32/.footprint
+++ b/freetype-32/.footprint
@ -1,7 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libfreetype.so -> libfreetype.so.6
-lrwxrwxrwx	root/root	usr/lib32/libfreetype.so.6 -> libfreetype.so.6.20.1
-rwxr-xr-x	root/root	usr/lib32/libfreetype.so.6.20.1
+-rw-r--r--	root/root	usr/lib32/libfreetype.a
+-rwxr-xr-x	root/root	usr/lib32/libfreetype.la
+lrwxrwxrwx	root/root	usr/lib32/libfreetype.so -> libfreetype.so.6.16.1
+lrwxrwxrwx	root/root	usr/lib32/libfreetype.so.6 -> libfreetype.so.6.16.1
+-rwxr-xr-x	root/root	usr/lib32/libfreetype.so.6.16.1
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/freetype2.pc
--- a/freetype-32/.md5sum
+++ b/freetype-32/.md5sum
@ -0,0 +1 @@
+60ef7d8160cd4bf8cb118ee9d65367ca  freetype-2.9.1.tar.bz2
--- a/freetype-32/.signature
+++ b/freetype-32/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXfFKafiqQ3vNxp3Xxh+44t8xYS890IrvojEM55WCLPyi72CgpxmQNDf1O4tDXNSljHlSDabD+nrfXVFrevjz0Qs=
-SHA256 (Pkgfile) = d5c039210d1617c4193cda7373407c68b65195373c6039f6a29eb7a2838a54d7
-SHA256 (.footprint) = fbe7a10a9b1a942d7b2560ec0183d4f9a02c7eedadce6bc51cd7f40c3df0e5da
-SHA256 (freetype-2.13.2.tar.xz) = 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d
+RWSwxGo/zH7eXb9Mei+f1YMmIB4wQr01AfT22KU8sFQqFBVQ2SN56rHq3VhZCOJCxM2LbW9qqASetORdROIZY6KPHTNxQr+HHgo=
+SHA256 (Pkgfile) = 7bb32084b0b9391a371573c93a9dd7cdbb863c6864a0ffb2f146f349e6572738
+SHA256 (.footprint) = 873caff6d3fc8c879501526ba2c896322baa88b7173faaeb541aa384314a3c1a
+SHA256 (freetype-2.9.1.tar.bz2) = db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
--- a/freetype-32/Pkgfile
+++ b/freetype-32/Pkgfile
@ -1,24 +1,23 @@
 # Description: A free and portable TrueType font rendering engine
 # URL:         https://www.freetype.org/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: bzip2-32 freetype libpng-32
+# Depends on: freetype libpng-32

 name=freetype-32
-version=2.13.2
+version=2.9.1
 release=1
-source=(https://sourceforge.net/projects/freetype/files/freetype2/$version/freetype-$version.tar.xz)
+source=(https://download.savannah.gnu.org/releases/${name%-*}/${name%-*}-$version.tar.bz2)

 build() {
-	meson setup ${name%-*}-$version build \
+	cd ${name%-*}-$version
+
+	 ./configure \
 		--prefix=/usr \
 		--libdir=/usr/lib32 \
-		--buildtype=plain \
-		--wrap-mode=nodownload \
-		-D b_lto=true \
-		-D b_pie=true \
-		-D default_library=shared
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
+		--with-zlib

-	rm -r $PKG/usr/include
+	make
+	make DESTDIR=$PKG install
+
+	rm -r $PKG/usr/{include,share}
 }
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`2f981a8f7897c59ec2ddc44916d33788 alsa-lib-1.1.6.tar.bz2`
				`@ -0,0 +1 @@`
				`1d38f3052107b77188f82d4c128fd7d0 v0.1.2.tar.gz`
				`@ -0,0 +1 @@`
				`dfb5e7474220afa3f4ca7e45af9f3a11 atk-2.28.1.tar.xz`
				`@ -0,0 +1 @@`
				`84f58dec00b60f2dc8fd1c9709291cc7 attr-2.4.47.src.tar.gz`
				`@ -0,0 +1 @@`
				`f060381576d67c855fad03e327fc9a69 cairo-1.15.10.tar.xz`
				`@ -0,0 +1 @@`
				`04c00832fa62d443b8745b056464fb30 curl-7.59.0.tar.xz`
				`@ -0,0 +1 @@`
				`b99454564d5b4479750567031d66fe24 db-5.3.28.tar.gz`
				`@ -0,0 +1 @@`
				`2764bf150e5aa8005b7bc0d6c388756a dbus-1.12.8.tar.gz`
				`@ -0,0 +1 @@`
				`1ce77c5315d6bba7d883c3c4f0c2697e elfutils-0.169.tar.bz2`
				`@ -0,0 +1 @@`
				`6ca08c0e14380f87df8e8aceac123671 eudev-3.2.5.tar.gz`