.editorconfig

@@ -1,8 +0,0 @@
-root = true
-[*]
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{c,h,sh}]
-indent_style = tab
-tab_width = 4

INSTALL.md

@@ -1,70 +0,0 @@
-# Iglunix Installation Guide
-
-## Getting an installation image
-There are two ways of getting hold of an install image: From the releases tab on
-GitHub and with [iglunix-autobuild](https://github.com/iglunix/iglunix-autobuild).
-
-### Using Autobuild
-```
-git clone https://github.com/iglunix/iglunix-autobuild
-cd iglunix-autobuild
-./autobuild.sh
-./chroot.sh
-./img.sh
-```
-
-### Writing the image
-Write the image to a USB to boot on the target computer.
-Make sure to triple check which disk you're writing to.
-```
-dd if=build/iglunix.img of=/dev/sdX bs=64M
-```
-
-## Disk Partitioning
-Iglunix recommends a two partition layout with an MBR partition table, a FAT
-formatted boot partition and an EXT4 formated root partition. The following
-is a guide on how to do it where `/dev/disk` is the target install disk.
-```
-fdisk /dev/disk
->o
->n
->p
->1
->2048
->+512M
->t
->ef
->n
->p
->2
->
->
->w
-
-mkfs.vfat -n BOOT /dev/disk1
-mkfs.ext4 -L ROOT /dev/disk2
-mkdir /install_root
-mount /dev/disk2 /install_root
-mkdir /install_root/boot
-mount /dev/disk1 /install_root/boot
-```
-
-## Extracting Packages
-For any packages you want to install
-```
-tar -I zstd -xf /mnt/<pkgname>.<pkgver>.tar.zst -C /install_root
-```
-
-## The init system
-Use https://github.com/iglunix/iglunix/tree/main/init not https://github.com/iglunix/init
-
-## Installing Bootloaders
-
-```
-limine-deploy /dev/disk
-cp /usr/share/limine/limine.sys /install_root/boot
-# If the oslo package wasn't installed earlier and you want UEFI support
-cp /usr/share/limine/BOOTX64.EFI /install_root/boot/efi/boot/bootx64.efi
-```
-Edit `/install_root/boot/efi/oslo/entries.ini` and `/install_root/boot/limine.cfg`
-accordingly

README.md

@@ -7,20 +7,16 @@ To create an ISO from a non-iglunix OS please see https://github.com/iglunix/igl
 
 ## Is this GNU/Linux
 No, GNU currently contributes roughly 10 MiB of code in the base system whilst,
-LLVM and Linux both contribute approximately 1 GiB each. Instead we suggest that
+LLVM and Linux both contribute aproximately 1 GiB each. Instead we suggest that
 one should refer to Igluinx running on the Linux kernel as LLVM/Musl/Linux.
 LLVM and Linux because they are the two largest packages and make up the
 majority of the base system, and Musl to be explicit about the C library,
 target triple and to differentiate it from any system using LLVM's libc
 (which will may very well likely use in the future).
 
-## Instalation
-See [INSTALL.md](INSTALL.md)
-
 ## Discord
 Join us at [link](https://discord.gg/NKB9qD2bMx)
 
-<!--
 ## Status of Other Kernels
 
 ### FreeBSD
@@ -36,32 +32,38 @@ otherwise the toolchain breaks).
 I have found no easy way of building libc on Darwin platforms as on yet.
 Because of this I haven't got far at all porting Iglunix to Darwin
 based systems such as MacOS and PureDarwin.
--->
 
 ## Web Browsers
-Iglunix has Firefox ESR packaged requiring 2 extra GNU packages: `gm4` and
-`autoconf`. Iglunix may switch to using a patched version of webkit gtk with
-openssl and maybe ffmpeg replacing gstreamer.
+Iglunix currently has qtwebengine running (with sandboxing broken on atleast
+aarch64). This does require 3 extra GNU dependencies ontop of GNU Make:
+`gperf`, `gm4`, `bison`. This also requires dbus however it is only needed
+at build time and for this reason we are working on a stub implementation.
 
 ## Replacements LUT
 
 |standard tool | iglunix tool       | use                              |
 |--------------|--------------------|----------------------------------|
 |glibc         | musl               | libc                             |
-|glibc         | libexecinfo        | Backtrace functions              |
+|glibc         | libexecinfo        | backtrace functions              |
 |libstdc++     | libc++             | C++ standard library             |
-|libgcc        | libunwind          | Stack unwinding                  |
-|libgcc        | compiler-rt        | Compiler builtins                |
+|libgcc        | libunwind          | stack unwinding                  |
+|libgcc        | complier-rt        | compiler builtins                |
+|flex          | reflex             | POSIX lex                        |
 |bison         | byacc              | POSIX yacc                       |
 |coreutils     | toybox+busybox     | POSIX utilities                  |
 |gcc           | clang              | C++ compiler                     |
-|zlib          | zlib-ng            | Compression library              |
+|zlib          | zlib-ng            | compression library              |
 |gmake         | bmake, others      | POSIX Make implementation        |
 |ninja         | samurai            | Ninja build implementation       |
 |GNU M4        | OpenBSD M4         | POSIX M4 implementation          |
 |ncurses       | netbsd-curses      | X/Open Curses implementation     |
 |bash          | mksh               | Shell                            |
 |Linux PAM     | Open PAM           | Pluggable Authentication Modules |
-|sudo          | doas               | Privilege escalation             |
-|pkg-config    | pkgconf            | Package configuration tool       |
-|e2fsprogs     | make_ext4fs        | Make an ext4 file system         |
+|sudo          | doas               | privalidge esculation            |
+|pkg-config    | pkgconf            | package configuration tool       |
+
+
+
+## TODO (lots more TODO items in the Discord)
+ - LLVM (Work out how to split packages)
+ - QEMU for multiarch (need lots of work on glibr to get this to build)

bad/README.md

@@ -2,6 +2,3 @@
 Bad packages are packages included that we want
 to remove our dependency on. All of these packages
 should eventually be removed.
-
- - `autoconf` is required for building `firefox`
- - `gmake` is required for building a number of packages

bad/autoconf/autoconf.sh.patch

@@ -1,23 +0,0 @@
---- a/autoconf.sh
-+++ b/autoconf.sh
-@@ -115,13 +115,14 @@
- # Use the frozen version of Autoconf if available.
- r= f=
- # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
--case `$M4 --help < /dev/null 2>&1` in
--*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
--*traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
--esac
-+# case `$M4 --help < /dev/null 2>&1` in
-+# *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
-+# *traditional*) ;;
-+# *) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
-+# esac
- 
--$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
-+# $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
-+$M4 -g -D__GNU__ -I$AC_MACRODIR $use_localdir autoconf.m4 $infile -> $tmpout ||
-   { rm -f $tmpin $tmpout; exit 2; }
- 
- # You could add your own prefixes to pattern if you wanted to check for

bad/autoconf/autoheader.sh.patch

@@ -1,11 +0,0 @@
---- autoconf-2.13/autoheader.sh
-+++ old/autoheader.sh
-@@ -122,7 +122,7 @@
- # Extract assignments of SYMS, TYPES, FUNCS, HEADERS, and LIBS from the
- # modified autoconf processing of the input file.  The sed hair is
- # necessary to win for multi-line macro invocations.
--eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile |
-+eval "`$M4 -g -D__gnu__ -I$AC_MACRODIR $use_localdir autoheader.m4 $infile |
-        sed -n -e '
- 		: again
- 		/^@@@.*@@@$/s/^@@@\(.*\)@@@$/\1/p

bad/autoconf/build.sh

@@ -1,31 +0,0 @@
-pkgname=autoconf
-pkgver=2.13
-
-fetch() {
-	curl "https://ftp.gnu.org/gnu/autoconf/autoconf-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-	cd $pkgname-$pkgver
-	patch -p1 < ../../makefile-m4f.patch
-	patch -p1 < ../../autoconf.sh.patch
-	patch -p1 < ../../autoheader.sh.patch
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr/bad/autoconf/ \
-		--build=$TRIPLE \
-		--host=$TRIPLE
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}

bad/autoconf/makefile-m4f.patch

@@ -1,70 +0,0 @@
---- src/autoconf-2.13/Makefile.in
-+++ Makefile.in
-@@ -33,8 +33,8 @@
- # Programs that are ALWAYS installed (and are created in the build dir).
- ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames 
- 
--# M4 input that is frozen.
--M4FROZEN = autoconf.m4f autoheader.m4f
-+# Don't freeze anything with OpenBSD m4
-+M4FROZEN =
- 
- # All programs, including those only installed if you have perl.
- SCRIPTS = $(ASCRIPTS) @SCRIPTS@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -137,23 +137,23 @@
- 	cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
- 
- installdirs:
--	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
-+	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(acdatadir)
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
- 	for p in $(ASCRIPTS); do \
--	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
- 	for i in $(M4FROZEN); do \
--	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-+	  $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \
- 	done
- 	for i in $(M4FILES) acconfig.h; do \
--	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
- 	done
- 	-if test -f autoscan; then \
--	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+	$(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \
- 	for i in acfunctions acheaders acidentifiers acprograms \
- 	  acmakevars; do \
--	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
- 	done; \
- 	else :; fi
- 
-@@ -161,11 +161,11 @@
- install-info: info installdirs
- 	if test -f autoconf.info; then \
- 	  for i in *.info*; do \
--	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \
- 	  done; \
- 	else \
- 	  for i in $(srcdir)/*.info*; do \
--	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
- 	  done; \
- 	fi
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,7 +139,7 @@
- installdirs:
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir)
- 
--install: all $(M4FILES) acconfig.h installdirs install-info
-+install: all $(M4FILES) acconfig.h installdirs
- 	for p in $(ASCRIPTS); do \
- 	  $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done

bad/bad/build.sh

@@ -1,28 +0,0 @@
-pkgname=bad
-pkgver=main
-
-fetch() {
-	curl -L "https://github.com/iglunix/bad/archive/refs/heads/main.tar.gz" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	[ -z "$WITH_CROSS" ] || export CFLAGS="$CFLAGS --target=$TRIPLE --sysroot=$WITH_CROSS_DIR"
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir PREFIX=/usr
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}
-
-backup() {
-	return
-}

bad/gm4/build.sh

@@ -1,31 +0,0 @@
-pkgname=gm4
-pkgver=1.4.19
-
-fetch() {
-	curl "http://ftp.gnu.org/pub/gnu/m4/m4-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv m4-$pkgver gm4-$pkgver
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--build=$TRIPLE \
-		--program-prefix=g \
-		--host=$TRIPLE \
-		--disable-nls
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

bad/gmake/build.sh

@@ -4,10 +4,9 @@ pkgrel=1
 deps="musl"
 bad="gmake"
 ext="doc:dev"
-auto_cross
 
 fetch() {
-	curl "https://ftp.gnu.org/gnu/make/make-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	curl "https://ftp.gnu.org/gnu/make/make-4.3.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 	mv make-$pkgver $pkgname-$pkgver
 }
@@ -15,40 +14,34 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 	./configure \
-		--prefix=/usr/bad/gmake \
+		--prefix=/usr \
 		--program-prefix=g \
-		--disable-nls \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE
+		--disable-nls
 	make
 }
 
 package() {
 	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-	rm -r $pkgdir/usr/bad/gmake/share
-	rm -r $pkgdir/usr/bad/gmake/include
+	./make install DESTDIR=$pkgdir
+	rm -r $pkgdir/usr/share
+	rm -r $pkgdir/usr/include
 }
 
 package_doc() {
 	cd $pkgname-$pkgver
-	make install DESDIR=$pkgdir
-	rm -r $pkgdir/usr/bad/gmake/bin
-	rm -r $pkgdir/usr/bad/gmake/share/info
-	rm -r $pkgdir/usr/bad/gmake/include
+	./make install DESDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/share/info
+	rm -r $pkgdir/usr/include
 }
 package_dev() {
 	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-	rm -r $pkgdir/usr/bad/gmake/bin
-	rm -r $pkgdir/usr/bad/gmake/share
+	./make install DESTDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/share
 }
 
 license() {
 	cd $pkgname-$pkgver
 	cat COPYING
 }
-
-backup() {
-	return
-}

base/bmake/build.sh

@@ -1,8 +1,8 @@
-pkgver=20220303
+pkgver=20210420
 pkgname=bmake
 mkdeps=""
 deps=""
-auto_cross
+ext="doc"
 
 fetch() {
 	curl http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz -o $pkgname-$pkgver.tar.gz
@@ -15,20 +15,20 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	./configure --prefix=/usr --with-default-sys-path=/usr/share/mk --build=$HOST_TRIPLE --host=$ARCH-linux-musl --with-machine-arch=$ARCH
-	MANTARGET=man sh ./make-bootstrap.sh
+	./configure --prefix=/usr --with-default-sys-path=/usr/share/mk
+	sh ./make-bootstrap.sh
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bmake -m ./mk install -f Makefile DESTDIR=$pkgdir MANTARGET=man prefix=/usr/ BINDIR=/usr/bin
-	ln -s bmake $pkgdir/usr/bin/make
-	rm -rf $pkgdir/usr/share/man/cat1
-	install -Dm644 ./bmake.1 $pkgdir/usr/share/man/man1
+	./bmake -m ./mk install DESTDIR=$pkgdir
+	ln -sr $pkgdir/usr/bin/bmake $pkgdir/usr/bin/make
+	rm -r $pkgdir/usr/share/man
 }
 
-backup() {
-    return
+package_doc() {
+	cd $pkgname-$pkgver
+	install -Dm644 ./bmake.1 $pkgdir/usr/share/man/man1/bmake.1
 }
 
 license() {

base/bmake/no-test.patch

@@ -1,11 +1,11 @@
---- a/boot-strap
-+++ b/boot-strap
-@@ -420,7 +420,7 @@
+--- ../bmakeb/bmake/boot-strap	2020-11-13 21:47:25.000000000 +0000
++++ boot-strap	2020-12-27 17:26:13.126598658 +0000
+@@ -431,7 +431,7 @@
  
  op_test() {
  	[ -x bmake ] || op_build
--	Bmake test "$@" || exit 1
-+	#Bmake test "$@" || exit 1
+-	Bmake test || exit 1
++	#Bmake test || exit 1
  }
  
  op_clean() {

base/byacc/build.sh

@@ -1,13 +1,13 @@
-pkgver=20220128
+pkgver=20210802
 pkgname=byacc
-deps="musl"
+deps=""
 mkdeps="bmake"
 bad=""
-auto_cross
+ext="doc"
 
 fetch() {
-	curl "ftp://ftp.invisible-island.net/byacc/byacc-$pkgver.tgz" -O
-	tar -xf $pkgname-$pkgver.tgz
+	curl https://invisible-island.net/datafiles/release/byacc.tar.gz -o $pkgname-$pkgver.tar.gz
+	tar -xf $pkgname-$pkgver.tar.gz
 	# Merged upstream; Don't need
 #	cp ../reader-mesa.patch .
 }
@@ -17,9 +17,7 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--program-prefix=b \
-		--enable-btyacc \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE
+		--enable-btyacc
 #	patch -p1 < ../reader-mesa.patch
 	make
 }
@@ -28,10 +26,13 @@ package() {
 	cd $pkgname-$pkgver
 	make install DESTDIR=$pkgdir
 	ln -sr $pkgdir/usr/bin/byacc $pkgdir/usr/bin/yacc
+	rm -r $pkgdir/usr/share
 }
 
-backup() {
-	return
+package_doc() {
+	cd $pkgname-$pkgver
+	make install DESTDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
 }
 
 license() {

base/ca-certificates/build.sh

@@ -0,0 +1,59 @@
+pkgname=ca-certificates
+pkgver=202200601
+pkgrel=2
+ext=doc
+mkdeps="gmake"
+deps="libressl"
+bad="gmake"
+
+fetch(){
+        curl http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20200601~deb10u2.tar.xz -o $pkgname-$pkgver.tar.gz
+        tar -xf $pkgname-$pkgver.tar.gz
+        mv work $pkgname-$pkgver
+        cd $pkgname-$pkgver
+        #patch -p1 < ../../libressl-update-rehash.patch
+}
+
+
+build() {
+	cd $pkgname-$pkgver
+	gmake
+}
+
+package() {
+	cd $pkgname-$pkgver
+	mkdir -p $pkgdir/usr/bin
+	mkdir -p $pkgdir/usr/sbin
+	mkdir -p $pkgdir/etc/ssl/
+	mkdir -p $pkgdir/etc/ca-certificates/update.d
+	mkdir -p $pkgdir/usr/share/ca-certificates/
+	
+	gmake install DESTDIR="$pkgdir"
+
+	(
+		echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "$pkgdir"/usr/share/ca-certificates
+		find . -name '*.crt' | sort | cut -b3-
+	) > "$pkgdir"/etc/ca-certificates.conf
+
+	cat > "$pkgdir"/etc/ca-certificates/update.d/certhash <<-EOF
+		#!/bin/sh
+		exec openssl certhash /etc/ssl/certs
+	EOF
+	
+	cat "$pkgdir"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/etc/ssl/cert.pem
+	chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash
+}
+
+package_doc() {
+	cd $pkgname-$pkgver
+	install -d $pkgdir/usr/share/man/man8
+	install -Dm644 ./sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat debian/copyright
+}

base/ca-certificates/libressl-update-rehash.patch

@@ -0,0 +1,14 @@
+--- a/sbin/update-ca-certificates
++++ b/sbin/update-ca-certificates
+@@ -183,9 +183,9 @@
+   done
+   if [ "$verbose" = 0 ]
+   then
+-    openssl rehash . > /dev/null
++    openssl certhash . > /dev/null
+   else
+-    openssl rehash -v .
++    openssl certhash -v .
+   fi
+ fi
+ 

base/cmake/build.sh

@@ -1,59 +1,50 @@
-pkgver=3.23.1
+pkgver=3.19.2
 pkgname=cmake
 pkgrel=1
-mkdeps="samurai"
+mkdeps="samu"
 deps=""
 bad=""
 ext=""
 
 fetch() {
-	curl "https://cmake.org/files/v3.23/cmake-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	curl "https://cmake.org/files/v3.19/cmake-3.19.2.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 }
 
 build() {
 	cd $pkgname-$pkgver
-	if [ -z "$WITH_CROSS" ]; then
-		./bootstrap \
-			--prefix=/usr \
-			--mandir=/share/man \
-			--datadir=/share/$pkgname \
-			--docdir=/share/doc/$pkgname \
-			--generator=Ninja \
-			--no-system-libs
-	else
-		mkdir -p build
-		cd build
-		cmake -G Ninja .. \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DCMAKE_SYSTEM_NAME=Linux \
-			-DCMAKE_SYSROOT=$WITH_CROSS_DIR \
-			-DCMAKE_C_COMPILER_TARGET=$TRIPLE \
-			-DCMAKE_CXX_COMPILER_TARGET=$TRIPLE \
-			-DCMAKE_ASM_COMPILER_TARGET=$TRIPLE \
-			-DHAVE_POLL_FINE_EXITCODE=OFF \
-			-DHAVE_POLL_FINE_EXITCODE__TRYRUN_OUTPUT=OFF \
-			-DCMAKE_PREFIX_PATH=$WITH_CROSS_DIR \
-			-DBUILD_CursesDialog=OFF
-	fi
+	./bootstrap \
+		--prefix=/usr \
+		--mandir=/share/man \
+		--datadir=/share/$pkgname \
+		--docdir=/share/doc/$pkgname \
+		--generator=Ninja \
+		--no-system-libs
 
 	samu
 }
 
 package() {
 	cd $pkgname-$pkgver
-	if [ ! -z "$WITH_CROSS" ]; then
-		cd build
-	fi
 	DESTDIR=$pkgdir samu install
 
 }
 
-backup() {
-	return
+package_doc() {
+	cd $pkgname-$pkgver
+	gmake install DESDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/share/info
+	rm -r $pkgdir/usr/include
+}
+package_dev() {
+	cd $pkgname-$pkgver
+	gmake install DESTDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/share
 }
 
 license() {
 	cd $pkgname-$pkgver
-	cat Copyright.txt
+	cat COPYING
 }

base/compiler-rt/build.sh

@@ -1,71 +0,0 @@
-pkgname=compiler-rt
-pkgver=14.0.1
-deps=linux
-
-fetch() {
-	curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/compiler-rt-$pkgver.src.tar.xz" -o $pkgname-$pkgver.tar.xz
-	# for c++ headers
-	# curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/libcxx-$pkgver.src.tar.xz" -o libcxx-$pkgver.tar.xz
-	# musl required for C headers
-	curl -O "http://musl.libc.org/releases/musl-1.2.2.tar.gz"
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv $pkgname-$pkgver.src $pkgname-$pkgver
-	# tar -xf libcxx-$pkgver.tar.xz
-	# mv libcxx-$pkgver.src libcxx-$pkgver
-	# cp ../__config_site libcxx-$pkgver/include
-	mkdir $pkgname-$pkgver/build
-	tar -xf musl-1.2.2.tar.gz
-	cd musl-1.2.2
-	CFLAGS="--sysroot=/usr/$ARCH-linux-musl --target=$TRIPLE" ./configure --prefix=$(pwd)/../libc --target=$TRIPLE
-	bad --gmake gmake install-headers
-}
-
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	cmake -G Ninja ../ \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr/lib/clang/$pkgver/ \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_C_COMPILER_TARGET=$TRIPLE \
-		-DCMAKE_CXX_COMPILER_TARGET=$TRIPLE \
-		-DCMAKE_ASM_COMPILER_TARGET=$TRIPLE \
-		-DCMAKE_C_COMPILER_WORKS=ON \
-		-DCMAKE_CXX_COMPILER_WORKS=ON \
-		-DCMAKE_SYSROOT=/usr/$ARCH-linux-musl \
-		-DCMAKE_C_FLAGS_INIT="-I $(pwd)/../../libc/include " \
-		-DCMAKE_C_FLAGS="-I $(pwd)/../../libc/include" \
-		-DCMAKE_CXX_FLAGS_INIT="-I $(pwd)/../../libc/include" \
-		-DCMAKE_CXX_FLAGS="-I $(pwd)/../../libc/include" \
-		-DCOMPILER_RT_USE_BUILTINS_LIBRARY=OFF \
-		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=OFF \
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-		-DCOMPILER_RT_BUILD_XRAY=OFF \
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF \
-		-DCOMPILER_RT_BUILD_ORC=OFF \
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
-		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-		-DCOMPILER_RT_BUILD_PROFILE=OFF \
-		-DCAN_TARGET_$ARCH=ON \
-		-DCMAKE_SIZEOF_VOID_P=8
-
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE.TXT
-}

base/curl/build.sh

@@ -1,11 +1,11 @@
-pkgver=7.81.0
+pkgver=7.77.0
 pkg_ver=$(echo $pkgver | tr '.' '_')
 pkgname=curl
 pkgrel=1
-mkdeps=""
+mkdeps="samu:cmake"
 deps="openssl"
 bad=""
-auto_cross
+ext="doc:dev"
 
 fetch() {
 	curl -L "https://github.com/curl/curl/releases/download/curl-$pkg_ver/curl-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.gz
@@ -14,20 +14,34 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	./configure --prefix=/usr \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE \
-		--with-openssl
-	make
+	mkdir build
+	cd build
+	cmake -G Ninja ../ \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+	samu
 }
 
 package() {
 	cd $pkgname-$pkgver
-	make DESTDIR=$pkgdir install
+	cd build
+	DESTDIR=$pkgdir samu install
+	rm -r $pkgdir/usr/share
+	rm -r $pkgdir/usr/include
+	rm -r $pkgdir/usr/lib/pkgconfig
+	rm -r $pkgdir/usr/lib/cmake
 }
 
-backup() {
-	return
+package_dev() {
+	cd $pkgname-$pkgver
+	cd build
+	DESTDIR=$pkgdir samu install
+	rm -r $pkgdir/usr/share
+	rm -r $pkgdir/usr/bin
+	rm $pkgdir/usr/lib/*.so
+	rm $pkgdir/usr/lib/*.so.*
 }
 
 license() {

base/expat/build.sh

@@ -4,7 +4,6 @@ bad=""
 mkdeps="bmake"
 deps=""
 ext="dev"
-auto_cross
 
 fetch() {
 	pkgver_r=$(echo $pkgver | tr '.' '_')
@@ -15,22 +14,30 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 	./configure \
-		--prefix=/usr \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE
+		--prefix=/usr
 	make
 }
 
 package() {
 	cd $pkgname-$pkgver
 	make install DESTDIR=$pkgdir
+	rm $pkgdir/usr/lib/*.a
+	rm $pkgdir/usr/lib/*.la
+	rm -r $pkgdir/usr/include
+	rm -r $pkgdir/usr/lib/pkgconfig
+	rm -r $pkgdir/usr/share
+}
+
+package_dev() {
+	cd $pkgname-$pkgver
+	make install DESTDIR=$pkgdir
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/share
+	rm $pkgdir/usr/lib/*.so
+	rm $pkgdir/usr/lib/*.so.*
 }
 
 license() {
 	cd $pkgname-$pkgver
 	cat COPYING
 }
-
-backup() {
-	return
-}

base/fakeroot/build.sh

@@ -1,30 +0,0 @@
-pkgname=fakeroot
-pkgver=1.26
-
-fetch() {
-	curl "https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	patch -p1 < ../../no64.patch
-	patch -p1 < ../../stdint.patch
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--build=$TRIPLE \
-		--host=$TRIPLE
-
-	bad --gmake gmake
-}
-
-package() {
-	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

base/fakeroot/no64.patch

@@ -1,17 +0,0 @@
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -81,12 +81,14 @@
- #define SEND_STAT64(a,b,c) send_stat64(a,b,c)
- #define SEND_GET_STAT(a,b) send_get_stat(a,b)
- #define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
-+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
- #else
- #define SEND_STAT(a,b,c) send_stat(a,b)
- #define SEND_STAT64(a,b,c) send_stat64(a,b)
- #define SEND_GET_STAT(a,b) send_get_stat(a)
- #define SEND_GET_STAT64(a,b) send_get_stat64(a)
-+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
- #endif
- 

base/fakeroot/stdint.patch

@@ -1,34 +0,0 @@
---- a/faked.c
-+++ b/faked.c
-@@ -514,11 +514,11 @@
- 
- #ifdef FAKEROOT_DB_PATH
-     if (find_path(i->buf.dev, i->buf.ino, roots, path))
--      fprintf(f,"mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu %s\n",
-+      fprintf(f,"mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" %s\n",
-               (uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,
-               (uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path);
- #else
--    fprintf(f,"dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
-+    fprintf(f,"dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
-             (uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode,
-             (uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink,
-             (uint64_t) i->buf.rdev);
-@@ -544,7 +544,7 @@
- 
-   while(1){
- #ifdef FAKEROOT_DB_PATH
--    r=scanf("mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu "DB_PATH_SCAN"\n",
-+    r=scanf("mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" "DB_PATH_SCAN"\n",
-             &stmode, &stuid, &stgid, &stnlink, &strdev, &path);
-     if (r != 6)
-       break;
-@@ -559,7 +559,7 @@
-     stdev = path_st.st_dev;
-     stino = path_st.st_ino;
- #else
--    r=scanf("dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
-+    r=scanf("dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
-             &stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev);
-     if (r != 7)
-       break;

base/flex/build.sh

@@ -1,36 +0,0 @@
-pkgname=flex
-pkgver=2.6.4
-auto_cross
-
-fetch() {
-	curl -L "https://github.com/westes/flex/releases/download/v2.6.4/flex-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	[ -z "$WITH_CROSS" ] || extra_flags=--disable-bootstrap
-
-	./configure \
-		--prefix=/usr \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE \
-		$extra_flags
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-	ln -sr $pkgdir/usr/bin/flex $pkgdir/usr/bin/lex
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}
-
-backup() {
-	return
-}

base/gettext-tiny/build.sh

@@ -1,7 +1,7 @@
 pkgname=gettext-tiny
 pkgver=master
+mkdeps="kati"
 deps=""
-auto_cross
 
 fetch() {
 	curl -L "https://github.com/sabotage-linux/gettext-tiny/archive/master.tar.gz" -o $pkgname-$pkgver.tar.gz
@@ -10,12 +10,12 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake
+	ckati
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir prefix=/usr
+	ckati install DESTDIR=$pkgdir prefix=/usr
 }
 
 license() {
@@ -23,7 +23,3 @@ license() {
 	cat LICENSE
 #	cat COPYING
 }
-
-backup() {
-	return
-}

base/git/build.sh

@@ -14,22 +14,22 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 	# gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
-	bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
+	gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
 	# Need to run twice for it to work ¯\_(ツ)_/¯
 	# Some issue with `msgfmt` 'cause I'm using gettext-tiny but idk why it works on the second run
 	# gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
-	bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
+	gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1
 }
 
 package() {
 	cd $pkgname-$pkgver
 	# gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1
-	bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1
+	gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1
 }
 
 package_doc() {
 	# gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1
-	bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1
+	gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1
 }
 
 license() {

base/iglupkg/build.sh

@@ -1,25 +0,0 @@
-pkgname=iglupkg
-pkgver=main
-
-fetch() {
-	curl -L "https://github.com/iglunix/iglupkg/archive/refs/heads/main.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-}
-
-build() {
-	return
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir PREFIX=/usr
-}
-
-license() {
-	cd $pkgname-$pkgver
-	return
-}
-
-backup() {
-	return
-}

base/kakoune/build.sh

@@ -12,12 +12,12 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake
+	ckati
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir PREFIX=/usr
+	ckati install DESTDIR=$pkgdir PREFIX=/usr
 	rm -r $pkgdir/usr/share/doc
 	rm -r $pkgdir/usr/share/man
 	rm -r $pkgdir/usr/libexec
@@ -35,7 +35,3 @@ license() {
 	cd $pkgname-$pkgver
 	cat UNLICENSE
 }
-
-backup() {
-	return
-}

base/kati/build.sh

@@ -9,7 +9,7 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake
+	gmake
 }
 
 package() {

base/libcxx/build.sh

@@ -1,63 +0,0 @@
-pkgver=14.0.1
-pkgname=libcxx
-bad=""
-ext="dev"
-
-fetch() {
-	curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv llvm-project-$pkgver.src $pkgname-$pkgver
-}
-
-build() {
-	cd $pkgname-$pkgver
-	PREFIX=/usr
-	[ -z "$FOR_CROSS" ] || PREFIX=$FOR_CROSS_DIR
-	[ -z "$WITH_CROSS" ] || cmake_extra_flags=-DCMAKE_SYSROOT=$WITH_CROSS_DIR
-
-	mkdir -p build
-	cd build
-	cmake -G Ninja -Wno-dev \
-		-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
-		-DLIBCXX_ENABLE_FILESYSTEM=ON \
-		-DLIBCXX_USE_COMPILER_RT=ON \
-		-DLIBCXX_HAS_MUSL_LIBC=ON \
-		-DLIBCXXABI_USE_COMPILER_RT=ON \
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
-		-DLIBCXX_ENABLE_STATIC=OFF \
-		-DLIBCXX_HAS_ATOMIC_LIB=OFF \
-		-DCMAKE_C_COMPILER=$CC \
-		-DCMAKE_CXX_COMPILER=$CXX \
-		-DCMAKE_C_COMPILER_TARGET=$ARCH-linux-musl \
-		-DCMAKE_CXX_COMPILER_TARGET=$ARCH-linux-musl \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		$cmake_extra_flags \
-		-DCMAKE_INSTALL_PREFIX=$PREFIX \
-		-DCMAKE_CXX_COMPILER_WORKS=1 \
-		-DCMAKE_SKIP_BUILD_RPATH=0 \
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
-		-DCMAKE_INSTALL_RPATH='${ORIGIN}/../lib' \
-		../runtimes
-
-	samu -j$JOBS
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-package_dev() {
-	echo "No... Shut"
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat */LICENSE.TXT
-}

base/libelf/build.sh

@@ -1,47 +0,0 @@
-pkgname=libelf
-pkgver=0.186
-auto_cross
-
-fetch() {
-	curl -LO "https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2"
-	tar -xf elfutils-$pkgver.tar.bz2
-	cd elfutils-$pkgver
-	patch -p1 < ../../musl.patch
-}
-
-if [ -z "$FOR_CROSS" ]; then
-	PREFIX=/usr
-else
-	PREFIX=$FOR_CROSS_DIR
-fi
-
-build() {
-	cd elfutils-$pkgver
-	export CFLAGS="$CFLAGS -Wno-error"
-	./configure \
-		--prefix=$PREFIX \
-		--sysconfdir=/etc \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE \
-		--disable-symbol-versioning \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
-		--disable-nls \
-		ac_cv_c99=yes
-
-	bad --gmake gmake -C lib
-	bad --gmake gmake -C libelf
-}
-
-package() {
-	cd elfutils-$pkgver
-	bad --gmake gmake -C libelf install DESTDIR=$pkgdir
-}
-
-backup() {
-	return
-}
-
-license() {
-	return
-}

base/libelf/musl.patch

@@ -1,59 +0,0 @@
-diff --git a/configure b/configure
-index d03dab4..7fc88bd 100755
---- a/configure
-+++ b/configure
-@@ -7758,7 +7758,7 @@ LIBS="$saved_LIBS"
- case "$ac_cv_search_argp_parse" in
-         no) { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "failed to find argp_parse
-+: $? "failed to find argp_parse
- See \`config.log' for more details" "$LINENO" 5; } ;;
-         -l*) argp_LDADD="$ac_cv_search_argp_parse" ;;
-         *) argp_LDADD= ;;
-@@ -7826,7 +7826,7 @@ LIBS="$saved_LIBS"
- case "$ac_cv_search_fts_close" in
-         no) { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "failed to find fts_close
-+: $? "failed to find fts_close
- See \`config.log' for more details" "$LINENO" 5; } ;;
-         -l*) fts_LIBS="$ac_cv_search_fts_close" ;;
-         *) fts_LIBS= ;;
-@@ -7894,7 +7894,7 @@ LIBS="$saved_LIBS"
- case "$ac_cv_search__obstack_free" in
-         no) { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "failed to find _obstack_free
-+: $? "failed to find _obstack_free
- See \`config.log' for more details" "$LINENO" 5; } ;;
-         -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;;
-         *) obstack_LIBS= ;;
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 41ff5f7..0c81496 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -117,8 +117,8 @@ libeu_a_AR = $(AR) $(ARFLAGS)
- libeu_a_LIBADD =
- am_libeu_a_OBJECTS = xasprintf.$(OBJEXT) xstrdup.$(OBJEXT) \
- 	xstrndup.$(OBJEXT) xmalloc.$(OBJEXT) next_prime.$(OBJEXT) \
--	crc32.$(OBJEXT) crc32_file.$(OBJEXT) color.$(OBJEXT) \
--	error.$(OBJEXT) printversion.$(OBJEXT)
-+	crc32.$(OBJEXT) crc32_file.$(OBJEXT) \
-+	error.$(OBJEXT)
- libeu_a_OBJECTS = $(am_libeu_a_OBJECTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -406,10 +406,10 @@ textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then $(textrel_found); f
- noinst_LIBRARIES = libeu.a
- libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \
- 		  crc32.c crc32_file.c \
--		  color.c error.c printversion.c
-+		  error.c
- 
- noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \
--		 eu-config.h color.h printversion.h bpf.h \
-+		 eu-config.h bpf.h \
- 		 atomics.h stdatomic-fbsd.h dynamicsizehash_concurrent.h
- 
- EXTRA_DIST = dynamicsizehash.c dynamicsizehash_concurrent.c

base/libffi/build.sh

@@ -2,7 +2,6 @@ pkgver=3.3
 pkgname=libffi
 bad="gmake"
 ext="dev"
-auto_cross
 
 fetch() {
 	curl -L "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz" -o $pkgname-$pkgver.tar.gz
@@ -11,27 +10,21 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	./configure --prefix=$PREFIX \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE
-	bad --gmake gmake
+	./configure --prefix=/usr
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 }
 
 package_dev() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 }
 
 license() {
 	cd $pkgname-$pkgver
 	cat LICENSE
 }
-
-backup() {
-	return
-}

base/libnl-tiny/build.sh

@@ -9,12 +9,12 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake prefix=/usr all CC=cc
+	gmake prefix=/usr all CC=cc
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake prefix=/usr DESTDIR=$pkgdir install
+	gmake prefix=/usr DESTDIR=$pkgdir install
 }
 
 license() {

base/libunwind/build.sh

@@ -1,70 +0,0 @@
-pkgver=14.0.1
-pkgname=libunwind
-bad=""
-ext="dev"
-
-fetch() {
-	curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv llvm-project-$pkgver.src $pkgname-$pkgver
-}
-
-build() {
-	cd $pkgname-$pkgver
-
-	PREFIX=/usr
-
-	[ -z "$FOR_CROSS" ] || PREFIX=$FOR_CROSS_DIR
-
-	if [ ! -z "$WITH_CROSS" ]; then
-		cmake_extra_flags=-DCMAKE_SYSROOT=$WITH_CROSS_DIR
-	fi
-
-	mkdir -p build
-	cd build
-	cmake -G Ninja -Wno-dev \
-		-DLLVM_ENABLE_RUNTIMES="libunwind" \
-		-DLIBUNWIND_USE_COMPILER_RT=ON \
-		-DLIBUNWIND_SUPPORTS_FNO_EXCEPTIONS_FLAG=1 \
-		-DLIBCXXABI_USE_LLVM_UNWINDER=YES \
-		-DLIBCXX_HAS_MUSL_LIBC=ON \
-		-DCMAKE_ASM_COMPILER=$CC \
-		-DCMAKE_C_COMPILER=$CC \
-		-DCMAKE_CXX_COMPILER=$CXX \
-		-DCMAKE_ASM_COMPILER_TARGET=$ARCH-linux-musl \
-		-DCMAKE_C_COMPILER_TARGET=$ARCH-linux-musl \
-		-DCMAKE_CXX_COMPILER_TARGET=$ARCH-linux-musl \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_ASM_FLAGS="$CFLAGS" \
-		-DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -unwindlib=none" \
-		$cmake_extra_flags \
-		-DCMAKE_INSTALL_PREFIX=$PREFIX \
-		-DCMAKE_C_COMPILER_WORKS=1 \
-		-DCMAKE_CXX_COMPILER_WORKS=1 \
-		-DCMAKE_SKIP_BUILD_RPATH=0 \
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
-		-DCMAKE_INSTALL_RPATH='${ORIGIN}/../lib' \
-		../runtimes
-
-	samu -j$JOBS
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-package_dev() {
-	echo "No... Shut"
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat */LICENSE.TXT
-}

base/llvm/build.sh

@@ -1,4 +1,4 @@
-pkgver=14.0.1
+pkgver=12.0.1
 pkgname=llvm
 bad=""
 ext="dev"
@@ -8,119 +8,92 @@ fetch() {
 	tar -xf $pkgname-$pkgver.tar.gz
 	mv llvm-project-$pkgver.src $pkgname-$pkgver
 
+	# fixes relaxation
 	cd $pkgname-$pkgver
 	patch -p1 < ../../riscv-relax.patch
+
+	cp -n ../default.llvm.conf /etc/iglupkg/llvm.conf
+	[ ../default/llvm.conf -nt /etc/iglupkg/llvm.conf ] && echo "WARNING: the default config file is newer than your config file." done
 }
 
 build() {
 	cd $pkgname-$pkgver
-
-	if [ ! -z "$WITH_CROSS" ]; then
-		EXTRA_ARGS="-DCMAKE_SYSROOT=$WITH_CROSS_DIR \
-			-DCMAKE_C_COMPILER_WORKS=ON \
-			-DCMAKE_CXX_COMPILER_WORKS=ON \
-			-DCMAKE_SYSTEM_NAME=Linux \
-			-DLLVM_TABLEGEN=$(pwd)/host-build/bin/llvm-tblgen \
-			-DCLANG_TABLEGEN=$(pwd)/host-build/bin/clang-tblgen \
-			-DLLVM_CONFIG_PATH=/usr/bin/llvm-config \
-			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
-			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"
-		mkdir -p host-build
-		cd host-build
-		cmake -G Ninja -Wno-dev \
-			-DLLVM_ENABLE_PROJECTS='clang' \
-			-DCMAKE_C_COMPILER=cc \
-			-DCMAKE_CXX_COMPILER=c++ \
-			../llvm
-
-		samu llvm-tblgen clang-tblgen
-
-		cd ..
-	fi
-
 	mkdir -p build
 	cd build
-	cmake -G Ninja -Wno-dev \
-		-DCMAKE_C_COMPILER_TARGET=$TRIPLE \
-		-DCMAKE_CXX_COMPILER_TARGET=$TRIPLE \
-		-DCMAKE_C_COMPILER=$CC \
-		-DCMAKE_CXX_COMPILER=$CXX \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DLLVM_VERSION_SUFFIX="" \
-		-DLLVM_APPEND_VC_REV=OFF \
-		-DLLVM_ENABLE_PROJECTS="llvm;lld;clang" \
-		-DLLVM_ENABLE_LLD=ON \
-		-DLLVM_TARGETS_TO_BUILD="all" \
-		-DLLVM_INSTALL_BINUTILS_SYMLINKS=ON \
-		-DLLVM_INSTALL_CCTOOLS_SYMLINKS=ON \
-		-DLLVM_INCLUDE_EXAMPLES=OFF \
-		-DLLVM_ENABLE_PIC=ON \
-		-DLLVM_ENABLE_LTO=OFF \
-		-DLLVM_INCLUDE_GO_TESTS=OFF \
-		-DLLVM_INCLUDE_TESTS=OFF \
-		-DLLVM_HOST_TRIPLE=$TRIPLE \
-		-DLLVM_DEFAULT_TARGET_TRIPLE=$TRIPLE \
-		-DLLVM_ENABLE_LIBXML2=OFF \
-		-DLLVM_ENABLE_ZLIB=OFF\
-		-DLLVM_BUILD_LLVM_DYLIB=ON \
-		-DLLVM_LINK_LLVM_DYLIB=ON \
-		-DLLVM_OPTIMIZED_TABLEGEN=ON \
-		-DLLVM_INCLUDE_BENCHMARKS=OFF \
-		-DLLVM_INCLUDE_DOCS=ON \
-		-DLLVM_TOOL_LLVM_ITANIUM_DEMANGLE_FUZZER_BUILD=OFF \
-		-DLLVM_TOOL_LLVM_MC_ASSEMBLE_FUZZER_BUILD=OFF \
-		-DLLVM_TOOL_LLVM_MC_DISASSEMBLE_FUZZER_BUILD=OFF \
-		-DLLVM_TOOL_LLVM_OPT_FUZZER_BUILD=OFF \
-		-DLLVM_TOOL_LLVM_MICROSOFT_DEMANGLE_FUZZER_BUILD=OFF \
-		-DLLVM_TOOL_LLVM_GO_BUILD=OFF \
-		-DLLVM_INSTALL_UTILS=ON \
-		-DLLVM_ENABLE_LIBCXX=ON \
-		-DLLVM_STATIC_LINK_CXX_STDLIB=ON \
-		-DLLVM_ENABLE_LIBEDIT=OFF \
-		-DLLVM_ENABLE_TERMINFO=OFF \
-		-DLIBCXX_ENABLE_FILESYSTEM=ON \
-		-DLIBCXX_USE_COMPILER_RT=ON \
-		-DLIBCXX_HAS_MUSL_LIBC=ON \
-		-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
-		-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=ON \
-		-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
-		-DLIBCXX_INSTALL_LIBRARY=ON \
-		-DLIBCXXABI_ENABLE_ASSERTIONS=ON \
-		-DLIBCXXABI_USE_COMPILER_RT=ON \
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
-		-DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \
-		-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=YES \
-		-DLIBCXXABI_ENABLE_SHARED=OFF \
-		-DLIBCXXABI_ENABLE_STATIC=ON \
-		-DLIBCXXABI_INSTALL_LIBRARY=ON \
-		-DLIBUNWIND_ENABLE_SHARED=ON \
-		-DLIBUNWIND_ENABLE_STATIC=ON \
-		-DLIBUNWIND_INSTALL_LIBRARY=ON \
-		-DLIBUNWIND_USE_COMPILER_RT=ON \
-		-DCLANG_DEFAULT_LINKER=lld \
-		-DCLANG_DEFAULT_CXX_STDLIB='libc++' \
-		-DCLANG_DEFAULT_RTLIB=compiler-rt \
-		-DCLANG_DEFAULT_UNWINDLIB=libunwind \
-		-DCLANG_VENDOR="Iglunix" \
-		-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-		-DCLANG_ENABLE_ARCMT=OFF \
-		-DCLANG_LINK_CLANG_DYLIB=OFF \
-		-DCLANG_TOOLING_BUILD_AST_INTROSPECTION=OFF \
-		-DCOMPILER_RT_USE_BUILTINS_LIBRARY=OFF \
-		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=OFF \
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-		-DCOMPILER_RT_BUILD_XRAY=OFF \
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF \
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
-		-DENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=TRUE \
-		$EXTRA_ARGS \
-		-DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON \
-		-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON \
-		../llvm
+        cmake -G Ninja -Wno-dev \
+                -DCMAKE_C_COMPILER_TARGET=$TRIPLE \
+                -DCMAKE_CXX_COMPILER_TARGET=$TRIPLE \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DLLVM_VERSION_SUFFIX="" \
+                -DLLVM_APPEND_VC_REV=OFF \
+                -DLLVM_ENABLE_PROJECTS="libunwind;libcxxabi;libcxx;compiler-rt;llvm;lld;clang;clang-tools-extra;lldb" \
+                -DLLVM_ENABLE_LLD=ON \
+                -DLLVM_TARGETS_TO_BUILD="all" \
+                -DLLVM_INSTALL_BINUTILS_SYMLINKS=ON \
+                -DLLVM_INSTALL_CCTOOLS_SYMLINKS=ON \
+                -DLLVM_INCLUDE_EXAMPLES=OFF \
+                -DLLVM_ENABLE_PIC=ON \
+                -DLLVM_ENABLE_LTO=OFF \
+                -DLLVM_INCLUDE_GO_TESTS=OFF \
+                -DLLVM_INCLUDE_TESTS=OFF \
+                -DLLVM_HOST_TRIPLE=$TRIPLE \
+                -DLLVM_DEFAULT_TARGET_TRIPLE=$TRIPLE \
+                -DLLVM_ENABLE_LIBXML2=OFF \
+                -DLLVM_ENABLE_ZLIB=OFF\
+                -DLLVM_BUILD_LLVM_DYLIB=ON \
+                -DLLVM_LINK_LLVM_DYLIB=ON \
+                -DLLVM_OPTIMIZED_TABLEGEN=ON \
+                -DLLVM_INCLUDE_BENCHMARKS=OFF \
+                -DLLVM_INCLUDE_DOCS=ON \
+                -DLLVM_TOOL_LLVM_ITANIUM_DEMANGLE_FUZZER_BUILD=OFF \
+                -DLLVM_TOOL_LLVM_MC_ASSEMBLE_FUZZER_BUILD=OFF \
+                -DLLVM_TOOL_LLVM_MC_DISASSEMBLE_FUZZER_BUILD=OFF \
+                -DLLVM_TOOL_LLVM_OPT_FUZZER_BUILD=OFF \
+                -DLLVM_TOOL_LLVM_MICROSOFT_DEMANGLE_FUZZER_BUILD=OFF \
+                -DLLVM_TOOL_LLVM_GO_BUILD=OFF \
+                -DLLVM_INSTALL_UTILS=ON \
+                -DLLVM_ENABLE_LIBCXX=ON \
+                -DLLVM_STATIC_LINK_CXX_STDLIB=ON \
+                -DLLVM_ENABLE_LIBEDIT=OFF \
+                -DLLVM_ENABLE_TERMINFO=OFF \
+                -DLIBCXX_ENABLE_FILESYSTEM=ON \
+                -DLIBCXX_USE_COMPILER_RT=ON \
+                -DLIBCXX_HAS_MUSL_LIBC=ON \
+                -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
+                -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=ON \
+                -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
+                -DLIBCXX_INSTALL_LIBRARY=ON \
+                -DLIBCXXABI_ENABLE_ASSERTIONS=ON \
+                -DLIBCXXABI_USE_COMPILER_RT=ON \
+                -DLIBCXXABI_USE_LLVM_UNWINDER=ON \
+                -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \
+                -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=YES \
+                -DLIBCXXABI_ENABLE_SHARED=OFF \
+                -DLIBCXXABI_ENABLE_STATIC=ON \
+                -DLIBCXXABI_INSTALL_LIBRARY=ON \
+                -DLIBUNWIND_ENABLE_SHARED=ON \
+                -DLIBUNWIND_ENABLE_STATIC=ON \
+                -DLIBUNWIND_INSTALL_LIBRARY=ON \
+                -DLIBUNWIND_USE_COMPILER_RT=ON \
+                -DCLANG_DEFAULT_LINKER=lld \
+                -DCLANG_DEFAULT_CXX_STDLIB='libc++' \
+                -DCLANG_DEFAULT_RTLIB=compiler-rt \
+                -DCLANG_DEFAULT_UNWINDLIB=libunwind \
+                -DCLANG_VENDOR="Iglunix" \
+                -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
+                -DCLANG_ENABLE_ARCMT=OFF \
+                -DCLANG_LINK_CLANG_DYLIB=OFF \
+                -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \
+                -DCOMPILER_RT_DEFAULT_TARGET_ONLY=OFF \
+                -DCOMPILER_RT_INCLUDE_TESTS=OFF \
+                -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
+                -DCOMPILER_RT_BUILD_XRAY=OFF \
+                -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+                -DCOMPILER_RT_INCLUDE_TESTS=OFF \
+                -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+                -DENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=TRUE \
+                ../llvm
 
 	samu -j$JOBS
 }
@@ -129,15 +102,10 @@ package() {
 	cd $pkgname-$pkgver
 	cd build
 	DESTDIR=$pkgdir samu install
-	ln -s clang $pkgdir/usr/bin/cc
-	ln -s clang $pkgdir/usr/bin/c89
-	ln -s clang $pkgdir/usr/bin/c99
-	ln -s clang++ $pkgdir/usr/bin/c++
-	ln -s ld.lld $pkgdir/usr/bin/ld
-}
-
-backup() {
-	return
+	ln -sr $pkgdir/usr/bin/clang $pkgdir/usr/bin/cc
+	ln -sr $pkgdir/usr/bin/clang $pkgdir/usr/bin/c89
+	ln -sr $pkgdir/usr/bin/clang $pkgdir/usr/bin/c99
+	ln -sr $pkgdir/usr/bin/clang++ $pkgdir/usr/bin/c++
 }
 
 package_dev() {

base/meson/build.sh

@@ -1,7 +1,8 @@
-pkgver=0.60.2
+pkgver=0.58.1
 pkgname=meson
 deps=python
 bad=""
+ext="doc"
 
 fetch() {
 	curl -L "https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
@@ -21,8 +22,8 @@ package() {
 	python setup.py install --prefix=/usr --root=$pkgdir
 }
 
-backup() {
-    return
+package_doc() {
+	echo $pkgdir
 }
 
 license() {

base/mksh/build.sh

@@ -5,7 +5,7 @@ bad=""
 ext="doc"
 
 fetch() {
-	curl http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz -o $pkgname-$pkgver.tar.gz
+	curl https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 }
 
@@ -24,8 +24,11 @@ package() {
 	ln -sr $pkgdir/bin/lksh $pkgdir/bin/sh
 }
 
-backup() {
-	return
+package_doc() {
+    	cd $pkgname
+	install -d $pkgdir/usr/share/man/man1
+	install -Dm 644 ./mksh.1 $pkgdir/usr/share/man/man1
+	install -Dm 644 ./lksh.1 $pkgdir/usr/share/man/man1
 }
 
 license() {

base/netbsd-curses/build.sh

@@ -1,29 +1,42 @@
 pkgver=master
 pkgname=netbsd-curses
-bad="gmake"
+bad=""
 deps="musl"
 ext="doc:dev"
-auto_cross
 
 fetch() {
 	curl -L "https://github.com/sabotage-linux/netbsd-curses/archive/master.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
-	cd $pkgname-$pkgver
-	patch -p1 < ../../cross.patch
 }
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake PREFIX=/usr HOSTCC=cc CROSSCOMPILING=1 LDFLAGS_HOST= CFLAGS_HOST=
+	ckati
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir PREFIX=/usr HOSTCC=cc CROSSCOMPILING=1 LDFLAGS_HOST= CFLAGS_HOST=
+	ckati install DESTDIR=$pkgdir PREFIX=/usr
+	rm -r $pkgdir/usr/share
+	rm $pkgdir/usr/lib/*.a
+	rm -r $pkgdir/usr/include
+	rm -r $pkgdir/usr/lib/pkgconfig
 }
 
-backup() {
-	return
+package_doc() {
+	cd $pkgname-$pkgver
+	ckati install DESTDIR=$pkgdir PREFIX=/usr
+	rm -r $pkgdir/usr/bin
+	rm -r $pkgdir/usr/lib
+	rm -r $pkgdir/usr/include
+}
+
+package_dev() {
+	cd $pkgname-$pkgver
+	ckati install DESTDIR=$pkgdir PREFIX=/usr
+	rm $pkgdir/usr/lib/*.so
+	rm -r $pkgdir/usr/share
+	rm -r $pkgdir/usr/bin
 }
 
 license() {

base/netbsd-curses/cross.patch

@@ -1,47 +0,0 @@
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -477,7 +477,7 @@
- 	$(RANLIB) $@
-
- $(TI_LIBSO): $(TI_LOBJS)
--	$(CC) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-
- libterminfo/hash.c: libterminfo/genhash libterminfo/term.h
- 		@echo "Generating terminfo hash"
-@@ -514,7 +514,7 @@
-
- $(CU_LIBSO): $(TI_LIBSO)
- $(CU_LIBSO): $(CU_LOBJS)
--	$(CC) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-
- libcurses/fileio.h: libcurses/shlib_version libcurses/genfileioh.awk
- 	$(AWK) -f ./genfileioh.awk < ./shlib_version > ./fileio.h
-@@ -526,7 +526,7 @@
-
- $(PA_LIBSO): $(CU_LIBSO)
- $(PA_LIBSO): $(PA_LOBJS)
--	$(CC) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-
- $(ME_LIBA): $(ME_OBJS)
- 	rm -f $@
-@@ -535,7 +535,7 @@
-
- $(ME_LIBSO): $(CU_LIBSO)
- $(ME_LIBSO): $(ME_LOBJS)
--	$(CC) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-
- $(FO_LIBA): $(FO_OBJS)
- 	rm -f $@
-@@ -544,7 +544,7 @@
-
- $(FO_LIBSO): $(CU_LIBSO)
- $(FO_LIBSO): $(FO_LOBJS)
--	$(CC) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=$(notdir $@)
-
- # Allow terminfo descriptions to be compiled into libterminfo
- ${TERMINFODIR}/terminfo.cdb: $(TOOL_TIC) ${TERMINFODIR}/terminfo

base/om4/build.sh

@@ -4,20 +4,16 @@ pkgrel=1
 deps="musl"
 bad=""
 ext="doc"
-auto_cross
 
 fetch() {
 	curl -L "https://github.com/ibara/m4/releases/download/om4-6.7/om4-6.7.tar.gz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
-	cd $pkgname-$pkgver
-	patch -p1 < ../../m4-hand-written-lexer.patch
-	patch -p1 < ../../configure.patch
 }
 
 build() {
 	cd $pkgname-$pkgver
 	./configure --prefix=/
-	make -j1
+	make
 }
 
 package() {
@@ -28,7 +24,7 @@ package() {
 }
 
 package_doc() {
-	cd $pkgname-$pkgver
+    	cd $pkgname-$pkgver
 	install -d $pkgdir/usr/share/man/man1
 	install -Dm644 m4.1 $pkgdir/usr/share/man/man1
 }
@@ -37,7 +33,3 @@ license() {
 	cd $pkgname-$pkgver
 	echo "Source are a combination of BSD and ISC licensed files"
 }
-
-backup() {
-	return
-}

base/om4/configure.patch

@@ -1,21 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -10,16 +10,8 @@
- EOF
-     $CC -o conftest conftest.c > /dev/null 2>&1
-     if [ $? -eq 0 ] ; then
-+      cc="$CC"
-+      return 0
--      ./conftest
--      if [ $? -eq 0 ] ; then
--	rm -f conftest conftest.c
--	cc="$CC"
--	return 0
--      else
--	echo "could not build working executables"
--	echo "Please ensure your C compiler is a native compiler"
--	exit 1
--      fi
-     else
-       rm -f conftest conftest.c
-     fi

base/om4/m4-hand-written-lexer.patch

@@ -1,327 +0,0 @@
-From edf250c633bef40e7e37dafc9fc393dd2ad9074f Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 10 Apr 2018 13:37:14 -0700
-Subject: [PATCH] m4: Use hand-written lexer to avoid cycle in bootstrap
-
----
- tokenizer.c | 191 +++++++++++++++++++++++++++++++++++++++++
- tokenizer.l | 109 -----------------------
- 2 files changed, 191 insertions(+), 109 deletions(-)
- create mode 100644 tokenizer.c
- delete mode 100644 tokenizer.l
-
-diff --git a/tokenizer.c b/tokenizer.c
-new file mode 100644
-index 00000000000..fa19fc65035
---- /dev/null
-+++ b/tokenizer.c
-@@ -0,0 +1,191 @@
-+/* $OpenBSD: tokenizer.l,v 1.10 2017/06/17 01:55:16 bcallah Exp $ */
-+/*
-+ * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+#include "parser.h"
-+#include <assert.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+
-+extern void m4_warnx(const char *, ...);
-+extern int mimic_gnu;
-+extern int32_t yylval;
-+static const char *yypos;
-+
-+void
-+yy_scan_string(const char *s)
-+{
-+	yypos = s;
-+}
-+
-+static int32_t
-+number(const char *yytext, size_t yylen)
-+{
-+	long l;
-+
-+	errno = 0;
-+	l = strtol(yytext, NULL, 0);
-+	if (((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE) ||
-+	    l > INT32_MAX || l < INT32_MIN)
-+		m4_warnx("numeric overflow in expr: %.*s", (int)yylen, yytext);
-+	return l;
-+}
-+
-+static int32_t
-+parse_radix(const char *yytext, size_t yylen)
-+{
-+	long base;
-+	char *next;
-+	long l;
-+	int d;
-+
-+	l = 0;
-+	base = strtol(yytext+2, &next, 0);
-+	if (base > 36 || next == NULL) {
-+		m4_warnx("error in number %.*s", (int)yylen, yytext);
-+	} else {
-+		next++;
-+		while (*next != 0) {
-+			if (*next >= '0' && *next <= '9')
-+				d = *next - '0';
-+			else if (*next >= 'a' && *next <= 'z')
-+				d = *next - 'a' + 10;
-+			else {
-+				assert(*next >= 'A' && *next <= 'Z');
-+				d = *next - 'A' + 10;
-+			}
-+			if (d >= base) {
-+				m4_warnx("error in number %.*s", (int)yylen, yytext);
-+				return 0;
-+			}
-+			l = base * l + d;
-+			next++;
-+		}
-+	}
-+	return l;
-+}
-+
-+static int
-+isodigit(int c)
-+{
-+	return c >= '0' && c <= '7';
-+}
-+
-+int yylex(void)
-+{
-+	const char *start;
-+
-+next:
-+	start = yypos;
-+	switch (*yypos) {
-+	case ' ':
-+	case '\t':
-+	case '\n':
-+		++yypos;
-+		goto next;
-+	case '<':
-+		switch (yypos[1]) {
-+		case '=':
-+			yypos += 2;
-+			return LE;
-+		case '<':
-+			yypos += 2;
-+			return LSHIFT;
-+		}
-+		break;
-+	case '>':
-+		switch (yypos[1]) {
-+		case '=':
-+			yypos += 2;
-+			return GE;
-+		case '>':
-+			yypos += 2;
-+			return RSHIFT;
-+		}
-+		break;
-+	case '=':
-+		if (yypos[1] != '=')
-+			break;
-+		yypos += 2;
-+		return EQ;
-+	case '!':
-+		if (yypos[1] != '=')
-+			break;
-+		yypos += 2;
-+		return NE;
-+	case '&':
-+		if (yypos[1] != '&')
-+			break;
-+		yypos += 2;
-+		return LAND;
-+	case '|':
-+		if (yypos[1] != '|')
-+			break;
-+		yypos += 2;
-+		return LOR;
-+	case '*':
-+		if (!mimic_gnu || yypos[1] != '*')
-+			break;
-+		yypos += 2;
-+		return EXPONENT;
-+	case '0':
-+		switch (*++yypos) {
-+		case 'x':
-+		case 'X':
-+			if (!isxdigit(*++yypos))
-+				return ERROR;
-+			do ++yypos;
-+			while (isxdigit(*yypos));
-+			break;
-+		case 'r':
-+		case 'R':
-+			if (!mimic_gnu)
-+				break;
-+			if (!isdigit(*++yypos))
-+				return ERROR;
-+			do ++yypos;
-+			while (isdigit(*yypos));
-+			if (*yypos != ':')
-+				return ERROR;
-+			if (!isalnum(*++yypos))
-+				return ERROR;
-+			do ++yypos;
-+			while (isalnum(*yypos));
-+			yylval = parse_radix(start, yypos - start);
-+			return NUMBER;
-+		default:
-+			do ++yypos;
-+			while (isodigit(*yypos));
-+			break;
-+		}
-+		yylval = number(start, yypos - start);
-+		return NUMBER;
-+	case '\0':
-+		return '\0';
-+	}
-+	if (isdigit(*yypos)) {
-+		do ++yypos;
-+		while (isdigit(*yypos));
-+		yylval = number(start, yypos - start);
-+		return NUMBER;
-+	}
-+
-+	return *yypos++;
-+}
-diff --git a/tokenizer.l b/tokenizer.l
-deleted file mode 100644
-index 94f02fb6085..00000000000
---- a/tokenizer.l
-+++ /dev/null
-@@ -1,109 +0,0 @@
--%{
--/* $OpenBSD: tokenizer.l,v 1.10 2017/06/17 01:55:16 bcallah Exp $ */
--/*
-- * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
--#include "parser.h"
--#include <assert.h>
--#include <stdlib.h>
--#include <errno.h>
--#include <stdint.h>
--#include <limits.h>
--
--extern void m4_warnx(const char *, ...);
--extern int mimic_gnu;
--extern int32_t yylval;
--
--int32_t number(void);
--int32_t parse_radix(void);
--%}
--
--delim 	[ \t\n]
--ws	{delim}+
--hex	0[xX][0-9a-fA-F]+
--oct	0[0-7]*
--dec	[1-9][0-9]*
--radix	0[rR][0-9]+:[0-9a-zA-Z]+
--
--%option noyywrap
--
--%%
--{ws}			{/* just skip it */}
--{hex}|{oct}|{dec}	{ yylval = number(); return(NUMBER); }
--{radix}			{ if (mimic_gnu) {
--				yylval = parse_radix(); return(NUMBER);
--			  } else {
--			  	return(ERROR);
--			  }
--			}
--"<="			{ return(LE); }
--">="			{ return(GE); }
--"<<"			{ return(LSHIFT); }
--">>"			{ return(RSHIFT); }
--"=="			{ return(EQ); }
--"!="			{ return(NE); }
--"&&"			{ return(LAND); }
--"||"			{ return(LOR); }
--"**"			{ if (mimic_gnu) { return (EXPONENT); } }
--.			{ return yytext[0]; }
--%%
--
--int32_t
--number()
--{
--	long l;
--
--	errno = 0;
--	l = strtol(yytext, NULL, 0);
--	if (((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE) ||
--	    l > INT32_MAX || l < INT32_MIN)
--		m4_warnx("numeric overflow in expr: %s", yytext);
--	return l;
--}
--
--int32_t
--parse_radix()
--{
--	long base;
--	char *next;
--	long l;
--	int d;
--
--	l = 0;
--	base = strtol(yytext+2, &next, 0);
--	if (base > 36 || next == NULL) {
--		m4_warnx("error in number %s", yytext);
--	} else {
--		next++;
--		while (*next != 0) {
--			if (*next >= '0' && *next <= '9')
--				d = *next - '0';
--			else if (*next >= 'a' && *next <= 'z')
--				d = *next - 'a' + 10;
--			else {
--				assert(*next >= 'A' && *next <= 'Z');
--				d = *next - 'A' + 10;
--			}
--			if (d >= base) {
--				m4_warnx("error in number %s", yytext);
--				return 0;
--			}
--			l = base * l + d;
--			next++;
--		}
--	}
--	return l;
--}
--
--- 
-2.17.0
-

base/openssl/build.sh

@@ -1,20 +1,16 @@
 pkgname=openssl
 pkgver=3.0.0
 ext="dev"
-auto_cross
 
 fetch() {
 	curl "https://www.openssl.org/source/openssl-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
 }
 
-PREFIX=/usr
-[ -z "$FOR_CROSS" ] || PREFIX=$FOR_CROSS_DIR
-
 build() {
 	cd $pkgname-$pkgver
 	./Configure \
-		--prefix=/$PREFIX \
+		--prefix=/usr \
 		--openssldir=/etc/ssl \
 		--libdir=lib \
 		linux-generic64 \
@@ -31,16 +27,14 @@ build() {
 package() {
 	cd $pkgname-$pkgver
 	make install_sw DESTDIR=$pkgdir
-	if [ -z "$FOR_CROSS" ]; then
-		install -d $pkgdir/usr/sbin
-		install -Dm755 ../../update-ca.sh $pkgdir/usr/sbin/update-ca
-	else
-		rm -rf $pkgdir/$PREFIX/bin
-	fi
+	rm -rf $pkgdir/usr/lib/pkgconf
+	rm -rf $pkgdir/usr/include
 }
 
-backup() {
-	return
+package_dev() {
+	cd $pkgname-$pkgver
+	make install_sw DESTDIR=$pkgdir
+	rm -rf $pkgdir/usr/bin
 }
 
 license() {

base/openssl/update-ca.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-curl -L https://curl.haxx.se/ca/cacert.pem -o /etc/ssl/cert.pem

base/oslo/build.sh

@@ -1,39 +0,0 @@
-pkgname=oslo
-pkgver=main
-
-fetch() {
-	curl -L "https://github.com/iglunix/oslo/archive/refs/heads/main.tar.gz" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	make ARCH=$ARCH
-}
-
-case $ARCH in
-	aarch64)
-		_a=aa64
-		;;
-	x86_64)
-		_a=x64
-		;;
-	*)
-		exit 1
-		;;
-esac
-
-package() {
-	cd $pkgname-$pkgver
-	install -Dm755 oslo.efi $pkgdir/boot/efi/boot/boot$_a.efi
-	install -Dm644 efi/oslo/entries.ini $pkgdir/boot/efi/oslo/entries.ini
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat license.txt
-}
-
-backup() {
-	echo boot/efi/oslo/entries.ini
-}

base/perl/build.sh

@@ -1,8 +1,8 @@
 pkgname=perl
-pkgver=5.34.0
+pkgver=5.32.1
 
 fetch() {
-	curl "https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	curl "https://www.cpan.org/src/5.0/perl-5.32.1.tar.gz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
 }
 
@@ -47,10 +47,6 @@ package() {
 	rm -rf $pkgdir/usr/share/man
 }
 
-backup() {
-    return
-}
-
 license() {
 	cd $pkgname-$pkgver
 	cat Copying

base/python/build.sh

@@ -1,8 +1,7 @@
 pkgname=python
-pkgver=3.10.4
+pkgver=3.9.6
 bad=""
 ext="doc"
-auto_cross
 
 fetch() {
 	curl "https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
@@ -11,32 +10,28 @@ fetch() {
 }
 
 build() {
-	cd $pkgname-$pkgver
+    	cd $pkgname-$pkgver
 	./configure \
 		--prefix=/usr \
-		--build=$HOST_TRIPLE \
-		--host=$TRIPLE  \
+		--build=$TARGET \
+		--host=$TARGET \
 		--with-system-ffi=true \
 		--with-ssl-default-suites=openssl \
-		--without-ensure-pip \
-		ax_cv_c_float_words_bigendian=no \
-		ac_cv_buggy_getaddrinfo=no \
-		ac_cv_file__dev_ptmx=yes \
-		ac_cv_file__dev_ptc=no
+		ax_cv_c_float_words_bigendian=no
 	make
 }
 
 package() {
     	cd $pkgname-$pkgver
 	make install DESTDIR=$pkgdir
-	rm -r $pkgdir/usr/lib/python3.10/test
-	rm -r $pkgdir/usr/lib/python3.10/ctypes/test
-	rm -r $pkgdir/usr/lib/python3.10/distutils/tests
-	rm -r $pkgdir/usr/lib/python3.10/idlelib/idle_test
-	rm -r $pkgidr/usr/lib/python3.10/lib2to3/tests
-	rm -r $pkgidr/usr/lib/python3.10/sqlite3/test
-	rm -r $pkgdir/usr/lib/python3.10/tkinter/test
-	rm -r $pkgdir/usr/lib/python3.10/unittest/test
+	rm -r $pkgdir/usr/lib/python3.9/test
+	rm -r $pkgdir/usr/lib/python3.9/ctypes/test
+	rm -r $pkgdir/usr/lib/python3.9/distutils/tests
+	rm -r $pkgdir/usr/lib/python3.9/idlelib/idle_test
+	rm -r $pkgidr/usr/lib/python3.9/lib2to3/tests
+	rm -r $pkgidr/usr/lib/python3.9/sqlite3/test
+	rm -r $pkgdir/usr/lib/python3.9/tkinter/test
+	rm -r $pkgdir/usr/lib/python3.9/unittest/test
 	rm -r $pkgdir/usr/share
 	ln -sr $pkgdir/usr/bin/python3 $pkgdir/usr/bin/python
 }

base/rust/abyss-install-template-shebang.patch

@@ -0,0 +1,10 @@
+The script seems to be POSIX-sh (+ local) compatible.
+
+--- a/src/tools/rust-installer/install-template.sh
++++ b/src/tools/rust-installer/install-template.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+ # file at the top-level directory of this distribution and at
+ # http://rust-lang.org/COPYRIGHT.

base/rust/abyss-libunwind.patch

@@ -0,0 +1,38 @@
+diff --git a/library/unwind/build.rs b/library/unwind/build.rs
+index 24bcd40c..51777664 100644
+--- a/library/unwind/build.rs
++++ b/library/unwind/build.rs
+@@ -19,7 +19,7 @@
+     } else if target.contains("linux") {
+         // linking for Linux is handled in lib.rs
+         if target.contains("musl") {
+-            llvm_libunwind::compile();
++            println!("cargo:rustc-link-lib=unwind");
+         } else if target.contains("android") {
+             let build = cc::Build::new();
+diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
+index dbdefa47..dca1897b 100644
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
+@@ -39,7 +39,7 @@ cfg_if::cfg_if! {
+ 
+ #[cfg(target_env = "musl")]
+ #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
+-#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
++#[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
+ extern "C" {}
+ 
+ // When building with crt-static, we get `gcc_eh` from the `libc` crate, since
+diff -Naur rustc-1.48.0-src.orig/src/bootstrap/dist.rs rustc-1.48.0-src/src/bootstrap/dist.rs
+--- rustc-1.48.0-src.orig/src/bootstrap/dist.rs		2020-12-22 16:39:30.504249113 +0100
++++ rustc-1.48.0-src/src/bootstrap/dist.rs			2020-12-22 16:42:08.663006830 +0100
+@@ -1016,7 +1016,7 @@
+         copy_src_dirs(
+             builder,
+             &builder.src,
+-            &["library", "src/llvm-project/libunwind"],
++            &["library"],
+             &[
+                 // not needed and contains symlinks which rustup currently
+                 // chokes on when unpacking.
+

base/rust/alpine-move-py.patch

@@ -0,0 +1,23 @@
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -12,7 +12,7 @@
+ 
+ # Find out where the pretty printer Python module is
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc"
+ 
+ # Run GDB with the additional arguments that load the pretty printers
+ # Set the environment variable `RUST_GDB` to overwrite the call to a
+ # Set the environment variable `RUST_GDB` to overwrite the call to a
+--- a/src/etc/rust-lldb
++++ b/src/etc/rust-lldb
+@@ -8,7 +8,7 @@
+ 
+ # Find out where to look for the pretty printer Python module
+ RUSTC_SYSROOT=$(rustc --print sysroot)
+-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
++RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
+ 
+ lldb=lldb
+ if [ -f "$RUST_LLDB" ]; then

base/rust/build.sh

@@ -21,7 +21,8 @@ _clear_vendor_checksums() {
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
 }
 
-export RUSTROOT="/opt/rust/"
+# export RUSTROOT="/usr"
+export RUSTROOT="/usr/src/rust-bootstrap/build/rust-root"
 
 fetch() {
 	curl "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz" -o $pkgname-$pkgver.tar.xz
@@ -32,30 +33,38 @@ fetch() {
 
 	cp ../*.patch .
 	cd $pkgname-$pkgver
+	patch -p1 < ../alpine-move-py.patch
+	patch -p1 < ../abyss-install-template-shebang.patch
 	patch -p1 < ../alpine-crt.patch
 	patch -p1 < ../libexec.patch
-	patch -p1 < ../fix-curl.patch
+	patch -p1 < ../llvm_crt.patch
+	patch -p1 < ../unfreeze.patch
+	patch -p1 < ../libresslssl.patch
 
 	sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py
-	_clear_vendor_checksums curl
-	_clear_vendor_checksums curl-sys
+	_clear_vendor_checksums libc
+	_clear_vendor_checksums openssl-sys
+	_clear_vendor_checksums openssl-src
+	_clear_vendor_checksums openssl
+
+	cd ..
 }
 
 build() {
 	cd $pkgname-$pkgver
-    #	--tools="cargo,rls,rustfmt,src" \
+
 	OPENSSL_LIB_DIR=/usr/lib/ ./configure \
 		--build="$TRIPLE" \
 		--host="$TRIPLE" \
 		--target="$TRIPLE" \
 		--prefix="/usr" \
 		--musl-root="/usr" \
-		--release-channel="nightly" \
+		--release-channel="beta" \
 		--enable-local-rust \
 		--local-rust-root=$RUSTROOT \
 		--disable-docs \
 		--enable-extended \
-		--tools="cargo,rustfmt,rls,src" \
+		--tools="cargo,rls,rustfmt,src" \
 		--enable-vendor \
 		--disable-locked-deps \
 		--enable-option-checking \
@@ -75,8 +84,7 @@ build() {
 		--set="target.$TRIPLE.cc=cc" \
 		--set="target.$TRIPLE.cxx=c++" \
 		--set="target.$TRIPLE.ar=ar" \
-		--set="target.$TRIPLE.linker=cc" \
-		--disable-llvm-static-stdcpp
+		--set="target.$TRIPLE.linker=cc"
 
 	sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
 #	sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
@@ -89,10 +97,6 @@ package() {
 	DESTDIR="$pkgdir" ./x.py install
 }
 
-backup() {
-	return
-}
-
 license() {
 	cd $pkgname-$pkgver
 	cat LICENSE-MIT

base/rust/libressl.patch

@@ -0,0 +1,10 @@
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -232,6 +232,7 @@
+             (3, 2, _) => ('3', '2', 'x'),
+             (3, 3, 0) => ('3', '3', '0'),
+             (3, 3, 1) => ('3', '3', '1'),
++            (3, 3, 2) => ('3', '3', '2'),
+             _ => version_error(),
+         };
+ 

base/rust/vendored-ssl.patch

@@ -0,0 +1,65 @@
+--- a/vendor/openssl-sys/Cargo.toml
++++ b/vendor/openssl-sys/Cargo.toml
+@@ -33,12 +33,11 @@
+
+ [build-dependencies.openssl-src]
+ version = "111.0.1"
+-optional = true
+
+ [build-dependencies.pkg-config]
+ version = "0.3.9"
+
+ [features]
+-vendored = ["openssl-src"]
++vendored = []
+ [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
+ version = "0.2.8"
+Only in ../../rust-1.49.0/vendor/openssl-sys: Cargo.toml.1
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -2,7 +2,6 @@
+
+ extern crate autocfg;
+ extern crate cc;
+-#[cfg(feature = "vendored")]
+ extern crate openssl_src;
+ extern crate pkg_config;
+ #[cfg(target_env = "msvc")]
+@@ -16,7 +15,6 @@
+ mod cfgs;
+
+ mod find_normal;
+-#[cfg(feature = "vendored")]
+ mod find_vendored;
+
+ enum Version {
+@@ -44,15 +42,14 @@
+ }
+
+ fn find_openssl(target: &str) -> (PathBuf, PathBuf) {
+-    #[cfg(feature = "vendored")]
+     {
+         // vendor if the feature is present, unless
+         // OPENSSL_NO_VENDOR exists and isn't `0`
+-        if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") {
++        //if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") {
+             return find_vendored::get_openssl(target);
+-        }
++        //}
+     }
+-    find_normal::get_openssl(target)
++    //find_normal::get_openssl(target)
+ }
+
+ fn main() {
+--- a/vendor/openssl-src/src/lib.rs
++++ b/vendor/openssl-src/src/lib.rs
+@@ -58,7 +58,7 @@
+         {
+             Command::new("gmake")
+         } else {
+-            Command::new("make")
++            Command::new("gmake")
+         }
+     }
+ 

base/samurai/build.sh

@@ -1,7 +1,6 @@
 pkgver=1.2
 pkgname=samurai
 pkgrel=1
-auto_cross
 
 fetch() {
 	curl -L "http://github.com/michaelforney/samurai/releases/download/1.2/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
@@ -10,7 +9,7 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	make LDFLAGS="$LDFLAGS"
+	samu
 }
 
 package() {
@@ -23,7 +22,3 @@ license() {
 	cd $pkgname-$pkgver
 	cat LICENSE
 }
-
-backup() {
-	return
-}

base/toybox/build.sh

@@ -1,36 +1,32 @@
-pkgver=0.8.7
+pkgver=0.8.5
 pkgname=toybox
 pkgrel=1
-deps="musl"
+deps="musl:pci-ids"
 
 fetch() {
-	curl -O "https://landley.net/toybox/downloads/toybox-$pkgver.tar.gz"
+	curl "http://www.landley.net/toybox/downloads/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
-	curl "https://pci-ids.ucw.cz/v2.2/pci.ids" -o pci.ids
 	cd $pkgname-$pkgver
 	patch -p1 < ../../ls-colour.patch
-	patch -p1 < ../../mksh.patch
-	patch -p1 < ../../xxd-i.patch
+	patch -p1 < ../../mksh-make.patch
 }
 
 build() {
 	cd $pkgname-$pkgver
-	CPUS=1 bad --gmake gmake defconfig
-	sed 's|# CONFIG_SH is not set|CONFIG_SH=y|' .config > /tmp/_
-	mv /tmp/_ .config
-	CPUS=1 bad --gmake gmake
-}
-
-backup() {
-	return
+	CPUS=1 gmake defconfig
+	CPUS=1 gmake
 }
 
 package() {
-	install -d $pkgdir/usr/share/misc
-	install -Dm 644 pci.ids $pkgdir/usr/share/misc
-
 	cd $pkgname-$pkgver
-	bad --gmake gmake PREFIX=$pkgdir install
+#	install -d $pkgdir/bin
+#	install -Dm755 ./toybox $pkgdir/bin/
+#	ln -sr $pkgdir/bin/toybox $pkgdir/bin/ln
+#	ln -sr $pkgdir/bin/toybox $pkgdir/bin/uname
+#	install -d $pkgdir/usr/bin
+#	ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/install
+#	ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/lspci
+	gmake PREFIX=$pkgdir install
 
 	# Provided by NetBSD Curses
 	rm $pkgdir/usr/bin/clear
@@ -39,10 +35,6 @@ package() {
 	# LLVM Provides this
 	rm $pkgdir/usr/bin/readelf
 #	rm $pkgdir/usr/bin/tar
-
-	# MKSH provides this
-	rm $pkgdir/bin/sh
-	rm $pkgdir/bin/bash
 }
 
 license() {

base/toybox/lspci-fix-ids.patch

@@ -1,55 +0,0 @@
---- a/toys/other/lspci.c
-+++ b/toys/other/lspci.c
-@@ -78,18 +78,45 @@
-
-       fseek(TT.db, 0, SEEK_SET);
-       while (!vbig || !dbig) {
-+        int tc = 0; // tab count
-         s = p;
-         if (!fgets(s, sizeof(toybuf)-(p-toybuf)-1, TT.db)) break;
--        while (isspace(*s)) s++;
-+        while (*s == ' ') s++;
-         if (*s == '#') continue;
--        if (vbig && s == p) break;
--        if (strstart(&s, vbig ? device : vendor)) {
--          if (vbig) dbig = s+2;
--          else vbig = s+2;
--          s += strlen(s);
--          s[-1] = 0; // trim ending newline
--          p = s + 1;
-+        while (*s == '\t') { s++; tc++; }
-+        switch (tc) {
-+        case 0:
-+          if (strstart(&s, vendor)) {
-+            vbig = s + 2;
-+            s += strlen(s);
-+            s[-1] = 0;
-+            p = s + 1;
-+          }
-+          break;
-+        case 1:
-+          if (vbig && strstart(&s, device)) {
-+            dbig = s + 2;
-+            s += strlen(s);
-+            s[-1] = 0;
-+            p = s + 1;
-+          }
-+          break;
-+        case 2:
-+          if (strstart(&s, vendor)) {
-+            s+=5;
-+            if (strstart(&s, device))
-+              printf("subven: %s\n", s);
-+          }
-+          break;
-         }
-+
-+        // if (strstart(&s, vbig ? device : vendor)) {
-+        //   if (vbig) dbig = s+2;
-+        //   else vbig = s+2;
-+        //   s += strlen(s);
-+        //   s[-1] = 0; // trim ending newline
-+        //   p = s + 1;
-+        // }
-       }
-     }

base/toybox/mksh-make.patch

@@ -0,0 +1,14 @@
+diff --git a/scripts/make.sh b/scripts/make.sh
+index 5b2d5d81..2c5e4b93 100755
+--- a/scripts/make.sh
++++ b/scripts/make.sh
+@@ -106,8 +106,7 @@ genbuildsh()
+   echo '$BUILD $FILES $LINK'
+ }
+ 
+-if ! cmp -s <(genbuildsh 2>/dev/null | head -n 6 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS) \
+-          <(head -n 7 generated/build.sh 2>/dev/null | $SED '7s/ -o .*//')
++if [ "$(genbuildsh 2>/dev/null | head -n 6 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS)" != "$(head -n 7 generated/build.sh 2>/dev/null | $SED '7s/ -o .*//')" ]
+ then
+   echo -n "Library probe"
+ 

base/toybox/mksh.patch

@@ -1,35 +0,0 @@
---- a/scripts/genconfig.sh
-+++ b/scripts/genconfig.sh
-@@ -16,7 +16,7 @@
- # Symbol name is first argument, flags second, feed C file to stdin
- probesymbol()
- {
--  probecc "${@:2}" 2>/dev/null && DEFAULT=y || DEFAULT=n
-+  probecc "$2" 2>/dev/null && DEFAULT=y || DEFAULT=n
-   rm a.out 2>/dev/null
-   echo -e "config $1\n\tbool\n\tdefault $DEFAULT\n" || exit 1
- }
---- a/scripts/portability.sh
-+++ b/scripts/portability.sh
-@@ -35,7 +35,7 @@
- fi
-
- # Centos 7 bug workaround, EOL June 30 2024. TODO
--DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
-+# DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
-
- # If the build is using gnu tools, make them behave less randomly.
- export LANG=c
---- a/scripts/make.sh
-+++ b/scripts/make.sh
-@@ -76,8 +76,8 @@
-   echo -e "\$BUILD lib/*.c $TOYFILES \$LINK -o $OUTNAME"
- }
-
--if ! cmp -s <(genbuildsh 2>/dev/null | head -n 5) \
--            <(head -n 5 "$GENDIR"/build.sh 2>/dev/null | $SED '5s/ -o .*//')
-+if [ "$(genbuildsh 2>/dev/null | head -n 5)" != \
-+     "$(head -n 5 "$GENDIR"/build.sh 2>/dev/null | $SED '5s/ -o .*//')" ]
- then
-   echo -n "Library probe"
-

base/toybox/xxd-i.patch

@@ -1,46 +0,0 @@
---- a/toys/other/xxd.c
-+++ b/toys/other/xxd.c
-@@ -77,11 +77,13 @@ static void do_xxd(int fd, char *name)
- 
- static void do_xxd_include(int fd, char *name)
- {
-+  long long total = 0;
-   int c = 1, i, len;
- 
-   // The original xxd outputs a header/footer if given a filename (not stdin).
-   // We don't, which means that unlike the original we can implement -ri.
-   while ((len = read(fd, toybuf, sizeof(toybuf))) > 0) {
-+    total += len;
-     for (i = 0; i < len; ++i) {
-       printf("%s%#.02x", c > 1 ? ", " : "  ", toybuf[i]);
-       if (c++ == TT.c) {
---- a/toys/other/xxd.c
-+++ b/toys/other/xxd.c
-@@ -80,7 +80,12 @@
-   int c = 1, i, len;
- 
-   // The original xxd outputs a header/footer if given a filename (not stdin).
--  // We don't, which means that unlike the original we can implement -ri.
-+  // We don't, which means that unlike the original we can implement -ri
-+  printf("unsigned char %s", isdigit(name[0]) ? "__": "");
-+  for (char *n = name; *n; n++)
-+    putchar(*n == '.' ? '_' : *n);
-+  puts("[] = {");
-+
-   while ((len = read(fd, toybuf, sizeof(toybuf))) > 0) {
-     total += len;
-     for (i = 0; i < len; ++i) {
-@@ -91,6 +96,13 @@
-       }
-     }
-   }
-+  puts("};");
-+  printf("unsigned int %s", isdigit(name[0]) ? "__": "");
-+  for (char *n = name; *n; n++)
-+    putchar(*n == '.' ? '_' : *n);
-+  
-+  printf("_len = %lld;\n", total);
-+
-   if (len < 0) perror_msg_raw(name);
-   if (c > 1) xputc('\n');
- }

base/wpa_supplicant/build.sh

@@ -25,7 +25,7 @@ build() {
 package() {
 	cd $pkgname-$pkgver
 	cd $pkgname
-	bad --gmake gmake install DESTDIR=$pkgdir BINDIR=/usr/sbin
+	gmake install DESTDIR=$pkgdir BINDIR=/usr/sbin
 }
 
 license() {

base/zlib-ng/build.sh

@@ -10,21 +10,12 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 	cd build
-
-	PREFIX=/usr
-
-	[ -z "$WITH_CROSS" ] || cmake_extra_flags="-DCMAKE_CROSSCOMPILING=ON \
-		-DCMAKE_SYSROOT=$WITH_CROSS_DIR \
-		-DCMAKE_C_COMPILER_TARGET=$ARCH-linux-musl"
-	[ -z "$FOR_CROSS" ] || PREFIX=$FOR_CROSS_DIR
-
 	cmake -G Ninja ../ \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$PREFIX \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DZLIB_COMPAT=ON \
-		$cmake_extra_flags
-
+		-DZLIB_COMPAT=ON
+	
 	samu
 }
 
@@ -38,7 +29,3 @@ license() {
 	cd $pkgname-$pkgver
 	cat LICENSE.md
 }
-
-backup() {
-	return
-}

base/zstd/build.sh

@@ -1,6 +1,5 @@
 pkgname=zstd
-pkgver=1.5.2
-auto_cross
+pkgver=1.5.0
 
 fetch() {
 	curl -L "https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
@@ -10,12 +9,12 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 
-	bad --gmake gmake
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install PREFIX=/usr DESTDIR=$pkgdir
+	gmake install PREFIX=/usr DESTDIR=$pkgdir
 }
 
 license() {
@@ -23,7 +22,3 @@ license() {
 	cat LICENSE
 #	cat COPYING
 }
-
-backup() {
-	return
-}

bootstrap/README.md

@@ -1,3 +0,0 @@
-# Bootstrap
-These packages are not meant to be used in a complete Iglunix system but are
-ment as a stepping stone to build the full packages.

bootstrap/rust/build.sh

@@ -1,33 +0,0 @@
-pkgname=rust
-pkgver=beta
-
-fetch() {
-	curl "https://static.rust-lang.org/dist/rust-$pkgver-$ARCH-unknown-linux-musl.tar.gz" -o rust.tar.gz
-	tar -xf rust.tar.gz
-}
-
-build() {
-	[ -f libgcc_s.so ] \
-	|| clang -shared -o libgcc_s.so \
-	-Wl,--allow-multiple-definition -Wl,--whole-archive \
-	$(clang -print-libgcc-file-name) -lunwind
-}
-
-package() {
-	[ -f $pkgdir/opt/rust/lib/rustlib/uninstall.sh ] \
-	|| ./rust-$pkgver-$ARCH-unknown-linux-musl/install.sh \
-	--disable-ldconfig \
-	--destdir=$pkgdir \
-	--prefix=/opt/rust
-
-	[ -f $pkgdir/opt/rust/lib/libgcc_s.so.1 ] \
-	|| cp ./libgcc_s.so $pkgdir/opt/rust/lib/libgcc_s.so.1
-}
-
-backup() {
-	return
-}
-
-license() {
-	return
-}

extra/autossh/build.sh

@@ -1,34 +0,0 @@
-pkgname=autossh
-pkgver=1.4g
-
-fetch() {
-	curl "https://www.harding.motd.ca/autossh/autossh-$pkgver.tgz" -LO
-	tar -xf $pkgname-$pkgver.tgz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--build=$TRIPLE \
-		--host=$TRIPLE
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

extra/bin86/build.sh

@@ -10,14 +10,14 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake PREFIX=/usr
+	gmake PREFIX=/usr
 }
 
 package() {
 	cd $pkgname-$pkgver
 	install -d $pkgdir/usr/bin
 	install -d $pkgdir/usr/share/man/man1
-	bad --gmake gmake PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
+	gmake PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
 }
 
 license() {

extra/distcc/build.sh

@@ -15,12 +15,12 @@ build() {
 		--host=x86_64-unknown-linux-musl \
 		--without-libiberty
 
-	bad --gmake gmake
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 
 	install -d $pkgdir/usr/lib/distcc
 	ln -sr $pkgdir/usr/bin/distcc $pkgdir/usr/lib/distcc/cc

extra/dropbear/build.sh

@@ -15,12 +15,12 @@ build() {
 		--build=x86_64-unknown-linux-musl \
 		--host=x86_64-unknown-linux-musl
 
-	bad --gmake gmake PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
+	gmake PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
+	gmake install DESTDIR=$pkgdir PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
 	ln -sr $pkgdir/usr/sbin/dropbear $pkgdir/usr/sbin/sshd
 	ln -sr $pkgdir/usr/bin/dbclient $pkgdir/usr/bin/ssh
 	rm -r $pkgdir/usr/share
@@ -28,7 +28,7 @@ package() {
 
 package_doc() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
+	gmake install DESTDIR=$pkgdir PROGRAMS='dropbear dbclient dropbearkey dropbearconvert scp'
 	rm -r $pkgdir/usr/bin
 	rm -r $pkgdir/usr/sbin
 }

extra/flex/build.sh

@@ -1,8 +1,8 @@
-pkgname=pcre
-pkgver=8.45
+pkgname=flex
+pkgver=2.6.4
 
 fetch() {
-    curl "https://ftp.pcre.org/pub/pcre/pcre-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	curl -L "https://github.com/westes/flex/releases/download/v2.6.4/flex-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 }
 
@@ -21,10 +21,6 @@ package() {
 	make install DESTDIR=$pkgdir
 }
 
-backup() {
-	return
-}
-
 license() {
 	cd $pkgname-$pkgver
 	cat LICENSE

extra/json-c/build.sh

@@ -1,30 +0,0 @@
-pkgname=json-c
-pkgver=0.15
-
-fetch() {
-	curl -L "https://s3.amazonaws.com/json-c_releases/releases/json-c-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mkdir $pkgname-$pkgver/build
-}
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	cmake -G Ninja ../ \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

extra/libxml2/build.sh

@@ -11,17 +11,17 @@ fetch() {
 build() {
 	cd $pkgname-$pkgver
 	./configure --prefix=/usr --without-python
-	bad --gmake gmake
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 }
 
 package_dev() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 }
 
 license() {

extra/lynx/build.sh

@@ -16,12 +16,12 @@ build() {
 		--build=x86_64-unknown-linux-musl \
 		--host=x86_64-unknown-linux-musl
 
-	bad --gmake gmake
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 }
 
 license() {

extra/mold/build.sh

@@ -11,12 +11,12 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake
+	gmake
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
+	gmake install DESTDIR=$pkgdir
 	ln -sr $pkgdir/usr/bin/mold $pkgdir/usr/bin/ld.mold
 }
 

extra/nodejs/build.sh

@@ -1,38 +0,0 @@
-pkgname=nodejs
-pkgver=16.6.1
-
-fetch() {
-	curl -L "https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv node-v$pkgver $pkgname-$pkgver
-	cd $pkgname-$pkgver
-	sed -i 's/-latomic//' node.gyp
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--shared-zlib \
-    	--shared-openssl \
-		--with-intl=none \
-		--without-etw \
-		--without-dtrace \
-		--without-report \
-		--without-node-snapshot \
-		--without-node-code-cache \
-		--ninja
-
-    samu -C out/Release
-}
-
-package() {
-	cd $pkgname-$pkgver
-
-	./tools/install.py install $pkgdir /usr
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

extra/nodejs/remove-latomic.patch

@@ -1,27 +0,0 @@
-From 8dbc49deefb50f4af05710d3e6ad1ca7ff6dbfac Mon Sep 17 00:00:00 2001
-From: Ishimoto Shinobu <nagakamira@gmail.com>
-Date: Sun, 21 Feb 2021 09:43:21 +0900
-Subject: [PATCH] remove -latomic library
-
-Signed-off-by: Ishimoto Shinobu <nagakamira@gmail.com>
----
- node.gyp | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/node.gyp b/node.gyp
-index 131461de..051d2816 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -343,9 +343,6 @@
-           '-Wl,-bnoerrmsg',
-         ],
-       }],
--      ['OS == "linux" and llvm_version != "0.0"', {
--        'libraries': ['-latomic'],
--      }],
-     ],
-   },
- 
--- 
-2.29.2
-

extra/openssh/build.sh

@@ -1,5 +1,5 @@
 pkgname=openssh
-pkgver=8.8p1
+pkgver=8.6p1
 
 fetch() {
 	curl "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
@@ -10,8 +10,8 @@ build() {
 	cd $pkgname-$pkgver
 	./configure \
 		--prefix=/usr \
-		--build=$TRIPLE \
-		--host=$TRIPLE \
+		--build=x86_64-unknown-linux-musl \
+		--host=x86_64-unknown-linux-musl \
 		--libexecdir=/usr/lib
 
 	make
@@ -22,10 +22,6 @@ package() {
 	make install DESTDIR=$pkgdir
 }
 
-backup() {
-    return
-}
-
 license() {
 	cd $pkgname-$pkgver
 	cat LICENCE

extra/pcre2/build.sh

@@ -1,31 +0,0 @@
-pkgname=pcre2
-pkgver=10.39
-
-fetch() {
-    curl -L "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-$pkgver.tar.bz2" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--build=$TRIPLE \
-		--host=$TRIPLE
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}

extra/rust/fix-curl.patch

@@ -1,13 +0,0 @@
-diff --git a/vendor/curl-sys/build.rs b/vendor/curl-sys/build.rs
-index 24475cc..3249440 100644
---- a/vendor/curl-sys/build.rs
-+++ b/vendor/curl-sys/build.rs
-@@ -111,6 +111,8 @@ fn main() {
-         .include("curl/lib")
-         .include("curl/include")
-         .define("BUILDING_LIBCURL", None)
-+        .define("CURL_CA_BUNDLE", "\"/etc/ssl/cert.pem\"")
-+        .define("CURL_CA_PATH", "\"/etc/ssl/certs\"")
-         .define("CURL_DISABLE_DICT", None)
-         .define("CURL_DISABLE_GOPHER", None)
-         .define("CURL_DISABLE_IMAP", None)

extra/xxhash/build.sh

@@ -10,12 +10,12 @@ fetch() {
 
 build() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake PREFIX=/usr
+	gmake PREFIX=/usr
 }
 
 package() {
 	cd $pkgname-$pkgver
-	bad --gmake gmake install PREFIX=/usr DESTDIR=$pkgdir
+	gmake install PREFIX=/usr DESTDIR=$pkgdir
 }
 
 license() {

extra/yasm/build.sh

@@ -1,32 +0,0 @@
-pkgname=yasm
-pkgver=1.3.0
-
-fetch() {
-	curl -L "https://github.com/yasm/yasm/releases/download/v$pkgver/yasm-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		# --build=$TRIPLE \
-		# --host=$TRIPLE
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make install DESTDIR=$pkgdir
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}

extra/zip/build.sh

@@ -1,29 +0,0 @@
-pkgname=zip
-pkgver=30
-
-fetch() {
-	curl "https://fossies.org/linux/misc/zip$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mv zip$pkgver $pkgname-$pkgver
-}
-
-build() {
-	cd $pkgname-$pkgver
-
-	make -f unix/Makefile generic
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make -f unix/Makefile install prefix=$pkgdir/usr
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

gnome/atk/build.sh

@@ -1,36 +0,0 @@
-pkgname=atk
-_pkgver=2.36
-pkgver=$_pkgver.0
-
-fetch() {
-	curl -L "https://download.gnome.org/sources/atk/$_pkgver/atk-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mkdir $pkgname-$pkgver/build
-}
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	meson .. \
-		--buildtype=release \
-		--prefix=/usr \
-		--libexecdir=lib \
-		-Dintrospection=false \
-		-Ddocs=false
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}

gnome/dbus-glib/build.sh

@@ -1,36 +0,0 @@
-pkgname=dbus-glib
-pkgver=0.112
-
-fetch() {
-	curl "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
-	tar -xf $pkgname-$pkgver.tar.gz
-	mkdir $pkgname-$pkgver/build
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--build=$TRIPLE \
-		--host=$TRIPLE
-
-	bad --gmake gmake
-}
-
-package() {
-	cd $pkgname-$pkgver
-	bad --gmake gmake install DESTDIR=$pkgdir
-	rm -rf $pkgdir/etc
-	rm -rf $pkgdir/usr/libexec
-	rm -rf $pkgdir/usr/share/gtk-doc
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat COPYING
-}
-
-backup() {
-	return
-}

gnome/gdk-pixbuf/build.sh

@@ -1,45 +0,0 @@
-pkgname=gdk-pixbuf
-_pkgver=2.42
-pkgver=$_pkgver.6
-
-fetch() {
-	curl -L "https://download.gnome.org/sources/gdk-pixbuf/$_pkgver/gdk-pixbuf-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mkdir $pkgname-$pkgver/build
-	rm $pkgdir-$pkgver/subprojects/*.wrap
-}
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	meson .. \
-		--buildtype=release \
-		--prefix=/usr \
-		--libexecdir=lib \
-		-Ddebug=false \
-		-Djpeg=true \
-		-Dpng=true \
-		-Dtiff=false \
-		-Ddocs=false \
-		-Dman=false \
-		-Dgio_sniffing=false \
-		-Dinstalled_tests=false \
-		-Dbuiltin_loaders=all
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

gnome/glib/build.sh

@@ -1,38 +0,0 @@
-pkgname=glib
-_pkgver=2.68
-pkgver=$_pkgver.4
-
-fetch() {
-	curl -L "https://download.gnome.org/sources/glib/$_pkgver/glib-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mkdir $pkgname-$pkgver/build
-}
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	meson .. \
-		--buildtype=release \
-		--prefix=/usr \
-		--libexecdir=lib \
-		-Dtests=false \
-		-Dnls=disabled
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-
-	rm -rf $pkgdir/usr/share/bash-completion
-	rm -rf $pkgdir/usr/share/gdb
-
-	rm -rf $pkgdir/usr/bin/gdbus*
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}

gnome/gtk+/build.sh

@@ -1,62 +0,0 @@
-pkgname=gtk+
-_pkgver=3.24
-pkgver=$_pkgver.31
-
-fetch() {
-	curl -L "https://download.gnome.org/sources/gtk+/$_pkgver/gtk%2B-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-	mkdir -p $pkgname-$pkgver/build
-	cd $pkgname-$pkgver
-	patch -p1 < ../../no-fribidi.patch
-
-	# Remove 'atk-bridge' dependency which removes the 'dbus' dependency.
-	sed '/atkbridge_dep/d;/atk-bridge-2.0/d' meson.build > _
-	mv -f _ meson.build
-	sed '/atkbridge_dep,/d' gtk/meson.build > _
-	mv -f _ gtk/meson.build
-
-	sed '/<atk-bridge.h>/d;/atk_bridge_adaptor_init/d' \
-	    gtk/a11y/gtkaccessibility.c > _
-	mv -f _ gtk/a11y/gtkaccessibility.c
-
-}
-
-build() {
-	cd $pkgname-$pkgver
-	cd build
-	meson .. \
-		--buildtype=release \
-		--prefix=/usr \
-		--libexecdir=lib \
-		--localstatedir=/var \
-		-Dx11_backend=false \
-		-Dprint_backends=auto \
-		-Dwayland_backend=true \
-		-Dwin32_backend=false \
-		-Dquartz_backend=false \
-		-Dcolord=no \
-		-Ddemos=false \
-		-Dexamples=false \
-		-Dtests=false \
-		-Dinstalled_tests=false \
-		-Dgtk_doc=false \
-		-Dintrospection=false
-
-	samu
-}
-
-package() {
-	cd $pkgname-$pkgver
-	cd build
-	DESTDIR=$pkgdir samu install
-}
-
-backup() {
-	return
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE
-#	cat COPYING
-}