bye bye libressl

2021-09-11 08:24:20 +00:00 · 2021-09-11 08:24:20 +00:00 · 4f387bcb0b
commit 4f387bcb0b
parent 879ade0254
47 changed files with 963 additions and 37 deletions
--- a/base/bmake/build.sh
+++ b/base/bmake/build.sh
@ -1,6 +1,7 @@
 pkgver=20210420
 pkgname=bmake
-bad="musl"
+mkdeps=""
+deps=""
 ext="doc"

 fetch() {
--- a/base/byacc/build.sh
+++ b/base/byacc/build.sh
@ -1,6 +1,7 @@
-pkgver=20210328
+pkgver=20210802
 pkgname=byacc
-deps="musl"
+deps=""
+mkdeps="bmake"
 bad=""
 ext="doc"

--- a/base/ca-certificates/build.sh
+++ b/base/ca-certificates/build.sh
@ -2,13 +2,16 @@ 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
+        #patch -p1 < ../../libressl-update-rehash.patch
 }


--- a/base/cmake/build.sh
+++ b/base/cmake/build.sh
@ -1,6 +1,8 @@
 pkgver=3.19.2
 pkgname=cmake
 pkgrel=1
+mkdeps="samu"
+deps=""
 bad=""
 ext=""

@ -13,9 +15,9 @@ build() {
 	cd $pkgname-$pkgver
 	./bootstrap \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/$pkgname \
-		--docdir=/usr/share/doc/$pkgname \
+		--mandir=/share/man \
+		--datadir=/share/$pkgname \
+		--docdir=/share/doc/$pkgname \
 		--generator=Ninja \
 		--no-system-libs

--- a/base/curl/build.sh
+++ b/base/curl/build.sh
@ -2,6 +2,8 @@ pkgver=7.77.0
 pkg_ver=$(echo $pkgver | tr '.' '_')
 pkgname=curl
 pkgrel=1
+mkdeps="samu:cmake"
+deps="openssl"
 bad=""
 ext="doc:dev"

--- a/base/expat/build.sh
+++ b/base/expat/build.sh
@ -1,6 +1,8 @@
 pkgver=2.2.10
 pkgname=expat
 bad=""
+mkdeps="bmake"
+deps=""
 ext="dev"

 fetch() {
--- a/base/gettext-tiny/build.sh
+++ b/base/gettext-tiny/build.sh
@ -1,5 +1,7 @@
 pkgname=gettext-tiny
 pkgver=master
+mkdeps="kati"
+deps=""

 fetch() {
 	curl -L "https://github.com/sabotage-linux/gettext-tiny/archive/master.tar.gz" -o $pkgname-$pkgver.tar.gz
--- a/base/git/build.sh
+++ b/base/git/build.sh
@ -1,7 +1,8 @@
 pkgver=2.32.0
 pkgname=git
 pkgrel=1
-deps="musl:zlib-ng:curl"
+mkdeps="zlib-ng-dev:curl-dev:gmake"
+deps="zlib-ng:curl"
 bad="gmake"
 ext="doc"

@ -12,19 +13,23 @@ 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
+	# gmake NO_PERL=1 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
+	# gmake NO_PERL=1 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
+	# 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
+	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
+	# gmake NO_PERL=1 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() {
--- a/base/kakoune/build.sh
+++ b/base/kakoune/build.sh
@ -1,4 +1,4 @@
-pkgver=builtin-terminal-ui
+pkgver=master
 pkgname=kakoune
 pkgrel=1
 deps="musl:llvm"
@ -6,7 +6,7 @@ bad=""
 ext="doc"

 fetch() {
-	curl -L "https://github.com/mawww/kakoune/archive/builtin-terminal-ui.tar.gz" -o $pkgname-$pkgver.tar.xz
+	curl -L "https://github.com/mawww/kakoune/archive/master.tar.gz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
 }

--- a/base/lc-make/build.sh
+++ b/base/lc-make/build.sh
@ -1,5 +1,7 @@
 pkgname=lc-make
 pkgver=main
+mkdeps="rust"
+deps=""

 fetch() {
 	curl -L "https://github.com/LightningCreations/lc-make/archive/refs/heads/main.tar.gz" -o $pkgname-$pkgver.tar.xz
--- a/base/openssl/build.sh
+++ b/base/openssl/build.sh
@ -0,0 +1,35 @@
+pkgname=openssl
+pkgver=1.1.1k
+
+fetch() {
+	curl "https://www.openssl.org/source/openssl-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./Configure \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=lib \
+		linux-$(uname -m) \
+		shared no-zlib no-async \
+		no-comp no-idea no-mdc2 \
+		no-rc5 no-ec2m no-sm2 \
+		no-sm4 -no-ssl2 no-ssl3 \
+		no-seed no-weak-ssl-ciphers \
+		-Wa,--noexecstack
+
+	make
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make install_sw DESTDIR=$pkgdir
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/base/python/build.sh
+++ b/base/python/build.sh
@ -1,5 +1,5 @@
 pkgname=python
-pkgver=3.9.5
+pkgver=3.9.6
 bad=""
 ext="doc"

@ -16,6 +16,7 @@ build() {
 		--build=$TARGET \
 		--host=$TARGET \
 		--with-system-ffi=true \
+		--with-ssl-default-suites=openssl \
 		ax_cv_c_float_words_bigendian=no
 	make
 }
--- a/base/rust/build.sh
+++ b/base/rust/build.sh
@ -21,8 +21,8 @@ _clear_vendor_checksums() {
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
 }

-export RUSTROOT="/usr"
-# export RUSTROOT="/usr/src/rust-bootstrap/build/rust-root"
+# 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
--- a/extra/bzip2/build.sh
+++ b/extra/bzip2/build.sh
@ -0,0 +1,52 @@
+pkgname=bzip2
+pkgver=1.0.8
+ext=dev
+
+fetch() {
+	curl "https://sourceware.org/pub/bzip2/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+
+	make -f Makefile-libbz2_so CC=cc
+}
+
+package() {
+	cd $pkgname-$pkgver
+	install -d $pkgdir/usr/lib/
+	install -Dm755 ./libbz2.so.$pkgver $pkgdir/usr/lib/
+	ln -sr $pkgdir/usr/lib/libbz2.so.$pkgver $pkgdir/usr/lib/libbz2.so
+	ln -sr $pkgdir/usr/lib/libbz2.so.$pkgver $pkgdir/usr/lib/libbz2.so.1
+	ln -sr $pkgdir/usr/lib/libbz2.so.$pkgver $pkgdir/usr/lib/libbz2.so.1.0
+}
+
+package_dev() {
+    cd $pkgname-$pkgver
+    install -d $pkgdir/usr/include/
+    install -Dm644 ./bzlib.h $pkgdir/usr/include/
+    install -d $pkgdir/usr/share/pkgconfig/
+
+	cat > $pkgdir/usr/share/pkgconfig/bzip2.pc << EOF
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
+EOF
+
+    
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/cbindgen/build.sh
+++ b/extra/cbindgen/build.sh
@ -0,0 +1,30 @@
+pkgname=cbindgen
+pkgver=0.20.0
+
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
+}
+
+fetch() {
+	curl -L "https://github.com/eqrion/cbindgen/archive/refs/tags/v$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+	cd $pkgname-$pkgver
+	mkdir -p .cargo
+	cargo vendor > .cargo/config
+}
+
+build() {
+	cd $pkgname-$pkgver
+	cargo build --release --locked --all-features
+}
+
+package() {
+	cd $pkgname-$pkgver
+	install -Dm755 target/release/$pkgname $pkgdir/usr/bin/$pkgname
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/editorconfig-core-c/build.sh
+++ b/extra/editorconfig-core-c/build.sh
@ -0,0 +1,30 @@
+pkgname=editorconfig-core-c
+pkgver=0.12.5
+
+fetch() {
+	curl -L "https://github.com/editorconfig/editorconfig-core-c/archive/refs/tags/v$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
+}
--- a/extra/gyp/build.sh
+++ b/extra/gyp/build.sh
@ -0,0 +1,23 @@
+pkgname=gyp
+pkgver=master
+
+fetch() {
+	curl -L "https://github.com/chromium/gyp/archive/refs/heads/master.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	python setup.py build
+}
+
+package() {
+	cd $pkgname-$pkgver
+	python setup.py install --root=$pkgdir
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/kak-lsp/build.sh
+++ b/extra/kak-lsp/build.sh
@ -0,0 +1,24 @@
+pkgname=kak-lsp
+pkgver=9.0.0
+
+fetch() {
+	curl -L "https://github.com/kak-lsp/kak-lsp/archive/v$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	cargo build --release --locked --all-features
+}
+
+package() {
+	cd $pkgname-$pkgver
+	install -Dm755 target/release/$pkgname $pkgdir/usr/bin/
+	install -Dm644 rc/lsp.kak $pkgdir/usr/share/kak-lsp/rc/
+	install -Dm644 kak-lsp.toml $pkgdir/usr/share/kak-lsp/examples/
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat UNLICENSE
+}
--- a/extra/libarchive/build.sh
+++ b/extra/libarchive/build.sh
@ -0,0 +1,28 @@
+pkgname=libarchive
+pkgver=3.5.1
+
+fetch() {
+	curl "http://libarchive.org/downloads/libarchive-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--build=$TRIPLE \
+		--host=$TRIPLE
+
+	make
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make install DESTDIR=$pkgdir
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/libevent/build.sh
+++ b/extra/libevent/build.sh
@ -0,0 +1,29 @@
+pkgname=libevent
+pkgver=2.1.12
+
+fetch() {
+	curl -L "https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+	mv libevent-$pkgver-stable $pkgname-$pkgver
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--build=$TRIPLE \
+		--host=$TRIPLE
+
+	make
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make install DESTDIR=$pkgdir
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/lua/build.sh
+++ b/extra/lua/build.sh
@ -0,0 +1,28 @@
+pkgname=lua
+pkgver=5.4.3
+
+fetch() {
+	curl "http://www.lua.org/ftp/lua-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	tar -xf $pkgname-$pkgver.tar.gz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--build=$TRIPLE \
+		--host=$TRIPLE
+
+	make CC=cc
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make install INSTALL_TOP=$pkgdir/usr
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/ncspot/build.sh
+++ b/extra/ncspot/build.sh
@ -1,5 +1,5 @@
 pkgname=ncspot
-pkgver=0.7.3
+pkgver=0.8.1

 _clear_vendor_checksums() {
    	sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
--- a/extra/nss/build.sh
+++ b/extra/nss/build.sh
@ -0,0 +1,86 @@
+pkgname=nss
+pkgver=3.69
+
+fetch() {
+	curl "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_69_RTM/src/nss-3.69-with-nspr-4.32.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	cd $pkgname
+
+	sed -i '/-no-integrated-as/d' ./lib/freebl/Makefile
+	sed -i '/-no-integrated-as/d' ./lib/freebl/freebl.gyp
+	sed -i '/-no-integrated-as/d' ./lib/freebl/freebl_base.gypi
+	
+	sed -i 's/bash/zsh/g' build.sh
+	./build.sh --opt --disable-tests
+
+}
+
+package() {
+    srcdir=$(pwd)/..
+	cd $pkgname-$pkgver
+
+	install -m755 -d "$pkgdir"/usr/lib/pkgconfig
+	install -m755 -d "$pkgdir"/usr/bin
+	install -m755 -d "$pkgdir"/usr/include/nss/private
+
+	NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
+	NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
+	NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
+
+	# pkgconfig files
+	local _pc; for _pc in nss.pc nss-util.pc nss-softokn.pc; do
+		sed "$srcdir"/$_pc.in \
+			-e "s,%libdir%,/usr/lib,g" \
+			-e "s,%prefix%,/usr,g" \
+			-e "s,%exec_prefix%,/usr/bin,g" \
+			-e "s,%includedir%,/usr/include/nss,g" \
+			-e "s,%SOFTOKEN_VERSION%,$pkgver,g" \
+			-e "s,%NSPR_VERSION%,$pkgver,g" \
+			-e "s,%NSS_VERSION%,$pkgver,g" \
+			-e "s,%NSSUTIL_VERSION%,$pkgver,g" \
+			> "$pkgdir"/usr/lib/pkgconfig/$_pc
+	done
+	ln -sf nss.pc "$pkgdir"/usr/lib/pkgconfig/mozilla-nss.pc
+	chmod 644 "$pkgdir"/usr/lib/pkgconfig/*.pc
+
+	# nss-config
+	sed "$srcdir"/nss-config.in \
+		-e "s,@libdir@,/usr/lib,g" \
+		-e "s,@prefix@,/usr/bin,g" \
+		-e "s,@exec_prefix@,/usr/bin,g" \
+		-e "s,@includedir@,/usr/include/nss,g" \
+		-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+		-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+		-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+		> "$pkgdir"/usr/bin/nss-config
+	chmod 755 "$pkgdir"/usr/bin/nss-config
+	local minor=${pkgver#*.}
+	minor=${minor%.*}
+	for file in $(find dist/Release/lib -name "*.so"); do
+		install -m755 $file \
+			"$pkgdir"/usr/lib/${file##*/}.$minor
+		ln -s ${file##*/}.$minor "$pkgdir"/usr/lib/${file##*/}
+	done
+	install -m644 dist/Release/lib/*.a "$pkgdir"/usr/lib/
+	install -m644 dist/Release/lib/*.chk "$pkgdir"/usr/lib/
+
+	for file in certutil cmsutil crlutil modutil pk12util shlibsign \
+			signtool signver ssltap; do
+		install -m755 dist/Release/bin/$file "$pkgdir"/usr/bin/
+	done
+	install -m644 dist/public/nss/*.h "$pkgdir"/usr/include/nss/
+	install -m644 dist/private/nss/blapi.h dist/private/nss/alghmac.h "$pkgdir"/usr/include/nss/private/
+
+
+	
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/extra/nss/nss-config.in
+++ b/extra/nss/nss-config.in
@ -0,0 +1,144 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	nssutil
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+    includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+    libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi
--- a/extra/nss/nss-softokn.pc.in
+++ b/extra/nss/nss-softokn.pc.in
@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-SOFTOKN
+Description: Network Security Services Softoken PKCS #11 Module
+Version: %SOFTOKEN_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
+Cflags: -I${includedir}/private
--- a/extra/nss/nss-util.pc.in
+++ b/extra/nss/nss-util.pc.in
@ -0,0 +1,10 @@
+_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-UTIL
+Description: Network Security Services Utility Library
+Version: %NSSUTIL_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -L${libdir} -lnssutil3
+Cflags: -I${includedir}
--- a/extra/nss/nss.pc.in
+++ b/extra/nss/nss.pc.in
@ -0,0 +1,10 @@
+prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
--- a/gui/alsa-sndio/build.sh
+++ b/gui/alsa-sndio/build.sh
@ -0,0 +1,23 @@
+pkgname=alsa-sndio
+pkgver=0.2
+
+fetch() {
+	curl -L "https://github.com/Duncaen/alsa-sndio/archive/refs/tags/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	tar -xf $pkgname-$pkgver.tar.gz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	gmake PREFIX=/usr
+}
+
+package() {
+	cd $pkgname-$pkgver
+	gmake install DESTDIR=$pkgdir PREFIX=/usr
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/ffmpeg/build.sh
+++ b/gui/ffmpeg/build.sh
@ -2,7 +2,7 @@ pkgname=ffmpeg
 pkgver=4.4

 fetch() {
-	curl "https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.xz" -o $pkgname-$pkgver.tar.xz
+	curl "https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
 }

--- a/gui/glfw/build.sh
+++ b/gui/glfw/build.sh
@ -16,6 +16,7 @@ build() {
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DGLFW_USE_WAYLAND=1 \
 		-DGLFW_BUILD_DOCS=0 \
+		-DGLFW_BUILD_EXAMPLES=1 \
 		-DBUILD_SHARED_LIBS=ON
 	samu
 }
--- a/gui/imagemagick/build.sh
+++ b/gui/imagemagick/build.sh
@ -0,0 +1,28 @@
+pkgname=ImageMagick
+pkgver=7.1.0
+
+fetch() {
+	curl "https://download.imagemagick.org/ImageMagick/download/ImageMagick.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--build=$TRIPLE \
+		--host=$TRIPLE
+
+	make
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make install DESTDIR=$pkgdir
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/libass/build.sh
+++ b/gui/libass/build.sh
@ -10,8 +10,8 @@ build() {
 	cd $pkgname-$pkgver
 	./configure \
 		--prefix=/usr \
-		--build=x86_64-unknown-linux-musl \
-		--host=x86_64-unknown-linux-musl \
+		--build=$TRIPLE \
+		--host=$TRIPLE \
 		--disable-asm

 	make
--- a/gui/libepoxy/build.sh
+++ b/gui/libepoxy/build.sh
@ -1,5 +1,5 @@
 pkgname=libepoxy
-pkgver=1.5.8
+pkgver=1.5.9

 fetch() {
 	curl -L "https://github.com/anholt/libepoxy/releases/download/$pkgver/libepoxy-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz
--- a/gui/libudev-zero/build.sh
+++ b/gui/libudev-zero/build.sh
@ -1,8 +1,8 @@
 pkgname=libudev-zero
-pkgver=0.4.7
+pkgver=0.5.2

 fetch() {
-	curl -L "https://github.com/illiliti/libudev-zero/archive/0.4.7.tar.gz" -o $pkgname-$pkgver.tar.xz
+	curl -L "https://github.com/illiliti/libudev-zero/archive/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
 	tar -xf $pkgname-$pkgver.tar.xz
 }

@ -18,6 +18,7 @@ package() {
 	make install PREFIX=/usr DESTDIR=$pkgdir
 	install -d $pkgdir/usr/sbin
 	install -Dm755 ./contrib/libudev-zero-hotplug-helper $pkgdir/usr/sbin/
+	install -Dm755 ./contrib/helper.sh $pkgdir/usr/sbin/libudev-zero-hotplug-helper.sh
 }

 license() {
--- a/gui/mesa/build.sh
+++ b/gui/mesa/build.sh
@ -1,10 +1,12 @@
 pkgname=mesa
-pkgver=21.2.1
+#pkgver=21.2.1
+pkgver=v3dv-vk-ext-vertex-attribute-divisor
 deps="musl:wayland:wayland-protocols:llvm:zlib-ng:expat:libffi:libdrm:python-mako"
 ext=dev

 fetch() {
 	curl "https://archive.mesa3d.org/$pkgname-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.gz
+	curl "https://gitlab.freedesktop.org/Ella-0/mesa/-/archive/v3dv-vk-ext-vertex-attribute-divisor/mesa-v3dv-vk-ext-vertex-attribute-divisor.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 	mkdir $pkgname-$pkgver/build
 	cp ../byacc-out-mid-build.patch .
--- a/gui/qtbase/build.sh
+++ b/gui/qtbase/build.sh
@ -0,0 +1,36 @@
+pkgname=qtbase
+pkgver=5.15
+
+fetch() {
+	curl "https://invent.kde.org/qt/qt/qtbase/-/archive/$pkgver/qtbase-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+	mkdir $pkgname-$pkgver/build
+	mkdir $pkgname-$pkgver/.git
+}
+
+build() {
+	cd $pkgname-$pkgver
+	cd build
+
+	../configure \
+		-opensource \
+		-confirm-license \
+		-nomake examples \
+		-nomake tests \
+		-platform linux-clang-libc++ \
+		-prefix /usr
+
+	gmake
+}
+
+package() {
+	cd $pkgname-$pkgver
+	cd build
+	gmake INSTALL_ROOT=$pkgdir install
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE*
+#	cat COPYING
+}
--- a/gui/qtbase/musl-socket.patch
+++ b/gui/qtbase/musl-socket.patch
@ -0,0 +1,11 @@
+--- a/mkspecs/linux-clang/qplatformdefs.h
+++ b/mkspecs/linux-clang/qplatformdefs.h
+@@ -81,7 +81,7 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#if defined(__GLIBC__) && (__GLIBC__ >= 2) || !defined(__GLIBC__)
+ #define QT_SOCKLEN_T            socklen_t
+ #else
+ #define QT_SOCKLEN_T            int
--- a/gui/qtbase/qplatformdefs.h
+++ b/gui/qtbase/qplatformdefs.h
@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../common/posix/qplatformdefs.h"
+
+#undef QT_SOCKLEN_T
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2) || !defined(__GLIBC__)
+#define QT_SOCKLEN_T            socklen_t
+#else
+#define QT_SOCKLEN_T            int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
+#endif
+
+#endif // QPLATFORMDEFS_H
--- a/gui/qtdeclarative/build.sh
+++ b/gui/qtdeclarative/build.sh
@ -0,0 +1,26 @@
+pkgname=qtdeclarative
+pkgver=5.15
+
+fetch() {
+	curl "https://invent.kde.org/qt/qt/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+	mkdir $pkgname-$pkgver/.git
+}
+
+build() {
+	cd $pkgname-$pkgver
+
+	qmake
+	gmake
+}
+
+package() {
+	cd $pkgname-$pkgver
+	gmake INSTALL_ROOT=$pkgdir install
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/qtwayland/build.sh
+++ b/gui/qtwayland/build.sh
@ -0,0 +1,26 @@
+pkgname=qtwayland
+pkgver=5.15
+
+fetch() {
+	curl "https://invent.kde.org/qt/qt/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+	mkdir $pkgname-$pkgver/.git
+}
+
+build() {
+	cd $pkgname-$pkgver
+
+	qmake
+	gmake
+}
+
+package() {
+	cd $pkgname-$pkgver
+	gmake INSTALL_ROOT=$pkgdir install
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/ribidi/build.sh
+++ b/gui/ribidi/build.sh
@ -0,0 +1,30 @@
+pkgname=ribidi
+pkgver=main
+
+fetch() {
+	curl -L "https://github.com/iglunix/ribidi/archive/refs/heads/main.tar.gz" -o $pkgname-$pkgver.tar.xz
+	tar -xf $pkgname-$pkgver.tar.xz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	cargo build --release --all-features
+}
+
+package() {
+	cd $pkgname-$pkgver
+	install -Dm755 target/release/lib$pkgname.so $pkgdir/usr/lib/
+	install -Dm644 include/ribidi.h $pkgdir/usr/include/ribidi/
+	install -d $pkgdir/usr/include/fribidi
+	ln -sr $pkgdir/usr/include/ribidi/ribidi.h $pkgdir/usr/include/fribidi/fribidi.h
+
+	
+	install -Dm644 $pkgname.pc $pkgdir/usr/lib/pkgconfig/
+	install -Dm644 f$pkgname.pc $pkgdir/usr/lib/pkgconfig/
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/sndio/build.sh
+++ b/gui/sndio/build.sh
@ -0,0 +1,51 @@
+pkgname=sndio
+pkgver=1.8.1
+ext="dev:doc"
+
+fetch() {
+	curl -L "https://sndio.org/sndio-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	tar -xf $pkgname-$pkgver.tar.gz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--enable-alsa
+
+	gmake
+}
+
+package() {
+	cd $pkgname-$pkgver
+	gmake install DESTDIR=$pkgdir
+
+	rm -rf $pkgdir/usr/share/man
+
+	rm -rf $pkgdir/usr/include
+	rm -rf $pkgdir/usr/lib/pkgconfig
+}
+
+package_dev() {
+	cd $pkgname-$pkgver
+	gmake install DESTDIR=$pkgdir
+
+	rm -rf $pkgdir/usr/bin
+	rm -rf $pkgdir/usr/share/man
+	rm -rf $pkgdir/usr/lib/*.so*
+}
+
+package_doc() {
+	cd $pkgname-$pkgver
+	gmake install DESTDIR=$pkgdir
+
+	rm -rf $pkgdir/usr/lib
+	rm -rf $pkgdir/usr/bin
+	rm -rf $pkgdir/usr/include
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/gui/webkit/build.sh
+++ b/gui/webkit/build.sh
@ -0,0 +1,31 @@
+pkgname=webkit
+pkgver=master
+
+fetch() {
+	curl -L "https://github.com/iglunix/WebKit/archive/refs/heads/$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 \
+		-DPORT=JSCOnly
+	samu
+}
+
+package() {
+	cd $pkgname-$pkgver
+	cd build
+	DESTDIR=$pkgdir samu install
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE
+#	cat COPYING
+}
--- a/linux/musl/build.sh
+++ b/linux/musl/build.sh
@ -1,6 +1,7 @@
 pkgver=1.2.2
 pkgname=musl
 deps=""
+mkdeps="gmake"
 bad="gmake"
 ext="dev"

--- a/linux/raspberrypi-firmware/build.sh
+++ b/linux/raspberrypi-firmware/build.sh
@ -1,5 +1,5 @@
 pkgname=raspberrypi-firmware
-pkgver=20210527
+pkgver=20210805

 fetch() {
 	curl -L "https://github.com/raspberrypi/firmware/archive/refs/tags/1.$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
--- a/linux/raspberrypi-linux/build.sh
+++ b/linux/raspberrypi-linux/build.sh
@ -1,40 +1,43 @@
-pkgver=rpi-5.10.y
+pkgver=1.20210303-1
 pkgname=raspberrypi-linux
 ext="dev"

 fetch() {
 	curl "https://raw.githubusercontent.com/kisslinux/website/master/site/dist/kernel-no-perl.patch" -o kernel-no-perl.patch
-	curl -L "https://github.com/raspberrypi/linux/archive/refs/heads/rpi-5.10.y.tar.gz" -o $pkgname-$pkgver.tar.gz
+	curl -L "https://github.com/raspberrypi/linux/archive/refs/tags/raspberrypi-kernel_$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
-	mv linux-$pkgver $pkgname-$pkgver
+	mv linux-raspberrypi-kernel_$pkgver $pkgname-$pkgver
 	cd $pkgname-$pkgver

 	patch -p1 < ../kernel-no-perl.patch
 	patch -p1 < ../../kernel-byacc.patch
-	patch -p1 < ../../reflex.patch
+	# patch -p1 < ../../reflex.patch
 }

 build() {
 	cd $pkgname-$pkgver
-	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 bcm2711_defconfig
-	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1
+	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 bcm2711_defconfig
+	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1
 }

 package() {
 	cd $pkgname-$pkgver
 	install -d $pkgdir/boot
 	cp arch/arm64/boot/Image $pkgdir/boot/kernel8.img
-	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_PATH=$pkgdir/boot install
-	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_DTBS_PATH=$pkgdir/boot dtbs_install
-	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_MOD_PATH=$pkgdir/ modules_install
+	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_PATH=$pkgdir/boot install
+	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_DTBS_PATH=$pkgdir/boot dtbs_install
+	gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_MOD_PATH=$pkgdir/ modules_install
+
+	mv $pkgdir/boot/broadcom/* $pkgdir/boot/
+	rmdir $pkgdir/boot/broadcom
 }

 package_dev() {
 	cd $pkgname-$pkgver
 	if stat /usr/bin/rsync 2>/dev/null /dev/null; then
-		gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_HDR_PATH=$pkgdir/usr headers_install
+		gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 INSTALL_HDR_PATH=$pkgdir/usr headers_install
 	else
-		gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=reflex YACC=yacc LLVM=1 LLVM_IAS=1 headers
+		gmake ARCH=arm64 CC=cc HOSTCC=cc LEX=flex YACC=yacc LLVM=1 LLVM_IAS=1 headers
 		find -name '.*' -exec rm {} \;
 		rm usr/include/Makefile
 		cp -r usr/include $pkgdir/usr
--- a/base/libressl/build.sh
+++ b/base/libressl/build.sh