From 6909061a17f175f547cb0bf3ae0f741b5445df57 Mon Sep 17 00:00:00 2001
From: Matt Jenkins <matt@majenko.co.uk>
Date: Mon, 22 Sep 2025 20:04:53 +0100
Subject: [PATCH] More packages

---
 arch/xz/PKGCONF       | 23 +++++++++++++++++++++++
 bin/makepkg           | 19 +++++++++++++++----
 crypto/nettle/PKGCONF | 23 +++++++++++++++++++++++
 lang/gcc-5/PKGCONF    |  5 ++++-
 libs/gettext/PKGCONF  |  3 +++
 5 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 arch/xz/PKGCONF
 create mode 100644 crypto/nettle/PKGCONF

diff --git a/arch/xz/PKGCONF b/arch/xz/PKGCONF
new file mode 100644
index 0000000..95b423d
--- /dev/null
+++ b/arch/xz/PKGCONF
@@ -0,0 +1,23 @@
+VERSION=5.8.1
+PACKAGE=xz
+URL=git://github.com/tukaani-project/${PACKAGE}@v${VERSION}
+CATEGORY=arch
+
+configure() {
+	echo "Configuring $PACKAGE"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	./autogen.sh
+	./configure
+}
+
+build() {
+	echo "Building $PACKAGE"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	make -j ${NCPU}
+}
+
+install() {
+	echo "Installing $PACKAGE to ${DESTDIR}"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	make install DESTDIR="${DESTDIR}"
+}
diff --git a/bin/makepkg b/bin/makepkg
index 3b89f37..50ae9f6 100755
--- a/bin/makepkg
+++ b/bin/makepkg
@@ -111,12 +111,23 @@ download() {
 
 extract() {
 	if [ "$URL_PROTO" != "git" ]; then
+		cd "${SRCDIR}"
 		printf "Extracting ${SRC} ... "
-		( 
-			cd "${SRCDIR}"
-			gzip -d < "${DISTFILES}/${SRC}" | tar xf -
-		)
+		case $SRC in
+			*.gz)
+				gzip -d < "${DISTFILES}/${SRC}" | tar xf -
+				;;
+
+			*.xz)
+				xz -d < "${DISTFILES}/${SRC}" | tar xf -
+				;;
+			*)
+				echo "Error: no method to extract ${SRC}"
+				return 10
+				;;
+		esac
 		echo "done"
+		cd "${HERE}"
 	fi
 }
 
diff --git a/crypto/nettle/PKGCONF b/crypto/nettle/PKGCONF
new file mode 100644
index 0000000..9c42439
--- /dev/null
+++ b/crypto/nettle/PKGCONF
@@ -0,0 +1,23 @@
+VERSION=3.10
+PACKAGE=nettle
+SRC=${PACKAGE}-${VERSION}.tar.gz
+URL=${SITE_GNU}/${PACKAGE}/${SRC}
+CATEGORY=crypto
+
+configure() {
+	echo "Configuring $PACKAGE"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	./configure --disable-openssl --enable-shared
+}
+
+build() {
+	echo "Building $PACKAGE"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	make -j ${NCPU}
+}
+
+install() {
+	echo "Installing $PACKAGE to ${DESTDIR}"
+	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
+	make install DESTDIR="${DESTDIR}"
+}
diff --git a/lang/gcc-5/PKGCONF b/lang/gcc-5/PKGCONF
index 4049552..29e81c4 100644
--- a/lang/gcc-5/PKGCONF
+++ b/lang/gcc-5/PKGCONF
@@ -22,7 +22,10 @@ configure() {
 	    --includedir=/usr/local/include \
 	    --mandir=/usr/local/share/man \
 	    --enable-cloog-backend=isl \
-	    --enable-languages=c,c++,fortran,go,objc \
+	    --without-isl \
+	    --disable-libsanitizer \
+	    --disable-bootstrap \
+	    --enable-languages=c,c++,fortran,objc \
 	    --enable-libssp \
 	    --enable-nls \
 	    --enable-objc-gc \
diff --git a/libs/gettext/PKGCONF b/libs/gettext/PKGCONF
index bf09f43..7c33541 100644
--- a/libs/gettext/PKGCONF
+++ b/libs/gettext/PKGCONF
@@ -26,4 +26,7 @@ install() {
 	echo "Installing $PACKAGE to ${DESTDIR}"
 	cd "${SRCDIR}/${PACKAGE}-${VERSION}"
 	make install DESTDIR="${DESTDIR}"
+
+	cd "${DESTDIR}/usr/local/bin"
+	ln -s msgfmt gmsgfmt
 }