Mercurial > vanilla

--- a/Templates/build/autotools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/autotools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,26 +34,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/cmake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/cmake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make VERBOSE=1
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make VERBOSE=1
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/gnu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/gnu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,26 +34,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/kde-frameworks.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/kde-frameworks.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DBUILD_TESTING=Off \
-		-DECM_MKSPECS_INSTALL_DIR=/lib/qt/mkspecs/modules
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DBUILD_TESTING=Off \
+	-DECM_MKSPECS_INSTALL_DIR=/lib/qt/mkspecs/modules
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/kde-plasma.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/kde-plasma.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DBUILD_TESTING=Off \
-		-DECM_MKSPECS_INSTALL_DIR=/lib/qt/mkspecs/modules
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DBUILD_TESTING=Off \
+	-DECM_MKSPECS_INSTALL_DIR=/lib/qt/mkspecs/modules
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/libretro-git.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/libretro-git.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,21 +32,18 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		CFLAGS="$CFLAGS" \
-		CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../CORE_libretro.info $DESTDIR/share/libretro/info/CORE_libretro.info
-	install -Dm0644 CORE_libretro.so $DESTDIR/lib/libretro/CORE_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	CFLAGS="$CFLAGS" \
+	CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../CORE_libretro.info $DESTDIR/share/libretro/info/CORE_libretro.info
+install -Dm0644 CORE_libretro.so $DESTDIR/lib/libretro/CORE_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/Templates/build/mate.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/mate.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,23 +32,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/meson.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/meson.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	# sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+# sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/minimal.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/minimal.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 # PKGDEPENDS="category/foo category/bar"
 # PKGOPTIONS="FOO BAR BAZ"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/perl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/perl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,15 +25,12 @@
 PKGDEPENDS="perl"
 # PKGOPTIONS="FOO BAR BAZ"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/python-hybrid.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/python-hybrid.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,17 +25,14 @@
 PKGDEPENDS="python python2 py-setuptools"
 # PKGOPTIONS="FOO BAR BAZ"

-build()
-{
-	for py in python python2; do
-		rm -rf $PKGNAME-$PKGVERSION
-		tar xvf $PKGNAME-$PKGVERSION.tar.gz
-		cd $PKGNAME-$PKGVERSION
+for py in python python2; do
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION

-		$py setup.py build
-		$py setup.py install --root=$DESTDIR --prefix=/.
+	$py setup.py build
+	$py setup.py install --root=$DESTDIR --prefix=/.

-		cd ..
-		rm -rf $PKGNAME-$PKGVERSION
-	done
-}
+	cd ..
+	rm -rf $PKGNAME-$PKGVERSION
+done
--- a/Templates/build/python.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/python.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,15 +25,12 @@
 PKGDEPENDS="python py-setuptools"
 # PKGOPTIONS="FOO BAR BAZ"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	python setup.py build
-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py build
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/Templates/build/ruby.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/ruby.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,12 +26,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/Templates/build/xfce.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/Templates/build/xfce.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,25 +32,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/accessibility/at-spi2-atk/at-spi2-atk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/accessibility/at-spi2-atk/at-spi2-atk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/accessibility/at-spi2-core/at-spi2-core.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/accessibility/at-spi2-core/at-spi2-core.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,28 +38,25 @@
 	with_x="-D x11=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/at-spi2-core/fix-meson-subdir.patch
-	patch -p1 < ../fix-meson-subdir.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D libdir=lib
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# https://git.alpinelinux.org/aports/plain/main/at-spi2-core/fix-meson-subdir.patch
+patch -p1 < ../fix-meson-subdir.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D libdir=lib
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/accessibility/atk/atk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/accessibility/atk/atk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/alsa-lib/alsa-lib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/alsa-lib/alsa-lib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,21 +27,18 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/alsa-tools/alsa-tools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/alsa-tools/alsa-tools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -66,35 +66,32 @@
 	PKGDEPENDS="gtk2 $PKGDEPENDS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	#
-	# The SUBDIRS variable is used in recursive projects so we can't specify
-	# it directly otherwise it will be propagated to the underlying
-	# projects. Instead, rename the variable to PROJECTS.
-	#
-	# Also fix many errors that prevents correct handling of configure
-	# arguments and disable qlo10k1 which requires a deprecated Qt version.
-	#
-	patch -p0 < ../patch-makefile.patch
+#
+# The SUBDIRS variable is used in recursive projects so we can't specify
+# it directly otherwise it will be propagated to the underlying
+# projects. Instead, rename the variable to PROJECTS.
+#
+# Also fix many errors that prevents correct handling of configure
+# arguments and disable qlo10k1 which requires a deprecated Qt version.
+#
+patch -p0 < ../patch-makefile.patch

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	make \
-		CONFIGURE_ARGS="--prefix= --bindir=/bin --sbindir=/bin" \
-		DESTDIR=$DESTDIR \
-		$with_tools \
-		configure install
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+make \
+	CONFIGURE_ARGS="--prefix= --bindir=/bin --sbindir=/bin" \
+	DESTDIR=$DESTDIR \
+	$with_tools \
+	configure install
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/alsa-utils/alsa-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/alsa-utils/alsa-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -72,30 +72,27 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_alsaconf \
-		$with_alsaloop \
-		$with_alsamixer \
-		$with_bat \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_alsaconf \
+	$with_alsaloop \
+	$with_alsamixer \
+	$with_bat \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/audiofile/audiofile.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/audiofile/audiofile.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,28 +41,25 @@
 	with_flac="--disable-flac"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_flac
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_flac
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/cdparanoia/cdparanoia.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/cdparanoia/cdparanoia.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-III-$PKGVERSION
-	tar xvf $PKGNAME-III-$PKGVERSION.src.tgz
-	cd $PKGNAME-III-$PKGVERSION
+rm -rf $PKGNAME-III-$PKGVERSION
+tar xvf $PKGNAME-III-$PKGVERSION.src.tgz
+cd $PKGNAME-III-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/cdparanoia/fix-includes.patch
-	patch -p0 < ../patch-utils.h.patch
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix=
-	make
-	make install prefix=$DESTDIR MANDIR=$DESTDIR/share/man
+# https://git.alpinelinux.org/aports/plain/main/cdparanoia/fix-includes.patch
+patch -p0 < ../patch-utils.h.patch
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix=
+make
+make install prefix=$DESTDIR MANDIR=$DESTDIR/share/man

-	cd ..
-	rm -rf $PKGNAME-III-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-III-$PKGVERSION
--- a/audio/cdrdao/cdrdao.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/cdrdao/cdrdao.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -55,30 +55,27 @@
 	with_lame="--without-lame"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# TODO: --without-gcdmaster: missing dependencies.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-gcdmaster \
-		$with_ogg \
-		$with_mad \
-		$with_lame
-	make
-	make install DESTDIR=$DESTDIR
+# TODO: --without-gcdmaster: missing dependencies.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-gcdmaster \
+	$with_ogg \
+	$with_mad \
+	$with_lame
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/faac/faac.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/faac/faac.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/faad2/faad2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/faad2/faad2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/flac/flac.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/flac/flac.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,30 +49,27 @@
 	with_ogg="--disable-ogg"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# configure script check for DOXYGEN variable presence.
-	unset DOXYGEN
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_doxygen \
-		$with_ogg
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# configure script check for DOXYGEN variable presence.
+unset DOXYGEN
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_doxygen \
+	$with_ogg
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/fluidsynth/fluidsynth.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/fluidsynth/fluidsynth.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -117,36 +117,33 @@
 	with_sndfile="-Denable-libsndfile=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLIB_SUFFIX="" \
-		-Denable-systemd=Off \
-		$with_alsa \
-		$with_audio \
-		$with_dbus \
-		$with_ipv6 \
-		$with_ladspa \
-		$with_oss \
-		$with_pulseaudio \
-		$with_readline \
-		$with_sndfile
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DLIB_SUFFIX="" \
+	-Denable-systemd=Off \
+	$with_alsa \
+	$with_audio \
+	$with_dbus \
+	$with_ipv6 \
+	$with_ladspa \
+	$with_oss \
+	$with_pulseaudio \
+	$with_readline \
+	$with_sndfile
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/jack2/jack2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/jack2/jack2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -88,30 +88,27 @@
 	with_sndfile="--sndfile=no"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-clang.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	python2 waf configure \
-		--prefix= \
-		$with_alsa \
-		$with_completion \
-		$with_dbus \
-		$with_doxygen \
-		$with_opus \
-		$with_samplerate \
-		$with_sndfile
-	python2 waf build
-	python2 waf install --destdir=$DESTDIR
+patch -p0 < ../patch-clang.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+python2 waf configure \
+	--prefix= \
+	$with_alsa \
+	$with_completion \
+	$with_dbus \
+	$with_doxygen \
+	$with_opus \
+	$with_samplerate \
+	$with_sndfile
+python2 waf build
+python2 waf install --destdir=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/ladspa/ladspa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/ladspa/ladspa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,21 +25,18 @@
 : ${CC=clang}
 : ${CXX:=clang++}

-build()
-{
-	rm -rf ${PKGNAME}_sdk_$PKGVERSION
-	tar xvf ${PKGNAME}_sdk_$PKGVERSION.tgz
-	cd ${PKGNAME}_sdk_$PKGVERSION/src
+rm -rf ${PKGNAME}_sdk_$PKGVERSION
+tar xvf ${PKGNAME}_sdk_$PKGVERSION.tgz
+cd ${PKGNAME}_sdk_$PKGVERSION/src

-	make targets \
-		CC="$CC" \
-		CPP="$CXX" \
-		INSTALL_PLUGINS_DIR=/lib/ladspa
-	make install \
-		INSTALL_PLUGINS_DIR=$DESTDIR/lib/ladspa \
-		INSTALL_INCLUDE_DIR=$DESTDIR/include \
-		INSTALL_BINARY_DIR=$DESTDIR/bin
+make targets \
+	CC="$CC" \
+	CPP="$CXX" \
+	INSTALL_PLUGINS_DIR=/lib/ladspa
+make install \
+	INSTALL_PLUGINS_DIR=$DESTDIR/lib/ladspa \
+	INSTALL_INCLUDE_DIR=$DESTDIR/include \
+	INSTALL_BINARY_DIR=$DESTDIR/bin

-	cd ../..
-	rm -rf ${PKGNAME}_sdk_$PKGVERSION
-}
+cd ../..
+rm -rf ${PKGNAME}_sdk_$PKGVERSION
--- a/audio/lame/lame.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/lame/lame.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libao/libao.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libao/libao.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,27 +49,24 @@
 	with_pulseaudio="--disable-pulse"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--docdir=/share/doc/$PKGNAME \
-		$with_alsa \
-		$with_pulseaudio
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--docdir=/share/doc/$PKGNAME \
+	$with_alsa \
+	$with_pulseaudio
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libcanberra/libcanberra.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libcanberra/libcanberra.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -61,27 +61,24 @@
 	with_udev="--disable-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--disable-oss \
-		$with_alsa \
-		$with_gtk \
-		$with_pulseaudio \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--disable-oss \
+	$with_alsa \
+	$with_gtk \
+	$with_pulseaudio \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libcddb/libcddb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libcddb/libcddb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,25 +27,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# --without-cdio: avoid cyclic dependency with libcdio.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared \
-		--without-cdio
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# --without-cdio: avoid cyclic dependency with libcdio.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared \
+	--without-cdio
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libmad/libmad.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libmad/libmad.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,31 +31,28 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# http://www.linuxfromscratch.org/blfs/view/cvs/multimedia/libmad.html
-	patch -p1 < ../patch-optimizations.patch
-	sed -i -e "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" configure.ac
-	touch NEWS AUTHORS ChangeLog
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# http://www.linuxfromscratch.org/blfs/view/cvs/multimedia/libmad.html
+patch -p1 < ../patch-optimizations.patch
+sed -i -e "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" configure.ac
+touch NEWS AUTHORS ChangeLog
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libmikmod/libmikmod.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libmikmod/libmikmod.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -60,27 +60,24 @@
 	with_pulseaudio="-DENABLE_PULSE=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		$with_alsa \
-		$with_openal \
-		$with_oss \
-		$with_pulseaudio
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	$with_alsa \
+	$with_openal \
+	$with_oss \
+	$with_pulseaudio
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libmpdclient/libmpdclient.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libmpdclient/libmpdclient.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libogg/libogg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libogg/libogg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libsamplerate/libsamplerate.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libsamplerate/libsamplerate.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,30 +43,27 @@
 	with_sndfile="--disable-sndfile"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-fhs.patch
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--docdir=/share/doc/$PKGNAME \
-		$with_sndfile
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+patch -p0 < ../patch-fhs.patch
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--docdir=/share/doc/$PKGNAME \
+	$with_sndfile
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libshout/libshout.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libshout/libshout.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,26 +47,23 @@
 	with_theora="--disable-theora"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_speex \
-		$with_theora
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_speex \
+	$with_theora
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libsndfile/libsndfile.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libsndfile/libsndfile.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,26 +39,23 @@
 	with_alsa="--disable-alsa"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_alsa
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_alsa
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/libvorbis/libvorbis.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/libvorbis/libvorbis.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/mpd/mpd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/mpd/mpd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -401,76 +401,73 @@
 	with_zlib="-D zlib=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D systemd=disabled \
-		$with_aac \
-		$with_alsa \
-		$with_ao \
-		$with_audiofile \
-		$with_avahi \
-		$with_bzip2 \
-		$with_cdio \
-		$wiht_cdio_paranoia \
-		$with_curl \
-		$with_dbus \
-		$with_ffmpeg \
-		$with_flac \
-		$with_fluidsynth \
-		$with_icu \
-		$with_id3 \
-		$with_ipv6 \
-		$with_jack \
-		$with_lame \
-		$with_mad \
-		$with_mikmod \
-		$with_mms \
-		$with_mp2 \
-		$with_mpg123 \
-		$with_openal \
-		$with_opus \
-		$with_oss \
-		$with_pulseaudio \
-		$with_regex \
-		$with_samplerate \
-		$with_shout \
-		$with_sndfile \
-		$with_soxr \
-		$with_sqlite \
-		$with_syslog \
-		$with_vorbis \
-		$with_wavpack \
-		$with_webdav \
-		$with_xml \
-		$with_yaml \
-		$with_zlib
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D systemd=disabled \
+	$with_aac \
+	$with_alsa \
+	$with_ao \
+	$with_audiofile \
+	$with_avahi \
+	$with_bzip2 \
+	$with_cdio \
+	$wiht_cdio_paranoia \
+	$with_curl \
+	$with_dbus \
+	$with_ffmpeg \
+	$with_flac \
+	$with_fluidsynth \
+	$with_icu \
+	$with_id3 \
+	$with_ipv6 \
+	$with_jack \
+	$with_lame \
+	$with_mad \
+	$with_mikmod \
+	$with_mms \
+	$with_mp2 \
+	$with_mpg123 \
+	$with_openal \
+	$with_opus \
+	$with_oss \
+	$with_pulseaudio \
+	$with_regex \
+	$with_samplerate \
+	$with_shout \
+	$with_sndfile \
+	$with_soxr \
+	$with_sqlite \
+	$with_syslog \
+	$with_vorbis \
+	$with_wavpack \
+	$with_webdav \
+	$with_xml \
+	$with_yaml \
+	$with_zlib
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	# Not installed by default.
-	install -Dm644 doc/mpdconf.example $DESTDIR/etc/mpd.conf
-	install -Dm644 doc/mpd.1 $DESTDIR/share/man/man1/mpd.1
-	install -Dm644 doc/mpd.conf.5 $DESTDIR/share/man/man5/mpd.conf.5
-	install -Dm644 ../mpd $DESTDIR/etc/rc.d/mpd
+# Not installed by default.
+install -Dm644 doc/mpdconf.example $DESTDIR/etc/mpd.conf
+install -Dm644 doc/mpd.1 $DESTDIR/share/man/man1/mpd.1
+install -Dm644 doc/mpd.conf.5 $DESTDIR/share/man/man5/mpd.conf.5
+install -Dm644 ../mpd $DESTDIR/etc/rc.d/mpd

-	# Customize the default config with our pid, uid and gid.
-	sed -i -e 's|^#pid_file.*|pid_file "/var/run/mpd/mpd.pid"|' $DESTDIR/etc/mpd.conf
-	sed -i -e 's|^#user.*|user "mpd"|' $DESTDIR/etc/mpd.conf
-	sed -i -e 's|^#group.*|group "mpd"|' $DESTDIR/etc/mpd.conf
+# Customize the default config with our pid, uid and gid.
+sed -i -e 's|^#pid_file.*|pid_file "/var/run/mpd/mpd.pid"|' $DESTDIR/etc/mpd.conf
+sed -i -e 's|^#user.*|user "mpd"|' $DESTDIR/etc/mpd.conf
+sed -i -e 's|^#group.*|group "mpd"|' $DESTDIR/etc/mpd.conf

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/mpg123/mpg123.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/mpg123/mpg123.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -56,27 +56,24 @@
 	with_audio="pulse $with_audio"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-audio=$with_audio
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-audio=$with_audio
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/ncmpc/ncmpc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/ncmpc/ncmpc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -67,29 +67,26 @@
 	with_regex="-D regex=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		$with_colors \
-		$with_locale \
-		$with_mouse \
-		$with_nls \
-		$with_regex
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	$with_colors \
+	$with_locale \
+	$with_mouse \
+	$with_nls \
+	$with_regex
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/openal-soft/openal-soft.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/openal-soft/openal-soft.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -88,37 +88,34 @@
 	with_utils="-DALSOFT_UTILS=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		$with_alsa \
-		$with_examples \
-		$with_jack \
-		$with_oss \
-		$with_pulseaudio \
-		$with_sdl2 \
-		$with_utils
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_LIBDIR=/lib \
+	$with_alsa \
+	$with_examples \
+	$with_jack \
+	$with_oss \
+	$with_pulseaudio \
+	$with_sdl2 \
+	$with_utils
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/opus/opus.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/opus/opus.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --enable-custom-modes: needed for jack2.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-custom-modes
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# --enable-custom-modes: needed for jack2.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-custom-modes
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/pulseaudio/pulseaudio.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/pulseaudio/pulseaudio.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -165,41 +165,38 @@
 	with_x="--disable-x11"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CPP="$CC -E" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-bluez4 \
-		$with_alsa \
-		$with_avahi \
-		$with_bluetooth \
-		$with_cap \
-		$with_dbus \
-		$with_gtk \
-		$with_ipv6 \
-		$with_jack \
-		$with_nls \
-		$with_oss \
-		$with_soxr \
-		$with_speex \
-		$with_ssl \
-		$with_udev \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CPP="$CC -E" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-bluez4 \
+	$with_alsa \
+	$with_avahi \
+	$with_bluetooth \
+	$with_cap \
+	$with_dbus \
+	$with_gtk \
+	$with_ipv6 \
+	$with_jack \
+	$with_nls \
+	$with_oss \
+	$with_soxr \
+	$with_speex \
+	$with_ssl \
+	$with_udev \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/sdl2-mixer/sdl2-mixer.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/sdl2-mixer/sdl2-mixer.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -87,31 +87,28 @@
 	with_wave="--disable-music-wave"
 fi

-build()
-{
-	rm -rf SDL2_mixer-$PKGVERSION
-	tar xvf SDL2_mixer-$PKGVERSION.tar.gz
-	cd SDL2_mixer-$PKGVERSION
+rm -rf SDL2_mixer-$PKGVERSION
+tar xvf SDL2_mixer-$PKGVERSION.tar.gz
+cd SDL2_mixer-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_flac \
-		$with_fluidsynth \
-		$with_mad \
-		$with_mpg123 \
-		$with_opus \
-		$with_ogg \
-		$with_wave
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_flac \
+	$with_fluidsynth \
+	$with_mad \
+	$with_mpg123 \
+	$with_opus \
+	$with_ogg \
+	$with_wave
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf SDL2_mixer-$PKGVERSION
-}
+cd ..
+rm -rf SDL2_mixer-$PKGVERSION
--- a/audio/soxr/soxr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/soxr/soxr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,24 +26,21 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION-Source
-	tar xvf $PKGNAME-$PKGVERSION-Source.tar.xz
-	cd $PKGNAME-$PKGVERSION-Source
+rm -rf $PKGNAME-$PKGVERSION-Source
+tar xvf $PKGNAME-$PKGVERSION-Source.tar.xz
+cd $PKGNAME-$PKGVERSION-Source

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DDOC_INSTALL_DIR=/share/doc/$PKGNAME
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DDOC_INSTALL_DIR=/share/doc/$PKGNAME
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION-Source
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION-Source
--- a/audio/speex/speex.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/speex/speex.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/speexdsp/speexdsp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/speexdsp/speexdsp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/taglib/taglib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/taglib/taglib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,25 +28,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/twolame/twolame.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/twolame/twolame.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/audio/wavpack/wavpack.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/audio/wavpack/wavpack.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf WavPack-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd WavPack-$PKGVERSION
+rm -rf WavPack-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd WavPack-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf WavPack-$PKGVERSION
-}
+cd ..
+rm -rf WavPack-$PKGVERSION
--- a/bluetooth/bluez/bluez.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/bluetooth/bluez/bluez.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -64,35 +64,32 @@
 	with_udev="--disable-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# --enable-library: required by many packages.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-systemd \
-		--enable-library \
-		$with_audio \
-		$with_cups \
-		$with_legacy \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	install -Dm0644 src/main.conf $DESTDIR/etc/bluetooth/main.conf
-	install -Dm0644 ../bluetooth $DESTDIR/etc/rc.d/bluetooth
+# --enable-library: required by many packages.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-systemd \
+	--enable-library \
+	$with_audio \
+	$with_cups \
+	$with_legacy \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+install -Dm0644 src/main.conf $DESTDIR/etc/bluetooth/main.conf
+install -Dm0644 ../bluetooth $DESTDIR/etc/rc.d/bluetooth

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/bzip2/bzip2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/bzip2/bzip2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 	CFLAGS="-fPIC $CFLAGS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p1 < ../patch-CVE-2016-3189.patch
-	patch -p0 < ../patch-fhs.patch
-	sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile
-	make CC="$CC" CFLAGS="$CFLAGS" all
-	make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all
-	make install DESTDIR=$DESTDIR PREFIX=/
-	install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*}
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*}
+patch -p1 < ../patch-CVE-2016-3189.patch
+patch -p0 < ../patch-fhs.patch
+sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile
+make CC="$CC" CFLAGS="$CFLAGS" all
+make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all
+make install DESTDIR=$DESTDIR PREFIX=/
+install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION
+ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so
+ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*}
+ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*}

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/libarchive/libarchive.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/libarchive/libarchive.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -111,41 +111,38 @@
 	with_zstd="--without-zstd"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-bsdtar=shared \
-		--enable-bsdcat=shared \
-		--enable-bsdcpio=shared \
-		--without-xml2 \
-		$with_acl \
-		$with_bzip2 \
-		$with_expat \
-		$with_lz4 \
-		$with_lzma \
-		$with_lzo \
-		$with_nettle \
-		$with_ssl \
-		$with_zlib \
-		$with_zstd
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-bsdtar=shared \
+	--enable-bsdcat=shared \
+	--enable-bsdcpio=shared \
+	--without-xml2 \
+	$with_acl \
+	$with_bzip2 \
+	$with_expat \
+	$with_lz4 \
+	$with_lzma \
+	$with_lzo \
+	$with_nettle \
+	$with_ssl \
+	$with_zlib \
+	$with_zstd
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/libzip/libzip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/libzip/libzip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS="-lfts" \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		-DDOCUMENTATION_FORMAT="man" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_EXE_LINKER_FLAGS="-lfts" \
+	-DCMAKE_INSTALL_LIBDIR=/lib \
+	-DDOCUMENTATION_FORMAT="man" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/lrzip/lrzip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/lrzip/lrzip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,27 +32,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	NOCONFIGURE=1 ./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+NOCONFIGURE=1 ./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/lz4/lz4.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/lz4/lz4.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,15 +25,12 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make CC="$CC" CFLAGS="$CFLAGS" PREFIX=
-	make DESTDIR=$DESTDIR PREFIX= install
+make CC="$CC" CFLAGS="$CFLAGS" PREFIX=
+make DESTDIR=$DESTDIR PREFIX= install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/lzip/lzip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/lzip/lzip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,17 +25,14 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# custom configure script.
-	./configure --prefix= CXX="$CXX" CXXFLAGS="$CXXFLAGS"
-	make
-	make install DESTDIR=$DESTDIR
+# custom configure script.
+./configure --prefix= CXX="$CXX" CXXFLAGS="$CXXFLAGS"
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/lzlib/lzlib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/lzlib/lzlib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		--prefix= \
-		--enable-shared \
-		--disable-ldconfig
-	make
-	make install DESTDIR=$DESTDIR
+./configure \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	--prefix= \
+	--enable-shared \
+	--disable-ldconfig
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/msgpack/msgpack.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/msgpack/msgpack.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,25 +28,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/unrar/unrar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/unrar/unrar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,19 +26,16 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf unrar
-	tar xvf unrarsrc-$PKGVERSION.tar.gz
-	cd unrar
+rm -rf unrar
+tar xvf unrarsrc-$PKGVERSION.tar.gz
+cd unrar

-	make \
-		CXX="$CXX" \
-		CXXFLAGS="$CXXFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		DESTDIR="$DESTDIR" \
-		all install
+make \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	DESTDIR="$DESTDIR" \
+	all install

-	cd ..
-	rm -rf unrar
-}
+cd ..
+rm -rf unrar
--- a/compression/unzip/unzip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/unzip/unzip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,27 +25,24 @@

 : ${CC:=clang}

-build()
-{
-	rm -rf ${PKGNAME}60
-	tar xvf ${PKGNAME}60.tar.gz
-	cd ${PKGNAME}60
+rm -rf ${PKGNAME}60
+tar xvf ${PKGNAME}60.tar.gz
+cd ${PKGNAME}60

-	patch -p1 < ../CVE-2014-8139.patch
-	patch -p1 < ../CVE-2014-8140.patch
-	patch -p1 < ../CVE-2014-8141.patch
-	patch -p1 < ../CVE-2014-9636.patch
-	patch -p1 < ../CVE-2014-9913.patch
-	patch -p1 < ../CVE-2016-9844.patch
-	patch -p1 < ../CVE-2018-1000035.patch
+patch -p1 < ../CVE-2014-8139.patch
+patch -p1 < ../CVE-2014-8140.patch
+patch -p1 < ../CVE-2014-8141.patch
+patch -p1 < ../CVE-2014-9636.patch
+patch -p1 < ../CVE-2014-9913.patch
+patch -p1 < ../CVE-2016-9844.patch
+patch -p1 < ../CVE-2018-1000035.patch

-	# does not support DESTDIR, fake it with prefix.
-	make -f unix/Makefile CC="$CC" generic
-	make -f unix/Makefile \
-		prefix=$DESTDIR/ \
-		MANDIR=$DESTDIR/share/man/man1 \
-		install
+# does not support DESTDIR, fake it with prefix.
+make -f unix/Makefile CC="$CC" generic
+make -f unix/Makefile \
+	prefix=$DESTDIR/ \
+	MANDIR=$DESTDIR/share/man/man1 \
+	install

-	cd ..
-	rm -rf ${PKGNAME}60
-}
+cd ..
+rm -rf ${PKGNAME}60
--- a/compression/xz/xz.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/xz/xz.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,26 +38,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/zip/zip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/zip/zip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,19 +25,16 @@

 : ${CC:=clang}

-build()
-{
-	rm -rf ${PKGNAME}30
-	tar xvf ${PKGNAME}30.tar.gz
-	cd ${PKGNAME}30
+rm -rf ${PKGNAME}30
+tar xvf ${PKGNAME}30.tar.gz
+cd ${PKGNAME}30

-	# does not support DESTDIR, fake it with prefix.
-	make -f unix/Makefile CC="$CC" generic
-	make -f unix/Makefile \
-		prefix=$DESTDIR/ \
-		MANDIR=$DESTDIR/share/man/man1 \
-		install
+# does not support DESTDIR, fake it with prefix.
+make -f unix/Makefile CC="$CC" generic
+make -f unix/Makefile \
+	prefix=$DESTDIR/ \
+	MANDIR=$DESTDIR/share/man/man1 \
+	install

-	cd ..
-	rm -rf ${PKGNAME}30
-}
+cd ..
+rm -rf ${PKGNAME}30
--- a/compression/zlib/zlib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/zlib/zlib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,17 +25,14 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# custom configure script.
-	CC="$CC" CFLAGS="$CFLAGS" ./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+# custom configure script.
+CC="$CC" CFLAGS="$CFLAGS" ./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/compression/zstd/zstd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/compression/zstd/zstd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,15 +25,12 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O3}                # upstream default

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make CC="$CC" CFLAGS="$CFLAGS"
-	make PREFIX= LIBDIR=/lib DESTDIR=$DESTDIR install
+make CC="$CC" CFLAGS="$CFLAGS"
+make PREFIX= LIBDIR=/lib DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/acl/acl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/acl/acl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,26 +41,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/attr/attr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/attr/attr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,26 +40,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/bash-completion/bash-completion.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/bash-completion/bash-completion.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,18 +23,15 @@
 PKGDOWNLOAD="https://github.com/scop/$PKGNAME/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="bash"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-Makefile.am.patch
-	autoreconf -vif
-	./configure --prefix=
-	make
-	make DESTDIR=$DESTDIR install
+patch -p0 < ../patch-Makefile.am.patch
+autoreconf -vif
+./configure --prefix=
+make
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/btrfs-progs/btrfs-progs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/btrfs-progs/btrfs-progs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -57,29 +57,26 @@
 	with_zstd="--disable-zstd"
 fi

-build()
-{
-	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvf $PKGNAME-v$PKGVERSION.tar.xz
-	cd $PKGNAME-v$PKGVERSION
+rm -rf $PKGNAME-v$PKGVERSION
+tar xvf $PKGNAME-v$PKGVERSION.tar.xz
+cd $PKGNAME-v$PKGVERSION

-	# --disable-backtrace: not available on musl.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-backtrace \
-		--disable-documentation \
-		$with_convert \
-		$with_python \
-		$with_zstd
-	make
-	make install DESTDIR=$DESTDIR
+# --disable-backtrace: not available on musl.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-backtrace \
+	--disable-documentation \
+	$with_convert \
+	$with_python \
+	$with_zstd
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-v$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-v$PKGVERSION
--- a/core/busybox/busybox.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/busybox/busybox.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,96 +41,93 @@
 : ${SELINUX:=no}
 : ${STATIC:=yes}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
-
-	#
-	# Allow user to specify a full config if specified, otherwise change
-	# package options.
-	#
-	if [ -n "$CONFIG" ] && [ -r "$CONFIG" ]; then
-		cp $CONFIG .config
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-		#
-		# When specifying a config file, force other selective options
-		# to a dummy value to avoid incorrect information in package
-		# file.
-		#
-		IPV6=""
-		SELINUX=""
-		PAM=""
-		STATIC=""
-	else
-		cp ../config .config
-
-		if [ "$SELINUX" = "yes" ]; then
-			echo "CONFIG_SELINUX=y" >> .config
-			echo "CONFIG_FEATURE_TAR_SELINUX=y" >> .config
-			echo "CONFIG_SELINUXENABLED=y" >> .config
-		fi
-
-		if [ "$PAM" = "yes" ]; then
-			echo "CONFIG_PAM=y" >> .config
-		fi
-
-		if [ "$IPV6" != "yes" ]; then
-			sed -i -e "/CONFIG_FEATURE_IPV6=y/ s/y/n/" .config
-			sed -i -e "/CONFIG_FEATURE_IFUPDOWN_IPV6=y/ s/y/n/" .config
-		fi
-
-		if [ "$STATIC" = "yes" ]; then
-			echo "CONFIG_STATIC=y" >> .config
-		fi
-	fi
+#
+# Allow user to specify a full config if specified, otherwise change
+# package options.
+#
+if [ -n "$CONFIG" ] && [ -r "$CONFIG" ]; then
+	cp $CONFIG .config

 	#
-	# Our start script is located in /etc/rc.init.
-	# Upstream: rejected a tunable option.
-	#
-	sed -i -e 's|/etc/init.d/rcS|/etc/rc.init|' init/init.c
-
-	#
-	# Change the redirection limit which is too small for vpk download.
-	# Upstream: yes in Git.
-	#
-	sed -i -e "/redir_limit = 5/ s/5/16/" networking/wget.c
-
-	#
-	# TODO: this is temporary, to build under clang.
-	#
-	# CFLAGS="": fix build under clang by removing all non-standard
-	# options.
-	#
-	# -O0: disable optimizations for the same reasons.
-	#
-	# See http://lists.busybox.net/pipermail/busybox/2019-October/087558.html
+	# When specifying a config file, force other selective options
+	# to a dummy value to avoid incorrect information in package
+	# file.
 	#
-	make \
-		AR="$AR" \
-		AS="$AS" \
-		CC="$CC" \
-		CFLAGS="-DBB_GLOBAL_CONST=''" \
-		HOSTCC="$CC" \
-		HOSTCFLAGS="" \
-		EXTRA_CFLAGS="$CFLAGS -O0" \
-		EXTRA_LDFLAGS="$LDFLAGS" \
-		NM="$NM" \
-		OBJCOPY="$OBJCOPY" \
-		OBJDUMP="$OBJDUMP" \
-		STRIP="$STRIP" \
-		V=1
-	install -Dm0755 busybox $DESTDIR/bin/busybox
-	install -dm0755 $DESTDIR/share/udhcp
-	install -m0644 examples/udhcp/sample.* $DESTDIR/share/udhcp
-	install -Dm0644 examples/udhcp/udhcpd.conf $DESTDIR/etc/udhcpd.conf
-	install -Dm0644 ../busybox.crond $DESTDIR/etc/rc.d/busybox.crond
-	install -Dm0644 ../busybox.klogd $DESTDIR/etc/rc.d/busybox.klogd
-	install -Dm0644 ../busybox.mdev $DESTDIR/etc/rc.d/busybox.mdev
-	install -Dm0644 ../busybox.syslogd $DESTDIR/etc/rc.d/busybox.syslogd
+	IPV6=""
+	SELINUX=""
+	PAM=""
+	STATIC=""
+else
+	cp ../config .config
+
+	if [ "$SELINUX" = "yes" ]; then
+		echo "CONFIG_SELINUX=y" >> .config
+		echo "CONFIG_FEATURE_TAR_SELINUX=y" >> .config
+		echo "CONFIG_SELINUXENABLED=y" >> .config
+	fi
+
+	if [ "$PAM" = "yes" ]; then
+		echo "CONFIG_PAM=y" >> .config
+	fi
+
+	if [ "$IPV6" != "yes" ]; then
+		sed -i -e "/CONFIG_FEATURE_IPV6=y/ s/y/n/" .config
+		sed -i -e "/CONFIG_FEATURE_IFUPDOWN_IPV6=y/ s/y/n/" .config
+	fi
+
+	if [ "$STATIC" = "yes" ]; then
+		echo "CONFIG_STATIC=y" >> .config
+	fi
+fi
+
+#
+# Our start script is located in /etc/rc.init.
+# Upstream: rejected a tunable option.
+#
+sed -i -e 's|/etc/init.d/rcS|/etc/rc.init|' init/init.c

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+#
+# Change the redirection limit which is too small for vpk download.
+# Upstream: yes in Git.
+#
+sed -i -e "/redir_limit = 5/ s/5/16/" networking/wget.c
+
+#
+# TODO: this is temporary, to build under clang.
+#
+# CFLAGS="": fix build under clang by removing all non-standard
+# options.
+#
+# -O0: disable optimizations for the same reasons.
+#
+# See http://lists.busybox.net/pipermail/busybox/2019-October/087558.html
+#
+make \
+	AR="$AR" \
+	AS="$AS" \
+	CC="$CC" \
+	CFLAGS="-DBB_GLOBAL_CONST=''" \
+	HOSTCC="$CC" \
+	HOSTCFLAGS="" \
+	EXTRA_CFLAGS="$CFLAGS -O0" \
+	EXTRA_LDFLAGS="$LDFLAGS" \
+	NM="$NM" \
+	OBJCOPY="$OBJCOPY" \
+	OBJDUMP="$OBJDUMP" \
+	STRIP="$STRIP" \
+	V=1
+install -Dm0755 busybox $DESTDIR/bin/busybox
+install -dm0755 $DESTDIR/share/udhcp
+install -m0644 examples/udhcp/sample.* $DESTDIR/share/udhcp
+install -Dm0644 examples/udhcp/udhcpd.conf $DESTDIR/etc/udhcpd.conf
+install -Dm0644 ../busybox.crond $DESTDIR/etc/rc.d/busybox.crond
+install -Dm0644 ../busybox.klogd $DESTDIR/etc/rc.d/busybox.klogd
+install -Dm0644 ../busybox.mdev $DESTDIR/etc/rc.d/busybox.mdev
+install -Dm0644 ../busybox.syslogd $DESTDIR/etc/rc.d/busybox.syslogd
+
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/ca-certificates/ca-certificates.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/ca-certificates/ca-certificates.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,7 +22,4 @@
 PKGSUMMARY="bundle of CA certificates from Mozilla"
 PKGDOWNLOAD="https://curl.haxx.se/ca/cacert-2019-01-23.pem"

-build()
-{
-	install -Dm644 cacert-2019-01-23.pem $DESTDIR/etc/ssl/cert.pem
-}
+install -Dm644 cacert-2019-01-23.pem $DESTDIR/etc/ssl/cert.pem
--- a/core/consolekit2/consolekit2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/consolekit2/consolekit2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,32 +62,29 @@
 	with_udev="--disable-libudev"
 fi

-build()
-{
-	rm -rf ConsoleKit2-$PKGVERSION
-	tar xvf ConsoleKit2-$PKGVERSION.tar.bz2
-	cd ConsoleKit2-$PKGVERSION
+rm -rf ConsoleKit2-$PKGVERSION
+tar xvf ConsoleKit2-$PKGVERSION.tar.bz2
+cd ConsoleKit2-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-pid-file=/var/run/consolekit2.pid \
-		--sbindir=/bin \
-		$with_pam \
-		$with_polkit \
-		$with_selinux \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--with-pid-file=/var/run/consolekit2.pid \
+	--sbindir=/bin \
+	$with_pam \
+	$with_polkit \
+	$with_selinux \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf ConsoleKit2-$PKGVERSION
-}
+cd ..
+rm -rf ConsoleKit2-$PKGVERSION
--- a/core/dcron/dcron.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/dcron/dcron.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,21 +27,18 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make all install \
-		DESTDIR="$DESTDIR" \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		PREFIX= \
-		SBINDIR=/bin
-	install -Dm0644 ../dcron $DESTDIR/etc/rc.d/dcron
+make all install \
+	DESTDIR="$DESTDIR" \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	PREFIX= \
+	SBINDIR=/bin
+install -Dm0644 ../dcron $DESTDIR/etc/rc.d/dcron

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/dialog/dialog.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/dialog/dialog.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tgz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tgz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/e2fsprogs/e2fsprogs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/e2fsprogs/e2fsprogs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,33 +47,30 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# disable-{fsck,uuid,libuuid,libblkid} => util-linux provides them.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-fsck \
-		--disable-uuidd \
-		--disable-libuuid \
-		--disable-libblkid \
-		--enable-elf-shlibs \
-		--with-crond-dir=/etc/cron.d \
-		$with_fuse \
-		$with_nls
-	make
-	make install install-libs DESTDIR=$DESTDIR
+# disable-{fsck,uuid,libuuid,libblkid} => util-linux provides them.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-fsck \
+	--disable-uuidd \
+	--disable-libuuid \
+	--disable-libblkid \
+	--enable-elf-shlibs \
+	--with-crond-dir=/etc/cron.d \
+	$with_fuse \
+	$with_nls
+make
+make install install-libs DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/efibootmgr/efibootmgr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/efibootmgr/efibootmgr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,19 +25,16 @@

 : ${CC:=clang}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://github.com/rhboot/efibootmgr/pull/96
-	patch -p0 < ../clang.patch
-	# https://git.alpinelinux.org/aports/tree/testing/efibootmgr?h=master
-	patch -p1 < ../efivar.patch
-	CC="$CC" PCDIR=/lib/pkgconfig EFIDIR=/boot/efi make
-	EFIDIR=/boot/efi DESTDIR=$DESTDIR prefix= sbindir=/bin make install
+# https://github.com/rhboot/efibootmgr/pull/96
+patch -p0 < ../clang.patch
+# https://git.alpinelinux.org/aports/tree/testing/efibootmgr?h=master
+patch -p1 < ../efivar.patch
+CC="$CC" PCDIR=/lib/pkgconfig EFIDIR=/boot/efi make
+EFIDIR=/boot/efi DESTDIR=$DESTDIR prefix= sbindir=/bin make install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/elogind/elogind.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/elogind/elogind.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,34 +47,31 @@
 	with_regex="-D pcre2=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D split-usr=true \
-		-D split-bin=false \
-		-D tests=false \
-		-D docdir=share/doc/$PKGNAME \
-		$with_pam \
-		$with_regex
+patch -p0 < ../patch-musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D split-usr=true \
+	-D split-bin=false \
+	-D tests=false \
+	-D docdir=share/doc/$PKGNAME \
+	$with_pam \
+	$with_regex

-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "/^#.*/d" $DESTDIR/etc/pam.d/elogind-user
-	sed -i -e "1i#" $DESTDIR/etc/pam.d/elogind-user
-	sed -i -e "2i# /etc/pam.d/elogind-user -- PAM configuration file for elogind" $DESTDIR/etc/pam.d/elogind-user
-	sed -i -e "3i#" $DESTDIR/etc/pam.d/elogind-user
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "/^#.*/d" $DESTDIR/etc/pam.d/elogind-user
+sed -i -e "1i#" $DESTDIR/etc/pam.d/elogind-user
+sed -i -e "2i# /etc/pam.d/elogind-user -- PAM configuration file for elogind" $DESTDIR/etc/pam.d/elogind-user
+sed -i -e "3i#" $DESTDIR/etc/pam.d/elogind-user

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/etc/etc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/etc/etc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
             etc/shadow
             etc/shells"

-build()
-{
-	install -Dm0600 shadow $DESTDIR/etc/shadow
-	install -Dm0644 fstab $DESTDIR/etc/fstab
-	install -Dm0644 group $DESTDIR/etc/group
-	install -Dm0644 issue $DESTDIR/etc/issue
-	install -Dm0644 passwd $DESTDIR/etc/passwd
-	install -Dm0644 profile $DESTDIR/etc/profile
-	install -Dm0644 securetty $DESTDIR/etc/securetty
-	install -Dm0644 shells $DESTDIR/etc/shells
-	ln -sf /proc/self/mounts $DESTDIR/etc/mtab
+install -Dm0600 shadow $DESTDIR/etc/shadow
+install -Dm0644 fstab $DESTDIR/etc/fstab
+install -Dm0644 group $DESTDIR/etc/group
+install -Dm0644 issue $DESTDIR/etc/issue
+install -Dm0644 passwd $DESTDIR/etc/passwd
+install -Dm0644 profile $DESTDIR/etc/profile
+install -Dm0644 securetty $DESTDIR/etc/securetty
+install -Dm0644 shells $DESTDIR/etc/shells
+ln -sf /proc/self/mounts $DESTDIR/etc/mtab

-	# Create /etc/vanilla-release information file.
-	case $(uname -m) in
-	'x86_64')
-		arch="amd64"
-		;;
-	esac
+# Create /etc/vanilla-release information file.
+case $(uname -m) in
+'x86_64')
+	arch="amd64"
+	;;
+esac

-	echo "VERSION=${PKGVERSION}" > $DESTDIR/etc/vanilla-release
-	echo "ARCH=$arch" >> $DESTDIR/etc/vanilla-release
-}
+echo "VERSION=${PKGVERSION}" > $DESTDIR/etc/vanilla-release
+echo "ARCH=$arch" >> $DESTDIR/etc/vanilla-release
--- a/core/eudev/eudev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/eudev/eudev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,32 +44,29 @@
 	with_kmod="--disable-kmod"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -fi
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-selinux \
-		--enable-shared \
-		$with_kmod
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	install -Dm0755 ../udevd $DESTDIR/etc/rc.d/udevd
+autoreconf -fi
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-selinux \
+	--enable-shared \
+	$with_kmod
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+install -Dm0755 ../udevd $DESTDIR/etc/rc.d/udevd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/file/file.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/file/file.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--datadir=/share/file
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--datadir=/share/file
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/filesystem/filesystem.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/filesystem/filesystem.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -21,37 +21,34 @@
 PKGLICENSE="ISC"
 PKGSUMMARY="base filesystem directories"

-build()
-{
-	install -d $DESTDIR/bin
-	install -d $DESTDIR/dev
-	install -d $DESTDIR/dev/pts
-	install -d $DESTDIR/etc
-	install -d $DESTDIR/etc/rc.d
-	install -d $DESTDIR/home
-	install -d $DESTDIR/include
-	install -d $DESTDIR/lib
-	install -d $DESTDIR/mnt
-	install -d $DESTDIR/proc
-	install -d $DESTDIR/root
-	install -d $DESTDIR/share
+install -d $DESTDIR/bin
+install -d $DESTDIR/dev
+install -d $DESTDIR/dev/pts
+install -d $DESTDIR/etc
+install -d $DESTDIR/etc/rc.d
+install -d $DESTDIR/home
+install -d $DESTDIR/include
+install -d $DESTDIR/lib
+install -d $DESTDIR/mnt
+install -d $DESTDIR/proc
+install -d $DESTDIR/root
+install -d $DESTDIR/share

-	for i in 1 2 3 4 5 6 7 8; do
-		install -d $DESTDIR/share/man/man$i
-	done
+for i in 1 2 3 4 5 6 7 8; do
+	install -d $DESTDIR/share/man/man$i
+done

-	install -d $DESTDIR/src
-	install -d $DESTDIR/sys
-	install -d $DESTDIR/var/lib/vpk
-	install -d $DESTDIR/var/log
-	install -d $DESTDIR/var/empty
-	install -d $DESTDIR/var/spool
-	install -dm 1777 $DESTDIR/tmp
-	install -dm 1777 $DESTDIR/var/run
-	install -dm 1777 $DESTDIR/var/tmp
+install -d $DESTDIR/src
+install -d $DESTDIR/sys
+install -d $DESTDIR/var/lib/vpk
+install -d $DESTDIR/var/log
+install -d $DESTDIR/var/empty
+install -d $DESTDIR/var/spool
+install -dm 1777 $DESTDIR/tmp
+install -dm 1777 $DESTDIR/var/run
+install -dm 1777 $DESTDIR/var/tmp

-	# Compatibility symlinks.
-	ln -sf / $DESTDIR/usr
-	ln -sf /bin $DESTDIR/sbin
-	ln -sf /var/run $DESTDIR/run
-}
+# Compatibility symlinks.
+ln -sf / $DESTDIR/usr
+ln -sf /bin $DESTDIR/sbin
+ln -sf /var/run $DESTDIR/run
--- a/core/gptfdisk/gptfdisk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/gptfdisk/gptfdisk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,26 +28,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e '/CXXFLAGS+=/ s/$/ $(EXTRA_CXXFLAGS)/' Makefile
-	sed -i -e '/LDFLAGS+=/ s/$/ $(EXTRA_LDFLAGS) $(EXTRA_LIBS)/' Makefile
-	make \
-		CXX="$CXX" \
-		EXTRA_CXXFLAGS="$CXXFLAGS" \
-		EXTRA_LDFLAGS="$LDFLAGS" \
-		EXTRA_LIBS="$LIBS"
+sed -i -e '/CXXFLAGS+=/ s/$/ $(EXTRA_CXXFLAGS)/' Makefile
+sed -i -e '/LDFLAGS+=/ s/$/ $(EXTRA_LDFLAGS) $(EXTRA_LIBS)/' Makefile
+make \
+	CXX="$CXX" \
+	EXTRA_CXXFLAGS="$CXXFLAGS" \
+	EXTRA_LDFLAGS="$LDFLAGS" \
+	EXTRA_LIBS="$LIBS"

-	# No install target.
-	for p in gdisk cgdisk sgdisk fixparts; do
-		install -Dm0755 $p $DESTDIR/bin/$p
-		install -Dm0644 $p.8 $DESTDIR/share/man/man8/$p.8
-	done
+# No install target.
+for p in gdisk cgdisk sgdisk fixparts; do
+	install -Dm0755 $p $DESTDIR/bin/$p
+	install -Dm0644 $p.8 $DESTDIR/share/man/man8/$p.8
+done

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/kbd/kbd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/kbd/kbd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,27 +39,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# disable vlock until we get PAM.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--disable-vlock \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+# disable vlock until we get PAM.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--disable-vlock \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/kmod/kmod.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/kmod/kmod.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,31 +47,28 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_xz \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_xz \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	# compatibility symlinks like lsmod, rmmod are installed as well.
-	for tool in lsmod insmod rmmod depmod modinfo modprove; do
-		ln -sf kmod $DESTDIR/bin/$tool
-	done
+# compatibility symlinks like lsmod, rmmod are installed as well.
+for tool in lsmod insmod rmmod depmod modinfo modprove; do
+	ln -sf kmod $DESTDIR/bin/$tool
+done

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/less/less.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/less/less.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-regex=pcre
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-regex=pcre
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/libcap/libcap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/libcap/libcap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	make \
-		BUILD_CC="$CC" \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		RAISE_SETFCAP=no \
-		SBINDIR=/bin \
-		DESTDIR=$DESTDIR \
-		LIBDIR=/lib \
-		lib=/lib \
-		prefix= \
-		all install
+make \
+	BUILD_CC="$CC" \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	RAISE_SETFCAP=no \
+	SBINDIR=/bin \
+	DESTDIR=$DESTDIR \
+	LIBDIR=/lib \
+	lib=/lib \
+	prefix= \
+	all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/lvm2/lvm2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/lvm2/lvm2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,33 +39,30 @@
 	with_completion="--disable-readline"
 fi

-build()
-{
-	rm -rf LVM2.$PKGVERSION
-	tar xvf LVM2.$PKGVERSION.tgz
-	cd LVM2.$PKGVERSION
+rm -rf LVM2.$PKGVERSION
+tar xvf LVM2.$PKGVERSION.tgz
+cd LVM2.$PKGVERSION

-	# https://bugzilla.redhat.com/show_bug.cgi?id=1697870
-	patch -p1 < ../patch-lld.patch
-	# --disable-nls: does not build with --enable-nls
-	patch -p0 < ../patch-musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-nls \
-		--enable-pkgconfig \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		$with_completion
-	make
-	make install DESTDIR=$DESTDIR
+# https://bugzilla.redhat.com/show_bug.cgi?id=1697870
+patch -p1 < ../patch-lld.patch
+# --disable-nls: does not build with --enable-nls
+patch -p0 < ../patch-musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-nls \
+	--enable-pkgconfig \
+	--enable-udev_rules \
+	--enable-udev_sync \
+	$with_completion
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf LVM2.$PKGVERSION
-}
+cd ..
+rm -rf LVM2.$PKGVERSION
--- a/core/mandoc/mandoc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/mandoc/mandoc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e "/^CC=/ s/CC=.*/CC=$CC/" configure
-	echo "UTF8_LOCALE=en_US.UTF-8" > configure.local
-	echo "PREFIX=/" >> configure.local
-	echo "SBINDIR=/bin" >> configure.local
-	echo "MANDIR=/share/man" >> configure.local
-	echo 'OSNAME="Vanilla Linux"' >> configure.local
-	./configure
-	make CC="$CC" CFLAGS="$CFLAGS"
-	make install DESTDIR=$DESTDIR
+sed -i -e "/^CC=/ s/CC=.*/CC=$CC/" configure
+echo "UTF8_LOCALE=en_US.UTF-8" > configure.local
+echo "PREFIX=/" >> configure.local
+echo "SBINDIR=/bin" >> configure.local
+echo "MANDIR=/share/man" >> configure.local
+echo 'OSNAME="Vanilla Linux"' >> configure.local
+./configure
+make CC="$CC" CFLAGS="$CFLAGS"
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/pciutils/pciutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/pciutils/pciutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -58,26 +58,23 @@
 	with_zlib="ZLIB=no"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		PREFIX= \
-		SBINDIR=/bin \
-		MANDIR=/share/man \
-		DESTDIR=$DESTDIR \
-		$with_dns \
-		$with_kmod \
-		$with_udev \
-		$with_zlib \
-		all install
+make \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	PREFIX= \
+	SBINDIR=/bin \
+	MANDIR=/share/man \
+	DESTDIR=$DESTDIR \
+	$with_dns \
+	$with_kmod \
+	$with_udev \
+	$with_zlib \
+	all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/procps/procps.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/procps/procps.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,30 +39,27 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvf $PKGNAME-v$PKGVERSION.tar.gz
-	cd $PKGNAME-v$PKGVERSION
+rm -rf $PKGNAME-v$PKGVERSION
+tar xvf $PKGNAME-v$PKGVERSION.tar.gz
+cd $PKGNAME-v$PKGVERSION

-	./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-libselinux \
-		--disable-kill \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-libselinux \
+	--disable-kill \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-v$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-v$PKGVERSION
--- a/core/rc/rc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/rc/rc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,13 +26,10 @@
             etc/rc.shutdown
             etc/rc.start"

-build()
-{
-	install -Dm0755 rc.conf $DESTDIR/etc/rc.conf
-	install -Dm0755 rc.init $DESTDIR/etc/rc.init
-	install -Dm0755 rc.shutdown $DESTDIR/etc/rc.shutdown
-	install -Dm0755 rc.start $DESTDIR/etc/rc.start
-	install -Dm0755 rc.networking $DESTDIR/etc/rc.networking
-	install -Dm0755 rc.conf.5 $DESTDIR/share/man/man5/rc.conf.5
-	install -Dm0755 rc.7 $DESTDIR/share/man/man7/rc.7
-}
+install -Dm0755 rc.conf $DESTDIR/etc/rc.conf
+install -Dm0755 rc.init $DESTDIR/etc/rc.init
+install -Dm0755 rc.shutdown $DESTDIR/etc/rc.shutdown
+install -Dm0755 rc.start $DESTDIR/etc/rc.start
+install -Dm0755 rc.networking $DESTDIR/etc/rc.networking
+install -Dm0755 rc.conf.5 $DESTDIR/share/man/man5/rc.conf.5
+install -Dm0755 rc.7 $DESTDIR/share/man/man7/rc.7
--- a/core/rhash/rhash.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/rhash/rhash.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,30 +45,27 @@
 	with_ssl="--disable-openssl"
 fi

-build()
-{
-	rm -rf RHash-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd RHash-$PKGVERSION
+rm -rf RHash-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd RHash-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--target=$CTARGET \
-		--prefix= \
-		--extra-cflags="$CFLAGS" \
-		--extra-ldflags="$LDFLAGS" \
-		$with_nls \
-		$with_ssl
-	make
-	make install DESTDIR=$DESTDIR
-	make -C librhash DESTDIR=$DESTDIR \
-		install-lib-headers \
-		install-lib-shared \
-		install-so-link
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--target=$CTARGET \
+	--prefix= \
+	--extra-cflags="$CFLAGS" \
+	--extra-ldflags="$LDFLAGS" \
+	$with_nls \
+	$with_ssl
+make
+make install DESTDIR=$DESTDIR
+make -C librhash DESTDIR=$DESTDIR \
+	install-lib-headers \
+	install-lib-shared \
+	install-so-link

-	cd ..
-	rm -rf RHash-$PKGVERSION
-}
+cd ..
+rm -rf RHash-$PKGVERSION
--- a/core/sysklogd/sysklogd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/sysklogd/sysklogd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,27 +30,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--without-systemd
-	make
-	make install DESTDIR=$DESTDIR
-	install -D -m 0766 ../syslog.conf $DESTDIR/etc/syslog.conf
-	install -D -m 0644 ../sysklogd $DESTDIR/etc/rc.d/sysklogd
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--without-systemd
+make
+make install DESTDIR=$DESTDIR
+install -D -m 0766 ../syslog.conf $DESTDIR/etc/syslog.conf
+install -D -m 0644 ../sysklogd $DESTDIR/etc/rc.d/sysklogd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/tmux/tmux.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/tmux/tmux.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/tree/tree.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/tree/tree.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,16 +26,13 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tgz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tgz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-Makefile.patch
-	make CC="$CC" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-	make prefix=$DESTDIR MANDIR=$DESTDIR/share/man/man1 install
+patch -p0 < ../patch-Makefile.patch
+make CC="$CC" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+make prefix=$DESTDIR MANDIR=$DESTDIR/share/man/man1 install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/tzdata/tzdata.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/tzdata/tzdata.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,16 +27,13 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	mkdir $PKGNAME-$PKGVERSION && cd $PKGNAME-$PKGVERSION
-	tar xvf ../tzdata$PKGVERSION.tar.gz
-	tar xvf ../tzcode$PKGVERSION.tar.gz
+rm -rf $PKGNAME-$PKGVERSION
+mkdir $PKGNAME-$PKGVERSION && cd $PKGNAME-$PKGVERSION
+tar xvf ../tzdata$PKGVERSION.tar.gz
+tar xvf ../tzcode$PKGVERSION.tar.gz

-	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-	make install DESTDIR=$DESTDIR USRDIR= ZICDIR=/bin
+make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+make install DESTDIR=$DESTDIR USRDIR= ZICDIR=/bin

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/usbutils/usbutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/usbutils/usbutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./autogen.sh \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/util-linux/util-linux.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/util-linux/util-linux.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -103,56 +103,53 @@
 	with_selinux="--without-selinux"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# All these tools are provided by shadow instead:
-	# --disable-chfn-chsh
-	# --disable-chsh
-	# --disable-login
-	# --disable-nologin
-	# --disable-su
-	# --disable-vipw
+# All these tools are provided by shadow instead:
+# --disable-chfn-chsh
+# --disable-chsh
+# --disable-login
+# --disable-nologin
+# --disable-su
+# --disable-vipw

-	# The configure.ac script has hardcoded /sbin checks.
-	sed -i -e 's|/sbin|/bin|' configure.ac
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--bindir=/bin \
-		--libdir=/lib \
-		--sbindir=/bin \
-		--disable-chfn-chsh \
-		--disable-gtk-doc \
-		--disable-login \
-		--disable-nologin \
-		--disable-su \
-		--disable-vipw \
-		--enable-libblkid \
-		--enable-libmount \
-		--enable-libsmartcols \
-		--enable-libuuid \
-		--enable-shared \
-		--without-systemd \
-		$with_audit \
-		$with_colors \
-		$with_components \
-		$with_nls \
-		$with_python \
-		$with_selinux
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# The configure.ac script has hardcoded /sbin checks.
+sed -i -e 's|/sbin|/bin|' configure.ac
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--bindir=/bin \
+	--libdir=/lib \
+	--sbindir=/bin \
+	--disable-chfn-chsh \
+	--disable-gtk-doc \
+	--disable-login \
+	--disable-nologin \
+	--disable-su \
+	--disable-vipw \
+	--enable-libblkid \
+	--enable-libmount \
+	--enable-libsmartcols \
+	--enable-libuuid \
+	--enable-shared \
+	--without-systemd \
+	$with_audit \
+	$with_colors \
+	$with_components \
+	$with_nls \
+	$with_python \
+	$with_selinux
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/core/vpk/vpk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/core/vpk/vpk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,14 +23,11 @@
 PKGDOWNLOAD="http://releases.malikania.fr/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
 PKGPROTECT="etc/vpk.conf"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	make install DESTDIR=$DESTDIR PREFIX=
+make install DESTDIR=$DESTDIR PREFIX=

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/argon2/argon2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/argon2/argon2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,26 +26,23 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf phc-winner-argon2-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd phc-winner-argon2-$PKGVERSION
+rm -rf phc-winner-argon2-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd phc-winner-argon2-$PKGVERSION

-	sed -i -e '164iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '164iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		PREFIX= \
-		DESTDIR=$DESTDIR \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		INST_INCLUDE=$DESTDIR/include \
-		INST_LIBRARY=$DESTDIR/lib \
-		INST_BINARY=$DESTDIR/bin \
-		INST_PKGCONFIG=$DESTDIR/lib/pkgconfig \
-		all install
+make \
+	PREFIX= \
+	DESTDIR=$DESTDIR \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	INST_INCLUDE=$DESTDIR/include \
+	INST_LIBRARY=$DESTDIR/lib \
+	INST_BINARY=$DESTDIR/bin \
+	INST_PKGCONFIG=$DESTDIR/lib/pkgconfig \
+	all install

-	cd ..
-	rm -rf phc-winner-argon2-$PKGVERSION
-}
+cd ..
+rm -rf phc-winner-argon2-$PKGVERSION
--- a/crypto/cryptsetup/cryptsetup.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/cryptsetup/cryptsetup.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -64,30 +64,27 @@
 	with_udev="--disable-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-internal-argon2 \
-		--enable-libargon2 \
-		$with_nls \
-		$with_ssl \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-internal-argon2 \
+	--enable-libargon2 \
+	$with_nls \
+	$with_ssl \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/gcr/gcr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/gcr/gcr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -65,30 +65,27 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_gtk \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_gtk \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/gnutls/gnutls.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/gnutls/gnutls.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,29 +49,26 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-3.6.7
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-3.6.7
+rm -rf $PKGNAME-3.6.7
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-3.6.7

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-included-unistring \
-		$with_idn2 \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-included-unistring \
+	$with_idn2 \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-3.6.7
-}
+cd ..
+rm -rf $PKGNAME-3.6.7
--- a/crypto/libassuan/libassuan.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/libassuan/libassuan.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/libgcrypt/libgcrypt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/libgcrypt/libgcrypt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/libgpg-error/libgpg-error.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/libgpg-error/libgpg-error.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,25 +38,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/libksba/libksba.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/libksba/libksba.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/libressl/libressl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/libressl/libressl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,24 +26,21 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-musl.patch
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+patch -p0 < ../patch-musl.patch
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/p11-kit/p11-kit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/crypto/p11-kit/p11-kit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,27 +39,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-systemd \
-		--with-trust-paths=/etc/pki/anchors \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-systemd \
+	--with-trust-paths=/etc/pki/anchors \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/databases/db/db.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/databases/db/db.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,25 +27,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../atomic.patch
-	patch -p0 < ../disable-docs.patch
-	cd build_unix
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	../dist/configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+patch -p0 < ../atomic.patch
+patch -p0 < ../disable-docs.patch
+cd build_unix
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+../dist/configure --prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/databases/lmdb/lmdb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/databases/lmdb/lmdb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,19 +25,16 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf lmdb-LMDB_$PKGVERSION
-	tar xvf LMDB_$PKGVERSION.tar.gz
-	cd lmdb-LMDB_$PKGVERSION/libraries/liblmdb
+rm -rf lmdb-LMDB_$PKGVERSION
+tar xvf LMDB_$PKGVERSION.tar.gz
+cd lmdb-LMDB_$PKGVERSION/libraries/liblmdb

-	make \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		DESTDIR="$DESTDIR" \
-		prefix= \
-		all install
+make \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	DESTDIR="$DESTDIR" \
+	prefix= \
+	all install

-	cd ../../..
-	rm -rf lmdb-LMDB_$PKGVERSION
-}
+cd ../../..
+rm -rf lmdb-LMDB_$PKGVERSION
--- a/databases/postgresql/postgresql.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/databases/postgresql/postgresql.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -141,38 +141,35 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_completion \
-		$with_icu \
-		$with_llvm \
-		$with_nls \
-		$with_pam \
-		$with_perl \
-		$with_python \
-		$with_ssl \
-		$with_tcl \
-		$with_xml \
-		$with_xslt \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0644 ../postgresql $DESTDIR/etc/rc.d/postgresql
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_completion \
+	$with_icu \
+	$with_llvm \
+	$with_nls \
+	$with_pam \
+	$with_perl \
+	$with_python \
+	$with_ssl \
+	$with_tcl \
+	$with_xml \
+	$with_xslt \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+install -Dm0644 ../postgresql $DESTDIR/etc/rc.d/postgresql

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/databases/sqlite/sqlite.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/databases/sqlite/sqlite.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,25 +46,22 @@
 	with_tcl="--disable-tcl"
 fi

-build()
-{
-	rm -rf $PKGNAME-src-$PKGVERSION
-	unzip $PKGNAME-src-$PKGVERSION.zip
-	cd $PKGNAME-src-$PKGVERSION
+rm -rf $PKGNAME-src-$PKGVERSION
+unzip $PKGNAME-src-$PKGVERSION.zip
+cd $PKGNAME-src-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		-prefix= \
-		--enable-shared \
-		$with_readline \
-		$with_tcl
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	-prefix= \
+	--enable-shared \
+	$with_readline \
+	$with_tcl
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-src-$PKGVERSION
--- a/desktop/dconf/dconf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/dconf/dconf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,29 +36,26 @@
 	with_vala="-D vapi=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# TODO: enable documentation once docbook-xml is there.
-	# https://gitlab.gnome.org/GNOME/dconf/issues/47
-	patch -p1 < ../patch-clang.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D man=false \
-		-D gtk_doc=false \
-		$with_vala
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# TODO: enable documentation once docbook-xml is there.
+# https://gitlab.gnome.org/GNOME/dconf/issues/47
+patch -p1 < ../patch-clang.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D man=false \
+	-D gtk_doc=false \
+	$with_vala
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/desktop-file-utils/desktop-file-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/desktop-file-utils/desktop-file-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/icon-naming-utils/icon-naming-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/icon-naming-utils/icon-naming-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="http://tango.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.bz2"
 PKGDEPENDS="perl p5-xml-simple"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libnotify/libnotify.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/libnotify/libnotify.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,27 +33,23 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D introspection=enabled \
-		. build
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D introspection=enabled \
+	. build
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
-
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libwnck/libwnck.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/libwnck/libwnck.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	NOCONFIGURE=1 ./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+NOCONFIGURE=1 ./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
-
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libwnck2/libwnck2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/libwnck2/libwnck2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,24 +33,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libwnck-$PKGVERSION
-	tar xvf libwnck-$PKGVERSION.tar.xz
-	cd libwnck-$PKGVERSION
+rm -rf libwnck-$PKGVERSION
+tar xvf libwnck-$PKGVERSION.tar.xz
+cd libwnck-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared \
-		--localedir=/share/locale
-	make
-	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared \
+	--localedir=/share/locale
+make
+make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libwnck-$PKGVERSION
-}
+cd ..
+rm -rf libwnck-$PKGVERSION
--- a/desktop/startup-notification/startup-notification.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/startup-notification/startup-notification.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/zenity/zenity.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/desktop/zenity/zenity.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_webkit="--disable-webkitgtk"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-libnotify \
-		$with_webkit
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-libnotify \
+	$with_webkit
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/bmake/bmake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/bmake/bmake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME
+rm -rf $PKGNAME
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME

-	sed -i "1s,:,#!/bin/sh,g" install-sh
-	mkdir build && cd build
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	../boot-strap \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= op=build
-	../boot-strap --install-destdir=$DESTDIR --prefix= op=install
-	cd ..
+sed -i "1s,:,#!/bin/sh,g" install-sh
+mkdir build && cd build
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+../boot-strap \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= op=build
+../boot-strap --install-destdir=$DESTDIR --prefix= op=install
+cd ..

-	cd ..
-	rm -rf $PKGNAME
-}
+cd ..
+rm -rf $PKGNAME
--- a/dev/bubblewrap/bubblewrap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/bubblewrap/bubblewrap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,26 +32,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/bubblewrap/musl-fixes.patch
-	patch -p1 < ../patch-musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# https://git.alpinelinux.org/aports/plain/main/bubblewrap/musl-fixes.patch
+patch -p1 < ../patch-musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/cbindgen/cbindgen.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=cbindgen
-PKGVERSION=0.9.1
-PKGREVISION=1
-PKGLICENSE="MPLv10"
-PKGSUMMARY="create C/C++11 headers for Rust libraries"
-PKGWWW="https://github.com/eqrion/cbindgen"
-PKGDOWNLOAD="https://github.com/eqrion/cbindgen/archive/v$PKGVERSION.tar.gz
-             $PKGNAME-$PKGVERSION.tar.gz:download"
-PKGDEPENDS="rust:build"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-: ${STRIP:=llvm-strip}
-
-download()
-{
-	tar -xvzf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
-	CARGO_HOME=vendor cargo fetch
-	cd ..
-	tar -czf $PKGNAME-$PKGVERSION.tar.gz $PKGNAME-$PKGVERSION
-	rm -rf $PKGNAME-$PKGVERSION
-}
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
-
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	CARGO_HOME=vendor \
-	cargo build --release --verbose --offline
-	cargo install --path . --root=$DESTDIR
-	llvm-strip $DESTDIR/bin/cbindgen
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
--- a/dev/cbindgen/cbindgen.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-c7bafebc25b270546fe999e81db1bcf6d89081c1  v0.9.1.tar.gz
--- a/dev/clang/clang.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=clang
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="C language family frontend for LLVM"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/cfe-$PKGVERSION.src.tar.xz
-             http://releases.llvm.org/$PKGVERSION/clang-tools-extra-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="cmake:build"
-PKGOPTIONS="COMPILER_RT LIBCXX LLD TOOLS"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-: ${COMPILER_RT:=yes}
-: ${LIBCXX:=yes}
-: ${LLD:=yes}
-: ${TOOLS:=yes}
-
-if [ "$COMPILER_RT" = "yes" ]; then
-	with_compiler_rt="-DCLANG_DEFAULT_RTLIB=compiler-rt"
-fi
-
-if [ "$LIBCXX" = "yes" ]; then
-	with_libcxx="-DCLANG_DEFAULT_CXX_STDLIB=libc++"
-else
-	with_libcxx="-DCLANG_DEFAULT_CXX_STDLIB=libstdc++"
-fi
-
-if [ "$LLD" = "yes" ]; then
-	with_lld="-DCLANG_DEFAULT_LINKER=lld"
-fi
-
-build()
-{
-	rm -rf cfe-$PKGVERSION.src
-	tar xvf cfe-$PKGVERSION.src.tar.xz
-	cd cfe-$PKGVERSION.src
-
-	# Extract clang-extra-tools as tools/extra if requested.
-	if [ "$TOOLS" = "yes" ]; then
-		tar xvf ../clang-tools-extra-$PKGVERSION.src.tar.xz -C tools
-		mv tools/clang-tools-extra-$PKGVERSION.src tools/extra
-	fi
-
-	mkdir build && cd build
-	cmake .. -Wno-dev \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_MANDIR=/share/man \
-		-DCLANG_VENDOR="Vanilla Linux" \
-		-DLLVM_ENABLE_EH=On \
-		-DLLVM_ENABLE_RTTI=On \
-		$with_compiler_rt \
-		$with_libcxx \
-		$with_lld
-	make
-	make DESTDIR=$DESTDIR install
-	cd ..
-
-	cd ..
-	rm -rf cfe-$PKGVERSION.src
-}
--- a/dev/clang/clang.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-ac64403321d8486699d8bea5376b2438663dbb41  clang-tools-extra-9.0.0.src.tar.xz
-6977cf7a802a053c57fa74138d3648b563e71e88  cfe-9.0.0.src.tar.xz
--- a/dev/cmake/cmake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/cmake/cmake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,27 +49,24 @@
 	with_qt="--no-qt-gui"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-fhs.patch
-	./configure \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		CXX="$CXX" \
-		CXXFLAGS="$CXXFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		--prefix= \
-		--datadir=/share/cmake \
-		--docdir=/share/doc/cmake \
-		--system-libs \
-		$with_qt
-	make
-	make install DESTDIR=$DESTDIR
+patch -p0 < ../patch-fhs.patch
+./configure \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	--prefix= \
+	--datadir=/share/cmake \
+	--docdir=/share/doc/cmake \
+	--system-libs \
+	$with_qt
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/ctags/ctags.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/ctags/ctags.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install prefix=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install prefix=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/diffstat/diffstat.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/diffstat/diffstat.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/doxygen/doxygen.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/doxygen/doxygen.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.src.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/elfutils/elfutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/elfutils/elfutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,29 +34,26 @@
 	CFLAGS="-fPIC $CFLAGS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# credits to void linux and alpine linux.
-	# https://github.com/void-linux/void-packages/tree/master/srcpkgs/elfutils
-	# https://git.alpinelinux.org/aports/tree/main/elfutils/
-	patch -p0 < ../musl.patch
-	autoreconf -fi
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--program-prefix="eu-" \
-		--disable-nls \
-		--disable-dependency-tracking
-	make
-	make install DESTDIR=$DESTDIR
+# credits to void linux and alpine linux.
+# https://github.com/void-linux/void-packages/tree/master/srcpkgs/elfutils
+# https://git.alpinelinux.org/aports/tree/main/elfutils/
+patch -p0 < ../musl.patch
+autoreconf -fi
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--program-prefix="eu-" \
+	--disable-nls \
+	--disable-dependency-tracking
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/flex/flex.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/flex/flex.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,28 +41,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/fossil/fossil.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/fossil/fossil.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -55,29 +55,26 @@
 	with_static="--static"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-src-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-src-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# CXX=$CC: fool C++ compiler, there is no C++ file in fossil.
-	CC="$CC" \
-	CC_FOR_BUILD="$CC" \
-	CXX="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		$with_fuse \
-		$with_json \
-		$with_ssl \
-		$with_static
-	make BCC=$CC TCC=$CC
-	install -Dm0755 fossil $DESTDIR/bin/fossil
-	install -Dm0644 fossil.1 $DESTDIR/share/man/man1/fossil.1
+# CXX=$CC: fool C++ compiler, there is no C++ file in fossil.
+CC="$CC" \
+CC_FOR_BUILD="$CC" \
+CXX="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	$with_fuse \
+	$with_json \
+	$with_ssl \
+	$with_static
+make BCC=$CC TCC=$CC
+install -Dm0755 fossil $DESTDIR/bin/fossil
+install -Dm0644 fossil.1 $DESTDIR/share/man/man1/fossil.1

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/git/git.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/git/git.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -82,33 +82,30 @@
 	perl -e "use Config; print \$Config{$1};"
 }

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# NO_PYTHON: only for 2.7 which is deprecated in Vanilla Linux.
-	# NO_REGEX: does not build without.
-	make \
-		V=1 \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		DESTDIR="$DESTDIR" \
-		NO_REGEX=YesPlease \
-		prefix= \
-		perllibdir=$(perl_config vendorlib) \
-		$with_curl \
-		$with_nls \
-		$with_perl \
-		$with_regex \
-		$with_ssl \
-		$with_xml \
-		$with_zlib \
-		NO_PYTHON=YesPlease \
-		all man install install-man
+# NO_PYTHON: only for 2.7 which is deprecated in Vanilla Linux.
+# NO_REGEX: does not build without.
+make \
+	V=1 \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	DESTDIR="$DESTDIR" \
+	NO_REGEX=YesPlease \
+	prefix= \
+	perllibdir=$(perl_config vendorlib) \
+	$with_curl \
+	$with_nls \
+	$with_perl \
+	$with_regex \
+	$with_ssl \
+	$with_xml \
+	$with_zlib \
+	NO_PYTHON=YesPlease \
+	all man install install-man

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/gobject-introspection/gobject-introspection.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/gobject-introspection/gobject-introspection.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,25 +27,22 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://gitlab.gnome.org/markand/gobject-introspection/commit/8342840f2d9d6b57ef673bc5541cacee45432d45
-	patch -p1 < ../patch-cc.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# https://gitlab.gnome.org/markand/gobject-introspection/commit/8342840f2d9d6b57ef673bc5541cacee45432d45
+patch -p1 < ../patch-cc.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/gtk-doc/gtk-doc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/gtk-doc/gtk-doc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/intltool/intltool.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/intltool/intltool.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/lld/lld.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=lld
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="LLVM's linker"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="cmake:build"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
-	cd $PKGNAME-$PKGVERSION.src
-
-	mkdir build && cd build
-	cmake .. -Wno-dev \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make DESTDIR=$DESTDIR install
-	cd ..
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION.src
-}
--- a/dev/lld/lld.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-021a8c38cf27d63db37d939c7cdec46ffd627be2  lld-9.0.0.src.tar.xz
--- a/dev/lldb/lldb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=lldb
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="LLVM debugger"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="cmake:build swig:build libffi libxml2"
-PKGOPTIONS="COMPLETION NCURSES PYTHON"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-: ${COMPLETION:=yes}
-: ${NCURSES:=yes}
-: ${PYTHON:=yes}
-
-if [ "$COMPLETION" = "yes" ]; then
-	PKGDEPENDS="libedit $PKGDEPENDS"
-	with_completion="-DLLDB_DISABLE_LIBEDIT=Off"
-else
-	with_completion="-DLLDB_DISABLE_LIBEDIT=On"
-fi
-
-if [ "$NCURSES" = "yes" ]; then
-	PKGDEPENDS="ncurses $PKGDEPENDS"
-	with_ncurses="-DLLDB_DISABLE_CURSES=Off"
-else
-	with_ncurses="-DLLDB_DISABLE_CURSES=On"
-fi
-
-if [ "$PYTHON" = "yes" ]; then
-	PKGDEPENDS="python $PKGDEPENDS"
-	with_python="-DLLDB_DISABLE_PYTHON=Off"
-else
-	with_python="-DLLDB_DISABLE_PYTHON=On"
-fi
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
-	cd $PKGNAME-$PKGVERSION.src
-
-	patch -p0 < ../patch-musl.patch
-	mkdir build && cd build
-	cmake .. -Wno-dev \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLLVM_ENABLE_EH=On \
-		-DLLVM_ENABLE_RTTI=On \
-		$with_completion \
-		$with_ncurses \
-		$with_python
-	make
-	make DESTDIR=$DESTDIR install
-	cd ..
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION.src
-}
--- a/dev/lldb/lldb.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7ac23c548c805be55713a759c4275d0389f9197e  lldb-9.0.0.src.tar.xz
--- a/dev/lldb/patch-musl.patch	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
---- source/API/SBStream.cpp.orig	2019-11-15 09:29:17.692459204 +0100
-+++ source/API/SBStream.cpp	2019-11-15 09:29:29.880459578 +0100
-@@ -105,7 +105,7 @@
- }
-
- void SBStream::RedirectToFileHandle(FILE *fh, bool transfer_fh_ownership) {
--  LLDB_RECORD_METHOD(void, SBStream, RedirectToFileHandle, (FILE *, bool), fh,
-+  LLDB_RECORD_DUMMY(void, SBStream, RedirectToFileHandle, (FILE *, bool), fh,
-                      transfer_fh_ownership);
-
-   if (fh == nullptr)
---- source/API/SBCommandReturnObject.cpp.orig	2019-11-18 08:52:26.912463944 +0000
-+++ source/API/SBCommandReturnObject.cpp	2019-11-18 08:53:28.696465842 +0000
-@@ -106,7 +106,7 @@
- }
-
- size_t SBCommandReturnObject::PutOutput(FILE *fh) {
--  LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutOutput, (FILE *), fh);
-+  LLDB_RECORD_DUMMY(size_t, SBCommandReturnObject, PutOutput, (FILE *), fh);
-
-   if (fh) {
-     size_t num_bytes = GetOutputSize();
-@@ -117,7 +117,7 @@
- }
-
- size_t SBCommandReturnObject::PutError(FILE *fh) {
--  LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutError, (FILE *), fh);
-+  LLDB_RECORD_DUMMY(size_t, SBCommandReturnObject, PutError, (FILE *), fh);
-
-   if (fh) {
-     size_t num_bytes = GetErrorSize();
-@@ -230,14 +230,14 @@
- }
-
- void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh) {
--  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-+  LLDB_RECORD_DUMMY(void, SBCommandReturnObject, SetImmediateOutputFile,
-                      (FILE *), fh);
-
-   SetImmediateOutputFile(fh, false);
- }
-
- void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh) {
--  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-+  LLDB_RECORD_DUMMY(void, SBCommandReturnObject, SetImmediateErrorFile,
-                      (FILE *), fh);
-
-   SetImmediateErrorFile(fh, false);
-@@ -245,7 +245,7 @@
-
- void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh,
-                                                    bool transfer_ownership) {
--  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-+  LLDB_RECORD_DUMMY(void, SBCommandReturnObject, SetImmediateOutputFile,
-                      (FILE *, bool), fh, transfer_ownership);
-
-   if (m_opaque_up)
-@@ -254,7 +254,7 @@
-
- void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh,
-                                                   bool transfer_ownership) {
--  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-+  LLDB_RECORD_DUMMY(void, SBCommandReturnObject, SetImmediateErrorFile,
-                      (FILE *, bool), fh, transfer_ownership);
-
-   if (m_opaque_up)
---- source/API/SBDebugger.cpp.orig	2019-11-18 08:59:25.852476813 +0000
-+++ source/API/SBDebugger.cpp	2019-11-18 09:06:47.496490379 +0000
-@@ -339,7 +339,7 @@
- // of problems; don't want users trying to switch modes in the middle of a
- // debugging session.
- void SBDebugger::SetInputFileHandle(FILE *fh, bool transfer_ownership) {
--  LLDB_RECORD_METHOD(void, SBDebugger, SetInputFileHandle, (FILE *, bool), fh,
-+  LLDB_RECORD_DUMMY(void, SBDebugger, SetInputFileHandle, (FILE *, bool), fh,
-                      transfer_ownership);
-
-   if (!m_opaque_sp)
-@@ -357,7 +357,7 @@
- }
-
- void SBDebugger::SetOutputFileHandle(FILE *fh, bool transfer_ownership) {
--  LLDB_RECORD_METHOD(void, SBDebugger, SetOutputFileHandle, (FILE *, bool), fh,
-+  LLDB_RECORD_DUMMY(void, SBDebugger, SetOutputFileHandle, (FILE *, bool), fh,
-                      transfer_ownership);
-
-   if (m_opaque_sp)
-@@ -365,7 +365,7 @@
- }
-
- void SBDebugger::SetErrorFileHandle(FILE *fh, bool transfer_ownership) {
--  LLDB_RECORD_METHOD(void, SBDebugger, SetErrorFileHandle, (FILE *, bool), fh,
-+  LLDB_RECORD_DUMMY(void, SBDebugger, SetErrorFileHandle, (FILE *, bool), fh,
-                      transfer_ownership);
-
-
-@@ -376,33 +376,18 @@
- FILE *SBDebugger::GetInputFileHandle() {
-   LLDB_RECORD_METHOD_NO_ARGS(FILE *, SBDebugger, GetInputFileHandle);
-
--  if (m_opaque_sp) {
--    StreamFileSP stream_file_sp(m_opaque_sp->GetInputFile());
--    if (stream_file_sp)
--      return LLDB_RECORD_RESULT(stream_file_sp->GetFile().GetStream());
--  }
-   return nullptr;
- }
-
- FILE *SBDebugger::GetOutputFileHandle() {
-   LLDB_RECORD_METHOD_NO_ARGS(FILE *, SBDebugger, GetOutputFileHandle);
-
--  if (m_opaque_sp) {
--    StreamFileSP stream_file_sp(m_opaque_sp->GetOutputFile());
--    if (stream_file_sp)
--      return LLDB_RECORD_RESULT(stream_file_sp->GetFile().GetStream());
--  }
-   return nullptr;
- }
-
- FILE *SBDebugger::GetErrorFileHandle() {
-   LLDB_RECORD_METHOD_NO_ARGS(FILE *, SBDebugger, GetErrorFileHandle);
-
--  if (m_opaque_sp) {
--    StreamFileSP stream_file_sp(m_opaque_sp->GetErrorFile());
--    if (stream_file_sp)
--      return LLDB_RECORD_RESULT(stream_file_sp->GetFile().GetStream());
--  }
-   return nullptr;
- }
-
-@@ -483,7 +468,7 @@
- void SBDebugger::HandleProcessEvent(const SBProcess &process,
-                                     const SBEvent &event, FILE *out,
-                                     FILE *err) {
--  LLDB_RECORD_METHOD(
-+  LLDB_RECORD_DUMMY(
-       void, SBDebugger, HandleProcessEvent,
-       (const lldb::SBProcess &, const lldb::SBEvent &, FILE *, FILE *), process,
-       event, out, err);
---- source/API/SBInstruction.cpp.orig	2019-11-18 09:18:56.628512777 +0000
-+++ source/API/SBInstruction.cpp	2019-11-18 09:19:17.728513425 +0000
-@@ -256,7 +256,7 @@
- }
-
- void SBInstruction::Print(FILE *out) {
--  LLDB_RECORD_METHOD(void, SBInstruction, Print, (FILE *), out);
-+  LLDB_RECORD_DUMMY(void, SBInstruction, Print, (FILE *), out);
-
-   if (out == nullptr)
-     return;
---- source/API/SBInstructionList.cpp.orig	2019-11-18 09:22:29.268519309 +0000
-+++ source/API/SBInstructionList.cpp	2019-11-18 09:22:37.372519558 +0000
-@@ -117,7 +117,7 @@
- }
-
- void SBInstructionList::Print(FILE *out) {
--  LLDB_RECORD_METHOD(void, SBInstructionList, Print, (FILE *), out);
-+  LLDB_RECORD_DUMMY(void, SBInstructionList, Print, (FILE *), out);
-
-   if (out == nullptr)
-     return;
---- source/API/SBProcess.cpp.orig	2019-11-18 11:41:31.220775555 +0000
-+++ source/API/SBProcess.cpp	2019-11-18 11:42:28.364777311 +0000
-@@ -332,7 +332,7 @@
- }
-
- void SBProcess::ReportEventState(const SBEvent &event, FILE *out) const {
--  LLDB_RECORD_METHOD_CONST(void, SBProcess, ReportEventState,
-+  LLDB_RECORD_DUMMY(void, SBProcess, ReportEventState,
-                            (const lldb::SBEvent &, FILE *), event, out);
-
-   if (out == nullptr)
--- a/dev/mercurial/mercurial.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/mercurial/mercurial.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,21 +26,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	make PYTHON=python2 PREFIX=/. all
-	make PYTHON=python2 PREFIX=/. DESTDIR=$DESTDIR install
-	install -Dm0755 contrib/hg-ssh $DESTDIR/bin/hg-ssh
-	install -Dm0755 contrib/hgk $DESTDIR/libexec/mercurial/hgk
-	install -Dm0644 contrib/zsh_completion $DESTDIR/share/zsh/site-functions/_$PKGNAME
-	install -Dm0644 contrib/bash_completion $DESTDIR/share/bash-completion/completions/$PKGNAME
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+make PYTHON=python2 PREFIX=/. all
+make PYTHON=python2 PREFIX=/. DESTDIR=$DESTDIR install
+install -Dm0755 contrib/hg-ssh $DESTDIR/bin/hg-ssh
+install -Dm0755 contrib/hgk $DESTDIR/libexec/mercurial/hgk
+install -Dm0644 contrib/zsh_completion $DESTDIR/share/zsh/site-functions/_$PKGNAME
+install -Dm0644 contrib/bash_completion $DESTDIR/share/bash-completion/completions/$PKGNAME

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/meson/meson.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/meson/meson.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,14 +23,11 @@
 PKGDOWNLOAD="https://github.com/mesonbuild/meson/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="ninja python py-setuptools:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	python setup.py install --root=${DESTDIR:-/} --prefix=/. -O1
+python setup.py install --root=${DESTDIR:-/} --prefix=/. -O1

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/nasm/nasm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/nasm/nasm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/ninja/ninja.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/ninja/ninja.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,21 +26,18 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/tree/main/ninja
-	patch -p1 < ../musl.patch
+# https://git.alpinelinux.org/aports/tree/main/ninja
+patch -p1 < ../musl.patch

-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	python3 ./configure.py --bootstrap
-	install -Dm0755 ninja $DESTDIR/bin/ninja
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+python3 ./configure.py --bootstrap
+install -Dm0755 ninja $DESTDIR/bin/ninja

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/patchelf/patchelf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/patchelf/patchelf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/pkgconf/pkgconf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/pkgconf/pkgconf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make

-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	ln -sf pkgconf $DESTDIR/bin/pkg-config
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+ln -sf pkgconf $DESTDIR/bin/pkg-config

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/swig/swig.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/swig/swig.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,26 +40,23 @@
 	with_pcre="--without-pcre"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_pcre
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_pcre
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dev/yasm/yasm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dev/yasm/yasm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_python="--disable-python --disable-python-bindings"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_python
-	make
-	make install DESTDIR=$DESTDIR
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_python
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dns/avahi/avahi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dns/avahi/avahi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -89,45 +89,42 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --disable-python: does not support Python 3 yet.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-gtk \
-		--disable-qt3 \
-		--disable-qt4  \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-python \
-		--with-xml=expat \
-		--with-distro="none" \
-		--without-systemdsystemunitdir \
-		$with_dbus \
-		$with_glib \
-		$with_gobject \
-		$with_gtk \
-		$with_introspection \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	rmdir $DESTDIR/run
-	find $DESTDIR -type f -name "*.la" -delete
-	install -Dm644 ../avahi $DESTDIR/etc/rc.d/avahi
+# --disable-python: does not support Python 3 yet.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-gtk \
+	--disable-qt3 \
+	--disable-qt4  \
+	--disable-mono \
+	--disable-monodoc \
+	--disable-python \
+	--with-xml=expat \
+	--with-distro="none" \
+	--without-systemdsystemunitdir \
+	$with_dbus \
+	$with_glib \
+	$with_gobject \
+	$with_gtk \
+	$with_introspection \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+rmdir $DESTDIR/run
+find $DESTDIR -type f -name "*.la" -delete
+install -Dm644 ../avahi $DESTDIR/etc/rc.d/avahi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/dns/c-ares/c-ares.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/dns/c-ares/c-ares.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/editors/nano/nano.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/editors/nano/nano.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -176,41 +176,38 @@
 	with_wrapping="--disable-wrapping"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_browser \
-		$with_color \
-		$with_comment \
-		$with_extra \
-		$with_help \
-		$with_histories \
-		$with_justify \
-		$with_libmagic \
-		$with_linenumbers \
-		$with_mouse \
-		$with_multibuffer \
-		$with_nanorc \
-		$with_nls \
-		$with_speller \
-		$with_tabcomp \
-		$with_utf8 \
-		$with_wordcomp \
-		$with_wrapping
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_browser \
+	$with_color \
+	$with_comment \
+	$with_extra \
+	$with_help \
+	$with_histories \
+	$with_justify \
+	$with_libmagic \
+	$with_linenumbers \
+	$with_mouse \
+	$with_multibuffer \
+	$with_nanorc \
+	$with_nls \
+	$with_speller \
+	$with_tabcomp \
+	$with_utf8 \
+	$with_wordcomp \
+	$with_wrapping
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/editors/vim/vim.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/editors/vim/vim.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -117,35 +117,32 @@
 	with_terminal="--disable-terminal"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--disable-selinux \
-		--disable-luainterp \
-		--disable-pythoninterp \
-		$with_acl \
-		$with_gpm \
-		$with_gui \
-		$with_libcanberra \
-		$with_multibyte \
-		$with_nls \
-		$with_perl \
-		$with_python \
-		$with_ruby \
-		$with_tcl \
-		$with_terminal
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--disable-selinux \
+	--disable-luainterp \
+	--disable-pythoninterp \
+	$with_acl \
+	$with_gpm \
+	$with_gui \
+	$with_libcanberra \
+	$with_multibyte \
+	$with_nls \
+	$with_perl \
+	$with_python \
+	$with_ruby \
+	$with_tcl \
+	$with_terminal
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/emulation/libretro-2048/libretro-2048.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-2048/libretro-2048.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,19 +29,16 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2 -DNDEBUG -fPIC}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CFLAGS="$CFLAGS"
-	install -Dm0644 ../2048_libretro.info $DESTDIR/share/libretro/info/2048_libretro.info
-	install -Dm0644 2048_libretro.so $DESTDIR/lib/libretro/2048_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CFLAGS="$CFLAGS"
+install -Dm0644 ../2048_libretro.info $DESTDIR/share/libretro/info/2048_libretro.info
+install -Dm0644 2048_libretro.so $DESTDIR/lib/libretro/2048_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-3dengine/libretro-3dengine.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-3dengine/libretro-3dengine.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,26 +31,23 @@
 : ${CFLAGS:=-O2}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '263iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '263iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '263iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '263iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	patch -p0 < ../patch-clang.patch
+patch -p0 < ../patch-clang.patch

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../3dengine_libretro.info $DESTDIR/share/libretro/info/3dengine_libretro.info
-	install -Dm0644 3dengine_libretro.so $DESTDIR/lib/libretro/3dengine_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../3dengine_libretro.info $DESTDIR/share/libretro/info/3dengine_libretro.info
+install -Dm0644 3dengine_libretro.so $DESTDIR/lib/libretro/3dengine_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-4do/libretro-4do.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-4do/libretro-4do.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf 4do-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd 4do-libretro-$_COMMIT
+rm -rf 4do-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd 4do-libretro-$_COMMIT

-	sed -i -e '601iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '601iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '601iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '601iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXx="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../4do_libretro.info $DESTDIR/share/libretro/info/4do_libretro.info
-	install -Dm0644 4do_libretro.so $DESTDIR/lib/libretro/4do_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXx="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../4do_libretro.info $DESTDIR/share/libretro/info/4do_libretro.info
+install -Dm0644 4do_libretro.so $DESTDIR/lib/libretro/4do_libretro.so

-	cd ..
-	rm -rf 4do-libretro-$_COMMIT
-}
+cd ..
+rm -rf 4do-libretro-$_COMMIT
--- a/emulation/libretro-81/libretro-81.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-81/libretro-81.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,21 +31,18 @@
 : ${CFLAGS:=-O2}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf 81-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd 81-libretro-$_COMMIT
+rm -rf 81-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd 81-libretro-$_COMMIT

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		CFLAGS="$CFLAGS" \
-		CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../81_libretro.info $DESTDIR/share/libretro/info/81_libretro.info
-	install -Dm0644 81_libretro.so $DESTDIR/lib/libretro/81_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	CFLAGS="$CFLAGS" \
+	CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../81_libretro.info $DESTDIR/share/libretro/info/81_libretro.info
+install -Dm0644 81_libretro.so $DESTDIR/lib/libretro/81_libretro.so

-	cd ..
-	rm -rf 81-libretro-$_COMMIT
-}
+cd ..
+rm -rf 81-libretro-$_COMMIT
--- a/emulation/libretro-atari800/libretro-atari800.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-atari800/libretro-atari800.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CFLAGS:=-O2}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '451iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '451iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '451iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '451iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../atari800_libretro.info $DESTDIR/share/libretro/info/atari800_libretro.info
-	install -Dm0644 atari800_libretro.so $DESTDIR/lib/libretro/atari800_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../atari800_libretro.info $DESTDIR/share/libretro/info/atari800_libretro.info
+install -Dm0644 atari800_libretro.so $DESTDIR/lib/libretro/atari800_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-beetle-bsnes/libretro-beetle-bsnes.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-bsnes/libretro-beetle-bsnes.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-bsnes-libretro-$_COMMIT
-	tar xvf beetle-bsnes-libretro-$_SCOMMIT.tar.gz
-	cd beetle-bsnes-libretro-$_COMMIT
+rm -rf beetle-bsnes-libretro-$_COMMIT
+tar xvf beetle-bsnes-libretro-$_SCOMMIT.tar.gz
+cd beetle-bsnes-libretro-$_COMMIT

-	sed -i -e '295iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '295iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '295iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '295iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_snes_libretro.info $DESTDIR/share/libretro/info/mednafen_snes_libretro.info
-	install -Dm0644 mednafen_snes_libretro.so $DESTDIR/lib/libretro/mednafen_snes_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_snes_libretro.info $DESTDIR/share/libretro/info/mednafen_snes_libretro.info
+install -Dm0644 mednafen_snes_libretro.so $DESTDIR/lib/libretro/mednafen_snes_libretro.so

-	cd ..
-	rm -rf beetle-bsnes-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-bsnes-libretro-$_COMMIT
--- a/emulation/libretro-beetle-gba/libretro-beetle-gba.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-gba/libretro-beetle-gba.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-gba-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-gba-libretro-$_COMMIT
+rm -rf beetle-gba-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-gba-libretro-$_COMMIT

-	sed -i -e '301iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '301iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '301iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '301iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_gba_libretro.info $DESTDIR/share/libretro/info/mednafen_gba_libretro.info
-	install -Dm0644 mednafen_gba_libretro.so $DESTDIR/lib/libretro/mednafen_gba_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_gba_libretro.info $DESTDIR/share/libretro/info/mednafen_gba_libretro.info
+install -Dm0644 mednafen_gba_libretro.so $DESTDIR/lib/libretro/mednafen_gba_libretro.so

-	cd ..
-	rm -rf beetle-gba-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-gba-libretro-$_COMMIT
--- a/emulation/libretro-beetle-lynx/libretro-beetle-lynx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-lynx/libretro-beetle-lynx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-lynx-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-lynx-libretro-$_COMMIT
+rm -rf beetle-lynx-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-lynx-libretro-$_COMMIT

-	sed -i -e '605iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '605iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '605iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '605iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_lynx_libretro.info $DESTDIR/share/libretro/info/mednafen_lynx_libretro.info
-	install -Dm0644 mednafen_lynx_libretro.so $DESTDIR/lib/libretro/mednafen_lynx_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_lynx_libretro.info $DESTDIR/share/libretro/info/mednafen_lynx_libretro.info
+install -Dm0644 mednafen_lynx_libretro.so $DESTDIR/lib/libretro/mednafen_lynx_libretro.so

-	cd ..
-	rm -rf beetle-lynx-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-lynx-libretro-$_COMMIT
--- a/emulation/libretro-beetle-ngp/libretro-beetle-ngp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-ngp/libretro-beetle-ngp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-ngp-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-ngp-libretro-$_COMMIT
+rm -rf beetle-ngp-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-ngp-libretro-$_COMMIT

-	sed -i -e '619iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '619iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '619iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '619iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_ngp_libretro.info $DESTDIR/share/libretro/info/mednafen_ngp_libretro.info
-	install -Dm0644 mednafen_ngp_libretro.so $DESTDIR/lib/libretro/mednafen_ngp_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_ngp_libretro.info $DESTDIR/share/libretro/info/mednafen_ngp_libretro.info
+install -Dm0644 mednafen_ngp_libretro.so $DESTDIR/lib/libretro/mednafen_ngp_libretro.so

-	cd ..
-	rm -rf beetle-ngp-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-ngp-libretro-$_COMMIT
--- a/emulation/libretro-beetle-pce-fast/libretro-beetle-pce-fast.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-pce-fast/libretro-beetle-pce-fast.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-pce-fast-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-pce-fast-libretro-$_COMMIT
+rm -rf beetle-pce-fast-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-pce-fast-libretro-$_COMMIT

-	sed -i -e '622iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '622iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '622iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '622iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_pce_fast_libretro.info $DESTDIR/share/libretro/info/mednafen_pce_fast_libretro.info
-	install -Dm0644 mednafen_pce_fast_libretro.so $DESTDIR/lib/libretro/mednafen_pce_fast_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_pce_fast_libretro.info $DESTDIR/share/libretro/info/mednafen_pce_fast_libretro.info
+install -Dm0644 mednafen_pce_fast_libretro.so $DESTDIR/lib/libretro/mednafen_pce_fast_libretro.so

-	cd ..
-	rm -rf beetle-pce-fast-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-pce-fast-libretro-$_COMMIT
--- a/emulation/libretro-beetle-pcfx/libretro-beetle-pcfx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-pcfx/libretro-beetle-pcfx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-pcfx-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-pcfx-libretro-$_COMMIT
+rm -rf beetle-pcfx-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-pcfx-libretro-$_COMMIT

-	sed -i -e '485iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '485iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '485iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '485iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_pcfx_libretro.info $DESTDIR/share/libretro/info/mednafen_pcfx_libretro.info
-	install -Dm0644 mednafen_pcfx_libretro.so $DESTDIR/lib/libretro/mednafen_pcfx_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_pcfx_libretro.info $DESTDIR/share/libretro/info/mednafen_pcfx_libretro.info
+install -Dm0644 mednafen_pcfx_libretro.so $DESTDIR/lib/libretro/mednafen_pcfx_libretro.so

-	cd ..
-	rm -rf beetle-pcfx-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-pcfx-libretro-$_COMMIT
--- a/emulation/libretro-beetle-psx/libretro-beetle-psx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-psx/libretro-beetle-psx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-psx-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-psx-libretro-$_COMMIT
+rm -rf beetle-psx-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-psx-libretro-$_COMMIT

-	sed -i -e '616iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '616iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '616iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '616iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_psx_libretro.info $DESTDIR/share/libretro/info/mednafen_psx_libretro.info
-	install -Dm0644 mednafen_psx_libretro.so $DESTDIR/lib/libretro/mednafen_psx_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_psx_libretro.info $DESTDIR/share/libretro/info/mednafen_psx_libretro.info
+install -Dm0644 mednafen_psx_libretro.so $DESTDIR/lib/libretro/mednafen_psx_libretro.so

-	cd ..
-	rm -rf beetle-psx-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-psx-libretro-$_COMMIT
--- a/emulation/libretro-beetle-saturn/libretro-beetle-saturn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-saturn/libretro-beetle-saturn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-saturn-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-saturn-libretro-$_COMMIT
+rm -rf beetle-saturn-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-saturn-libretro-$_COMMIT

-	sed -i -e '509iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '509iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '509iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '509iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_saturn_libretro.info $DESTDIR/share/libretro/info/mednafen_saturn_libretro.info
-	install -Dm0644 mednafen_saturn_libretro.so $DESTDIR/lib/libretro/mednafen_saturn_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_saturn_libretro.info $DESTDIR/share/libretro/info/mednafen_saturn_libretro.info
+install -Dm0644 mednafen_saturn_libretro.so $DESTDIR/lib/libretro/mednafen_saturn_libretro.so

-	cd ..
-	rm -rf beetle-saturn-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-saturn-libretro-$_COMMIT
--- a/emulation/libretro-beetle-supergrafx/libretro-beetle-supergrafx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-supergrafx/libretro-beetle-supergrafx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-supergrafx-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-supergrafx-libretro-$_COMMIT
+rm -rf beetle-supergrafx-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-supergrafx-libretro-$_COMMIT

-	sed -i -e '435iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '435iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '435iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '435iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_supergrafx_libretro.info $DESTDIR/share/libretro/info/mednafen_supergrafx_libretro.info
-	install -Dm0644 mednafen_supergrafx_libretro.so $DESTDIR/lib/libretro/mednafen_supergrafx_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_supergrafx_libretro.info $DESTDIR/share/libretro/info/mednafen_supergrafx_libretro.info
+install -Dm0644 mednafen_supergrafx_libretro.so $DESTDIR/lib/libretro/mednafen_supergrafx_libretro.so

-	cd ..
-	rm -rf beetle-supergrafx-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-supergrafx-libretro-$_COMMIT
--- a/emulation/libretro-beetle-vb/libretro-beetle-vb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-vb/libretro-beetle-vb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-vb-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-vb-libretro-$_COMMIT
+rm -rf beetle-vb-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-vb-libretro-$_COMMIT

-	sed -i -e '566iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '566iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '566iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '566iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_vb_libretro.info $DESTDIR/share/libretro/info/mednafen_vb_libretro.info
-	install -Dm0644 mednafen_vb_libretro.so $DESTDIR/lib/libretro/mednafen_vb_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_vb_libretro.info $DESTDIR/share/libretro/info/mednafen_vb_libretro.info
+install -Dm0644 mednafen_vb_libretro.so $DESTDIR/lib/libretro/mednafen_vb_libretro.so

-	cd ..
-	rm -rf beetle-vb-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-vb-libretro-$_COMMIT
--- a/emulation/libretro-beetle-wswan/libretro-beetle-wswan.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-beetle-wswan/libretro-beetle-wswan.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf beetle-wswan-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd beetle-wswan-libretro-$_COMMIT
+rm -rf beetle-wswan-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd beetle-wswan-libretro-$_COMMIT

-	sed -i -e '577iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '577iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '577iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '577iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mednafen_wswan_libretro.info $DESTDIR/share/libretro/info/mednafen_wswan_libretro.info
-	install -Dm0644 mednafen_wswan_libretro.so $DESTDIR/lib/libretro/mednafen_wswan_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mednafen_wswan_libretro.info $DESTDIR/share/libretro/info/mednafen_wswan_libretro.info
+install -Dm0644 mednafen_wswan_libretro.so $DESTDIR/lib/libretro/mednafen_wswan_libretro.so

-	cd ..
-	rm -rf beetle-wswan-libretro-$_COMMIT
-}
+cd ..
+rm -rf beetle-wswan-libretro-$_COMMIT
--- a/emulation/libretro-blastem/libretro-blastem.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-blastem/libretro-blastem.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,21 +30,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf blastem-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd blastem-$_COMMIT
+rm -rf blastem-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd blastem-$_COMMIT

-	sed -i -e '266iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '266iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../blastem_libretro.info $DESTDIR/share/libretro/info/blastem_libretro.info
-	install -Dm0644 blastem_libretro.so $DESTDIR/lib/libretro/blastem_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../blastem_libretro.info $DESTDIR/share/libretro/info/blastem_libretro.info
+install -Dm0644 blastem_libretro.so $DESTDIR/lib/libretro/blastem_libretro.so

-	cd ..
-	rm -rf blastem-$_COMMIT
-}
+cd ..
+rm -rf blastem-$_COMMIT
--- a/emulation/libretro-bluemsx/libretro-bluemsx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-bluemsx/libretro-bluemsx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf blueMSX-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd blueMSX-libretro-$_COMMIT
+rm -rf blueMSX-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd blueMSX-libretro-$_COMMIT

-	sed -i -e '617iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '617iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '617iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '617iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	patch -p0 < ../patch-clang.patch
-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../bluemsx_libretro.info $DESTDIR/share/libretro/info/bluemsx_libretro.info
-	install -Dm0644 bluemsx_libretro.so $DESTDIR/lib/libretro/bluemsx_libretro.so
+patch -p0 < ../patch-clang.patch
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../bluemsx_libretro.info $DESTDIR/share/libretro/info/bluemsx_libretro.info
+install -Dm0644 bluemsx_libretro.so $DESTDIR/lib/libretro/bluemsx_libretro.so

-	cd ..
-	rm -rf blueMSX-libretro-$_COMMIT
-}
+cd ..
+rm -rf blueMSX-libretro-$_COMMIT
--- a/emulation/libretro-bsnes/libretro-bsnes.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-bsnes/libretro-bsnes.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,25 +33,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf bsnes-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd bsnes-libretro-$_COMMIT
+rm -rf bsnes-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd bsnes-libretro-$_COMMIT

-	for profile in accuracy balanced performance; do
-		make \
-			GIT_VERSION="$_SCOMMIT" \
-			CC="$CC" \
-			CXX="$CXX" \
-			cflags="$CFLAGS" \
-			cppflags="$CXXFLAGS" \
-			profile=$profile
+for profile in accuracy balanced performance; do
+	make \
+		GIT_VERSION="$_SCOMMIT" \
+		CC="$CC" \
+		CXX="$CXX" \
+		cflags="$CFLAGS" \
+		cppflags="$CXXFLAGS" \
+		profile=$profile

-		install -Dm0644 out/bsnes_${profile}_libretro.so $DESTDIR/lib/libretro/bsnes_${profile}_libretro.so
-		install -Dm0644 ../bsnes_${profile}_libretro.info $DESTDIR/share/libretro/info/bsnes_${profile}_libretro.info
-	done
+	install -Dm0644 out/bsnes_${profile}_libretro.so $DESTDIR/lib/libretro/bsnes_${profile}_libretro.so
+	install -Dm0644 ../bsnes_${profile}_libretro.info $DESTDIR/share/libretro/info/bsnes_${profile}_libretro.info
+done

-	cd ..
-	rm -rf bsnes-libretro-$_COMMIT
-}
+cd ..
+rm -rf bsnes-libretro-$_COMMIT
--- a/emulation/libretro-cap32/libretro-cap32.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-cap32/libretro-cap32.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '356iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '356iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '356iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '356iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../cap32_libretro.info $DESTDIR/share/libretro/info/cap32_libretro.info
-	install -Dm0644 cap32_libretro.so $DESTDIR/lib/libretro/cap32_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../cap32_libretro.info $DESTDIR/share/libretro/info/cap32_libretro.info
+install -Dm0644 cap32_libretro.so $DESTDIR/lib/libretro/cap32_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-craft/libretro-craft.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-craft/libretro-craft.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,24 +32,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf Craft-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd Craft-$_COMMIT
+rm -rf Craft-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd Craft-$_COMMIT

-	sed -i -e '478iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '478iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '478iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '478iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../craft_libretro.info $DESTDIR/share/libretro/info/craft_libretro.info
-	install -Dm0644 craft_libretro.so $DESTDIR/lib/libretro/craft_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../craft_libretro.info $DESTDIR/share/libretro/info/craft_libretro.info
+install -Dm0644 craft_libretro.so $DESTDIR/lib/libretro/craft_libretro.so

-	cd ..
-	rm -rf Craft-$_COMMIT
-}
+cd ..
+rm -rf Craft-$_COMMIT
--- a/emulation/libretro-crocods/libretro-crocods.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-crocods/libretro-crocods.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,22 +29,19 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '278iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '278iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		platform=unix
-	install -Dm0644 ../crocods_libretro.info $DESTDIR/share/libretro/info/crocods_libretro.info
-	install -Dm0644 crocods_libretro.so $DESTDIR/lib/libretro/crocods_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	platform=unix
+install -Dm0644 ../crocods_libretro.info $DESTDIR/share/libretro/info/crocods_libretro.info
+install -Dm0644 crocods_libretro.so $DESTDIR/lib/libretro/crocods_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-desmume/libretro-desmume.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-desmume/libretro-desmume.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,26 +33,23 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf desmume-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd desmume-$_COMMIT
+rm -rf desmume-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd desmume-$_COMMIT

-	sed -i -e '624iCFLAGS+= $(EXTRA_CFLAGS)' desmume/src/frontend/libretro/Makefile.libretro
-	sed -i -e '624iCXXFLAGS+= $(EXTRA_CXXFLAGS)' desmume/src/frontend/libretro/Makefile.libretro
+sed -i -e '624iCFLAGS+= $(EXTRA_CFLAGS)' desmume/src/frontend/libretro/Makefile.libretro
+sed -i -e '624iCXXFLAGS+= $(EXTRA_CXXFLAGS)' desmume/src/frontend/libretro/Makefile.libretro

-	make \
-		-C desmume/src/frontend/libretro \
-		-f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../desmume_libretro.info $DESTDIR/share/libretro/info/desmume_libretro.info
-	install -Dm0644 desmume/src/frontend/libretro/desmume_libretro.so $DESTDIR/lib/libretro/desmume_libretro.so
+make \
+	-C desmume/src/frontend/libretro \
+	-f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../desmume_libretro.info $DESTDIR/share/libretro/info/desmume_libretro.info
+install -Dm0644 desmume/src/frontend/libretro/desmume_libretro.so $DESTDIR/lib/libretro/desmume_libretro.so

-	cd ..
-	rm -rf desmume-$_COMMIT
-}
+cd ..
+rm -rf desmume-$_COMMIT
--- a/emulation/libretro-dinothawr/libretro-dinothawr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-dinothawr/libretro-dinothawr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf Dinothawr-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd Dinothawr-$_COMMIT
+rm -rf Dinothawr-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd Dinothawr-$_COMMIT

-	sed -i -e '359iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '359iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '359iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '359iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../dinothawr_libretro.info $DESTDIR/share/libretro/info/dinothawr_libretro.info
-	install -Dm0644 dinothawr_libretro.so $DESTDIR/lib/libretro/dinothawr_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../dinothawr_libretro.info $DESTDIR/share/libretro/info/dinothawr_libretro.info
+install -Dm0644 dinothawr_libretro.so $DESTDIR/lib/libretro/dinothawr_libretro.so

-	cd ..
-	rm -rf Dinothawr-$_COMMIT
-}
+cd ..
+rm -rf Dinothawr-$_COMMIT
--- a/emulation/libretro-dolphin/libretro-dolphin.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-dolphin/libretro-dolphin.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,26 +32,23 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf dolphin-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd dolphin-$_COMMIT
+rm -rf dolphin-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd dolphin-$_COMMIT

-	patch -p0 < ../patch-musl.patch
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DLIBRETRO=On
-	make
-	install -Dm0644 ../../dolphin_libretro.info $DESTDIR/share/libretro/info/dolphin_libretro.info
-	install -Dm0644 dolphin_libretro.so $DESTDIR/lib/libretro/dolphin_libretro.so
-	cd ..
+patch -p0 < ../patch-musl.patch
+mkdir build && cd build
+cmake .. \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DLIBRETRO=On
+make
+install -Dm0644 ../../dolphin_libretro.info $DESTDIR/share/libretro/info/dolphin_libretro.info
+install -Dm0644 dolphin_libretro.so $DESTDIR/lib/libretro/dolphin_libretro.so
+cd ..

-	cd ..
-	rm -rf dolphin-$_COMMIT
-}
+cd ..
+rm -rf dolphin-$_COMMIT
--- a/emulation/libretro-dosbox/libretro-dosbox.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-dosbox/libretro-dosbox.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf dosbox-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd dosbox-libretro-$_COMMIT
+rm -rf dosbox-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd dosbox-libretro-$_COMMIT

-	sed -i -e '211iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '211iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '211iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '211iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../dosbox_libretro.info $DESTDIR/share/libretro/info/dosbox_libretro.info
-	install -Dm0644 dosbox_libretro.so $DESTDIR/lib/libretro/dosbox_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../dosbox_libretro.info $DESTDIR/share/libretro/info/dosbox_libretro.info
+install -Dm0644 dosbox_libretro.so $DESTDIR/lib/libretro/dosbox_libretro.so

-	cd ..
-	rm -rf dosbox-libretro-$_COMMIT
-}
+cd ..
+rm -rf dosbox-libretro-$_COMMIT
--- a/emulation/libretro-fceumm/libretro-fceumm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-fceumm/libretro-fceumm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '749iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '749iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '749iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '749iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../fceumm_libretro.info $DESTDIR/share/libretro/info/fceumm_libretro.info
-	install -Dm0644 fceumm_libretro.so $DESTDIR/lib/libretro/fceumm_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../fceumm_libretro.info $DESTDIR/share/libretro/info/fceumm_libretro.info
+install -Dm0644 fceumm_libretro.so $DESTDIR/lib/libretro/fceumm_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-fmsx/libretro-fmsx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-fmsx/libretro-fmsx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf fmsx-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd fmsx-libretro-$_COMMIT
+rm -rf fmsx-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd fmsx-libretro-$_COMMIT

-	sed -i -e '514iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '514iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../fmsx_libretro.info $DESTDIR/share/libretro/info/fmsx_libretro.info
-	install -Dm0644 fmsx_libretro.so $DESTDIR/lib/libretro/fmsx_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../fmsx_libretro.info $DESTDIR/share/libretro/info/fmsx_libretro.info
+install -Dm0644 fmsx_libretro.so $DESTDIR/lib/libretro/fmsx_libretro.so

-	cd ..
-	rm -rf fmsx-libretro-$_COMMIT
-}
+cd ..
+rm -rf fmsx-libretro-$_COMMIT
--- a/emulation/libretro-fuse/libretro-fuse.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-fuse/libretro-fuse.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf fuse-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd fuse-libretro-$_COMMIT
+rm -rf fuse-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd fuse-libretro-$_COMMIT

-	sed -i -e '455iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '455iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '455iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '455iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../fuse_libretro.info $DESTDIR/share/libretro/info/fuse_libretro.info
-	install -Dm0644 fuse_libretro.so $DESTDIR/lib/libretro/fuse_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../fuse_libretro.info $DESTDIR/share/libretro/info/fuse_libretro.info
+install -Dm0644 fuse_libretro.so $DESTDIR/lib/libretro/fuse_libretro.so

-	cd ..
-	rm -rf fuse-libretro-$_COMMIT
-}
+cd ..
+rm -rf fuse-libretro-$_COMMIT
--- a/emulation/libretro-gambatte/libretro-gambatte.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-gambatte/libretro-gambatte.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf gambatte-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd gambatte-libretro-$_COMMIT
+rm -rf gambatte-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd gambatte-libretro-$_COMMIT

-	sed -i -e '636iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '636iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '636iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '636iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../gambatte_libretro.info $DESTDIR/share/libretro/info/gambatte_libretro.info
-	install -Dm0644 gambatte_libretro.so $DESTDIR/lib/libretro/gambatte_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../gambatte_libretro.info $DESTDIR/share/libretro/info/gambatte_libretro.info
+install -Dm0644 gambatte_libretro.so $DESTDIR/lib/libretro/gambatte_libretro.so

-	cd ..
-	rm -rf gambatte-libretro-$_COMMIT
-}
+cd ..
+rm -rf gambatte-libretro-$_COMMIT
--- a/emulation/libretro-gearboy/libretro-gearboy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-gearboy/libretro-gearboy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf Gearboy-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd Gearboy-$_COMMIT
+rm -rf Gearboy-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd Gearboy-$_COMMIT

-	sed -i -e '211iCFLAGS+= $(EXTRA_CFLAGS)' platforms/libretro/Makefile
-	sed -i -e '211iCXXFLAGS+= $(EXTRA_CXXFLAGS)' platforms/libretro/Makefile
+sed -i -e '211iCFLAGS+= $(EXTRA_CFLAGS)' platforms/libretro/Makefile
+sed -i -e '211iCXXFLAGS+= $(EXTRA_CXXFLAGS)' platforms/libretro/Makefile

-	make -C platforms/libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../gearboy_libretro.info $DESTDIR/share/libretro/info/gearboy_libretro.info
-	install -Dm0644 platforms/libretro/gearboy_libretro.so $DESTDIR/lib/libretro/gearboy_libretro.so
+make -C platforms/libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../gearboy_libretro.info $DESTDIR/share/libretro/info/gearboy_libretro.info
+install -Dm0644 platforms/libretro/gearboy_libretro.so $DESTDIR/lib/libretro/gearboy_libretro.so

-	cd ..
-	rm -rf Gearboy-$_COMMIT
-}
+cd ..
+rm -rf Gearboy-$_COMMIT
--- a/emulation/libretro-genesis-plus-gx/libretro-genesis-plus-gx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-genesis-plus-gx/libretro-genesis-plus-gx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf Genesis-Plus-GX-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd Genesis-Plus-GX-$_COMMIT
+rm -rf Genesis-Plus-GX-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd Genesis-Plus-GX-$_COMMIT

-	sed -i -e '687iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '687iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '687iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '687iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../genesis_plus_gx_libretro.info $DESTDIR/share/libretro/info/genesis_plus_gx_libretro.info
-	install -Dm0644 genesis_plus_gx_libretro.so $DESTDIR/lib/libretro/genesis_plus_gx_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../genesis_plus_gx_libretro.info $DESTDIR/share/libretro/info/genesis_plus_gx_libretro.info
+install -Dm0644 genesis_plus_gx_libretro.so $DESTDIR/lib/libretro/genesis_plus_gx_libretro.so

-	cd ..
-	rm -rf Genesis-Plus-GX-$_COMMIT
-}
+cd ..
+rm -rf Genesis-Plus-GX-$_COMMIT
--- a/emulation/libretro-gme/libretro-gme.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-gme/libretro-gme.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '475iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '475iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '475iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '475iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../gme_libretro.info $DESTDIR/share/libretro/info/gme_libretro.info
-	install -Dm0644 gme_libretro.so $DESTDIR/lib/libretro/gme_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../gme_libretro.info $DESTDIR/share/libretro/info/gme_libretro.info
+install -Dm0644 gme_libretro.so $DESTDIR/lib/libretro/gme_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-gpsp/libretro-gpsp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-gpsp/libretro-gpsp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf gpsp-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd gpsp-$_COMMIT
+rm -rf gpsp-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd gpsp-$_COMMIT

-	sed -i -e '473iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '473iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '473iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '473iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		CFLAGS="$CFLAGS" \
-		CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../gpsp_libretro.info $DESTDIR/share/libretro/info/gpsp_libretro.info
-	install -Dm0644 gpsp_libretro.so $DESTDIR/lib/libretro/gpsp_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	CFLAGS="$CFLAGS" \
+	CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../gpsp_libretro.info $DESTDIR/share/libretro/info/gpsp_libretro.info
+install -Dm0644 gpsp_libretro.so $DESTDIR/lib/libretro/gpsp_libretro.so

-	cd ..
-	rm -rf gpsp-$_COMMIT
-}
+cd ..
+rm -rf gpsp-$_COMMIT
--- a/emulation/libretro-gw/libretro-gw.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-gw/libretro-gw.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf gw-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd gw-libretro-$_COMMIT
+rm -rf gw-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd gw-libretro-$_COMMIT

-	sed -i -e '407iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '407iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../gw_libretro.info $DESTDIR/share/libretro/info/gw_libretro.info
-	install -Dm0644 gw_libretro.so $DESTDIR/lib/libretro/gw_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../gw_libretro.info $DESTDIR/share/libretro/info/gw_libretro.info
+install -Dm0644 gw_libretro.so $DESTDIR/lib/libretro/gw_libretro.so

-	cd ..
-	rm -rf gw-libretro-$_COMMIT
-}
+cd ..
+rm -rf gw-libretro-$_COMMIT
--- a/emulation/libretro-handy/libretro-handy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-handy/libretro-handy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '534iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '534iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '534iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '534iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../handy_libretro.info $DESTDIR/share/libretro/info/handy_libretro.info
-	install -Dm0644 handy_libretro.so $DESTDIR/lib/libretro/handy_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../handy_libretro.info $DESTDIR/share/libretro/info/handy_libretro.info
+install -Dm0644 handy_libretro.so $DESTDIR/lib/libretro/handy_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-hatari/libretro-hatari.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-hatari/libretro-hatari.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf hatari-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd hatari-$_COMMIT
+rm -rf hatari-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd hatari-$_COMMIT

-	sed -i -e '187iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '187iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '187iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '187iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../hatari_libretro.info $DESTDIR/share/libretro/info/hatari_libretro.info
-	install -Dm0644 hatari_libretro.so $DESTDIR/lib/libretro/hatari_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../hatari_libretro.info $DESTDIR/share/libretro/info/hatari_libretro.info
+install -Dm0644 hatari_libretro.so $DESTDIR/lib/libretro/hatari_libretro.so

-	cd ..
-	rm -rf hatari-$_COMMIT
-}
+cd ..
+rm -rf hatari-$_COMMIT
--- a/emulation/libretro-meteor/libretro-meteor.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-meteor/libretro-meteor.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf meteor-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd meteor-libretro-$_COMMIT
+rm -rf meteor-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd meteor-libretro-$_COMMIT

-	sed -i -e '254iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
-	sed -i -e '254iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile
+sed -i -e '254iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
+sed -i -e '254iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile

-	make -C libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../meteor_libretro.info $DESTDIR/share/libretro/info/meteor_libretro.info
-	install -Dm0644 libretro/meteor_libretro.so $DESTDIR/lib/libretro/meteor_libretro.so
+make -C libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../meteor_libretro.info $DESTDIR/share/libretro/info/meteor_libretro.info
+install -Dm0644 libretro/meteor_libretro.so $DESTDIR/lib/libretro/meteor_libretro.so

-	cd ..
-	rm -rf meteor-libretro-$_COMMIT
-}
+cd ..
+rm -rf meteor-libretro-$_COMMIT
--- a/emulation/libretro-mgba/libretro-mgba.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-mgba/libretro-mgba.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf mgba-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd mgba-$_COMMIT
+rm -rf mgba-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd mgba-$_COMMIT

-	sed -i -e '406iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '406iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '406iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '406iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mgba_libretro.info $DESTDIR/share/libretro/info/mgba_libretro.info
-	install -Dm0644 mgba_libretro.so $DESTDIR/lib/libretro/mgba_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mgba_libretro.info $DESTDIR/share/libretro/info/mgba_libretro.info
+install -Dm0644 mgba_libretro.so $DESTDIR/lib/libretro/mgba_libretro.so

-	cd ..
-	rm -rf mgba-$_COMMIT
-}
+cd ..
+rm -rf mgba-$_COMMIT
--- a/emulation/libretro-mrboom/libretro-mrboom.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-mrboom/libretro-mrboom.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf mrboom-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd mrboom-libretro-$_COMMIT
+rm -rf mrboom-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd mrboom-libretro-$_COMMIT

-	sed -i -e '409iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '409iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '409iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '409iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../mrboom_libretro.info $DESTDIR/share/libretro/info/mrboom_libretro.info
-	install -Dm0644 mrboom_libretro.so $DESTDIR/lib/libretro/mrboom_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../mrboom_libretro.info $DESTDIR/share/libretro/info/mrboom_libretro.info
+install -Dm0644 mrboom_libretro.so $DESTDIR/lib/libretro/mrboom_libretro.so

-	cd ..
-	rm -rf mrboom-libretro-$_COMMIT
-}
+cd ..
+rm -rf mrboom-libretro-$_COMMIT
--- a/emulation/libretro-nestopia/libretro-nestopia.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-nestopia/libretro-nestopia.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf nestopia-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd nestopia-$_COMMIT
+rm -rf nestopia-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd nestopia-$_COMMIT

-	sed -i -e '716iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
-	sed -i -e '716iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile
+sed -i -e '716iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
+sed -i -e '716iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile

-	make -C libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../nestopia_libretro.info $DESTDIR/share/libretro/info/nestopia_libretro.info
-	install -Dm0644 libretro/nestopia_libretro.so $DESTDIR/lib/libretro/nestopia_libretro.so
+make -C libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../nestopia_libretro.info $DESTDIR/share/libretro/info/nestopia_libretro.info
+install -Dm0644 libretro/nestopia_libretro.so $DESTDIR/lib/libretro/nestopia_libretro.so

-	cd ..
-	rm -rf nestopia-$_COMMIT
-}
+cd ..
+rm -rf nestopia-$_COMMIT
--- a/emulation/libretro-nxengine/libretro-nxengine.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-nxengine/libretro-nxengine.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf nxengine-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd nxengine-libretro-$_COMMIT
+rm -rf nxengine-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd nxengine-libretro-$_COMMIT

-	sed -i -e '642iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '642iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '642iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '642iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../nxengine_libretro.info $DESTDIR/share/libretro/info/nxengine_libretro.info
-	install -Dm0644 nxengine_libretro.so $DESTDIR/lib/libretro/nxengine_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../nxengine_libretro.info $DESTDIR/share/libretro/info/nxengine_libretro.info
+install -Dm0644 nxengine_libretro.so $DESTDIR/lib/libretro/nxengine_libretro.so

-	cd ..
-	rm -rf nxengine-libretro-$_COMMIT
-}
+cd ..
+rm -rf nxengine-libretro-$_COMMIT
--- a/emulation/libretro-o2em/libretro-o2em.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-o2em/libretro-o2em.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '549iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '549iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../o2em_libretro.info $DESTDIR/share/libretro/info/o2em_libretro.info
-	install -Dm0644 o2em_libretro.so $DESTDIR/lib/libretro/o2em_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../o2em_libretro.info $DESTDIR/share/libretro/info/o2em_libretro.info
+install -Dm0644 o2em_libretro.so $DESTDIR/lib/libretro/o2em_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-openlara/libretro-openlara.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-openlara/libretro-openlara.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,24 +32,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf OpenLara-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd OpenLara-$_COMMIT
+rm -rf OpenLara-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd OpenLara-$_COMMIT

-	sed -i -e '206iCFLAGS+= $(EXTRA_CFLAGS)' src/platform/libretro/Makefile
-	sed -i -e '206iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/platform/libretro/Makefile
+sed -i -e '206iCFLAGS+= $(EXTRA_CFLAGS)' src/platform/libretro/Makefile
+sed -i -e '206iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/platform/libretro/Makefile

-	make -C src/platform/libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../openlara_libretro.info $DESTDIR/share/libretro/info/openlara_libretro.info
-	install -Dm0644 src/platform/libretro/openlara_libretro.so $DESTDIR/lib/libretro/openlara_libretro.so
+make -C src/platform/libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../openlara_libretro.info $DESTDIR/share/libretro/info/openlara_libretro.info
+install -Dm0644 src/platform/libretro/openlara_libretro.so $DESTDIR/lib/libretro/openlara_libretro.so

-	cd ..
-	rm -rf OpenLara-$_COMMIT
-}
+cd ..
+rm -rf OpenLara-$_COMMIT
--- a/emulation/libretro-parallel-n64/libretro-parallel-n64.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-parallel-n64/libretro-parallel-n64.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf parallel-n64-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd parallel-n64-$_COMMIT
+rm -rf parallel-n64-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd parallel-n64-$_COMMIT

-	sed -i -e '949iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '949iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '949iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '949iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	patch -p0 < ../patch-musl.patch
-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../parallel_n64_libretro.info $DESTDIR/share/libretro/info/parallel_n64_libretro.info
-	install -Dm0644 parallel_n64_libretro.so $DESTDIR/lib/libretro/parallel_n64_libretro.so
+patch -p0 < ../patch-musl.patch
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../parallel_n64_libretro.info $DESTDIR/share/libretro/info/parallel_n64_libretro.info
+install -Dm0644 parallel_n64_libretro.so $DESTDIR/lib/libretro/parallel_n64_libretro.so

-	cd ..
-	rm -rf parallel-n64-$_COMMIT
-}
+cd ..
+rm -rf parallel-n64-$_COMMIT
--- a/emulation/libretro-pcem/libretro-pcem.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-pcem/libretro-pcem.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '198iCFLAGS+= $(EXTRA_CFLAGS)' src/Makefile.libretro
-	sed -i -e '198iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/Makefile.libretro
+sed -i -e '198iCFLAGS+= $(EXTRA_CFLAGS)' src/Makefile.libretro
+sed -i -e '198iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/Makefile.libretro

-	make -C src -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../pcem_libretro.info $DESTDIR/share/libretro/info/pcem_libretro.info
-	install -Dm0644 src/pcem_libretro.so $DESTDIR/lib/libretro/pcem_libretro.so
+make -C src -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../pcem_libretro.info $DESTDIR/share/libretro/info/pcem_libretro.info
+install -Dm0644 src/pcem_libretro.so $DESTDIR/lib/libretro/pcem_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-pcsx-rearmed/libretro-pcsx-rearmed.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-pcsx-rearmed/libretro-pcsx-rearmed.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf pcsx_rearmed-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd pcsx_rearmed-$_COMMIT
+rm -rf pcsx_rearmed-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd pcsx_rearmed-$_COMMIT

-	sed -i -e '331iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '331iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '331iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '331iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../pcsx_rearmed_libretro.info $DESTDIR/share/libretro/info/pcsx_rearmed_libretro.info
-	install -Dm0644 pcsx_rearmed_libretro.so $DESTDIR/lib/libretro/pcsx_rearmed_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../pcsx_rearmed_libretro.info $DESTDIR/share/libretro/info/pcsx_rearmed_libretro.info
+install -Dm0644 pcsx_rearmed_libretro.so $DESTDIR/lib/libretro/pcsx_rearmed_libretro.so

-	cd ..
-	rm -rf pcsx_rearmed-$_COMMIT
-}
+cd ..
+rm -rf pcsx_rearmed-$_COMMIT
--- a/emulation/libretro-picodrive/libretro-picodrive.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-picodrive/libretro-picodrive.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,24 +40,21 @@
 	rm -rf $PKGNAME-$PKGVERSION
 }

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e '198iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '198iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '198iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '198iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../picodrive_libretro.info $DESTDIR/share/libretro/info/picodrive_libretro.info
-	install -Dm0644 picodrive_libretro.so $DESTDIR/lib/libretro/picodrive_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../picodrive_libretro.info $DESTDIR/share/libretro/info/picodrive_libretro.info
+install -Dm0644 picodrive_libretro.so $DESTDIR/lib/libretro/picodrive_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-pocketcdg/libretro-pocketcdg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-pocketcdg/libretro-pocketcdg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '583iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '583iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../pocketcdg_libretro.info $DESTDIR/share/libretro/info/pocketcdg_libretro.info
-	install -Dm0644 pocketcdg_libretro.so $DESTDIR/lib/libretro/pocketcdg_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../pocketcdg_libretro.info $DESTDIR/share/libretro/info/pocketcdg_libretro.info
+install -Dm0644 pocketcdg_libretro.so $DESTDIR/lib/libretro/pocketcdg_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-pokemini/libretro-pokemini.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-pokemini/libretro-pokemini.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf PokeMini-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd PokeMini-$_COMMIT
+rm -rf PokeMini-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd PokeMini-$_COMMIT

-	sed -i -e '623iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '623iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '623iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '623iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../pokemini_libretro.info $DESTDIR/share/libretro/info/pokemini_libretro.info
-	install -Dm0644 pokemini_libretro.so $DESTDIR/lib/libretro/pokemini_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../pokemini_libretro.info $DESTDIR/share/libretro/info/pokemini_libretro.info
+install -Dm0644 pokemini_libretro.so $DESTDIR/lib/libretro/pokemini_libretro.so

-	cd ..
-	rm -rf PokeMini-$_COMMIT
-}
+cd ..
+rm -rf PokeMini-$_COMMIT
--- a/emulation/libretro-prboom/libretro-prboom.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-prboom/libretro-prboom.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '642iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '642iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '642iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '642iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../prboom_libretro.info $DESTDIR/share/libretro/info/prboom_libretro.info
-	install -Dm0644 prboom_libretro.so $DESTDIR/lib/libretro/prboom_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../prboom_libretro.info $DESTDIR/share/libretro/info/prboom_libretro.info
+install -Dm0644 prboom_libretro.so $DESTDIR/lib/libretro/prboom_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-prosystem/libretro-prosystem.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-prosystem/libretro-prosystem.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf prosystem-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd prosystem-libretro-$_COMMIT
+rm -rf prosystem-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd prosystem-libretro-$_COMMIT

-	sed -i -e '624iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '624iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../prosystem_libretro.info $DESTDIR/share/libretro/info/prosystem_libretro.info
-	install -Dm0644 prosystem_libretro.so $DESTDIR/lib/libretro/prosystem_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../prosystem_libretro.info $DESTDIR/share/libretro/info/prosystem_libretro.info
+install -Dm0644 prosystem_libretro.so $DESTDIR/lib/libretro/prosystem_libretro.so

-	cd ..
-	rm -rf prosystem-libretro-$_COMMIT
-}
+cd ..
+rm -rf prosystem-libretro-$_COMMIT
--- a/emulation/libretro-quicknes/libretro-quicknes.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-quicknes/libretro-quicknes.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf QuickNES_Core-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd QuickNES_Core-$_COMMIT
+rm -rf QuickNES_Core-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd QuickNES_Core-$_COMMIT

-	sed -i -e '630iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '630iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '630iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '630iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../quicknes_libretro.info $DESTDIR/share/libretro/info/quicknes_libretro.info
-	install -Dm0644 quicknes_libretro.so $DESTDIR/lib/libretro/quicknes_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../quicknes_libretro.info $DESTDIR/share/libretro/info/quicknes_libretro.info
+install -Dm0644 quicknes_libretro.so $DESTDIR/lib/libretro/quicknes_libretro.so

-	cd ..
-	rm -rf QuickNES_Core-$_COMMIT
-}
+cd ..
+rm -rf QuickNES_Core-$_COMMIT
--- a/emulation/libretro-scummvm/libretro-scummvm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-scummvm/libretro-scummvm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf scummvm-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd scummvm-$_COMMIT
+rm -rf scummvm-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd scummvm-$_COMMIT

-	sed -i -e '440iCFLAGS+= $(EXTRA_CFLAGS)' backends/platform/libretro/build/Makefile
-	sed -i -e '440iCXXFLAGS+= $(EXTRA_CXXFLAGS)' backends/platform/libretro/build/Makefile
+sed -i -e '440iCFLAGS+= $(EXTRA_CFLAGS)' backends/platform/libretro/build/Makefile
+sed -i -e '440iCXXFLAGS+= $(EXTRA_CXXFLAGS)' backends/platform/libretro/build/Makefile

-	make -C backends/platform/libretro/build \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../scummvm_libretro.info $DESTDIR/share/libretro/info/scummvm_libretro.info
-	install -Dm0644 backends/platform/libretro/build/scummvm_libretro.so $DESTDIR/lib/libretro/scummvm_libretro.so
+make -C backends/platform/libretro/build \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../scummvm_libretro.info $DESTDIR/share/libretro/info/scummvm_libretro.info
+install -Dm0644 backends/platform/libretro/build/scummvm_libretro.so $DESTDIR/lib/libretro/scummvm_libretro.so

-	cd ..
-	rm -rf scummvm-$_COMMIT
-}
+cd ..
+rm -rf scummvm-$_COMMIT
--- a/emulation/libretro-snes9x/libretro-snes9x.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-snes9x/libretro-snes9x.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf snes9x-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd snes9x-$_COMMIT
+rm -rf snes9x-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd snes9x-$_COMMIT

-	sed -i -e '649iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
-	sed -i -e '649iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile
+sed -i -e '649iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
+sed -i -e '649iCXXFLAGS+= $(EXTRA_CXXFLAGS)' libretro/Makefile

-	make -C libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../snes9x_libretro.info $DESTDIR/share/libretro/info/snes9x_libretro.info
-	install -Dm0644 libretro/snes9x_libretro.so $DESTDIR/lib/libretro/snes9x_libretro.so
+make -C libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../snes9x_libretro.info $DESTDIR/share/libretro/info/snes9x_libretro.info
+install -Dm0644 libretro/snes9x_libretro.so $DESTDIR/lib/libretro/snes9x_libretro.so

-	cd ..
-	rm -rf snes9x-$_COMMIT
-}
+cd ..
+rm -rf snes9x-$_COMMIT
--- a/emulation/libretro-stella2014/libretro-stella2014.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-stella2014/libretro-stella2014.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf stella2014-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd stella2014-libretro-$_COMMIT
+rm -rf stella2014-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd stella2014-libretro-$_COMMIT

-	sed -i -e '621iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '621iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '621iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '621iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../stella2014_libretro.info $DESTDIR/share/libretro/info/stella2014_libretro.info
-	install -Dm0644 stella2014_libretro.so $DESTDIR/lib/libretro/stella2014_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../stella2014_libretro.info $DESTDIR/share/libretro/info/stella2014_libretro.info
+install -Dm0644 stella2014_libretro.so $DESTDIR/lib/libretro/stella2014_libretro.so

-	cd ..
-	rm -rf stella2014-libretro-$_COMMIT
-}
+cd ..
+rm -rf stella2014-libretro-$_COMMIT
--- a/emulation/libretro-tgbdual/libretro-tgbdual.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-tgbdual/libretro-tgbdual.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf tgbdual-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd tgbdual-libretro-$_COMMIT
+rm -rf tgbdual-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd tgbdual-libretro-$_COMMIT

-	sed -i -e '562iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
-	sed -i -e '562iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile
+sed -i -e '562iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '562iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../tgbdual_libretro.info $DESTDIR/share/libretro/info/tgbdual_libretro.info
-	install -Dm0644 tgbdual_libretro.so $DESTDIR/lib/libretro/tgbdual_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../tgbdual_libretro.info $DESTDIR/share/libretro/info/tgbdual_libretro.info
+install -Dm0644 tgbdual_libretro.so $DESTDIR/lib/libretro/tgbdual_libretro.so

-	cd ..
-	rm -rf tgbdual-libretro-$_COMMIT
-}
+cd ..
+rm -rf tgbdual-libretro-$_COMMIT
--- a/emulation/libretro-tyrquake/libretro-tyrquake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-tyrquake/libretro-tyrquake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf tyrquake-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd tyrquake-$_COMMIT
+rm -rf tyrquake-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd tyrquake-$_COMMIT

-	sed -i -e '808iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '808iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../tyrquake_libretro.info $DESTDIR/share/libretro/info/tyrquake_libretro.info
-	install -Dm0644 tyrquake_libretro.so $DESTDIR/lib/libretro/tyrquake_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../tyrquake_libretro.info $DESTDIR/share/libretro/info/tyrquake_libretro.info
+install -Dm0644 tyrquake_libretro.so $DESTDIR/lib/libretro/tyrquake_libretro.so

-	cd ..
-	rm -rf tyrquake-$_COMMIT
-}
+cd ..
+rm -rf tyrquake-$_COMMIT
--- a/emulation/libretro-uzem/libretro-uzem.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-uzem/libretro-uzem.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '227iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '227iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '227iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '227iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../uzem_libretro.info $DESTDIR/share/libretro/info/uzem_libretro.info
-	install -Dm0644 uzem_libretro.so $DESTDIR/lib/libretro/uzem_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../uzem_libretro.info $DESTDIR/share/libretro/info/uzem_libretro.info
+install -Dm0644 uzem_libretro.so $DESTDIR/lib/libretro/uzem_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-vba-next/libretro-vba-next.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-vba-next/libretro-vba-next.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf vba-next-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd vba-next-$_COMMIT
+rm -rf vba-next-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd vba-next-$_COMMIT

-	sed -i -e '583iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
-	sed -i -e '583iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro
+sed -i -e '583iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '583iCXXFLAGS+= $(EXTRA_CXXFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../vba_next_libretro.info $DESTDIR/share/libretro/info/vba_next_libretro.info
-	install -Dm0644 vba_next_libretro.so $DESTDIR/lib/libretro/vba_next_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../vba_next_libretro.info $DESTDIR/share/libretro/info/vba_next_libretro.info
+install -Dm0644 vba_next_libretro.so $DESTDIR/lib/libretro/vba_next_libretro.so

-	cd ..
-	rm -rf vba-next-$_COMMIT
-}
+cd ..
+rm -rf vba-next-$_COMMIT
--- a/emulation/libretro-vbam/libretro-vbam.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-vbam/libretro-vbam.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,24 +31,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf vbam-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd vbam-libretro-$_COMMIT
+rm -rf vbam-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd vbam-libretro-$_COMMIT

-	sed -i -e '581iCFLAGS+= $(EXTRA_CFLAGS)' src/libretro/Makefile
-	sed -i -e '581iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/libretro/Makefile
+sed -i -e '581iCFLAGS+= $(EXTRA_CFLAGS)' src/libretro/Makefile
+sed -i -e '581iCXXFLAGS+= $(EXTRA_CXXFLAGS)' src/libretro/Makefile

-	make -C src/libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		CXX="$CXX" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_CXXFLAGS="$CXXFLAGS"
-	install -Dm0644 ../vbam_libretro.info $DESTDIR/share/libretro/info/vbam_libretro.info
-	install -Dm0644 src/libretro/vbam_libretro.so $DESTDIR/lib/libretro/vbam_libretro.so
+make -C src/libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	CXX="$CXX" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_CXXFLAGS="$CXXFLAGS"
+install -Dm0644 ../vbam_libretro.info $DESTDIR/share/libretro/info/vbam_libretro.info
+install -Dm0644 src/libretro/vbam_libretro.so $DESTDIR/lib/libretro/vbam_libretro.so

-	cd ..
-	rm -rf vbam-libretro-$_COMMIT
-}
+cd ..
+rm -rf vbam-libretro-$_COMMIT
--- a/emulation/libretro-vecx/libretro-vecx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-vecx/libretro-vecx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd $PKGNAME-$_COMMIT
+rm -rf $PKGNAME-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd $PKGNAME-$_COMMIT

-	sed -i -e '609iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '609iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../vecx_libretro.info $DESTDIR/share/libretro/info/vecx_libretro.info
-	install -Dm0644 vecx_libretro.so $DESTDIR/lib/libretro/vecx_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../vecx_libretro.info $DESTDIR/share/libretro/info/vecx_libretro.info
+install -Dm0644 vecx_libretro.so $DESTDIR/lib/libretro/vecx_libretro.so

-	cd ..
-	rm -rf $PKGNAME-$_COMMIT
-}
+cd ..
+rm -rf $PKGNAME-$_COMMIT
--- a/emulation/libretro-virtualjaguar/libretro-virtualjaguar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-virtualjaguar/libretro-virtualjaguar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf virtualjaguar-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd virtualjaguar-libretro-$_COMMIT
+rm -rf virtualjaguar-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd virtualjaguar-libretro-$_COMMIT

-	sed -i -e '571iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '571iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../virtualjaguar_libretro.info $DESTDIR/share/libretro/info/virtualjaguar_libretro.info
-	install -Dm0644 virtualjaguar_libretro.so $DESTDIR/lib/libretro/virtualjaguar_libretro.so
+make \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../virtualjaguar_libretro.info $DESTDIR/share/libretro/info/virtualjaguar_libretro.info
+install -Dm0644 virtualjaguar_libretro.so $DESTDIR/lib/libretro/virtualjaguar_libretro.so

-	cd ..
-	rm -rf virtualjaguar-libretro-$_COMMIT
-}
+cd ..
+rm -rf virtualjaguar-libretro-$_COMMIT
--- a/emulation/libretro-xrick/libretro-xrick.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-xrick/libretro-xrick.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf xrick-libretro-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd xrick-libretro-$_COMMIT
+rm -rf xrick-libretro-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd xrick-libretro-$_COMMIT

-	sed -i -e '396iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro
+sed -i -e '396iCFLAGS+= $(EXTRA_CFLAGS)' Makefile.libretro

-	make -f Makefile.libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../xrick_libretro.info $DESTDIR/share/libretro/info/xrick_libretro.info
-	install -Dm0644 xrick_libretro.so $DESTDIR/lib/libretro/xrick_libretro.so
+make -f Makefile.libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../xrick_libretro.info $DESTDIR/share/libretro/info/xrick_libretro.info
+install -Dm0644 xrick_libretro.so $DESTDIR/lib/libretro/xrick_libretro.so

-	cd ..
-	rm -rf xrick-libretro-$_COMMIT
-}
+cd ..
+rm -rf xrick-libretro-$_COMMIT
--- a/emulation/libretro-yabause/libretro-yabause.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/libretro-yabause/libretro-yabause.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,21 +29,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf yabause-$_COMMIT
-	tar xvf $_COMMIT.tar.gz
-	cd yabause-$_COMMIT
+rm -rf yabause-$_COMMIT
+tar xvf $_COMMIT.tar.gz
+cd yabause-$_COMMIT

-	sed -i -e '456iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile
+sed -i -e '456iCFLAGS+= $(EXTRA_CFLAGS)' libretro/Makefile

-	make -C libretro \
-		GIT_VERSION="$_SCOMMIT" \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS"
-	install -Dm0644 ../yabause_libretro.info $DESTDIR/share/libretro/info/yabause_libretro.info
-	install -Dm0644 libretro/yabause_libretro.so $DESTDIR/lib/libretro/yabause_libretro.so
+make -C libretro \
+	GIT_VERSION="$_SCOMMIT" \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS"
+install -Dm0644 ../yabause_libretro.info $DESTDIR/share/libretro/info/yabause_libretro.info
+install -Dm0644 libretro/yabause_libretro.so $DESTDIR/lib/libretro/yabause_libretro.so

-	cd ..
-	rm -rf yabause-$_COMMIT
-}
+cd ..
+rm -rf yabause-$_COMMIT
--- a/emulation/retroarch/retroarch.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/emulation/retroarch/retroarch.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -195,54 +195,51 @@
 	with_zlib="--disable-zlib"
 fi

-build()
-{
-	rm -rf RetroArch-$PKGVERSION
-	tar xvf RetroArch-$PKGVERSION.tar.xz
-	cd RetroArch-$PKGVERSION
+rm -rf RetroArch-$PKGVERSION
+tar xvf RetroArch-$PKGVERSION.tar.xz
+cd RetroArch-$PKGVERSION
+
+# Disable core updater because they are not binary compatible and
+# shipped with Vanilla Linux.
+sed -i -e "s|# menu_show_core_updater.*|menu_show_core_updater = false|" retroarch.cfg

-	# Disable core updater because they are not binary compatible and
-	# shipped with Vanilla Linux.
-	sed -i -e "s|# menu_show_core_updater.*|menu_show_core_updater = false|" retroarch.cfg
+# Adapt core and their info directories respectively.
+sed -i \
+	-e "s|# libretro_directory.*|libretro_directory = /lib/libretro|" \
+	-e "s|# libretro_info_path.*|libretro_info_path = /share/libretro/info|" retroarch.cfg

-	# Adapt core and their info directories respectively.
-	sed -i \
-		-e "s|# libretro_directory.*|libretro_directory = /lib/libretro|" \
-		-e "s|# libretro_info_path.*|libretro_info_path = /share/libretro/info|" retroarch.cfg
-
-	# Adapt assets directory.
-	sed -i -e "s|# assets_directory.*|assets_directory = /share/retroarch/assets|" retroarch.cfg
+# Adapt assets directory.
+sed -i -e "s|# assets_directory.*|assets_directory = /share/retroarch/assets|" retroarch.cfg

-	# --prefix=/.: does not accept an empty prefix.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	PKG_CONF_PATH=/bin/pkgconf \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/. \
-		--disable-sdl \
-		--disable-systemd \
-		$with_alsa \
-		$with_dbus \
-		$with_ffmpeg \
-		$with_jack \
-		$with_kms \
-		$with_openal \
-		$with_opengl \
-		$with_pulseaudio \
-		$with_qt \
-		$with_sdl2 \
-		$with_ttf \
-		$with_udev \
-		$with_usb \
-		$with_wayland \
-		$with_x \
-		$with_zlib
-	make CC="$CC" CXX="$CXX"
-	make install DESTDIR=$DESTDIR
+# --prefix=/.: does not accept an empty prefix.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+PKG_CONF_PATH=/bin/pkgconf \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=/. \
+	--disable-sdl \
+	--disable-systemd \
+	$with_alsa \
+	$with_dbus \
+	$with_ffmpeg \
+	$with_jack \
+	$with_kms \
+	$with_openal \
+	$with_opengl \
+	$with_pulseaudio \
+	$with_qt \
+	$with_sdl2 \
+	$with_ttf \
+	$with_udev \
+	$with_usb \
+	$with_wayland \
+	$with_x \
+	$with_zlib
+make CC="$CC" CXX="$CXX"
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf RetroArch-$PKGVERSION
-}
+cd ..
+rm -rf RetroArch-$PKGVERSION
--- a/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-arabic-misc/font-arabic-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-arabic-misc/font-arabic-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-100dpi/font-bh-100dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-100dpi/font-bh-100dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-75dpi/font-bh-75dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-75dpi/font-bh-75dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-ttf/font-bh-ttf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-ttf/font-bh-ttf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bh-type1/font-bh-type1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bh-type1/font-bh-type1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-bitstream-type1/font-bitstream-type1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-bitstream-type1/font-bitstream-type1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-cursor-misc/font-cursor-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-cursor-misc/font-cursor-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-daewoo-misc/font-daewoo-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-daewoo-misc/font-daewoo-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-dec-misc/font-dec-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-dec-misc/font-dec-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-dejavu/font-dejavu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-dejavu/font-dejavu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,17 +23,14 @@
 PKGDOWNLOAD="http://sourceforge.net/projects/dejavu/files/dejavu/$PKGVERSION/dejavu-fonts-ttf-$PKGVERSION.tar.bz2"
 PKGDEPENDS="fontconfig"

-build()
-{
-	rm -rf dejavu-fonts-ttf-$PKGVERSION
-	tar xvf dejavu-fonts-ttf-$PKGVERSION.tar.bz2
-	cd dejavu-fonts-ttf-$PKGVERSION
+rm -rf dejavu-fonts-ttf-$PKGVERSION
+tar xvf dejavu-fonts-ttf-$PKGVERSION.tar.bz2
+cd dejavu-fonts-ttf-$PKGVERSION

-	install -dm0755 $DESTDIR/etc/fonts/conf.avail
-	install -dm0755 $DESTDIR/share/fonts/$PKGNAME
-	install -m0644 ttf/*.ttf $DESTDIR/share/fonts/$PKGNAME
-	install -m0644 fontconfig/* $DESTDIR/etc/fonts/conf.avail
+install -dm0755 $DESTDIR/etc/fonts/conf.avail
+install -dm0755 $DESTDIR/share/fonts/$PKGNAME
+install -m0644 ttf/*.ttf $DESTDIR/share/fonts/$PKGNAME
+install -m0644 fontconfig/* $DESTDIR/etc/fonts/conf.avail

-	cd ..
-	rm -rf dejavu-fonts-ttf-$PKGVERSION
-}
+cd ..
+rm -rf dejavu-fonts-ttf-$PKGVERSION
--- a/fonts/font-ibm-type1/font-ibm-type1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-ibm-type1/font-ibm-type1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-isas-misc/font-isas-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-isas-misc/font-isas-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-jis-misc/font-jis-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-jis-misc/font-jis-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-micro-misc/font-micro-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-micro-misc/font-micro-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-misc-meltho/font-misc-meltho.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-misc-meltho/font-misc-meltho.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-misc-misc/font-misc-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-misc-misc/font-misc-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-mutt-misc/font-mutt-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-mutt-misc/font-mutt-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-schumacher-misc/font-schumacher-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-schumacher-misc/font-schumacher-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-sony-misc/font-sony-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-sony-misc/font-sony-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-sun-misc/font-sun-misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-sun-misc/font-sun-misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-ubuntu/font-ubuntu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-ubuntu/font-ubuntu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,15 +22,12 @@
 PKGSUMMARY="Ubuntu font family"
 PKGDOWNLOAD="https://assets.ubuntu.com/v1/0cef8205-ubuntu-font-family-$PKGVERSION.zip"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	unzip -d $PKGNAME-$PKGVERSION 0cef8205-ubuntu-font-family-$PKGVERSION.zip
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+unzip -d $PKGNAME-$PKGVERSION 0cef8205-ubuntu-font-family-$PKGVERSION.zip
+cd $PKGNAME-$PKGVERSION

-	install -dm0755 $DESTDIR/share/fonts/$PKGNAME
-	install -m0644 ubuntu-font-family-$PKGVERSION/*.ttf $DESTDIR/share/fonts/$PKGNAME
+install -dm0755 $DESTDIR/share/fonts/$PKGNAME
+install -m0644 ubuntu-font-family-$PKGVERSION/*.ttf $DESTDIR/share/fonts/$PKGNAME

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/font-xfree86-type1/font-xfree86-type1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/font-xfree86-type1/font-xfree86-type1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/fontconfig/fontconfig.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/fontconfig/fontconfig.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/freetype/freetype.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/freetype/freetype.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,28 +54,25 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		$with_bzip2 \
-		$with_png \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	$with_bzip2 \
+	$with_png \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/harfbuzz/harfbuzz.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/harfbuzz/harfbuzz.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -73,31 +73,28 @@
 fi


-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_cairo \
-		$with_fontconfig \
-		$with_glib \
-		$with_icu \
-		$with_ttf
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_cairo \
+	$with_fontconfig \
+	$with_glib \
+	$with_icu \
+	$with_ttf
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/pango/pango.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/pango/pango.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,25 +46,22 @@
 	PKGDEPENDS="libxrender $PKGDEPENDS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	CC="$CC" CXX="$CXX" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+CC="$CC" CXX="$CXX" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/fonts/sdl2-ttf/sdl2-ttf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/fonts/sdl2-ttf/sdl2-ttf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf SDL2_ttf-$PKGVERSION
-	tar xvf SDL2_ttf-$PKGVERSION.tar.gz
-	cd SDL2_ttf-$PKGVERSION
+rm -rf SDL2_ttf-$PKGVERSION
+tar xvf SDL2_ttf-$PKGVERSION.tar.gz
+cd SDL2_ttf-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf SDL2_ttf-$PKGVERSION
-}
+cd ..
+rm -rf SDL2_ttf-$PKGVERSION
--- a/games/supertux/supertux.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/games/supertux/supertux.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,27 +41,24 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf SuperTux-v$PKGVERSION-Source
-	tar xvf SuperTux-v$PKGVERSION-Source.tar.gz
-	cd SuperTux-v$PKGVERSION-Source
+rm -rf SuperTux-v$PKGVERSION-Source
+tar xvf SuperTux-v$PKGVERSION-Source.tar.gz
+cd SuperTux-v$PKGVERSION-Source

-	patch -p0 < ../patch-boost.patch
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DINSTALL_SUBDIR_DOC=/share/doc/$PKGNAME
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+patch -p0 < ../patch-boost.patch
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DINSTALL_SUBDIR_DOC=/share/doc/$PKGNAME
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf SuperTux-v$PKGVERSION-Source
-}
+cd ..
+rm -rf SuperTux-v$PKGVERSION-Source
--- a/games/wesnoth/wesnoth.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/games/wesnoth/wesnoth.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -61,32 +61,29 @@
 	with_notifications="-DENABLE_NOTIFICATIONS=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# -DENABLE_SERVER=Off: broken with libc++ yet.
-	patch -p0 < ../patch-clang.patch
-	patch -p0 < ../patch-boost.patch
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DENABLE_SERVER=Off \
-		$with_fribidi \
-		$with_nls \
-		$with_notifications
-	make -j2
-	make install DESTDIR=$DESTDIR
-	cd ..
+# -DENABLE_SERVER=Off: broken with libc++ yet.
+patch -p0 < ../patch-clang.patch
+patch -p0 < ../patch-boost.patch
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DENABLE_SERVER=Off \
+	$with_fribidi \
+	$with_nls \
+	$with_notifications
+make -j2
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/aspell-af/aspell-af.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-af/aspell-af.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-af-$PKGVERSION
-	tar xvf aspell-af-$PKGVERSION.tar.bz2
-	cd aspell-af-$PKGVERSION
+rm -rf aspell-af-$PKGVERSION
+tar xvf aspell-af-$PKGVERSION.tar.bz2
+cd aspell-af-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-af-$PKGVERSION
-}
+cd ..
+rm -rf aspell-af-$PKGVERSION
--- a/gnu/aspell-am/aspell-am.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-am/aspell-am.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-am-$PKGVERSION
-	tar xvf aspell6-am-$PKGVERSION.tar.bz2
-	cd aspell6-am-$PKGVERSION
+rm -rf aspell6-am-$PKGVERSION
+tar xvf aspell6-am-$PKGVERSION.tar.bz2
+cd aspell6-am-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-am-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-am-$PKGVERSION
--- a/gnu/aspell-ar/aspell-ar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ar/aspell-ar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ar-$PKGVERSION
-	tar xvf aspell6-ar-$PKGVERSION.tar.bz2
-	cd aspell6-ar-$PKGVERSION
+rm -rf aspell6-ar-$PKGVERSION
+tar xvf aspell6-ar-$PKGVERSION.tar.bz2
+cd aspell6-ar-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ar-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ar-$PKGVERSION
--- a/gnu/aspell-ast/aspell-ast.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ast/aspell-ast.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ast-$PKGVERSION
-	tar xvf aspell6-ast-$PKGVERSION.tar.bz2
-	cd aspell6-ast-$PKGVERSION
+rm -rf aspell6-ast-$PKGVERSION
+tar xvf aspell6-ast-$PKGVERSION.tar.bz2
+cd aspell6-ast-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ast-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ast-$PKGVERSION
--- a/gnu/aspell-az/aspell-az.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-az/aspell-az.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-az-$PKGVERSION
-	tar xvf aspell6-az-$PKGVERSION.tar.bz2
-	cd aspell6-az-$PKGVERSION
+rm -rf aspell6-az-$PKGVERSION
+tar xvf aspell6-az-$PKGVERSION.tar.bz2
+cd aspell6-az-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-az-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-az-$PKGVERSION
--- a/gnu/aspell-be/aspell-be.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-be/aspell-be.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-be-$PKGVERSION
-	tar xvf aspell5-be-$PKGVERSION.tar.bz2
-	cd aspell5-be-$PKGVERSION
+rm -rf aspell5-be-$PKGVERSION
+tar xvf aspell5-be-$PKGVERSION.tar.bz2
+cd aspell5-be-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-be-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-be-$PKGVERSION
--- a/gnu/aspell-bg/aspell-bg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-bg/aspell-bg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-bg-$PKGVERSION
-	tar xvf aspell6-bg-$PKGVERSION.tar.bz2
-	cd aspell6-bg-$PKGVERSION
+rm -rf aspell6-bg-$PKGVERSION
+tar xvf aspell6-bg-$PKGVERSION.tar.bz2
+cd aspell6-bg-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-bg-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-bg-$PKGVERSION
--- a/gnu/aspell-bn/aspell-bn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-bn/aspell-bn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-bn-$PKGVERSION
-	tar xvf aspell6-bn-$PKGVERSION.tar.bz2
-	cd aspell6-bn-$PKGVERSION
+rm -rf aspell6-bn-$PKGVERSION
+tar xvf aspell6-bn-$PKGVERSION.tar.bz2
+cd aspell6-bn-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-bn-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-bn-$PKGVERSION
--- a/gnu/aspell-br/aspell-br.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-br/aspell-br.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-br-$PKGVERSION
-	tar xvf aspell-br-$PKGVERSION.tar.bz2
-	cd aspell-br-$PKGVERSION
+rm -rf aspell-br-$PKGVERSION
+tar xvf aspell-br-$PKGVERSION.tar.bz2
+cd aspell-br-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-br-$PKGVERSION
-}
+cd ..
+rm -rf aspell-br-$PKGVERSION
--- a/gnu/aspell-ca/aspell-ca.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ca/aspell-ca.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ca-$PKGVERSION
-	tar xvf aspell6-ca-$PKGVERSION.tar.bz2
-	cd aspell6-ca-$PKGVERSION
+rm -rf aspell6-ca-$PKGVERSION
+tar xvf aspell6-ca-$PKGVERSION.tar.bz2
+cd aspell6-ca-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ca-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ca-$PKGVERSION
--- a/gnu/aspell-cs/aspell-cs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-cs/aspell-cs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-cs-$PKGVERSION
-	tar xvf aspell6-cs-$PKGVERSION.tar.bz2
-	cd aspell6-cs-$PKGVERSION
+rm -rf aspell6-cs-$PKGVERSION
+tar xvf aspell6-cs-$PKGVERSION.tar.bz2
+cd aspell6-cs-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-cs-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-cs-$PKGVERSION
--- a/gnu/aspell-csb/aspell-csb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-csb/aspell-csb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-csb-$PKGVERSION
-	tar xvf aspell6-csb-$PKGVERSION.tar.bz2
-	cd aspell6-csb-$PKGVERSION
+rm -rf aspell6-csb-$PKGVERSION
+tar xvf aspell6-csb-$PKGVERSION.tar.bz2
+cd aspell6-csb-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-csb-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-csb-$PKGVERSION
--- a/gnu/aspell-cy/aspell-cy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-cy/aspell-cy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-cy-$PKGVERSION
-	tar xvf aspell-cy-$PKGVERSION.tar.bz2
-	cd aspell-cy-$PKGVERSION
+rm -rf aspell-cy-$PKGVERSION
+tar xvf aspell-cy-$PKGVERSION.tar.bz2
+cd aspell-cy-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-cy-$PKGVERSION
-}
+cd ..
+rm -rf aspell-cy-$PKGVERSION
--- a/gnu/aspell-da/aspell-da.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-da/aspell-da.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/da/aspell6-da-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-da-$PKGVERSION
-	tar xvf aspell6-da-$PKGVERSION.tar.bz2
-	cd aspell6-da-$PKGVERSION
+rm -rf aspell6-da-$PKGVERSION
+tar xvf aspell6-da-$PKGVERSION.tar.bz2
+cd aspell6-da-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-da-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-da-$PKGVERSION
--- a/gnu/aspell-de/aspell-de.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-de/aspell-de.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-de-$PKGVERSION
-	tar xvf aspell6-de-$PKGVERSION.tar.bz2
-	cd aspell6-de-$PKGVERSION
+rm -rf aspell6-de-$PKGVERSION
+tar xvf aspell6-de-$PKGVERSION.tar.bz2
+cd aspell6-de-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-de-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-de-$PKGVERSION
--- a/gnu/aspell-el/aspell-el.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-el/aspell-el.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-el-$PKGVERSION
-	tar xvf aspell6-el-$PKGVERSION.tar.bz2
-	cd aspell6-el-$PKGVERSION
+rm -rf aspell6-el-$PKGVERSION
+tar xvf aspell6-el-$PKGVERSION.tar.bz2
+cd aspell6-el-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-el-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-el-$PKGVERSION
--- a/gnu/aspell-en/aspell-en.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-en/aspell-en.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-en-$PKGVERSION
-	tar xvf aspell6-en-$PKGVERSION.tar.bz2
-	cd aspell6-en-$PKGVERSION
+rm -rf aspell6-en-$PKGVERSION
+tar xvf aspell6-en-$PKGVERSION.tar.bz2
+cd aspell6-en-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-en-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-en-$PKGVERSION
--- a/gnu/aspell-eo/aspell-eo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-eo/aspell-eo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-eo-$PKGVERSION
-	tar xvf aspell6-eo-$PKGVERSION.tar.bz2
-	cd aspell6-eo-$PKGVERSION
+rm -rf aspell6-eo-$PKGVERSION
+tar xvf aspell6-eo-$PKGVERSION.tar.bz2
+cd aspell6-eo-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-eo-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-eo-$PKGVERSION
--- a/gnu/aspell-es/aspell-es.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-es/aspell-es.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-es-$PKGVERSION
-	tar xvf aspell6-es-$PKGVERSION.tar.bz2
-	cd aspell6-es-$PKGVERSION
+rm -rf aspell6-es-$PKGVERSION
+tar xvf aspell6-es-$PKGVERSION.tar.bz2
+cd aspell6-es-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-es-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-es-$PKGVERSION
--- a/gnu/aspell-et/aspell-et.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-et/aspell-et.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-et-$PKGVERSION
-	tar xvf aspell6-et-$PKGVERSION.tar.bz2
-	cd aspell6-et-$PKGVERSION
+rm -rf aspell6-et-$PKGVERSION
+tar xvf aspell6-et-$PKGVERSION.tar.bz2
+cd aspell6-et-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-et-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-et-$PKGVERSION
--- a/gnu/aspell-fa/aspell-fa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-fa/aspell-fa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-fa-$PKGVERSION
-	tar xvf aspell6-fa-$PKGVERSION.tar.bz2
-	cd aspell6-fa-$PKGVERSION
+rm -rf aspell6-fa-$PKGVERSION
+tar xvf aspell6-fa-$PKGVERSION.tar.bz2
+cd aspell6-fa-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-fa-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-fa-$PKGVERSION
--- a/gnu/aspell-fi/aspell-fi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-fi/aspell-fi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-fi-$PKGVERSION
-	tar xvf aspell6-fi-$PKGVERSION.tar.bz2
-	cd aspell6-fi-$PKGVERSION
+rm -rf aspell6-fi-$PKGVERSION
+tar xvf aspell6-fi-$PKGVERSION.tar.bz2
+cd aspell6-fi-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-fi-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-fi-$PKGVERSION
--- a/gnu/aspell-fo/aspell-fo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-fo/aspell-fo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fo/aspell-fo-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-fo-$PKGVERSION
-	tar xvf aspell-fo-$PKGVERSION.tar.bz2
-	cd aspell-fo-$PKGVERSION
+rm -rf aspell-fo-$PKGVERSION
+tar xvf aspell-fo-$PKGVERSION.tar.bz2
+cd aspell-fo-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-fo-$PKGVERSION
-}
+cd ..
+rm -rf aspell-fo-$PKGVERSION
--- a/gnu/aspell-fr/aspell-fr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-fr/aspell-fr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fr/$PKGNAME-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/aspell-fy/aspell-fy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-fy/aspell-fy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-fy-$PKGVERSION
-	tar xvf aspell6-fy-$PKGVERSION.tar.bz2
-	cd aspell6-fy-$PKGVERSION
+rm -rf aspell6-fy-$PKGVERSION
+tar xvf aspell6-fy-$PKGVERSION.tar.bz2
+cd aspell6-fy-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-fy-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-fy-$PKGVERSION
--- a/gnu/aspell-ga/aspell-ga.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ga/aspell-ga.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ga/aspell5-ga-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-ga-$PKGVERSION
-	tar xvf aspell5-ga-$PKGVERSION.tar.bz2
-	cd aspell5-ga-$PKGVERSION
+rm -rf aspell5-ga-$PKGVERSION
+tar xvf aspell5-ga-$PKGVERSION.tar.bz2
+cd aspell5-ga-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-ga-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-ga-$PKGVERSION
--- a/gnu/aspell-gd/aspell-gd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-gd/aspell-gd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-gd-$PKGVERSION
-	tar xvf aspell5-gd-$PKGVERSION.tar.bz2
-	cd aspell5-gd-$PKGVERSION
+rm -rf aspell5-gd-$PKGVERSION
+tar xvf aspell5-gd-$PKGVERSION.tar.bz2
+cd aspell5-gd-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-gd-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-gd-$PKGVERSION
--- a/gnu/aspell-gl/aspell-gl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-gl/aspell-gl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-gl-$PKGVERSION
-	tar xvf aspell6-gl-$PKGVERSION.tar.bz2
-	cd aspell6-gl-$PKGVERSION
+rm -rf aspell6-gl-$PKGVERSION
+tar xvf aspell6-gl-$PKGVERSION.tar.bz2
+cd aspell6-gl-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-gl-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-gl-$PKGVERSION
--- a/gnu/aspell-grc/aspell-grc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-grc/aspell-grc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-grc-$PKGVERSION
-	tar xvf aspell6-grc-$PKGVERSION.tar.bz2
-	cd aspell6-grc-$PKGVERSION
+rm -rf aspell6-grc-$PKGVERSION
+tar xvf aspell6-grc-$PKGVERSION.tar.bz2
+cd aspell6-grc-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-grc-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-grc-$PKGVERSION
--- a/gnu/aspell-gu/aspell-gu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-gu/aspell-gu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-gu-$PKGVERSION
-	tar xvf aspell6-gu-$PKGVERSION.tar.bz2
-	cd aspell6-gu-$PKGVERSION
+rm -rf aspell6-gu-$PKGVERSION
+tar xvf aspell6-gu-$PKGVERSION.tar.bz2
+cd aspell6-gu-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-gu-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-gu-$PKGVERSION
--- a/gnu/aspell-gv/aspell-gv.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-gv/aspell-gv.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-gv-$PKGVERSION
-	tar xvf aspell-gv-$PKGVERSION.tar.bz2
-	cd aspell-gv-$PKGVERSION
+rm -rf aspell-gv-$PKGVERSION
+tar xvf aspell-gv-$PKGVERSION.tar.bz2
+cd aspell-gv-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-gv-$PKGVERSION
-}
+cd ..
+rm -rf aspell-gv-$PKGVERSION
--- a/gnu/aspell-he/aspell-he.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-he/aspell-he.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-he-$PKGVERSION
-	tar xvf aspell6-he-$PKGVERSION.tar.bz2
-	cd aspell6-he-$PKGVERSION
+rm -rf aspell6-he-$PKGVERSION
+tar xvf aspell6-he-$PKGVERSION.tar.bz2
+cd aspell6-he-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-he-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-he-$PKGVERSION
--- a/gnu/aspell-hi/aspell-hi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hi/aspell-hi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-hi-$PKGVERSION
-	tar xvf aspell6-hi-$PKGVERSION.tar.bz2
-	cd aspell6-hi-$PKGVERSION
+rm -rf aspell6-hi-$PKGVERSION
+tar xvf aspell6-hi-$PKGVERSION.tar.bz2
+cd aspell6-hi-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-hi-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-hi-$PKGVERSION
--- a/gnu/aspell-hil/aspell-hil.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hil/aspell-hil.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-hil-$PKGVERSION
-	tar xvf aspell5-hil-$PKGVERSION.tar.bz2
-	cd aspell5-hil-$PKGVERSION
+rm -rf aspell5-hil-$PKGVERSION
+tar xvf aspell5-hil-$PKGVERSION.tar.bz2
+cd aspell5-hil-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-hil-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-hil-$PKGVERSION
--- a/gnu/aspell-hr/aspell-hr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hr/aspell-hr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-hr-$PKGVERSION
-	tar xvf aspell-hr-$PKGVERSION.tar.bz2
-	cd aspell-hr-$PKGVERSION
+rm -rf aspell-hr-$PKGVERSION
+tar xvf aspell-hr-$PKGVERSION.tar.bz2
+cd aspell-hr-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-hr-$PKGVERSION
-}
+cd ..
+rm -rf aspell-hr-$PKGVERSION
--- a/gnu/aspell-hsb/aspell-hsb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hsb/aspell-hsb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-hsb-$PKGVERSION
-	tar xvf aspell6-hsb-$PKGVERSION.tar.bz2
-	cd aspell6-hsb-$PKGVERSION
+rm -rf aspell6-hsb-$PKGVERSION
+tar xvf aspell6-hsb-$PKGVERSION.tar.bz2
+cd aspell6-hsb-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-hsb-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-hsb-$PKGVERSION
--- a/gnu/aspell-hu/aspell-hu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hu/aspell-hu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-hu-$PKGVERSION
-	tar xvf aspell6-hu-$PKGVERSION.tar.bz2
-	cd aspell6-hu-$PKGVERSION
+rm -rf aspell6-hu-$PKGVERSION
+tar xvf aspell6-hu-$PKGVERSION.tar.bz2
+cd aspell6-hu-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-hu-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-hu-$PKGVERSION
--- a/gnu/aspell-hus/aspell-hus.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hus/aspell-hus.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-hus-$PKGVERSION
-	tar xvf aspell6-hus-$PKGVERSION.tar.bz2
-	cd aspell6-hus-$PKGVERSION
+rm -rf aspell6-hus-$PKGVERSION
+tar xvf aspell6-hus-$PKGVERSION.tar.bz2
+cd aspell6-hus-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-hus-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-hus-$PKGVERSION
--- a/gnu/aspell-hy/aspell-hy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-hy/aspell-hy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-hy-$PKGVERSION
-	tar xvf aspell6-hy-$PKGVERSION.tar.bz2
-	cd aspell6-hy-$PKGVERSION
+rm -rf aspell6-hy-$PKGVERSION
+tar xvf aspell6-hy-$PKGVERSION.tar.bz2
+cd aspell6-hy-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-hy-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-hy-$PKGVERSION
--- a/gnu/aspell-ia/aspell-ia.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ia/aspell-ia.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-ia-$PKGVERSION
-	tar xvf aspell-ia-$PKGVERSION.tar.bz2
-	cd aspell-ia-$PKGVERSION
+rm -rf aspell-ia-$PKGVERSION
+tar xvf aspell-ia-$PKGVERSION.tar.bz2
+cd aspell-ia-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-ia-$PKGVERSION
-}
+cd ..
+rm -rf aspell-ia-$PKGVERSION
--- a/gnu/aspell-id/aspell-id.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-id/aspell-id.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-id-$PKGVERSION
-	tar xvf aspell5-id-$PKGVERSION.tar.bz2
-	cd aspell5-id-$PKGVERSION
+rm -rf aspell5-id-$PKGVERSION
+tar xvf aspell5-id-$PKGVERSION.tar.bz2
+cd aspell5-id-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-id-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-id-$PKGVERSION
--- a/gnu/aspell-is/aspell-is.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-is/aspell-is.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-is-$PKGVERSION
-	tar xvf aspell-is-$PKGVERSION.tar.bz2
-	cd aspell-is-$PKGVERSION
+rm -rf aspell-is-$PKGVERSION
+tar xvf aspell-is-$PKGVERSION.tar.bz2
+cd aspell-is-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-is-$PKGVERSION
-}
+cd ..
+rm -rf aspell-is-$PKGVERSION
--- a/gnu/aspell-it/aspell-it.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-it/aspell-it.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-it-$PKGVERSION
-	tar xvf aspell6-it-$PKGVERSION.tar.bz2
-	cd aspell6-it-$PKGVERSION
+rm -rf aspell6-it-$PKGVERSION
+tar xvf aspell6-it-$PKGVERSION.tar.bz2
+cd aspell6-it-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-it-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-it-$PKGVERSION
--- a/gnu/aspell-kn/aspell-kn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-kn/aspell-kn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-kn-$PKGVERSION
-	tar xvf aspell6-kn-$PKGVERSION.tar.bz2
-	cd aspell6-kn-$PKGVERSION
+rm -rf aspell6-kn-$PKGVERSION
+tar xvf aspell6-kn-$PKGVERSION.tar.bz2
+cd aspell6-kn-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-kn-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-kn-$PKGVERSION
--- a/gnu/aspell-ku/aspell-ku.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ku/aspell-ku.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-ku-$PKGVERSION
-	tar xvf aspell5-ku-$PKGVERSION.tar.bz2
-	cd aspell5-ku-$PKGVERSION
+rm -rf aspell5-ku-$PKGVERSION
+tar xvf aspell5-ku-$PKGVERSION.tar.bz2
+cd aspell5-ku-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-ku-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-ku-$PKGVERSION
--- a/gnu/aspell-ky/aspell-ky.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ky/aspell-ky.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ky-$PKGVERSION
-	tar xvf aspell6-ky-$PKGVERSION.tar.bz2
-	cd aspell6-ky-$PKGVERSION
+rm -rf aspell6-ky-$PKGVERSION
+tar xvf aspell6-ky-$PKGVERSION.tar.bz2
+cd aspell6-ky-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ky-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ky-$PKGVERSION
--- a/gnu/aspell-la/aspell-la.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-la/aspell-la.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-la-$PKGVERSION
-	tar xvf aspell6-la-$PKGVERSION.tar.bz2
-	cd aspell6-la-$PKGVERSION
+rm -rf aspell6-la-$PKGVERSION
+tar xvf aspell6-la-$PKGVERSION.tar.bz2
+cd aspell6-la-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-la-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-la-$PKGVERSION
--- a/gnu/aspell-lt/aspell-lt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-lt/aspell-lt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/lt/aspell6-lt-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-lt-$PKGVERSION
-	tar xvf aspell6-lt-$PKGVERSION.tar.bz2
-	cd aspell6-lt-$PKGVERSION
+rm -rf aspell6-lt-$PKGVERSION
+tar xvf aspell6-lt-$PKGVERSION.tar.bz2
+cd aspell6-lt-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-lt-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-lt-$PKGVERSION
--- a/gnu/aspell-lv/aspell-lv.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-lv/aspell-lv.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-lv-$PKGVERSION
-	tar xvf aspell6-lv-$PKGVERSION.tar.bz2
-	cd aspell6-lv-$PKGVERSION
+rm -rf aspell6-lv-$PKGVERSION
+tar xvf aspell6-lv-$PKGVERSION.tar.bz2
+cd aspell6-lv-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-lv-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-lv-$PKGVERSION
--- a/gnu/aspell-mg/aspell-mg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mg/aspell-mg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-mg-$PKGVERSION
-	tar xvf aspell5-mg-$PKGVERSION.tar.bz2
-	cd aspell5-mg-$PKGVERSION
+rm -rf aspell5-mg-$PKGVERSION
+tar xvf aspell5-mg-$PKGVERSION.tar.bz2
+cd aspell5-mg-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-mg-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-mg-$PKGVERSION
--- a/gnu/aspell-mi/aspell-mi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mi/aspell-mi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-mi-$PKGVERSION
-	tar xvf aspell-mi-$PKGVERSION.tar.bz2
-	cd aspell-mi-$PKGVERSION
+rm -rf aspell-mi-$PKGVERSION
+tar xvf aspell-mi-$PKGVERSION.tar.bz2
+cd aspell-mi-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-mi-$PKGVERSION
-}
+cd ..
+rm -rf aspell-mi-$PKGVERSION
--- a/gnu/aspell-mk/aspell-mk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mk/aspell-mk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-mk-$PKGVERSION
-	tar xvf aspell-mk-$PKGVERSION.tar.bz2
-	cd aspell-mk-$PKGVERSION
+rm -rf aspell-mk-$PKGVERSION
+tar xvf aspell-mk-$PKGVERSION.tar.bz2
+cd aspell-mk-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-mk-$PKGVERSION
-}
+cd ..
+rm -rf aspell-mk-$PKGVERSION
--- a/gnu/aspell-ml/aspell-ml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ml/aspell-ml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ml/aspell6-ml-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ml-$PKGVERSION
-	tar xvf aspell6-ml-$PKGVERSION.tar.bz2
-	cd aspell6-ml-$PKGVERSION
+rm -rf aspell6-ml-$PKGVERSION
+tar xvf aspell6-ml-$PKGVERSION.tar.bz2
+cd aspell6-ml-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ml-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ml-$PKGVERSION
--- a/gnu/aspell-mn/aspell-mn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mn/aspell-mn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-mn-$PKGVERSION
-	tar xvf aspell6-mn-$PKGVERSION.tar.bz2
-	cd aspell6-mn-$PKGVERSION
+rm -rf aspell6-mn-$PKGVERSION
+tar xvf aspell6-mn-$PKGVERSION.tar.bz2
+cd aspell6-mn-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-mn-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-mn-$PKGVERSION
--- a/gnu/aspell-mr/aspell-mr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mr/aspell-mr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-mr-$PKGVERSION
-	tar xvf aspell6-mr-$PKGVERSION.tar.bz2
-	cd aspell6-mr-$PKGVERSION
+rm -rf aspell6-mr-$PKGVERSION
+tar xvf aspell6-mr-$PKGVERSION.tar.bz2
+cd aspell6-mr-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-mr-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-mr-$PKGVERSION
--- a/gnu/aspell-ms/aspell-ms.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ms/aspell-ms.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-ms-$PKGVERSION
-	tar xvf aspell-ms-$PKGVERSION.tar.bz2
-	cd aspell-ms-$PKGVERSION
+rm -rf aspell-ms-$PKGVERSION
+tar xvf aspell-ms-$PKGVERSION.tar.bz2
+cd aspell-ms-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-ms-$PKGVERSION
-}
+cd ..
+rm -rf aspell-ms-$PKGVERSION
--- a/gnu/aspell-mt/aspell-mt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-mt/aspell-mt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-mt-$PKGVERSION
-	tar xvf aspell-mt-$PKGVERSION.tar.bz2
-	cd aspell-mt-$PKGVERSION
+rm -rf aspell-mt-$PKGVERSION
+tar xvf aspell-mt-$PKGVERSION.tar.bz2
+cd aspell-mt-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-mt-$PKGVERSION
-}
+cd ..
+rm -rf aspell-mt-$PKGVERSION
--- a/gnu/aspell-nb/aspell-nb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-nb/aspell-nb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-nb-$PKGVERSION
-	tar xvf aspell-nb-$PKGVERSION.tar.bz2
-	cd aspell-nb-$PKGVERSION
+rm -rf aspell-nb-$PKGVERSION
+tar xvf aspell-nb-$PKGVERSION.tar.bz2
+cd aspell-nb-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-nb-$PKGVERSION
-}
+cd ..
+rm -rf aspell-nb-$PKGVERSION
--- a/gnu/aspell-nds/aspell-nds.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-nds/aspell-nds.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-nds-$PKGVERSION
-	tar xvf aspell6-nds-$PKGVERSION.tar.bz2
-	cd aspell6-nds-$PKGVERSION
+rm -rf aspell6-nds-$PKGVERSION
+tar xvf aspell6-nds-$PKGVERSION.tar.bz2
+cd aspell6-nds-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-nds-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-nds-$PKGVERSION
--- a/gnu/aspell-nl/aspell-nl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-nl/aspell-nl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-nl-$PKGVERSION
-	tar xvf aspell-nl-$PKGVERSION.tar.bz2
-	cd aspell-nl-$PKGVERSION
+rm -rf aspell-nl-$PKGVERSION
+tar xvf aspell-nl-$PKGVERSION.tar.bz2
+cd aspell-nl-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-nl-$PKGVERSION
-}
+cd ..
+rm -rf aspell-nl-$PKGVERSION
--- a/gnu/aspell-nn/aspell-nn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-nn/aspell-nn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-nn-$PKGVERSION
-	tar xvf aspell-nn-$PKGVERSION.tar.bz2
-	cd aspell-nn-$PKGVERSION
+rm -rf aspell-nn-$PKGVERSION
+tar xvf aspell-nn-$PKGVERSION.tar.bz2
+cd aspell-nn-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-nn-$PKGVERSION
-}
+cd ..
+rm -rf aspell-nn-$PKGVERSION
--- a/gnu/aspell-ny/aspell-ny.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ny/aspell-ny.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-ny-$PKGVERSION
-	tar xvf aspell5-ny-$PKGVERSION.tar.bz2
-	cd aspell5-ny-$PKGVERSION
+rm -rf aspell5-ny-$PKGVERSION
+tar xvf aspell5-ny-$PKGVERSION.tar.bz2
+cd aspell5-ny-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-ny-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-ny-$PKGVERSION
--- a/gnu/aspell-or/aspell-or.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-or/aspell-or.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-or-$PKGVERSION
-	tar xvf aspell6-or-$PKGVERSION.tar.bz2
-	cd aspell6-or-$PKGVERSION
+rm -rf aspell6-or-$PKGVERSION
+tar xvf aspell6-or-$PKGVERSION.tar.bz2
+cd aspell6-or-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-or-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-or-$PKGVERSION
--- a/gnu/aspell-pa/aspell-pa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-pa/aspell-pa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-pa-$PKGVERSION
-	tar xvf aspell6-pa-$PKGVERSION.tar.bz2
-	cd aspell6-pa-$PKGVERSION
+rm -rf aspell6-pa-$PKGVERSION
+tar xvf aspell6-pa-$PKGVERSION.tar.bz2
+cd aspell6-pa-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-pa-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-pa-$PKGVERSION
--- a/gnu/aspell-pl/aspell-6.0_20061121-0.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-9016f4c294cb80a730553f24a4c32bac3efc77c2  aspell6-de-20161207-7-0.tar.bz2
--- a/gnu/aspell-pl/aspell-pl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-pl/aspell-pl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-pl-$PKGVERSION
-	tar xvf aspell6-pl-$PKGVERSION.tar.bz2
-	cd aspell6-pl-$PKGVERSION
+rm -rf aspell6-pl-$PKGVERSION
+tar xvf aspell6-pl-$PKGVERSION.tar.bz2
+cd aspell6-pl-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-pl-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-pl-$PKGVERSION
--- a/gnu/aspell-pt/aspell-pt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-pt/aspell-pt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pt/aspell-pt-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-pt-$PKGVERSION
-	tar xvf aspell-pt-$PKGVERSION.tar.bz2
-	cd aspell-pt-$PKGVERSION
+rm -rf aspell-pt-$PKGVERSION
+tar xvf aspell-pt-$PKGVERSION.tar.bz2
+cd aspell-pt-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-pt-$PKGVERSION
-}
+cd ..
+rm -rf aspell-pt-$PKGVERSION
--- a/gnu/aspell-qu/aspell-qu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-qu/aspell-qu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-qu-$PKGVERSION
-	tar xvf aspell6-qu-$PKGVERSION.tar.bz2
-	cd aspell6-qu-$PKGVERSION
+rm -rf aspell6-qu-$PKGVERSION
+tar xvf aspell6-qu-$PKGVERSION.tar.bz2
+cd aspell6-qu-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-qu-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-qu-$PKGVERSION
--- a/gnu/aspell-ro/aspell-ro.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ro/aspell-ro.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ro/aspell5-ro-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-ro-$PKGVERSION
-	tar xvf aspell5-ro-$PKGVERSION.tar.bz2
-	cd aspell5-ro-$PKGVERSION
+rm -rf aspell5-ro-$PKGVERSION
+tar xvf aspell5-ro-$PKGVERSION.tar.bz2
+cd aspell5-ro-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-ro-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-ro-$PKGVERSION
--- a/gnu/aspell-ru/aspell-ru.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ru/aspell-ru.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ru-$PKGVERSION
-	tar xvf aspell6-ru-$PKGVERSION.tar.bz2
-	cd aspell6-ru-$PKGVERSION
+rm -rf aspell6-ru-$PKGVERSION
+tar xvf aspell6-ru-$PKGVERSION.tar.bz2
+cd aspell6-ru-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ru-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ru-$PKGVERSION
--- a/gnu/aspell-rw/aspell-rw.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-rw/aspell-rw.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-rw-$PKGVERSION
-	tar xvf aspell-rw-$PKGVERSION.tar.bz2
-	cd aspell-rw-$PKGVERSION
+rm -rf aspell-rw-$PKGVERSION
+tar xvf aspell-rw-$PKGVERSION.tar.bz2
+cd aspell-rw-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-rw-$PKGVERSION
-}
+cd ..
+rm -rf aspell-rw-$PKGVERSION
--- a/gnu/aspell-sc/aspell-sc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sc/aspell-sc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-sc-$PKGVERSION
-	tar xvf aspell5-sc-$PKGVERSION.tar.bz2
-	cd aspell5-sc-$PKGVERSION
+rm -rf aspell5-sc-$PKGVERSION
+tar xvf aspell5-sc-$PKGVERSION.tar.bz2
+cd aspell5-sc-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-sc-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-sc-$PKGVERSION
--- a/gnu/aspell-sk/aspell-sk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sk/aspell-sk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sk/aspell6-sk-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-sk-$PKGVERSION
-	tar xvf aspell6-sk-$PKGVERSION.tar.bz2
-	cd aspell6-sk-$PKGVERSION
+rm -rf aspell6-sk-$PKGVERSION
+tar xvf aspell6-sk-$PKGVERSION.tar.bz2
+cd aspell6-sk-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-sk-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-sk-$PKGVERSION
--- a/gnu/aspell-sl/aspell-sl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sl/aspell-sl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-sl-$PKGVERSION
-	tar xvf aspell-sl-$PKGVERSION.tar.bz2
-	cd aspell-sl-$PKGVERSION
+rm -rf aspell-sl-$PKGVERSION
+tar xvf aspell-sl-$PKGVERSION.tar.bz2
+cd aspell-sl-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-sl-$PKGVERSION
-}
+cd ..
+rm -rf aspell-sl-$PKGVERSION
--- a/gnu/aspell-sr/aspell-sr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sr/aspell-sr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-sr-$PKGVERSION
-	tar xvf aspell6-sr-$PKGVERSION.tar.bz2
-	cd aspell6-sr-$PKGVERSION
+rm -rf aspell6-sr-$PKGVERSION
+tar xvf aspell6-sr-$PKGVERSION.tar.bz2
+cd aspell6-sr-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-sr-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-sr-$PKGVERSION
--- a/gnu/aspell-sv/aspell-sv.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sv/aspell-sv.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-sv-$PKGVERSION
-	tar xvf aspell-sv-$PKGVERSION.tar.bz2
-	cd aspell-sv-$PKGVERSION
+rm -rf aspell-sv-$PKGVERSION
+tar xvf aspell-sv-$PKGVERSION.tar.bz2
+cd aspell-sv-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-sv-$PKGVERSION
-}
+cd ..
+rm -rf aspell-sv-$PKGVERSION
--- a/gnu/aspell-sw/aspell-sw.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-sw/aspell-sw.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-sw-$PKGVERSION
-	tar xvf aspell-sw-$PKGVERSION.tar.bz2
-	cd aspell-sw-$PKGVERSION
+rm -rf aspell-sw-$PKGVERSION
+tar xvf aspell-sw-$PKGVERSION.tar.bz2
+cd aspell-sw-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-sw-$PKGVERSION
-}
+cd ..
+rm -rf aspell-sw-$PKGVERSION
--- a/gnu/aspell-ta/aspell-ta.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-ta/aspell-ta.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-ta-$PKGVERSION
-	tar xvf aspell6-ta-$PKGVERSION.tar.bz2
-	cd aspell6-ta-$PKGVERSION
+rm -rf aspell6-ta-$PKGVERSION
+tar xvf aspell6-ta-$PKGVERSION.tar.bz2
+cd aspell6-ta-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-ta-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-ta-$PKGVERSION
--- a/gnu/aspell-te/aspell-te.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-te/aspell-te.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-te-$PKGVERSION
-	tar xvf aspell6-te-$PKGVERSION.tar.bz2
-	cd aspell6-te-$PKGVERSION
+rm -rf aspell6-te-$PKGVERSION
+tar xvf aspell6-te-$PKGVERSION.tar.bz2
+cd aspell6-te-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-te-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-te-$PKGVERSION
--- a/gnu/aspell-tet/aspell-tet.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-tet/aspell-tet.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-tet-$PKGVERSION
-	tar xvf aspell5-tet-$PKGVERSION.tar.bz2
-	cd aspell5-tet-$PKGVERSION
+rm -rf aspell5-tet-$PKGVERSION
+tar xvf aspell5-tet-$PKGVERSION.tar.bz2
+cd aspell5-tet-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-tet-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-tet-$PKGVERSION
--- a/gnu/aspell-tk/aspell-tk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-tk/aspell-tk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-tk-$PKGVERSION
-	tar xvf aspell5-tk-$PKGVERSION.tar.bz2
-	cd aspell5-tk-$PKGVERSION
+rm -rf aspell5-tk-$PKGVERSION
+tar xvf aspell5-tk-$PKGVERSION.tar.bz2
+cd aspell5-tk-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-tk-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-tk-$PKGVERSION
--- a/gnu/aspell-tl/aspell-tl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-tl/aspell-tl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tl/aspell5-tl-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-tl-$PKGVERSION
-	tar xvf aspell5-tl-$PKGVERSION.tar.bz2
-	cd aspell5-tl-$PKGVERSION
+rm -rf aspell5-tl-$PKGVERSION
+tar xvf aspell5-tl-$PKGVERSION.tar.bz2
+cd aspell5-tl-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-tl-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-tl-$PKGVERSION
--- a/gnu/aspell-tn/aspell-tn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-tn/aspell-tn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell5-tn-$PKGVERSION
-	tar xvf aspell5-tn-$PKGVERSION.tar.bz2
-	cd aspell5-tn-$PKGVERSION
+rm -rf aspell5-tn-$PKGVERSION
+tar xvf aspell5-tn-$PKGVERSION.tar.bz2
+cd aspell5-tn-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell5-tn-$PKGVERSION
-}
+cd ..
+rm -rf aspell5-tn-$PKGVERSION
--- a/gnu/aspell-tr/aspell-tr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-tr/aspell-tr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-tr-$PKGVERSION
-	tar xvf aspell-tr-$PKGVERSION.tar.bz2
-	cd aspell-tr-$PKGVERSION
+rm -rf aspell-tr-$PKGVERSION
+tar xvf aspell-tr-$PKGVERSION.tar.bz2
+cd aspell-tr-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-tr-$PKGVERSION
-}
+cd ..
+rm -rf aspell-tr-$PKGVERSION
--- a/gnu/aspell-uk/aspell-uk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-uk/aspell-uk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-uk-$PKGVERSION
-	tar xvf aspell6-uk-$PKGVERSION.tar.bz2
-	cd aspell6-uk-$PKGVERSION
+rm -rf aspell6-uk-$PKGVERSION
+tar xvf aspell6-uk-$PKGVERSION.tar.bz2
+cd aspell6-uk-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-uk-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-uk-$PKGVERSION
--- a/gnu/aspell-uz/aspell-uz.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-uz/aspell-uz.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-uz-$PKGVERSION
-	tar xvf aspell6-uz-$PKGVERSION.tar.bz2
-	cd aspell6-uz-$PKGVERSION
+rm -rf aspell6-uz-$PKGVERSION
+tar xvf aspell6-uz-$PKGVERSION.tar.bz2
+cd aspell6-uz-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-uz-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-uz-$PKGVERSION
--- a/gnu/aspell-vi/aspell-vi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-vi/aspell-vi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-vi-$PKGVERSION
-	tar xvf aspell6-vi-$PKGVERSION.tar.bz2
-	cd aspell6-vi-$PKGVERSION
+rm -rf aspell6-vi-$PKGVERSION
+tar xvf aspell6-vi-$PKGVERSION.tar.bz2
+cd aspell6-vi-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-vi-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-vi-$PKGVERSION
--- a/gnu/aspell-wa/aspell-wa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-wa/aspell-wa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-wa-$PKGVERSION
-	tar xvf aspell-wa-$PKGVERSION.tar.bz2
-	cd aspell-wa-$PKGVERSION
+rm -rf aspell-wa-$PKGVERSION
+tar xvf aspell-wa-$PKGVERSION.tar.bz2
+cd aspell-wa-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-wa-$PKGVERSION
-}
+cd ..
+rm -rf aspell-wa-$PKGVERSION
--- a/gnu/aspell-yi/aspell-wi.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-da49f8445ce89f656d9d75d5ee1a730126077896  aspell6-yi-0.01.1-1.tar.bz2
--- a/gnu/aspell-yi/aspell-yi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-yi/aspell-yi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell6-yi-$PKGVERSION
-	tar xvf aspell6-yi-$PKGVERSION.tar.bz2
-	cd aspell6-yi-$PKGVERSION
+rm -rf aspell6-yi-$PKGVERSION
+tar xvf aspell6-yi-$PKGVERSION.tar.bz2
+cd aspell6-yi-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell6-yi-$PKGVERSION
-}
+cd ..
+rm -rf aspell6-yi-$PKGVERSION
--- a/gnu/aspell-zu/aspell-zu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell-zu/aspell-zu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$PKGVERSION.tar.bz2"
 PKGDEPENDS="aspell"

-build()
-{
-	rm -rf aspell-zu-$PKGVERSION
-	tar xvf aspell-zu-$PKGVERSION.tar.bz2
-	cd aspell-zu-$PKGVERSION
+rm -rf aspell-zu-$PKGVERSION
+tar xvf aspell-zu-$PKGVERSION.tar.bz2
+cd aspell-zu-$PKGVERSION

-	./configure
-	make
-	make install DESTDIR=$DESTDIR
+./configure
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf aspell-zu-$PKGVERSION
-}
+cd ..
+rm -rf aspell-zu-$PKGVERSION
--- a/gnu/aspell/aspell.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/aspell/aspell.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,41 +49,38 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	datadir="/share/aspell"
-	dictdir="/share/aspell"
-	confdir="/etc"
+datadir="/share/aspell"
+dictdir="/share/aspell"
+confdir="/etc"

-	echo "#define PREFIX \"\"" > gen/dirs.h
-	echo "#define DATA_DIR \"$datadir\"" >> gen/dirs.h
-	echo "#define DICT_DIR \"$dictdir\"" >> gen/dirs.h
-	echo "#define CONF_DIR \"$confdir\"" >> gen/dirs.h
+echo "#define PREFIX \"\"" > gen/dirs.h
+echo "#define DATA_DIR \"$datadir\"" >> gen/dirs.h
+echo "#define DICT_DIR \"$dictdir\"" >> gen/dirs.h
+echo "#define CONF_DIR \"$confdir\"" >> gen/dirs.h

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sysconfdir=$confdir \
-		--enable-pkgdatadir=$datadir \
-		--enable-pkglibdir=$datadir \
-		--enable-dict-dir=$dictdir \
-		$with_ncurses \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sysconfdir=$confdir \
+	--enable-pkgdatadir=$datadir \
+	--enable-pkglibdir=$datadir \
+	--enable-dict-dir=$dictdir \
+	$with_ncurses \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/autoconf-archive/autoconf-archive.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/autoconf-archive/autoconf-archive.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,16 +22,13 @@
 PKGSUMMARY="GNU macros for autoconf"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-2019.01.06.tar.xz"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/autoconf/autoconf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/autoconf/autoconf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,20 +28,17 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/autoconf213/autoconf213.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/autoconf213/autoconf213.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,20 +23,17 @@
 PKGDOWNLOAD="ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-$PKGVERSION.tar.gz"
 PKGDEPENDS="m4 make:build perl"

-build()
-{
-	rm -rf autoconf-$PKGVERSION
-	tar xvf autoconf-$PKGVERSION.tar.gz
-	cd autoconf-$PKGVERSION
+rm -rf autoconf-$PKGVERSION
+tar xvf autoconf-$PKGVERSION.tar.gz
+cd autoconf-$PKGVERSION

-	# http://www.linuxfromscratch.org/blfs/view/svn/general/autoconf213.html
-	patch -p1 < ../autoconf.patch
-	mv autoconf.texi autoconf213.texi
-	rm autoconf.info
-	./configure --prefix= --program-suffix=-2.13
-	make
-	make install DESTDIR=$DESTDIR
+# http://www.linuxfromscratch.org/blfs/view/svn/general/autoconf213.html
+patch -p1 < ../autoconf.patch
+mv autoconf.texi autoconf213.texi
+rm autoconf.info
+./configure --prefix= --program-suffix=-2.13
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf autoconf-$PKGVERSION
-}
+cd ..
+rm -rf autoconf-$PKGVERSION
--- a/gnu/automake/automake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/automake/automake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/bash/bash.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/bash/bash.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-bash-malloc \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-bash-malloc \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/bc/bc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/bc/bc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-readline
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-readline
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/binutils/binutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/binutils/binutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -48,35 +48,32 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CFLAGS="$CFLAGS" \
-	CXXFLAGS="$CXXFLAGS" \
-	CC="$CC" \
-	CXX="$CXX" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		--exec-prefix=/libexec/binutils \
-		--bindir=/bin \
-		--sbindir=/bin \
-		--disable-werror \
-		--enable-shared \
-		--with-system-zlib \
-		$with_nls \
-		$with_gdb
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS" \
+CC="$CC" \
+CXX="$CXX" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	--exec-prefix=/libexec/binutils \
+	--bindir=/bin \
+	--sbindir=/bin \
+	--disable-werror \
+	--enable-shared \
+	--with-system-zlib \
+	$with_nls \
+	$with_gdb
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/bison/bison.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/bison/bison.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,28 +41,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# TODO: check how to build liby as shared.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+# TODO: check how to build liby as shared.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/coreutils/coreutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/coreutils/coreutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -53,30 +53,27 @@
 	with_ssl="--with-openssl"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# kill is provided by util-linux and shells
-	# uptime is provided by procps-ng
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	FORCE_UNSAFE_CONFIGURE=1 \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-no-install-programs=kill,uptime \
-		$with_gmp \
-		$with_nls \
-		$with_ssl
-	make
-	make install DESTDIR=$DESTDIR
+# kill is provided by util-linux and shells
+# uptime is provided by procps-ng
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+FORCE_UNSAFE_CONFIGURE=1 \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-no-install-programs=kill,uptime \
+	$with_gmp \
+	$with_nls \
+	$with_ssl
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/cpio/cpio.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/cpio/cpio.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/diffutils/diffutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/diffutils/diffutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,24 +38,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/ed/ed.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/ed/ed.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,17 +25,14 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.lz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.lz
+cd $PKGNAME-$PKGVERSION

-	# custom configure script.
-	./configure --prefix= CC="$CC" CFLAGS="$CFLAGS"
-	make
-	make install DESTDIR=$DESTDIR
+# custom configure script.
+./configure --prefix= CC="$CC" CFLAGS="$CFLAGS"
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/findutils/findutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/findutils/findutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,25 +38,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-selinux \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-selinux \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gawk/gawk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gawk/gawk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gcc/gcc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gcc/gcc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -42,48 +42,45 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# on Vanilla Linux we use /lib rather than /lib64.
-	sed -i -e '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-	sed -i -e 's/lib64/lib/' gcc/config/i386/linux64.h
+# on Vanilla Linux we use /lib rather than /lib64.
+sed -i -e '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+sed -i -e 's/lib64/lib/' gcc/config/i386/linux64.h

-	mkdir build && cd build
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	../configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		--enable-languages=c,c++ \
-		--enable-threads=posix \
-		--enable-__cxa_atexit \
-		--libdir=/lib \
-		--with-system-zlib \
-		--enable-shared \
-		--enable-tls \
-		--enable-default-pie \
-		--enable-default-ssp \
-		--disable-multilib \
-		--disable-bootstrap \
-		--disable-libsanitizer \
-		--disable-libgomp \
-		--with-pkgversion="Vanilla 0.2" \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+../configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	--enable-languages=c,c++ \
+	--enable-threads=posix \
+	--enable-__cxa_atexit \
+	--libdir=/lib \
+	--with-system-zlib \
+	--enable-shared \
+	--enable-tls \
+	--enable-default-pie \
+	--enable-default-ssp \
+	--disable-multilib \
+	--disable-bootstrap \
+	--disable-libsanitizer \
+	--disable-libgomp \
+	--with-pkgversion="Vanilla 0.2" \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gdb/gdb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gdb/gdb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -65,34 +65,31 @@
         with_xml="--without-expat"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# --disable-nls: install files that conflict with binutils.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-nls \
-		--with-system-zlib \
-                --with-system-readline \
-                $with_guile \
-                $with_lzma \
-                $with_python \
-                $with_xml
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# --disable-nls: install files that conflict with binutils.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-nls \
+	--with-system-zlib \
+	--with-system-readline \
+	$with_guile \
+	$with_lzma \
+	$with_python \
+	$with_xml
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gdbm/gdbm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gdbm/gdbm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,29 +47,26 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-libgdbm-compat \
-		$with_completion \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-libgdbm-compat \
+	$with_completion \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gettext/gettext.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gettext/gettext.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,29 +29,26 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CFLAGS="$CFLAGS" \
-	CXXFLAGS="$CXXFLAGS" \
-	CC="$CC" \
-	CXX="$CXX" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--with-included-gettext \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS" \
+CC="$CC" \
+CXX="$CXX" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--with-included-gettext \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	# Avoid conflict with musl.
-	rm -f $DESTDIR/include/libintl.h
+# Avoid conflict with musl.
+rm -f $DESTDIR/include/libintl.h

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gperf/gperf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gperf/gperf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/grep/grep.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/grep/grep.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/groff/groff.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/groff/groff.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# Fix /share/doc/$PKGNAME and /share/data/$PKGNAME
-	patch -p0 < ../patch-fhs.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+# Fix /share/doc/$PKGNAME and /share/data/$PKGNAME
+patch -p0 < ../patch-fhs.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/grub/grub.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/grub/grub.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -90,27 +90,24 @@
 	rm -rf build
 }

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	if [ "$CC" = "clang" ]; then
-		patch -p0 < ../patch-clang.patch
-	fi
+if [ "$CC" = "clang" ]; then
+	patch -p0 < ../patch-clang.patch
+fi

-	for p in $platforms; do
-		case $p in
-		efi)
-			build_grub --with-platform=$p --disable-efiemu
-			;;
-		*)
-			build_grub --with-platform=$p
-			;;
-		esac
-	done
+for p in $platforms; do
+	case $p in
+	efi)
+		build_grub --with-platform=$p --disable-efiemu
+		;;
+	*)
+		build_grub --with-platform=$p
+		;;
+	esac
+done

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/guile/guile.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/guile/guile.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/gzip/gzip.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/gzip/gzip.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/help2man/help2man.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/help2man/help2man.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,24 +40,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/inetutils/inetutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/inetutils/inetutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,31 +47,28 @@
 	with_pam="--without-pam"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# --disable-rcp: does not build with musl.
-	# --disable-rlogin: does not build with musl.
-	# --disable-rsh: does not build with musl.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-rcp \
-		--disable-rlogin \
-		--disable-rsh \
-		$with_completion \
-		$with_pam
-	make
-	make install DESTDIR=$DESTDIR
+# --disable-rcp: does not build with musl.
+# --disable-rlogin: does not build with musl.
+# --disable-rsh: does not build with musl.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-rcp \
+	--disable-rlogin \
+	--disable-rsh \
+	$with_completion \
+	$with_pam
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libcdio-paranoia/libcdio-paranoia.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libcdio-paranoia/libcdio-paranoia.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,26 +32,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libcdio/libcdio.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libcdio/libcdio.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,27 +43,24 @@
 	with_cddb="--disable-cddb"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_cddb
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_cddb
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libidn/libidn.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libidn/libidn.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,26 +38,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libidn2/libidn2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libidn2/libidn2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,26 +39,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-2.1.1
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-2.1.1
+rm -rf $PKGNAME-2.1.1
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-2.1.1

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-2.1.1
-}
+cd ..
+rm -rf $PKGNAME-2.1.1
--- a/gnu/libtasn1/libtasn1.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libtasn1/libtasn1.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libtool/libtool.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libtool/libtool.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/libunistring/libunistring.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/libunistring/libunistring.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/m4/m4.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/m4/m4.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/make/make.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/make/make.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,36 +46,33 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION
+
+# Change default CC/CXX/OBJC for a better compatibility.
+patch -p0 < ../patch-default.patch

-	# Change default CC/CXX/OBJC for a better compatibility.
-	patch -p0 < ../patch-default.patch
+case $CC in
+"gcc") CXX=g++ ;;
+"clang") CXX=clang++ ;;
+esac

-	case $CC in
-	"gcc") CXX=g++ ;;
-	"clang") CXX=clang++ ;;
-	esac
-
-	sed -i -e "s|@CC@|$CC|" default.c
-	sed -i -e "s|@CXX@|$CXX|" default.c
+sed -i -e "s|@CC@|$CC|" default.c
+sed -i -e "s|@CXX@|$CXX|" default.c

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_guile \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_guile \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/mpc/mpc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/mpc/mpc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/ncurses/ncurses.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/ncurses/ncurses.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,44 +29,41 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --enable-overwrite: required when prefix is not /usr.
-	# --enable-pc-files: lots of packages require this.
-	# --enable-widec: some packages require this it (e.g. neomutt).
-	# --with-manpage-format=normal: vpk compress by itself.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-overwrite \
-		--enable-pc-files \
-		--enable-widec \
-		--prefix= \
-		--with-manpage-format=normal \
-		--with-pkg-config-libdir=/lib/pkgconfig \
-		--with-shared \
-		--without-debug
-	make
-	make install DESTDIR=$DESTDIR
+# --enable-overwrite: required when prefix is not /usr.
+# --enable-pc-files: lots of packages require this.
+# --enable-widec: some packages require this it (e.g. neomutt).
+# --with-manpage-format=normal: vpk compress by itself.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-overwrite \
+	--enable-pc-files \
+	--enable-widec \
+	--prefix= \
+	--with-manpage-format=normal \
+	--with-pkg-config-libdir=/lib/pkgconfig \
+	--with-shared \
+	--without-debug
+make
+make install DESTDIR=$DESTDIR

-	# For each wide library, create a input link.
-	for lib in ncurses ncurses++ form panel menu; do
-		echo "INPUT(-l${lib}w)" > $DESTDIR/lib/lib${lib}.so
-		ln -s ${lib}w.pc $DESTDIR/lib/pkgconfig/${lib}.pc
-	done
+# For each wide library, create a input link.
+for lib in ncurses ncurses++ form panel menu; do
+	echo "INPUT(-l${lib}w)" > $DESTDIR/lib/lib${lib}.so
+	ln -s ${lib}w.pc $DESTDIR/lib/pkgconfig/${lib}.pc
+done

-	# Create a legacy libcurses library.
-	echo "INPUT(-lncursesw)" > $DESTDIR/lib/libcursesw.so
-	ln -s libncurses.so $DESTDIR/lib/libcurses.so
+# Create a legacy libcurses library.
+echo "INPUT(-lncursesw)" > $DESTDIR/lib/libcursesw.so
+ln -s libncurses.so $DESTDIR/lib/libcurses.so

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/nettle/nettle.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/nettle/nettle.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,26 +32,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/parted/parted.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/parted/parted.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,28 +47,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_completion \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+patch -p0 < ../patch-musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_completion \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/patch/patch.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/patch/patch.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/readline/readline.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/readline/readline.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,30 +30,27 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/readline/fix-ncurses-underlinking.patch
-	patch -p0 < ../patch-ncurses-link.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-curses \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
+# https://git.alpinelinux.org/aports/plain/main/readline/fix-ncurses-underlinking.patch
+patch -p0 < ../patch-ncurses-link.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-curses \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/sed/sed.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/sed/sed.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,25 +45,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_acl \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_acl \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/sharutils/sharutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/sharutils/sharutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,26 +41,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/tar/tar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/tar/tar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,26 +46,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	FORCE_UNSAFE_CONFIGURE=1 ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-selinux \
-		$with_acl \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+FORCE_UNSAFE_CONFIGURE=1 ./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-selinux \
+	$with_acl \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/texinfo/texinfo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/texinfo/texinfo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/time/time.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/time/time.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/wget/wget.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/wget/wget.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,27 +62,24 @@
 	with_uuid="--without-uuid"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.lz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.lz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-included-libunistring \
-		$with_nls \
-		$with_ssl \
-		$with_uuid
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-included-libunistring \
+	$with_nls \
+	$with_ssl \
+	$with_uuid
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/gnu/which/which.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/gnu/which/which.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/cairo/cairo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/cairo/cairo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -130,37 +130,34 @@
 	with_x="--with-x $with_x"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-valgrind \
-		--enable-shared \
-		$with_drm \
-		$with_fontconfig \
-		$with_egl \
-		$with_gles2 \
-		$with_gles3 \
-		$with_glib \
-		$with_pdf \
-		$with_png \
-		$with_svg \
-		$with_ttf \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-valgrind \
+	--enable-shared \
+	$with_drm \
+	$with_fontconfig \
+	$with_egl \
+	$with_gles2 \
+	$with_gles3 \
+	$with_glib \
+	$with_pdf \
+	$with_png \
+	$with_svg \
+	$with_ttf \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/exiv2/exiv2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/exiv2/exiv2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -53,28 +53,25 @@
 	with_xmp="-DEXIV2_ENABLE_XMP=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION-Source
-	tar xvf $PKGNAME-$PKGVERSION-Source.tar.gz
-	cd $PKGNAME-$PKGVERSION-Source
+rm -rf $PKGNAME-$PKGVERSION-Source
+tar xvf $PKGNAME-$PKGVERSION-Source.tar.gz
+cd $PKGNAME-$PKGVERSION-Source

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		$with_nls \
-		$with_png \
-		$with_xmp
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	$with_nls \
+	$with_png \
+	$with_xmp
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION-Source
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION-Source
--- a/graphics/fltk/fltk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/fltk/fltk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -48,31 +48,28 @@
 	with_opengl="--disable-gl"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION-source.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION-source.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-debug \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--enable-shared \
-		$with_gl
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-debug \
+	--disable-localjpeg \
+	--disable-localpng \
+	--disable-localzlib \
+	--enable-shared \
+	$with_gl
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/freeglut/freeglut.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/freeglut/freeglut.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,29 +36,26 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# -DFREEGLUT_BUILD_DEMOS=Off: not installed anyway.
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DFREEGLUT_BUILD_SHARED_LIBS=On \
-		-DFREEGLUT_BUILD_STATIC_LIBS=On \
-		-DFREEGLUT_BUILD_DEMOS=Off
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+# -DFREEGLUT_BUILD_DEMOS=Off: not installed anyway.
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DFREEGLUT_BUILD_SHARED_LIBS=On \
+	-DFREEGLUT_BUILD_STATIC_LIBS=On \
+	-DFREEGLUT_BUILD_DEMOS=Off
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -70,36 +70,33 @@
 	with_x="-D x11=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# TODO: enable documentation once docbook-xml is there.
-	patch -p0 < ../patch-meson.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D libdir=lib \
-		-D docs=false \
-		-D man=false \
-		-D installed_tests=false \
-		$with_jasper \
-		$with_jpeg \
-		$with_png \
-		$with_tiff \
-		$with_x
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# TODO: enable documentation once docbook-xml is there.
+patch -p0 < ../patch-meson.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D libdir=lib \
+	-D docs=false \
+	-D man=false \
+	-D installed_tests=false \
+	$with_jasper \
+	$with_jpeg \
+	$with_png \
+	$with_tiff \
+	$with_x
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/giflib/giflib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/giflib/giflib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,21 +25,18 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e '12iCFLAGS+= $(EXTRA_CFLAGS)' Makefile
+sed -i -e '12iCFLAGS+= $(EXTRA_CFLAGS)' Makefile

-	make \
-		CC="$CC" \
-		DESTDIR=$DESTDIR \
-		EXTRA_CFLAGS="$CFLAGS" \
-		PREFIX= \
-		all install
+make \
+	CC="$CC" \
+	DESTDIR=$DESTDIR \
+	EXTRA_CFLAGS="$CFLAGS" \
+	PREFIX= \
+	all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/glbinding/glbinding.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/glbinding/glbinding.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -51,29 +51,26 @@
 	with_tools="-DOPTION_BUILD_TOOLS=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-fhs.patch
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		$with_doxygen \
-		$with_examples \
-		$with_tools
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+patch -p0 < ../patch-fhs.patch
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	$with_doxygen \
+	$with_examples \
+	$with_tools
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/glew/glew.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/glew/glew.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,23 +26,20 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2 -fPIC}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tgz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tgz
+cd $PKGNAME-$PKGVERSION

-	sed -i 's/lib64/lib/' config/Makefile.linux
-	make all install \
-		CC="$CC" \
-		LD="$CC" \
-		CFLAGS.EXTRA="$CFLAGS" \
-		BINDIR=/bin \
-		LIBDIR=/lib \
-		GLEW_PREFIX= \
-		GLEW_DEST= \
-		DESTDIR=$DESTDIR
+sed -i 's/lib64/lib/' config/Makefile.linux
+make all install \
+	CC="$CC" \
+	LD="$CC" \
+	CFLAGS.EXTRA="$CFLAGS" \
+	BINDIR=/bin \
+	LIBDIR=/lib \
+	GLEW_PREFIX= \
+	GLEW_DEST= \
+	DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/glu/glu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/glu/glu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,26 +32,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/graphviz/graphviz.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/graphviz/graphviz.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -101,64 +101,61 @@
 	with_expat="--without-expat"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# TODO: enable features as they become available.
-	# --disable-tcl because it installs to /lib64.
-	CONFIG_SHELL=/bin/bash \
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--libdir=/lib \
-		--disable-tcl \
-		--disable-ltdl-install \
-		--without-included-ltdl \
-		--without-qt \
-		--without-devil \
-		--without-poppler \
-		--without-rsvg \
-		--without-ghostscript \
-		--without-visio \
-		--without-lasi \
-		--without-glitz \
-		--without-gtkgl \
-		--without-gtkglext \
-		--without-gts \
-		--without-ann \
-		--without-glade \
-		--without-ming \
-		--without-qt\
-		--without-quartz \
-		--without-gdiplus \
-		--without-glut \
-		--without-smyrna \
-		--without-ortho \
-		--without-digcola \
-		--without-ipsepcola \
-		--with-sfdp \
-		$with_fontconfig \
-		$with_gd \
-		$with_gtk \
-		$with_pango \
-		$with_ttf \
-		$with_webp \
-		$with_x \
-		$with_xml
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# TODO: enable features as they become available.
+# --disable-tcl because it installs to /lib64.
+CONFIG_SHELL=/bin/bash \
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--libdir=/lib \
+	--disable-tcl \
+	--disable-ltdl-install \
+	--without-included-ltdl \
+	--without-qt \
+	--without-devil \
+	--without-poppler \
+	--without-rsvg \
+	--without-ghostscript \
+	--without-visio \
+	--without-lasi \
+	--without-glitz \
+	--without-gtkgl \
+	--without-gtkglext \
+	--without-gts \
+	--without-ann \
+	--without-glade \
+	--without-ming \
+	--without-qt\
+	--without-quartz \
+	--without-gdiplus \
+	--without-glut \
+	--without-smyrna \
+	--without-ortho \
+	--without-digcola \
+	--without-ipsepcola \
+	--with-sfdp \
+	$with_fontconfig \
+	$with_gd \
+	$with_gtk \
+	$with_pango \
+	$with_ttf \
+	$with_webp \
+	$with_x \
+	$with_xml
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/gtk/gtk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/gtk/gtk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -76,29 +76,25 @@
 	fi
 fi

-build()
-{
-	rm -rf gtk+-$PKGVERSION
-	tar xvf gtk+-$PKGVERSION.tar.xz
-	cd gtk+-$PKGVERSION
+rm -rf gtk+-$PKGVERSION
+tar xvf gtk+-$PKGVERSION.tar.xz
+cd gtk+-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls \
-		$with_wayland \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls \
+	$with_wayland \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf gtk+-$PKGVERSION
-}
-
+cd ..
+rm -rf gtk+-$PKGVERSION
--- a/graphics/gtk2/gtk2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/gtk2/gtk2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -63,30 +63,26 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf gtk+-$PKGVERSION
-	tar xvf gtk+-$PKGVERSION.tar.xz
-	cd gtk+-$PKGVERSION
+rm -rf gtk+-$PKGVERSION
+tar xvf gtk+-$PKGVERSION.tar.xz
+cd gtk+-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		$with_cups \
-		$with_nls
-	make
-	make install localedir=/share/locale DESTDIR=$DESTDIR
-	rm -f $DESTDIR/bin/gtk-update-icon-cache
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	$with_cups \
+	$with_nls
+make
+make install localedir=/share/locale DESTDIR=$DESTDIR
+rm -f $DESTDIR/bin/gtk-update-icon-cache
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf gtk+-$PKGVERSION
-}
-
+cd ..
+rm -rf gtk+-$PKGVERSION
--- a/graphics/gtksourceview/gtksourceview.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/gtksourceview/gtksourceview.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,28 +49,25 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/imlib2/imlib2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/imlib2/imlib2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -95,32 +95,29 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_bzip2 \
-		$with_gif \
-		$with_jpeg \
-		$with_id3 \
-		$with_png \
-		$with_tiff \
-		$with_x \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_bzip2 \
+	$with_gif \
+	$with_jpeg \
+	$with_id3 \
+	$with_png \
+	$with_tiff \
+	$with_x \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/jasper/jasper.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/jasper/jasper.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,26 +43,23 @@
 	with_opengl="-DJAS_ENABLE_OPENGL=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir bld && cd bld
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_DOCDIR=/share/doc/$PKGNAME \
-		$with_jpeg \
-		$with_opengl
-	make VERBOSE=1
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir bld && cd bld
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_DOCDIR=/share/doc/$PKGNAME \
+	$with_jpeg \
+	$with_opengl
+make VERBOSE=1
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libdmtx/libdmtx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libdmtx/libdmtx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libdrm/libdrm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libdrm/libdrm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,26 +46,23 @@
 	with_kms="--disable-libkms"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_udev \
-		$with_kms
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_udev \
+	$with_kms
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libepoxy/libepoxy.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,28 +38,25 @@
 	with_x="-D x11=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D libdir=lib \
-		-D tests=false \
-		$with_x
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D libdir=lib \
+	-D tests=false \
+	$with_x
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libexif/libexif.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libexif/libexif.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,27 +38,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libgd/libgd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libgd/libgd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -102,34 +102,31 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_fontconfig \
-		$with_jpeg \
-		$with_liq \
-		$with_png \
-		$with_tiff \
-		$with_ttf \
-		$with_webp \
-		$with_x \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_fontconfig \
+	$with_jpeg \
+	$with_liq \
+	$with_png \
+	$with_tiff \
+	$with_ttf \
+	$with_webp \
+	$with_x \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libjpeg-turbo/libjpeg-turbo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,24 +26,21 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_LIBDIR=/lib
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libpng/libpng.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libpng/libpng.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/librsvg/librsvg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/librsvg/librsvg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,26 +45,23 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libtiff/libtiff.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libtiff/libtiff.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -72,33 +72,30 @@
 	with_zstd="--disable-zstd"
 fi

-build()
-{
-	rm -rf tiff-$PKGVERSION
-	tar xvf tiff-$PKGVERSION.tar.gz
-	cd tiff-$PKGVERSION
+rm -rf tiff-$PKGVERSION
+tar xvf tiff-$PKGVERSION.tar.gz
+cd tiff-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-docdir=/share/doc/libtiff \
-		--enable-shared \
-		$with_jpeg \
-		$with_lzma \
-		$with_webp \
-		$with_zlib \
-		$with_zstd
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-docdir=/share/doc/libtiff \
+	--enable-shared \
+	$with_jpeg \
+	$with_lzma \
+	$with_webp \
+	$with_zlib \
+	$with_zstd
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf tiff-$PKGVERSION
-}
+cd ..
+rm -rf tiff-$PKGVERSION
--- a/graphics/libwebp/libwebp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/libwebp/libwebp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -57,30 +57,27 @@
 	with_tiff="--disable-tiff"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_jpeg \
-		$with_png \
-		$with_tiff
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_jpeg \
+	$with_png \
+	$with_tiff
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/mesa/mesa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/mesa/mesa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -103,39 +103,36 @@
 	with_glx="-D glx=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../disable-tls.patch
-	# https://git.alpinelinux.org/aports/plain/main/mesa/musl-fix-includes.patch
-	patch -p1 < ../musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D libdir=lib \
-		-D bpm=true \
-		-D platforms="$with_platforms" \
-		-D dri-drivers="$with_dri_drivers" \
-		-D gallium-drivers="$with_gallium_drivers" \
-		-D vulkan-drivers="$with_vulkan_drivers" \
-		$with_dri \
-		$with_egl \
-		$with_glvnd \
-		$with_glx \
-		$with_llvm
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+patch -p0 < ../disable-tls.patch
+# https://git.alpinelinux.org/aports/plain/main/mesa/musl-fix-includes.patch
+patch -p1 < ../musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D libdir=lib \
+	-D bpm=true \
+	-D platforms="$with_platforms" \
+	-D dri-drivers="$with_dri_drivers" \
+	-D gallium-drivers="$with_gallium_drivers" \
+	-D vulkan-drivers="$with_vulkan_drivers" \
+	$with_dri \
+	$with_egl \
+	$with_glvnd \
+	$with_glx \
+	$with_llvm
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/openjpeg/openjpeg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/openjpeg/openjpeg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,29 +30,26 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# -DBUILD_DOC=Off: installs directory in /share/doc/html.
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DOPENJPEG_INSTALL_DOC_DIR=/share/doc/openjpeg \
-		-DOPENJPEG_INSTALL_PACKAGE_DIR=/lib/cmake/openjpeg \
-		-DBUILD_DOC=Off
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+# -DBUILD_DOC=Off: installs directory in /share/doc/html.
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DOPENJPEG_INSTALL_DOC_DIR=/share/doc/openjpeg \
+	-DOPENJPEG_INSTALL_PACKAGE_DIR=/lib/cmake/openjpeg \
+	-DBUILD_DOC=Off
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/pixman/pixman.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/pixman/pixman.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,29 +46,26 @@
 	with_png="--disable-libpng"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-gnuplot \
-		--disable-gtk \
-		--enable-shared \
-		$with_openmp \
-		$with_png
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-gnuplot \
+	--disable-gtk \
+	--enable-shared \
+	$with_openmp \
+	$with_png
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/qrencode/qrencode.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/qrencode/qrencode.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,29 +46,26 @@
 	with_tools="--without-tools"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-static \
-		$with_png \
-		$with_tools
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-static \
+	$with_png \
+	$with_tools
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/sdl2-image/sdl2-image.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/sdl2-image/sdl2-image.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -145,38 +145,35 @@
 	with_webp="--disable-webp"
 fi

-build()
-{
-	rm -rf SDL2_image-$PKGVERSION
-	tar xvf SDL2_image-$PKGVERSION.tar.gz
-	cd SDL2_image-$PKGVERSION
+rm -rf SDL2_image-$PKGVERSION
+tar xvf SDL2_image-$PKGVERSION.tar.gz
+cd SDL2_image-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_bmp \
-		$with_gif \
-		$with_jpeg \
-		$with_lbm \
-		$with_pcx \
-		$with_png \
-		$with_pnm \
-		$with_svg \
-		$with_tga \
-		$with_tiff \
-		$with_webp \
-		$with_xcf \
-		$with_xpm \
-		$with_xv
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_bmp \
+	$with_gif \
+	$with_jpeg \
+	$with_lbm \
+	$with_pcx \
+	$with_png \
+	$with_pnm \
+	$with_svg \
+	$with_tga \
+	$with_tiff \
+	$with_webp \
+	$with_xcf \
+	$with_xpm \
+	$with_xv
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf SDL2_image-$PKGVERSION
-}
+cd ..
+rm -rf SDL2_image-$PKGVERSION
--- a/graphics/swaybg/swaybg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/swaybg/swaybg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -37,22 +37,19 @@
 	with_gdk_pixbuf="-D gdk-pixbuf=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		$with_gdk_pixbuf
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	$with_gdk_pixbuf
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wayland-protocols/wayland-protocols.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/wayland-protocols/wayland-protocols.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,16 +22,13 @@
 PKGSUMMARY="protocols for wayland"
 PKGDOWNLOAD="https://wayland.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.xz"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wayland/wayland.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/wayland/wayland.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,26 +47,23 @@
 	with_docs="--disable-documentation"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_dtd \
-		$with_docs
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_dtd \
+	$with_docs
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/weston/weston.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/weston/weston.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,31 +54,28 @@
 	with_x="--disable-xwayland --disable-x11-compositor"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://gitlab.freedesktop.org/wayland/weston/merge_requests/135
-	patch -p1 < ../musl.patch
-	patch -p0 < ../gobject.patch
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_dbus \
-		$with_pam \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# https://gitlab.freedesktop.org/wayland/weston/merge_requests/135
+patch -p1 < ../musl.patch
+patch -p0 < ../gobject.patch
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_dbus \
+	$with_pam \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wlroots/wlroots.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/wlroots/wlroots.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -61,26 +61,23 @@
 	with_x="-D xwayland=disabled -D x11-backend=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library both \
-		$with_cap \
-		$with_elogind \
-		$with_x
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library both \
+	$with_cap \
+	$with_elogind \
+	$with_x
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wxwidgets/wxwidgets.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/graphics/wxwidgets/wxwidgets.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -116,41 +116,38 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf wxWidgets-$PKGVERSION
-	tar xvf wxWidgets-$PKGVERSION.tar.bz2
-	cd wxWidgets-$PKGVERSION
+rm -rf wxWidgets-$PKGVERSION
+tar xvf wxWidgets-$PKGVERSION.tar.bz2
+cd wxWidgets-$PKGVERSION

-	# --disable-xlocale: does not build (strtol_l).
-	# --enable-unicode: this should be default.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-cxx=17 \
-		--disable-xlocale \
-		--enable-unicode \
-		$with_gtk \
-		$with_jpeg \
-		$with_lzma \
-		$with_notifications \
-		$with_opengl \
-		$with_png \
-		$with_qt \
-		$with_tiff \
-		$with_xml \
-		$with_xpm \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
+# --disable-xlocale: does not build (strtol_l).
+# --enable-unicode: this should be default.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-cxx=17 \
+	--disable-xlocale \
+	--enable-unicode \
+	$with_gtk \
+	$with_jpeg \
+	$with_lzma \
+	$with_notifications \
+	$with_opengl \
+	$with_png \
+	$with_qt \
+	$with_tiff \
+	$with_xml \
+	$with_xpm \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf wxWidgets-$PKGVERSION
-}
+cd ..
+rm -rf wxWidgets-$PKGVERSION
--- a/irc/irccd/irccd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/irc/irccd/irccd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -96,41 +96,38 @@
 	with_ssl="-DIRCCD_WITH_SSL=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DIRCCD_WITH_SYSTEMD=Off \
-		$with_ask \
-		$with_hangman \
-		$with_history \
-		$with_javascript \
-		$with_joke \
-		$with_libedit \
-		$with_links \
-		$with_logger \
-		$with_plugin \
-		$with_roulette \
-		$with_ssl \
-		$with_tictactoe
-	make VERBOSE=1
-	make install DESTDIR=$DESTDIR
-	cd ..
-	install -Dm0644 ../irccd $DESTDIR/etc/rc.d/irccd
-	mv $DESTDIR/etc/irccd.conf.sample $DESTDIR/etc/irccd.conf
-	mv $DESTDIR/etc/irccdctl.conf.sample $DESTDIR/etc/irccdctl.conf
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DIRCCD_WITH_SYSTEMD=Off \
+	$with_ask \
+	$with_hangman \
+	$with_history \
+	$with_javascript \
+	$with_joke \
+	$with_libedit \
+	$with_links \
+	$with_logger \
+	$with_plugin \
+	$with_roulette \
+	$with_ssl \
+	$with_tictactoe
+make VERBOSE=1
+make install DESTDIR=$DESTDIR
+cd ..
+install -Dm0644 ../irccd $DESTDIR/etc/rc.d/irccd
+mv $DESTDIR/etc/irccd.conf.sample $DESTDIR/etc/irccd.conf
+mv $DESTDIR/etc/irccdctl.conf.sample $DESTDIR/etc/irccdctl.conf

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/irc/irssi/irssi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/irc/irssi/irssi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,27 +47,24 @@
 	with_truecolor="--disable-true-color"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_perl \
-		$with_truecolor
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_perl \
+	$with_truecolor
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/irc/ngircd/ngircd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/irc/ngircd/ngircd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -69,28 +69,25 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_ipv6 \
-		$with_pam \
-		$with_ssl \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_ipv6 \
+	$with_pam \
+	$with_ssl \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/kernel/linux-headers/linux-headers.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/kernel/linux-headers/linux-headers.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,8 +22,5 @@
 PKGSUMMARY="kernel headers for userspace"
 PKGDOWNLOAD="http://files.malikania.fr/distfiles/$PKGNAME-$PKGVERSION.tar.xz"

-build()
-{
-	mkdir -p $DESTDIR
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz -C $DESTDIR
-}
+mkdir -p $DESTDIR
+tar xvf $PKGNAME-$PKGVERSION.tar.xz -C $DESTDIR
--- a/kernel/linux/linux.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/kernel/linux/linux.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,29 +43,26 @@
 : ${LIBS:=}
 : ${CONFIG:=}   # Note: path to kernel config file.

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	if [ -n "$CONFIG" ]; then
-		cp $CONFIG .config
-	else
-		# TODO: add architecture support.
-		cp ../config-amd64 .config
-	fi
+if [ -n "$CONFIG" ]; then
+	cp $CONFIG .config
+else
+	# TODO: add architecture support.
+	cp ../config-amd64 .config
+fi

-	mkdir -p $DESTDIR/boot
-	mkdir -p $DESTDIR/lib
-	make \
-		CC="$CC" \
-		HOSTCC="$CC" \
-		CFLAGS="$CFLAGS" \
-		INSTALL_PATH=$DESTDIR/boot \
-		INSTALL_MOD_PATH=$DESTDIR \
-		all install modules_install
+mkdir -p $DESTDIR/boot
+mkdir -p $DESTDIR/lib
+make \
+	CC="$CC" \
+	HOSTCC="$CC" \
+	CFLAGS="$CFLAGS" \
+	INSTALL_PATH=$DESTDIR/boot \
+	INSTALL_MOD_PATH=$DESTDIR \
+	all install modules_install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lang/lua/lua.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/lua/lua.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e "/^#define LUA_ROOT/ s|/usr/local/|/|" src/luaconf.h
-	make \
-		CC="$CC" \
-		MYCFLAGS="$CFLAGS" \
-		MYLDFLAGS="$LDFLAGS" \
-		MYLIBS="$LIBS" \
-		INSTALL_TOP=$DESTDIR \
-		INSTALL_MAN=/share/man/man1 \
-		linux install
+sed -i -e "/^#define LUA_ROOT/ s|/usr/local/|/|" src/luaconf.h
+make \
+	CC="$CC" \
+	MYCFLAGS="$CFLAGS" \
+	MYLDFLAGS="$LDFLAGS" \
+	MYLIBS="$LIBS" \
+	INSTALL_TOP=$DESTDIR \
+	INSTALL_MAN=/share/man/man1 \
+	linux install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lang/luajit/luajit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/luajit/luajit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,21 +27,18 @@
 : ${LDFLAGS:=}
 : ${LIBS:=-lunwind}

-build()
-{
-	rm -rf LuaJIT-$PKGVERSION
-	tar xvf LuaJIT-$PKGVERSION.tar.gz
-	cd LuaJIT-$PKGVERSION
+rm -rf LuaJIT-$PKGVERSION
+tar xvf LuaJIT-$PKGVERSION.tar.gz
+cd LuaJIT-$PKGVERSION

-	make \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		DESTDIR="$DESTDIR" \
-		LIBS="$LIBS" \
-		PREFIX= \
-		all install
+make \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	DESTDIR="$DESTDIR" \
+	LIBS="$LIBS" \
+	PREFIX= \
+	all install

-	cd ..
-	rm -rf LuaJIT-$PKGVERSION
-}
+cd ..
+rm -rf LuaJIT-$PKGVERSION
--- a/lang/mozjs52/mozjs52.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/mozjs52/mozjs52.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,33 +26,30 @@
 : ${CC:=clang}
 : ${CXX:=clang++}

-build()
-{
-	rm -rf firefox-${PKGVERSION}esr
-	tar xvf firefox-${PKGVERSION}esr.source.tar.xz
-	cd firefox-${PKGVERSION}esr
+rm -rf firefox-${PKGVERSION}esr
+tar xvf firefox-${PKGVERSION}esr.source.tar.xz
+cd firefox-${PKGVERSION}esr

-	unset DOXYGEN
-	# credits to FreeBSD.
-	patch -p0 < ../patch-clang.patch
-	cd js/src
-	CC="$CC" HOST_CC="$CC" \
-	CXX="$CXX" HOST_CXX="$CXX" \
-	SHELL="/bin/bash" PYTHON="/bin/python2" \
-	./configure \
-		--prefix= \
-		--disable-tests \
-		--disable-jemalloc \
-		--enable-shared-js \
-		--enable-ctypes \
-		--with-system-icu \
-		--with-system-nspr \
-		--with-system-zlib
-	SHELL="/bin/bash" PYTHON="/bin/python2" \
-	make
-	make install DESTDIR=$DESTDIR
-	cd ../..
+unset DOXYGEN
+# credits to FreeBSD.
+patch -p0 < ../patch-clang.patch
+cd js/src
+CC="$CC" HOST_CC="$CC" \
+CXX="$CXX" HOST_CXX="$CXX" \
+SHELL="/bin/bash" PYTHON="/bin/python2" \
+./configure \
+	--prefix= \
+	--disable-tests \
+	--disable-jemalloc \
+	--enable-shared-js \
+	--enable-ctypes \
+	--with-system-icu \
+	--with-system-nspr \
+	--with-system-zlib
+SHELL="/bin/bash" PYTHON="/bin/python2" \
+make
+make install DESTDIR=$DESTDIR
+cd ../..

-	cd ..
-	rm -rf firefox-${PKGVERSION}esr
-}
+cd ..
+rm -rf firefox-${PKGVERSION}esr
--- a/lang/rust/rust.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/rust/rust.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -42,36 +42,33 @@
 	with_components="$COMPONENTS"
 esac

-build()
-{
-	rm -rf rustc-$PKGVERSION-src
-	tar xvpf rustc-$PKGVERSION-src.tar.gz
-	cd rustc-$PKGVERSION-src
+rm -rf rustc-$PKGVERSION-src
+tar xvpf rustc-$PKGVERSION-src.tar.gz
+cd rustc-$PKGVERSION-src

-	if [ "$CC" = "clang" ]; then
-		patch -p0 < ../patch-clang.patch
-	fi
+if [ "$CC" = "clang" ]; then
+	patch -p0 < ../patch-clang.patch
+fi

-	# http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/rust/patches
-	patch -p0 < ../patch-libressl.patch
-	patch -p0 < ../patch-rust.patch
+# http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/rust/patches
+patch -p0 < ../patch-libressl.patch
+patch -p0 < ../patch-rust.patch

-	sed \
-		-e "s|@PWD@|$cwd|" \
-		-e "s|@ARCH@|$(uname -m)|" \
-		-e "s|@CC@|$CC|" \
-		-e "s|@CXX@|$CXX|" \
-		-e "s|@VERSION@|$PKGVERSION|" ../config.toml > config.toml
-
-	./x.py build -v -j 2 src/libstd src/librustc $with_components
-	DESTDIR=$DESTDIR ./x.py install -v src/libstd src/librustc $with_components
+sed \
+	-e "s|@PWD@|$cwd|" \
+	-e "s|@ARCH@|$(uname -m)|" \
+	-e "s|@CC@|$CC|" \
+	-e "s|@CXX@|$CXX|" \
+	-e "s|@VERSION@|$PKGVERSION|" ../config.toml > config.toml

-	# Remove useless bits.
-	rm -f $DESTDIR/lib/rustlib/uninstall.sh
-	rm -f $DESTDIR/lib/rustlib/install.log
-	rm -f $DESTDIR/lib/rustlib/components
-	rm -f $DESTDIR/lib/rustlib/manifest*
+./x.py build -v -j 2 src/libstd src/librustc $with_components
+DESTDIR=$DESTDIR ./x.py install -v src/libstd src/librustc $with_components

-	cd ..
-	rm -rf rustc-$PKGVERSION-src
-}
+# Remove useless bits.
+rm -f $DESTDIR/lib/rustlib/uninstall.sh
+rm -f $DESTDIR/lib/rustlib/install.log
+rm -f $DESTDIR/lib/rustlib/components
+rm -f $DESTDIR/lib/rustlib/manifest*
+
+cd ..
+rm -rf rustc-$PKGVERSION-src
--- a/lang/tcl/tcl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/tcl/tcl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,27 +30,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf ${PKGNAME}${PKGVERSION}
-	tar xvf ${PKGNAME}${PKGVERSION}-src.tar.gz
-	cd ${PKGNAME}${PKGVERSION}/unix
+rm -rf ${PKGNAME}${PKGVERSION}
+tar xvf ${PKGNAME}${PKGVERSION}-src.tar.gz
+cd ${PKGNAME}${PKGVERSION}/unix

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--mandir=/share/man \
-		--enable-shared \
-		--enable-64bit
-	make
-	make install DESTDIR=$DESTDIR
-	ln -sf $DESTDIR/bin/tclsh8 $DESTDIR/bin/tclsh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--mandir=/share/man \
+	--enable-shared \
+	--enable-64bit
+make
+make install DESTDIR=$DESTDIR
+ln -sf $DESTDIR/bin/tclsh8 $DESTDIR/bin/tclsh

-	cd ../..
-	rm -rf ${PKGNAME}${PKGVERSION}
-}
+cd ../..
+rm -rf ${PKGNAME}${PKGVERSION}
--- a/lang/vala/vala.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lang/vala/vala.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,26 +39,23 @@
 	with_valadoc="--disable-valadoc"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_valadoc
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_valadoc
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/argp-standalone/argp-standalone.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/argp-standalone/argp-standalone.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,33 +35,30 @@
 	with_static="--disable-shared"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://svnweb.freebsd.org/ports/head/devel/argp-standalone/files
-	patch -p0 < ../patch-configure.ac.patch
-	patch -p0 < ../patch-Makefile.am.patch
-	patch -p0 < ../patch-testsuite_Makefile.am.patch
-	patch -p1 < ../patch-gnu89-inline.patch
-	patch -p1 < ../patch-throw-in-funcdef.patch
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_static
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0644 argp.h $DESTDIR/include/argp.h
-	find $DESTDIR -type f -name "*.la" -delete
+# https://svnweb.freebsd.org/ports/head/devel/argp-standalone/files
+patch -p0 < ../patch-configure.ac.patch
+patch -p0 < ../patch-Makefile.am.patch
+patch -p0 < ../patch-testsuite_Makefile.am.patch
+patch -p1 < ../patch-gnu89-inline.patch
+patch -p1 < ../patch-throw-in-funcdef.patch
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_static
+make
+make install DESTDIR=$DESTDIR
+install -Dm0644 argp.h $DESTDIR/include/argp.h
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/boost/boost.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/boost/boost.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -63,40 +63,37 @@
 	;;
 esac

-build()
-{
-	rm -rf ${PKGNAME}_$_VERSION
-	tar xvf ${PKGNAME}_$_VERSION.tar.gz
-	cd ${PKGNAME}_$_VERSION
+rm -rf ${PKGNAME}_$_VERSION
+tar xvf ${PKGNAME}_$_VERSION.tar.gz
+cd ${PKGNAME}_$_VERSION

-	touch user-config.jam
+touch user-config.jam

-	if [ "$PYTHON" = "yes" ]; then
-		echo "using python : 3.7 : /bin/python : /include/python3.7m : : : : ;" >> user-config.jam
-	fi
+if [ "$PYTHON" = "yes" ]; then
+	echo "using python : 3.7 : /bin/python : /include/python3.7m : : : : ;" >> user-config.jam
+fi

-	./bootstrap.sh \
-		--with-toolset=$with_toolset \
-		$with_bootstrap_icu \
-		$with_bootstrap_python
+./bootstrap.sh \
+	--with-toolset=$with_toolset \
+	$with_bootstrap_icu \
+	$with_bootstrap_python

-	# --layout=system: generate simple libraries names (no suffixes).
-	./b2 \
-		--user-config=user-config.jam \
-		--layout=system \
-		--prefix=$DESTDIR \
-		link=static,shared \
-		debug-symbols=off \
-		runtime-link=shared \
-		threading=multi \
-		variant=release \
-		toolset=$with_toolset \
-		$with_cxxflags \
-		$with_linkflags \
-		$with_python \
-		$with_icu \
-		install
+# --layout=system: generate simple libraries names (no suffixes).
+./b2 \
+	--user-config=user-config.jam \
+	--layout=system \
+	--prefix=$DESTDIR \
+	link=static,shared \
+	debug-symbols=off \
+	runtime-link=shared \
+	threading=multi \
+	variant=release \
+	toolset=$with_toolset \
+	$with_cxxflags \
+	$with_linkflags \
+	$with_python \
+	$with_icu \
+	install

-	cd ..
-	rm -rf ${PKGNAME}_$_VERSION
-}
+cd ..
+rm -rf ${PKGNAME}_$_VERSION
--- a/lib/compiler-rt/compiler-rt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=compiler-rt
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="compiler-rt runtime libraries"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
-	cd $PKGNAME-$PKGVERSION.src
-
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/lib/clang/$PKGVERSION \
-		-DCOMPILER_RT_BUILD_BUILTINS=On \
-		-DCOMPILER_RT_BUILD_SANITIZERS=Off \
-		-DCOMPILER_RT_BUILD_XRAY=Off \
-		-DCOMPILER_RT_USE_BUILTINS_LIBRARY=On
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION.src
-}
--- a/lib/compiler-rt/compiler-rt.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-4e00cb231ff87fd4f970f35b2da86185a612e0e2  compiler-rt-9.0.0.src.tar.xz
--- a/lib/dbus-glib/dbus-glib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/dbus-glib/dbus-glib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/efivar/efivar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/efivar/efivar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,20 +25,17 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	make \
-		CC="$CC" \
-		CC_FOR_BUILD="$CC" \
-		CFLAGS="$CFLAGS" \
-		LIBDIR=/lib \
-		PREFIX= \
-		DESTDIR=$DESTDIR all install
+make \
+	CC="$CC" \
+	CC_FOR_BUILD="$CC" \
+	CFLAGS="$CFLAGS" \
+	LIBDIR=/lib \
+	PREFIX= \
+	DESTDIR=$DESTDIR all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/expat/expat.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/expat/expat.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/fribidi/fribidi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/fribidi/fribidi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/fuse/fuse.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/fuse/fuse.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,29 +45,26 @@
 	with_utils="-D utils=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D sbindir=bin \
-		$with_examples \
-		$with_utils
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	rm -rf $DESTDIR/etc/init.d
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D sbindir=bin \
+	$with_examples \
+	$with_utils
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+rm -rf $DESTDIR/etc/init.d
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/fuse2/fuse2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/fuse2/fuse2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf fuse-$PKGVERSION
-	tar xvf fuse-$PKGVERSION.tar.gz
-	cd fuse-$PKGVERSION
+rm -rf fuse-$PKGVERSION
+tar xvf fuse-$PKGVERSION.tar.gz
+cd fuse-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	MOUNT_FUSE_PATH=/bin \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	rm -rf $DESTDIR/etc/init.d
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+MOUNT_FUSE_PATH=/bin \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+rm -rf $DESTDIR/etc/init.d
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf fuse-$PKGVERSION
-}
+cd ..
+rm -rf fuse-$PKGVERSION
--- a/lib/gc/gc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/gc/gc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,27 +32,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-libatomic-ops=yes
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-libatomic-ops=yes
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/glib/glib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/glib/glib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -50,27 +50,24 @@
 	with_selinux="-D selinux=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D libdir=lib \
-		$with_mount \
-		$with_nls \
-		$with_selinux
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D libdir=lib \
+	$with_mount \
+	$with_nls \
+	$with_selinux
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/gmp/gmp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/gmp/gmp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,29 +31,26 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-cxx \
-		--enable-fat \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-cxx \
+	--enable-fat \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/gvfs/gvfs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/gvfs/gvfs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -129,49 +129,46 @@
 	with_udev="-D gudev=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D afc=false \
-		-D cdda=false \
-		-D dnssd=false \
-		-D goa=false \
-		-D google=false \
-		-D gphoto2=false \
-		-D logind=false \
-		-D mtp=false \
-		-D nfs=false \
-		-D smb=false \
-		-D systemduserunitdir=no \
-		-D tmpfilesdir=no \
-		-D udisks2=false \
-		-D libusb=false \
-		$with_admin \
-		$with_afp \
-		$with_bluray \
-		$with_crypto \
-		$with_fuse \
-		$with_gcr \
-		$with_http \
-		$with_keyring \
-		$with_libarchive \
-		$with_ssh \
-		$with_udev
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D afc=false \
+	-D cdda=false \
+	-D dnssd=false \
+	-D goa=false \
+	-D google=false \
+	-D gphoto2=false \
+	-D logind=false \
+	-D mtp=false \
+	-D nfs=false \
+	-D smb=false \
+	-D systemduserunitdir=no \
+	-D tmpfilesdir=no \
+	-D udisks2=false \
+	-D libusb=false \
+	$with_admin \
+	$with_afp \
+	$with_bluray \
+	$with_crypto \
+	$with_fuse \
+	$with_gcr \
+	$with_http \
+	$with_keyring \
+	$with_libarchive \
+	$with_ssh \
+	$with_udev
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/icu/icu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/icu/icu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,26 +31,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME
-	tar xvf icu4c-${PKGVERSION}_1-src.tgz
-	cd $PKGNAME/source
+rm -rf $PKGNAME
+tar xvf icu4c-${PKGVERSION}_1-src.tgz
+cd $PKGNAME/source

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+make
+make install DESTDIR=$DESTDIR

-	cd ../..
-	rm -rf $PKGNAME
-}
+cd ../..
+rm -rf $PKGNAME
--- a/lib/isl/isl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/isl/isl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,30 +32,27 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# --prefix=/.: complains if prefix is empty.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/. \
-		--enable-shared \
-		--with-gmp=system
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# --prefix=/.: complains if prefix is empty.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=/. \
+	--enable-shared \
+	--with-gmp=system
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libaio/libaio.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libaio/libaio.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,19 +25,16 @@

 : ${CC:=clang}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGNAME-$PKGVERSION

-	# TODO: honor CFLAGS.
-	make CC="$CC" install \
-		prefix=$DESTDIR/ \
-		sysconfdir=$DESTDIR/etc \
-		mandir=$DESTDIR/share/man \
-		infodir=$DESTDIR/share/info
+# TODO: honor CFLAGS.
+make CC="$CC" install \
+	prefix=$DESTDIR/ \
+	sysconfdir=$DESTDIR/etc \
+	mandir=$DESTDIR/share/man \
+	infodir=$DESTDIR/share/info

-	cd ..
-	rm -rf $PKGNAME-$PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGNAME-$PKGVERSION
--- a/lib/libatomic-ops/libatomic-ops.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libatomic-ops/libatomic-ops.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libatomic_ops-$PKGVERSION
-	tar xvf libatomic_ops-$PKGVERSION.tar.gz
-	cd libatomic_ops-$PKGVERSION
+rm -rf libatomic_ops-$PKGVERSION
+tar xvf libatomic_ops-$PKGVERSION.tar.gz
+cd libatomic_ops-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--docdir=/share/doc/$PKGNAME
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--docdir=/share/doc/$PKGNAME
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libatomic_ops-$PKGVERSION
-}
+cd ..
+rm -rf libatomic_ops-$PKGVERSION
--- a/lib/libblockdev/libblockdev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libblockdev/libblockdev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -51,39 +51,36 @@
 	with_python="--without-python3"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-btrfs \
-		--without-crypto \
-		--without-dmraid \
-		--without-fs \
-		--without-kbd \
-		--without-mdraid \
-		--without-nvdimm \
-		--without-part \
-		--without-python2 \
-		--without-tools \
-		--without-vdo \
-		$with_lvm \
-		$with_python
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-btrfs \
+	--without-crypto \
+	--without-dmraid \
+	--without-fs \
+	--without-kbd \
+	--without-mdraid \
+	--without-nvdimm \
+	--without-part \
+	--without-python2 \
+	--without-tools \
+	--without-vdo \
+	$with_lvm \
+	$with_python
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libbytesize/libbytesize.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libbytesize/libbytesize.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libc++/libc++.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=libc++
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="C++ standard library from LLVM"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/libcxx-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="ABI COMPILER_RT LIBUNWIND "
-PKGPRESERVE="lib/libc++.so.1.0"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-: ${ABI:=libcxxabi}
-: ${COMPILER_RT:=yes}
-: ${LIBUNWIND:=yes}
-
-if [ "$COMPILER_RT" = "yes" ]; then
-	with_compiler_rt="-DLIBCXX_USE_COMPILER_RT=On"
-else
-	with_compiler_rt="-DLIBCXX_USE_COMPILER_RT=Off"
-fi
-
-if [ "$LIBUNWIND" = "yes" ]; then
-	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=On"
-else
-	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off"
-fi
-
-build()
-{
-	rm -rf libcxx-$PKGVERSION.src
-	tar xvf libcxx-$PKGVERSION.src.tar.xz
-	cd libcxx-$PKGVERSION.src
-
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLIBCXX_CXX_ABI=$ABI \
-		-DLIBCXX_HAS_MUSL_LIBC=On \
-		$with_compiler_rt \
-		$with_libunwind
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
-
-	cd ..
-	rm -rf libcxx-$PKGVERSION.src
-}
--- a/lib/libc++/libc++.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-e27ce439b2aec1f4af302db255359ccbc1cc6f46  libcxx-9.0.0.src.tar.xz
--- a/lib/libc++abi/libc++abi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=libc++abi
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="low level support for the standard C++ library"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="COMPILER_RT LIBUNWIND"
-PKGPRESERVE="lib/libc++abi.so.1.0"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-: ${COMPILER_RT:=yes}
-: ${LIBUNWIND:=yes}
-
-if [ "$COMPILER_RT" = "yes" ]; then
-	with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=Off"
-else
-	with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=On"
-fi
-
-if [ "$LIBUNWIND" = "yes" ]; then
-	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=On"
-else
-	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off"
-fi
-
-build()
-{
-	rm -rf libcxxabi-$PKGVERSION.src
-	tar xvf libcxxabi-$PKGVERSION.src.tar.xz
-	cd libcxxabi-$PKGVERSION.src
-
-	#
-	# We build libc++abi against the system-wide libc++, so disable the
-	# -nostdinc++ flag.
-	#
-	sed -i -e "/-nostdinc++/d" CMakeLists.txt
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \
-		$with_compiler_rt \
-		$with_libunwind
-	make
-	make install DESTDIR=$DESTDIR
-	mkdir -p $DESTDIR/include
-	cp ../include/* $DESTDIR/include
-	cd ..
-
-	cd ..
-	rm -rf libcxxabi-$PKGVERSION.src
-}
--- a/lib/libc++abi/libc++abi.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-9e6532595d98eca447cb00352848fed7688f722c  libcxxabi-9.0.0.src.tar.xz
--- a/lib/libdaemon/libdaemon.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libdaemon/libdaemon.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,26 +29,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-examples
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-examples
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libedit/libedit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libedit/libedit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../clang.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+patch -p0 < ../clang.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libev/libev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libev/libev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libevdev/libevdev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libevdev/libevdev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libevent/libevent.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libevent/libevent.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,26 +38,23 @@
 	with_ssl="--disable-openssl"
 fi

-build()
-{
-	rm -rf $PKGNAME-${PKGVERSION}-stable
-	tar xvf $PKGNAME-${PKGVERSION}-stable.tar.gz
-	cd $PKGNAME-${PKGVERSION}-stable
+rm -rf $PKGNAME-${PKGVERSION}-stable
+tar xvf $PKGNAME-${PKGVERSION}-stable.tar.gz
+cd $PKGNAME-${PKGVERSION}-stable

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_ssl
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_ssl
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-${PKGVERSION}-stable
-}
+cd ..
+rm -rf $PKGNAME-${PKGVERSION}-stable
--- a/lib/libffi/libffi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libffi/libffi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,32 +31,29 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../set-libdir.patch
-	sed -i -e 's|$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@|$(prefix)|' include/Makefile.am
-	sed -i -e 's|${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@|@prefix@|' libffi.pc.in
-	autoreconf -fi
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+patch -p0 < ../set-libdir.patch
+sed -i -e 's|$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@|$(prefix)|' include/Makefile.am
+sed -i -e 's|${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@|@prefix@|' libffi.pc.in
+autoreconf -fi
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libgudev/libgudev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libgudev/libgudev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-umockdev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-umockdev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libical/libical.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libical/libical.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,29 +45,26 @@
 	with_vala="-DICAL_GLIB_VAPI=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		-DSHARED_ONLY=On \
-		$with_glib \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_LIBDIR=/lib \
+	-DSHARED_ONLY=On \
+	$with_glib \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libid3tag/libid3tag.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libid3tag/libid3tag.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,29 +32,26 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	touch NEWS AUTHORS ChangeLog
-	autoreconf -vif
-	patch -p0 < ../patch-CVE-2008-2109.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+touch NEWS AUTHORS ChangeLog
+autoreconf -vif
+patch -p0 < ../patch-CVE-2008-2109.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libinput/libinput.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libinput/libinput.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -37,30 +37,27 @@
 	with_wacom="-D libwacom=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# TODO: -D documentation=false: enable once sphinx is available.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D documentation=false \
-		-D debug-gui=false \
-		-D tests=false \
-		-D libdir=lib \
-		$with_doxygen \
-		$with_wacom
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# TODO: -D documentation=false: enable once sphinx is available.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D documentation=false \
+	-D debug-gui=false \
+	-D tests=false \
+	-D libdir=lib \
+	$with_doxygen \
+	$with_wacom
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libmnl/libmnl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libmnl/libmnl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,28 +29,25 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libnftnl/libnftnl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libnftnl/libnftnl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,27 +30,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libnl/libnl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libnl/libnl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/libnl3/libnl3-musl.patch
-	patch -p1 < ../musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# https://git.alpinelinux.org/aports/plain/main/libnl3/libnl3-musl.patch
+patch -p1 < ../musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libpeas/libpeas.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libpeas/libpeas.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -56,29 +56,26 @@
 	with_vala="-D vapi=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# Tests do not build with llvm-objcopy.
-	sed -i -e "/subdir('tests')/d" meson.build
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		-D lua51=false \
-		$with_gtk \
-		$with_introspection \
-		$with_vala
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+# Tests do not build with llvm-objcopy.
+sed -i -e "/subdir('tests')/d" meson.build
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	-D lua51=false \
+	$with_gtk \
+	$with_introspection \
+	$with_vala
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libtermkey/libtermkey.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libtermkey/libtermkey.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,20 +27,17 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make all install \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		PREFIX= \
-		DESTDIR="$DESTDIR"
-	find $DESTDIR -type f -name "*.la" -delete
+make all install \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	PREFIX= \
+	DESTDIR="$DESTDIR"
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libunwind/libunwind.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=libunwind
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="MIT CUSTOM"
-PKGSUMMARY="LLVM's unwinder"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGPRESERVE="lib/libunwind.so.1.0"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
-	cd $PKGNAME-$PKGVERSION.src
-
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLIBUNWIND_USE_COMPILER_RT=On
-	make
-	make install DESTDIR=$DESTDIR
-	mkdir -p $DESTDIR/include
-	cp ../include/*.h $DESTDIR/include
-	cd ..
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION.src
-}
--- a/lib/libunwind/libunwind.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ae3cc4616986b8131e8336f40e60f97745cbddfb  libunwind-9.0.0.src.tar.xz
--- a/lib/libusb/libusb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libusb/libusb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,27 +41,24 @@
 	with_udev="--disable-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libuv/libuv.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libuv/libuv.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvf $PKGNAME-v$PKGVERSION.tar.gz
-	cd $PKGNAME-v$PKGVERSION
+rm -rf $PKGNAME-v$PKGVERSION
+tar xvf $PKGNAME-v$PKGVERSION.tar.gz
+cd $PKGNAME-v$PKGVERSION

-	./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-v$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-v$PKGVERSION
--- a/lib/libwacom/libwacom.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libwacom/libwacom.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libxkbcommon/libxkbcommon.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libxkbcommon/libxkbcommon.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -55,28 +55,25 @@
 	with_wayland="--disable-wayland"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_doxygen \
-		$with_x \
-		$with_wayland
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_doxygen \
+	$with_x \
+	$with_wayland
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libxklavier/libxklavier.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/libxklavier/libxklavier.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/lzo/lzo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/lzo/lzo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/mpfr/mpfr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/mpfr/mpfr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-thread-safe
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-thread-safe
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/mtdev/mtdev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/mtdev/mtdev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,24 +27,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/musl-fts/musl-fts.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/musl-fts/musl-fts.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,26 +29,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./bootstrap.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./bootstrap.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/musl-obstack/musl-obstack.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/musl-obstack/musl-obstack.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,26 +29,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./bootstrap.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./bootstrap.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/musl/musl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/musl/musl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,28 +36,25 @@
 	PKGPRESERVE="lib/ld-musl-x86_64.so.1"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	./configure \
-		--prefix= \
-		$with_static
-	make \
-		AR=llvm-ar \
-		RANLIB=llvm-ranlib \
-		DESTDIR=$DESTDIR \
-		all install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+./configure \
+	--prefix= \
+	$with_static
+make \
+	AR=llvm-ar \
+	RANLIB=llvm-ranlib \
+	DESTDIR=$DESTDIR \
+	all install

-	if [ "$STATIC" != "yes" ]; then
-		mkdir -p $DESTDIR/bin
-		ln -sf /lib/ld-musl-x86_64.so.1 $DESTDIR/bin/ldd
-	fi
+if [ "$STATIC" != "yes" ]; then
+	mkdir -p $DESTDIR/bin
+	ln -sf /lib/ld-musl-x86_64.so.1 $DESTDIR/bin/ldd
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/nspr/nspr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/nspr/nspr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,29 +39,26 @@
 	with_ipv6="--disable-ipv6"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION/nspr
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION/nspr

-	sed -i -e 's#$(LIBRARY) ##' config/rules.mk
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-64bit \
-		--with-mozilla \
-		$with_ipv6
-	make
-	make install DESTDIR=$DESTDIR
+sed -i -e 's#$(LIBRARY) ##' config/rules.mk
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-64bit \
+	--with-mozilla \
+	$with_ipv6
+make
+make install DESTDIR=$DESTDIR

-	cd ../..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ../..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/openmp/openmp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=openmp
-PKGVERSION=9.0.0
-PKGREVISION=1
-PKGLICENSE="CUSTOM"
-PKGSUMMARY="OpenMP implementation from LLVM"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="python:build perl:build"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
-	cd $PKGNAME-$PKGVERSION.src
-
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION.src
-}
--- a/lib/openmp/openmp.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-53a17a74f23a2b6a24964cc3f6c1dd8a8e7d8eb3  openmp-9.0.0.src.tar.xz
--- a/lib/pcre/pcre.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/pcre/pcre.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,33 +32,30 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-jit \
-		--enable-newline-is-anycrlf \
-		--enable-pcregrep-libz \
-		--enable-shared \
-		--enable-unicode-properties \
-		--enable-utf8 \
-		--with-pic
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-jit \
+	--enable-newline-is-anycrlf \
+	--enable-pcregrep-libz \
+	--enable-shared \
+	--enable-unicode-properties \
+	--enable-utf8 \
+	--with-pic
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/pcre2/pcre2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/pcre2/pcre2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,30 +32,27 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --enable-pcre2-(16|32): some packages require this (e.g. qtbase)
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-pcre2-16 \
-		--enable-pcre2-32
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# --enable-pcre2-(16|32): some packages require this (e.g. qtbase)
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-pcre2-16 \
+	--enable-pcre2-32
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/popt/popt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/popt/popt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,24 +38,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/re2c/re2c.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/re2c/re2c.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,25 +31,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/vte/vte.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/lib/vte/vte.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,29 +36,26 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://gitlab.gnome.org/GNOME/vte/issues/72
-	patch -p1 < ../musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# https://gitlab.gnome.org/GNOME/vte/issues/72
+patch -p1 < ../musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mail/neomutt/neomutt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mail/neomutt/neomutt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -59,21 +59,18 @@
 	;;
 esac

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGNAME-$PKGVERSION

-	./configure \
-		--prefix= \
-		$with_idn2 \
-		$with_nls \
-		$with_notmuch \
-		$with_ssl
-	make CC="$CC" EXTRA_CFLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
-	make install DESTDIR=$DESTDIR
+./configure \
+	--prefix= \
+	$with_idn2 \
+	$with_nls \
+	$with_notmuch \
+	$with_ssl
+make CC="$CC" EXTRA_CFLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGNAME-$PKGVERSION
--- a/mate/caja/caja.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/caja/caja.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,25 +46,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/engrampa/engrampa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/engrampa/engrampa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,26 +47,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_caja \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_caja \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/libmatekbd/libmatekbd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/libmatekbd/libmatekbd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/libmatemixer/libmatemixer.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/libmatemixer/libmatemixer.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,27 +46,24 @@
 	with_pulseaudio="--disable-pulseaudio"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_alsa \
-		$with_pulseaudio
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_alsa \
+	$with_pulseaudio
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/libmateweather/libmateweather.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/libmateweather/libmateweather.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,24 +33,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/marco/marco.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/marco/marco.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -42,27 +42,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# credits to void-linux.
-	patch -p0 < ../musl.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# credits to void-linux.
+patch -p0 < ../musl.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-backgrounds/mate-backgrounds.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-backgrounds/mate-backgrounds.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,16 +22,13 @@
 PKGSUMMARY="MATE collection of backgrounds"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-calc/mate-calc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-calc/mate-calc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-common/mate-common.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-common/mate-common.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-desktop/mate-desktop.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-desktop/mate-desktop.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-icon-theme/mate-icon-theme.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-icon-theme/mate-icon-theme.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="icon-naming-utils"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-menus/mate-menus.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-menus/mate-menus.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,26 +39,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-panel/mate-panel.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-panel/mate-panel.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -56,27 +56,24 @@
 	with_x="--disable-x11"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_wayland \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_wayland \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-polkit/mate-polkit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-polkit/mate-polkit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-session-manager/mate-session-manager.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-session-manager/mate-session-manager.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,27 +49,24 @@
 	with_ipv6="--disable-ipv6"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/community/mate-session-manager/systemd-dependency.patch
-	patch -p1 < ../systemd-dependency.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-systemd \
-		$with_ipv6
-	make
-	make install DESTDIR=$DESTDIR
+# https://git.alpinelinux.org/aports/plain/community/mate-session-manager/systemd-dependency.patch
+patch -p1 < ../systemd-dependency.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-systemd \
+	$with_ipv6
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -63,29 +63,26 @@
 	with_pulseaudio="--disable-pulse"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# TODO: libcanberra
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_audio \
-		$with_polkit \
-		$with_pulseaudio
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# TODO: libcanberra
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_audio \
+	$with_polkit \
+	$with_pulseaudio
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-terminal/mate-terminal.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/mate/mate-terminal/mate-terminal.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/meta/meta-xfce/meta-xfce.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/meta/meta-xfce/meta-xfce.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,8 +40,3 @@
             xfconf
             xfdesktop
             xfwm4"
-
-build()
-{
-	exit 0
-}
--- a/meta/meta-xorg/meta-xorg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/meta/meta-xorg/meta-xorg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -118,8 +118,3 @@
             xtrans
             xvinfo
             xwininfo"
-
-build()
-{
-	exit 0
-}
--- a/misc/gsettings-desktop-schemas/gsettings-desktop-schemas.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/misc/gsettings-desktop-schemas/gsettings-desktop-schemas.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,26 +38,23 @@
 	with_introspection="-D introspection=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-fhs.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		$with_introspection
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+patch -p0 < ../patch-fhs.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	$with_introspection
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/misc/iso-codes/iso-codes.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/misc/iso-codes/iso-codes.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://salsa.debian.org/iso-codes-team/$PKGNAME/uploads/049ce6aac94d842be809f4063950646c/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="gettext"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/misc/itstool/itstool.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/misc/itstool/itstool.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,19 +23,16 @@
 PKGDOWNLOAD="http://files.itstool.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2"
 PKGDEPENDS="libxml2 python"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/misc/shared-mime-info/shared-mime-info.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/misc/shared-mime-info/shared-mime-info.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/misc/swayidle/swayidle.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/misc/swayidle/swayidle.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -37,22 +37,19 @@
 	with_elogind="-D logind=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		$with_elogind
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	$with_elogind
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/misc/vanilla-minirootfs/vanilla-minirootfs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/busybox sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or 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.
-#
-
-PKGNAME=vanilla-minirootfs
-PKGVERSION=0.2.0
-PKGREVISION=1
-PKGLICENSE="ISC"
-PKGSUMMARY="official miniroot filesystem for chroot"
-PKGDOWNLOAD="http://releases.malikania.fr/vanilla/${PKGVERSION%.*}/images/Vanilla-Linux-$PKGVERSION-$(vpk arch)-minirootfs.tar.xz"
-
-build()
-{
-	install -dm0755 $DESTDIR/lib/vanilla-$PKGVERSION-$(vpk arch)
-	tar xvJf Vanilla-Linux-$PKGVERSION-$(vpk arch)-minirootfs.tar.xz -C $DESTDIR/lib/vanilla-$PKGVERSION-$(vpk arch)
-}
--- a/misc/vanilla-minirootfs/vanilla-minirootfs.sha1	Wed Jul 28 15:24:46 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-70ee622df61fe0ec50e4aa20c9e9dbb22a79cc73  Vanilla-Linux-0.2.0-amd64-minirootfs.tar.xz
--- a/multimedia/ffmpeg/ffmpeg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/ffmpeg/ffmpeg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -305,51 +305,48 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	sed -i -e 's|prefix_default="/usr/local"|prefix_default=|' configure
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--enable-shared \
-		--logfile=/dev/null \
-		$with_alsa \
-		$with_bluray \
-		$with_bzip2 \
-		$with_crypto \
-		$with_fontconfig \
-		$with_fribidi \
-		$with_gmp \
-		$with_jack \
-		$with_lzma \
-		$with_mp3 \
-		$with_opengl \
-		$with_opus \
-		$with_pulseaudio \
-		$with_sdl \
-		$with_speex \
-		$with_ssh \
-		$with_ssl \
-		$with_svg \
-		$with_theora \
-		$with_ttf \
-		$with_vorbis \
-		$with_webp \
-		$with_x265 \
-		$with_x \
-		$with_xml \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
+sed -i -e 's|prefix_default="/usr/local"|prefix_default=|' configure
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--enable-shared \
+	--logfile=/dev/null \
+	$with_alsa \
+	$with_bluray \
+	$with_bzip2 \
+	$with_crypto \
+	$with_fontconfig \
+	$with_fribidi \
+	$with_gmp \
+	$with_jack \
+	$with_lzma \
+	$with_mp3 \
+	$with_opengl \
+	$with_opus \
+	$with_pulseaudio \
+	$with_sdl \
+	$with_speex \
+	$with_ssh \
+	$with_ssl \
+	$with_svg \
+	$with_theora \
+	$with_ttf \
+	$with_vorbis \
+	$with_webp \
+	$with_x265 \
+	$with_x \
+	$with_xml \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-libav/gst-libav.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gst-libav/gst-libav.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -205,45 +205,42 @@
 	with_x="-D x11=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D tests=disabled \
-		$with_bluetooth \
-		$with_bzip2 \
-		$with_curl \
-		$with_dvd \
-		$with_faac \
-		$with_faad \
-		$with_fluidsynth \
-		$with_h264 \
-		$with_h265 \
-		$with_jpeg \
-		$with_kms \
-		$with_mms \
-		$with_openal \
-		$with_opus \
-		$with_sndfile \
-		$with_ssl \
-		$with_wayland \
-		$with_webcam \
-		$with_x
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D tests=disabled \
+	$with_bluetooth \
+	$with_bzip2 \
+	$with_curl \
+	$with_dvd \
+	$with_faac \
+	$with_faad \
+	$with_fluidsynth \
+	$with_h264 \
+	$with_h265 \
+	$with_jpeg \
+	$with_kms \
+	$with_mms \
+	$with_openal \
+	$with_opus \
+	$with_sndfile \
+	$with_ssl \
+	$with_wayland \
+	$with_webcam \
+	$with_x
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-plugins-base/gst-plugins-base.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gst-plugins-base/gst-plugins-base.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -104,35 +104,32 @@
 	with_x="-D x11=disabled -Dxshm=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D tests=disabled \
-		$with_alsa \
-		$with_cdparanoia \
-		$with_pango \
-		$with_ogg \
-		$with_opengl \
-		$with_opus \
-		$with_theora \
-		$with_vorbis \
-		$with_x
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D tests=disabled \
+	$with_alsa \
+	$with_cdparanoia \
+	$with_pango \
+	$with_ogg \
+	$with_opengl \
+	$with_opus \
+	$with_theora \
+	$with_vorbis \
+	$with_x
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-plugins-good/gst-plugins-good.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gst-plugins-good/gst-plugins-good.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -216,45 +216,42 @@
 	with_x="-D ximagesrc-xdmage=disabled $with_x"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D tests=disabled \
-		$with_bzip2 \
-		$with_cairo \
-		$with_flac \
-		$with_gtk \
-		$with_jack \
-		$with_jpeg \
-		$with_lame \
-		$with_libsoup \
-		$with_mp2 \
-		$with_mpg123 \
-		$with_nls \
-		$with_oss \
-		$with_png \
-		$with_pulseaudio \
-		$with_qt \
-		$with_shout \
-		$with_speex \
-		$with_taglib \
-		$with_wavpack \
-		$with_x
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D tests=disabled \
+	$with_bzip2 \
+	$with_cairo \
+	$with_flac \
+	$with_gtk \
+	$with_jack \
+	$with_jpeg \
+	$with_lame \
+	$with_libsoup \
+	$with_mp2 \
+	$with_mpg123 \
+	$with_nls \
+	$with_oss \
+	$with_png \
+	$with_pulseaudio \
+	$with_qt \
+	$with_shout \
+	$with_speex \
+	$with_taglib \
+	$with_wavpack \
+	$with_x
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,28 +54,25 @@
 	with_h264="-D x264=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D tests=disabled \
-		$with_cdio \
-		$with_dvd \
-		$with_h264
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D tests=disabled \
+	$with_cdio \
+	$with_dvd \
+	$with_h264
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gstreamer/gstreamer.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/gstreamer/gstreamer.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,26 +44,23 @@
 	with_nls="-D nls=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D tests=disabled \
-		$with_introspection \
-		$with_nls
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D tests=disabled \
+	$with_introspection \
+	$with_nls
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libbluray/libbluray.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libbluray/libbluray.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,30 +54,27 @@
 	with_xml="--without-libxml2"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# TODO: re-enable bdjava-jar once ant is there.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-bdjava-jar \
-		--enable-shared \
-		$with_fontconfig \
-		$with_ttf \
-		$with_xml
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# TODO: re-enable bdjava-jar once ant is there.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-bdjava-jar \
+	--enable-shared \
+	$with_fontconfig \
+	$with_ttf \
+	$with_xml
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libdvdcss/libdvdcss.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libdvdcss/libdvdcss.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libdvdnav/libdvdnav.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libdvdnav/libdvdnav.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libdvdread/libdvdread.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libdvdread/libdvdread.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--with-libdvdcss
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--with-libdvdcss
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libmms/libmms.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libmms/libmms.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,27 +31,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libtheora/libtheora.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libtheora/libtheora.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,24 +28,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--disable-examples \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--disable-examples \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/libvpx/libvpx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/libvpx/libvpx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# Custom configure script.
-	# TODO: CFLAGS is not corretly handled.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	./configure \
-		--prefix= \
-		--enable-shared
-	make V=1
-	make install DIST_DIR=$DESTDIR
-	sed -i -e "s|prefix=.*|prefix=|" $DESTDIR/lib/pkgconfig/vpx.pc
+# Custom configure script.
+# TODO: CFLAGS is not corretly handled.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+./configure \
+	--prefix= \
+	--enable-shared
+make V=1
+make install DIST_DIR=$DESTDIR
+sed -i -e "s|prefix=.*|prefix=|" $DESTDIR/lib/pkgconfig/vpx.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/openh264/openh264.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/openh264/openh264.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/sdl2/sdl2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/sdl2/sdl2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -270,54 +270,51 @@
 	with_x="--disable-video-x11-xshape $with_x"
 fi

-build()
-{
-	rm -rf SDL2-$PKGVERSION
-	tar xvf SDL2-$PKGVERSION.tar.gz
-	cd SDL2-$PKGVERSION
+rm -rf SDL2-$PKGVERSION
+tar xvf SDL2-$PKGVERSION.tar.gz
+cd SDL2-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_alsa \
-		$with_atomic \
-		$with_audio \
-		$with_dbus \
-		$with_dso \
-		$with_events \
-		$with_file \
-		$with_filesystem \
-		$with_gles1 \
-		$with_gles2 \
-		$with_gles3 \
-		$with_haptic \
-		$with_jack \
-		$with_joystick \
-		$with_kms \
-		$with_opengl \
-		$with_oss \
-		$with_power \
-		$with_pulseaudio \
-		$with_render \
-		$with_sensor \
-		$with_threads \
-		$with_timer \
-		$with_udev \
-		$with_video \
-		$with_vulkan \
-		$with_wayland \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_alsa \
+	$with_atomic \
+	$with_audio \
+	$with_dbus \
+	$with_dso \
+	$with_events \
+	$with_file \
+	$with_filesystem \
+	$with_gles1 \
+	$with_gles2 \
+	$with_gles3 \
+	$with_haptic \
+	$with_jack \
+	$with_joystick \
+	$with_kms \
+	$with_opengl \
+	$with_oss \
+	$with_power \
+	$with_pulseaudio \
+	$with_render \
+	$with_sensor \
+	$with_threads \
+	$with_timer \
+	$with_udev \
+	$with_video \
+	$with_vulkan \
+	$with_wayland \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf SDL2-$PKGVERSION
-}
+cd ..
+rm -rf SDL2-$PKGVERSION
--- a/multimedia/sfml/sfml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/sfml/sfml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -65,31 +65,28 @@
 	with_window="-DSFML_BUILD_WINDOW=Off"
 fi

-build()
-{
-	rm -rf SFML-$PKGVERSION
-	unzip SFML-$PKGVERSION-sources.zip
-	cd SFML-$PKGVERSION
+rm -rf SFML-$PKGVERSION
+unzip SFML-$PKGVERSION-sources.zip
+cd SFML-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DSFML_USE_SYSTEM_DEPS=On \
-		-DSFML_PKGCONFIG_INSTALL_PREFIX=/lib/pkgconfig \
-		$with_audio \
-		$with_graphics \
-		$with_network \
-		$with_window
-	make VERBOSE=1
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DSFML_USE_SYSTEM_DEPS=On \
+	-DSFML_PKGCONFIG_INSTALL_PREFIX=/lib/pkgconfig \
+	$with_audio \
+	$with_graphics \
+	$with_network \
+	$with_window
+make VERBOSE=1
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf SFML-$PKGVERSION
-}
+cd ..
+rm -rf SFML-$PKGVERSION
--- a/multimedia/x264/x264.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/x264/x264.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,24 +36,21 @@
 	with_ffmpeg="--disable-swscale --disable-lavf"
 fi

-build()
-{
-	rm -rf $PKGNAME-snapshot-$PKGVERSION
-	tar xvf $PKGNAME-snapshot-$PKGVERSION.tar.bz2
-	cd $PKGNAME-snapshot-$PKGVERSION
+rm -rf $PKGNAME-snapshot-$PKGVERSION
+tar xvf $PKGNAME-snapshot-$PKGVERSION.tar.bz2
+cd $PKGNAME-snapshot-$PKGVERSION

-	sed -i -e "s|/bin/bash|/bin/busybox sh|" configure
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--enable-shared \
-		--enable-static
-	make
-	make install DESTDIR=$DESTDIR
+sed -i -e "s|/bin/bash|/bin/busybox sh|" configure
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--enable-shared \
+	--enable-static
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-snapshot-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-snapshot-$PKGVERSION
--- a/multimedia/x265/x265.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/multimedia/x265/x265.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,25 +28,22 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf ${PKGNAME}_$PKGVERSION
-	tar xvf ${PKGNAME}_$PKGVERSION.tar.gz
-	cd ${PKGNAME}_$PKGVERSION
+rm -rf ${PKGNAME}_$PKGVERSION
+tar xvf ${PKGNAME}_$PKGVERSION.tar.gz
+cd ${PKGNAME}_$PKGVERSION

-	mkdir bld && cd bld
-	cmake ../source \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir bld && cd bld
+cmake ../source \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf ${PKGNAME}_$PKGVERSION
-}
+cd ..
+rm -rf ${PKGNAME}_$PKGVERSION
--- a/network/bridge-utils/bridge-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/bridge-utils/bridge-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,29 +33,26 @@
 : ${LIBS:=}
 : ${RANLIB:=llvm-ranlib}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# Honor AR variable.
-	patch -p0 < ../patch-llvm.patch
-	autoreconf -vif
-	AR="$AR" \
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	RANLIB="$RANLIB" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin
-	make
-	make install DESTDIR=$DESTDIR
+# Honor AR variable.
+patch -p0 < ../patch-llvm.patch
+autoreconf -vif
+AR="$AR" \
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+RANLIB="$RANLIB" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/curl/curl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/curl/curl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -86,38 +86,35 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--with-ca-bundle=/etc/ssl/cert.pem \
-		--without-cyassl \
-		--without-gnutls \
-		--without-mbedtls \
-		--without-polarssl \
-		--without-wolfssl \
-		$with_idn2 \
-		$with_ipv6 \
-		$with_nghttp2 \
-		$with_psl \
-		$with_ssh \
-		$with_ssl \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--with-ca-bundle=/etc/ssl/cert.pem \
+	--without-cyassl \
+	--without-gnutls \
+	--without-mbedtls \
+	--without-polarssl \
+	--without-wolfssl \
+	$with_idn2 \
+	$with_ipv6 \
+	$with_nghttp2 \
+	$with_psl \
+	$with_ssh \
+	$with_ssl \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/dbus/dbus.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/dbus/dbus.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -50,32 +50,29 @@
 	with_x="--without-x"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--disable-systemd \
-		--enable-shared \
-		$with_selinux \
-		$with_x
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	install -Dm0644 ../dbus $DESTDIR/etc/rc.d/dbus
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-system-pid-file=/var/run/dbus.pid \
+	--disable-systemd \
+	--enable-shared \
+	$with_selinux \
+	$with_x
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+install -Dm0644 ../dbus $DESTDIR/etc/rc.d/dbus

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/dhcpcd/dhcpcd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/dhcpcd/dhcpcd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,29 +46,26 @@
 	with_udev="--without-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--mandir=/share/man \
-		--datadir=/share \
-		$with_ipv6 \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0644 ../dhcpcd $DESTDIR/etc/rc.d/dhcpcd
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--mandir=/share/man \
+	--datadir=/share \
+	$with_ipv6 \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+install -Dm0644 ../dhcpcd $DESTDIR/etc/rc.d/dhcpcd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/dropbear/dropbear.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/dropbear/dropbear.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -66,31 +66,28 @@
 	with_zlib="--disable-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_pam \
-		$with_shadow \
-		$with_syslog \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0644 ../dropbear $DESTDIR/etc/rc.d/dropbear
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_pam \
+	$with_shadow \
+	$with_syslog \
+	$with_zlib
+make
+make install DESTDIR=$DESTDIR
+install -Dm0644 ../dropbear $DESTDIR/etc/rc.d/dropbear

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/glib-networking/glib-networking.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/glib-networking/glib-networking.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd -
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd -
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/ipcalc/ipcalc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/ipcalc/ipcalc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,14 +23,11 @@
 PKGDOWNLOAD="http://jodies.de/ipcalc-archive/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	install -Dm0755 ipcalc $DESTDIR/bin/ipcalc
+install -Dm0755 ipcalc $DESTDIR/bin/ipcalc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/iproute2/iproute2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/iproute2/iproute2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,31 +45,28 @@
 	LIBS="-lmnl $LIBS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# custom configure script is not customizable.
-	echo CC="$CC" > config.mk
-	echo CFLAGS+="$CFLAGS" >> config.mk
-	echo PKG_CONFIG="pkgconf" >> config.mk
-	echo IP_CONFIG_SETNS=y >> config.mk
-	echo LDLIBS+="$LIBS" >> config.mk
-	echo TC_CONFIG_NO_XT=y >> config.mk
+# custom configure script is not customizable.
+echo CC="$CC" > config.mk
+echo CFLAGS+="$CFLAGS" >> config.mk
+echo PKG_CONFIG="pkgconf" >> config.mk
+echo IP_CONFIG_SETNS=y >> config.mk
+echo LDLIBS+="$LIBS" >> config.mk
+echo TC_CONFIG_NO_XT=y >> config.mk

-	if [ "$CAP" = "yes" ]; then
-		echo HAVE_CAP=y >> config.mk
-	fi
-	if [ "$MNL" = "yes" ]; then
-		echo HAVE_MNL=y >> config.mk
-	fi
+if [ "$CAP" = "yes" ]; then
+	echo HAVE_CAP=y >> config.mk
+fi
+if [ "$MNL" = "yes" ]; then
+	echo HAVE_MNL=y >> config.mk
+fi

-	patch -p0 < ../musl.patch
-	make CC="$CC"
-	make PREFIX=/ SBINDIR=/bin DESTDIR=$DESTDIR install
+patch -p0 < ../musl.patch
+make CC="$CC"
+make PREFIX=/ SBINDIR=/bin DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/iputils/iputils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/iputils/iputils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,22 +38,19 @@
 	mflags="USE_CAP=no $mflags"
 fi

-build()
-{
-	rm -rf $PKGNAME-s$PKGVERSION
-	tar xvf s$PKGVERSION.tar.gz
-	cd $PKGNAME-s$PKGVERSION
+rm -rf $PKGNAME-s$PKGVERSION
+tar xvf s$PKGVERSION.tar.gz
+cd $PKGNAME-s$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/iputils/fix-defines.patch
-	# USE_IDN=no
-	# ping.c:198:119: error: use of undeclared identifier 'AI_IDN'
-	#         struct addrinfo hints = { .ai_family = AF_UNSPEC, .ai_protocol = IPPROTO_UDP, .ai_socktype = SOCK_DGRAM, .ai_flags = getaddrinfo_flags };
-	patch -p1 < ../patch-ping.c.patch
-	make CC="$CC" CFLAGS="$CFLAGS" USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/include $mflags
-	for p in arping clockdiff ipg ping rarpd rdisc tftpd tracepath traceroute6; do
-		install -D -m 0755 $p $DESTDIR/bin/$p
-	done
+# https://git.alpinelinux.org/aports/plain/main/iputils/fix-defines.patch
+# USE_IDN=no
+# ping.c:198:119: error: use of undeclared identifier 'AI_IDN'
+#         struct addrinfo hints = { .ai_family = AF_UNSPEC, .ai_protocol = IPPROTO_UDP, .ai_socktype = SOCK_DGRAM, .ai_flags = getaddrinfo_flags };
+patch -p1 < ../patch-ping.c.patch
+make CC="$CC" CFLAGS="$CFLAGS" USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/include $mflags
+for p in arping clockdiff ipg ping rarpd rdisc tftpd tracepath traceroute6; do
+	install -D -m 0755 $p $DESTDIR/bin/$p
+done

-	cd ..
-	rm -rf $PKGNAME-s$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-s$PKGVERSION
--- a/network/libpcap/libpcap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/libpcap/libpcap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -65,29 +65,26 @@
 	with_usb="--disable-usb"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	AR="$AR" \
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	RANLIB="$RANLIB" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_dbus \
-		$with_ipv6 \
-		$with_netlink \
-		$with_usb
-	make
-	make install DESTDIR=$DESTDIR
+AR="$AR" \
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+RANLIB="$RANLIB" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_dbus \
+	$with_ipv6 \
+	$with_netlink \
+	$with_usb
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/libpsl/libpsl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/libpsl/libpsl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,27 +30,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --disable-nls: no .po files available.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--disable-nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# --disable-nls: no .po files available.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--disable-nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/libsoup/libsoup.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/libsoup/libsoup.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -51,26 +51,23 @@
 	with_vala="-D vapi=false"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		$with_gnome \
-		$with_kerberos \
-		$with_vala
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	$with_gnome \
+	$with_kerberos \
+	$with_vala
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/libssh/libssh.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/libssh/libssh.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,32 +26,29 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# -DWITH_EXAMPLES=Off:
-	# ld.lld: error: undefined symbol: argp_parse
-	# >>> referenced by ssh_server_fork.c
-	# >>>               CMakeFiles/ssh_server_fork.dir/ssh_server_fork.c.o:(main)
-	patch -p0 < ../patch-libressl.patch
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_DIR=/lib/cmake \
-		-DINCLUDE_INSTALL_DIR=/include \
-		-DLIB_INSTALL_DIR=/lib \
-		-DWITH_EXAMPLES=Off
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+# -DWITH_EXAMPLES=Off:
+# ld.lld: error: undefined symbol: argp_parse
+# >>> referenced by ssh_server_fork.c
+# >>>               CMakeFiles/ssh_server_fork.dir/ssh_server_fork.c.o:(main)
+patch -p0 < ../patch-libressl.patch
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_DIR=/lib/cmake \
+	-DINCLUDE_INSTALL_DIR=/include \
+	-DLIB_INSTALL_DIR=/lib \
+	-DWITH_EXAMPLES=Off
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/libssh2/libssh2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/libssh2/libssh2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,30 +26,27 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_INCLUDEDIR=include \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_INSTALL_MANDIR=share/man \
-		-DCMAKE_INSTALL_DOCDIR=share/doc/libssh \
-		-DCRYPTO_BACKEND=OpenSSL \
-		-DENABLE_ZLIB_COMPRESSION=On \
-		-DBUILD_TESTING=Off
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_INCLUDEDIR=include \
+	-DCMAKE_INSTALL_LIBDIR=lib \
+	-DCMAKE_INSTALL_MANDIR=share/man \
+	-DCMAKE_INSTALL_DOCDIR=share/doc/libssh \
+	-DCRYPTO_BACKEND=OpenSSL \
+	-DENABLE_ZLIB_COMPRESSION=On \
+	-DBUILD_TESTING=Off
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/nghttp2/nghttp2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/nghttp2/nghttp2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,29 +46,26 @@
 	with_tools="--disable-app"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-shared \
-		--prefix= \
-		--without-systemd \
-		$with_tools
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--enable-shared \
+	--prefix= \
+	--without-systemd \
+	$with_tools
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/ntp/ntp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/ntp/ntp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -56,27 +56,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_cap \
-		$with_ipv6 \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_cap \
+	$with_ipv6 \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/openssh/openssh.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/openssh/openssh.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,33 +49,30 @@
 	with_selinux="--without-selinux"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p1 < ../CVE-2018-20685.patch
-	patch -p1 < ../CVE-2019-6109.patch
-	patch -p1 < ../CVE-2019-6111.patch
+patch -p1 < ../CVE-2018-20685.patch
+patch -p1 < ../CVE-2019-6109.patch
+patch -p1 < ../CVE-2019-6111.patch

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sysconfdir=/etc/ssh \
-		--with-pid-dir=/var/run \
-		--sbindir=/bin \
-		$with_pam \
-		$with_selinux
-	make
-	make install DESTDIR=$DESTDIR
-	install -D -m 0644 ../sshd $DESTDIR/etc/rc.d/sshd
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sysconfdir=/etc/ssh \
+	--with-pid-dir=/var/run \
+	--sbindir=/bin \
+	$with_pam \
+	$with_selinux
+make
+make install DESTDIR=$DESTDIR
+install -D -m 0644 ../sshd $DESTDIR/etc/rc.d/sshd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/sdl2-net/sdl2-net.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/sdl2-net/sdl2-net.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf SDL2_net-$PKGVERSION
-	tar xvf SDL2_net-$PKGVERSION.tar.gz
-	cd SDL2_net-$PKGVERSION
+rm -rf SDL2_net-$PKGVERSION
+tar xvf SDL2_net-$PKGVERSION.tar.gz
+cd SDL2_net-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf SDL2_net-$PKGVERSION
-}
+cd ..
+rm -rf SDL2_net-$PKGVERSION
--- a/network/uriparser/uriparser.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/uriparser/uriparser.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -37,28 +37,25 @@
 	with_doxygen="-DURIPARSER_BUILD_DOCS=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		-DURIPARSER_BUILD_TESTS=Off \
-		$with_doxygen
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_LIBDIR=/lib \
+	-DURIPARSER_BUILD_TESTS=Off \
+	$with_doxygen
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/network/wireless-tools/wireless-tools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/wireless-tools/wireless-tools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf wireless_tools.$PKGVERSION
-	tar xvf wireless_tools.$PKGVERSION.tar.gz
-	cd wireless_tools.$PKGVERSION
+rm -rf wireless_tools.$PKGVERSION
+tar xvf wireless_tools.$PKGVERSION.tar.gz
+cd wireless_tools.$PKGVERSION

-	make \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		LIBS="$LIBS" \
-		INSTALL_DIR=$DESTDIR/bin \
-		INSTALL_MAN=$DESTDIR/share/man \
-		PREFIX=$DESTDIR \
-		all install
+make \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	INSTALL_DIR=$DESTDIR/bin \
+	INSTALL_MAN=$DESTDIR/share/man \
+	PREFIX=$DESTDIR \
+	all install

-	cd ..
-	rm -rf wireless_tools.$PKGVERSION
-}
+cd ..
+rm -rf wireless_tools.$PKGVERSION
--- a/network/wpa-supplicant/wpa-supplicant.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/network/wpa-supplicant/wpa-supplicant.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,32 +44,29 @@
 	;;
 esac

-build()
-{
-	rm -rf wpa_supplicant-$PKGVERSION
-	tar xvf wpa_supplicant-$PKGVERSION.tar.gz
-	cd wpa_supplicant-$PKGVERSION/wpa_supplicant
+rm -rf wpa_supplicant-$PKGVERSION
+tar xvf wpa_supplicant-$PKGVERSION.tar.gz
+cd wpa_supplicant-$PKGVERSION/wpa_supplicant

-	cp defconfig .config
+cp defconfig .config

-	if [ "$DBUS" = "yes" ]; then
-		sed -i -e '/CONFIG_CTRL_IFACE_DBUS_NEW.*/d' .config
-		sed -i -e '/CONFIG_CTRL_IFACE_DBUS_INTRO.*/d' .config
-	fi
+if [ "$DBUS" = "yes" ]; then
+	sed -i -e '/CONFIG_CTRL_IFACE_DBUS_NEW.*/d' .config
+	sed -i -e '/CONFIG_CTRL_IFACE_DBUS_INTRO.*/d' .config
+fi

-	if [ -n "$with_ssl" ]; then
-		sed -i -e "s/^#CONFIG_TLS.*/CONFIG_TLS=$with_ssl/" .config
-	fi
+if [ -n "$with_ssl" ]; then
+	sed -i -e "s/^#CONFIG_TLS.*/CONFIG_TLS=$with_ssl/" .config
+fi

-	make \
-		V=1 \
-		CC="$CC" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		BINDIR=/bin \
-		LIBDIR=/lib \
-		DESTDIR=$DESTDIR \
-		all install
+make \
+	V=1 \
+	CC="$CC" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	BINDIR=/bin \
+	LIBDIR=/lib \
+	DESTDIR=$DESTDIR \
+	all install

-	cd ../..
-	rm -rf wpa_supplicant-$PKGVERSION
-}
+cd ../..
+rm -rf wpa_supplicant-$PKGVERSION
--- a/perl/p5-locale-gettext/p5-locale-gettext.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-locale-gettext/p5-locale-gettext.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,15 +26,12 @@
 : ${CC:=clang}
 : ${CFLAGS:=}

-build()
-{
-	rm -rf Locale-gettext-$PKGVERSION
-	tar xvf Locale-gettext-$PKGVERSION.tar.gz
-	cd Locale-gettext-$PKGVERSION
+rm -rf Locale-gettext-$PKGVERSION
+tar xvf Locale-gettext-$PKGVERSION.tar.gz
+cd Locale-gettext-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make CC="$CC" CFLAGS="$CFLAGS" DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make CC="$CC" CFLAGS="$CFLAGS" DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf Locale-gettext-$PKGVERSION
-}
+cd ..
+rm -rf Locale-gettext-$PKGVERSION
--- a/perl/p5-uri/p5-uri.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-uri/p5-uri.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl"

-build()
-{
-	rm -rf URI-$PKGVERSION
-	tar xvf URI-$PKGVERSION.tar.gz
-	cd URI-$PKGVERSION
+rm -rf URI-$PKGVERSION
+tar xvf URI-$PKGVERSION.tar.gz
+cd URI-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf URI-$PKGVERSION
-}
+cd ..
+rm -rf URI-$PKGVERSION
--- a/perl/p5-xml-namespacesupport/p5-xml-namespacesupport.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-namespacesupport/p5-xml-namespacesupport.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="https://www.cpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl"

-build()
-{
-	rm -rf XML-NamespaceSupport-$PKGVERSION
-	tar xvf XML-NamespaceSupport-$PKGVERSION.tar.gz
-	cd XML-NamespaceSupport-$PKGVERSION
+rm -rf XML-NamespaceSupport-$PKGVERSION
+tar xvf XML-NamespaceSupport-$PKGVERSION.tar.gz
+cd XML-NamespaceSupport-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf XML-NamespaceSupport-$PKGVERSION
-}
+cd ..
+rm -rf XML-NamespaceSupport-$PKGVERSION
--- a/perl/p5-xml-parser/p5-xml-parser.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-parser/p5-xml-parser.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,15 +25,12 @@

 : ${CC:=clang}

-build()
-{
-	rm -rf XML-Parser-$PKGVERSION
-	tar xvf XML-Parser-$PKGVERSION.tar.gz
-	cd XML-Parser-$PKGVERSION
+rm -rf XML-Parser-$PKGVERSION
+tar xvf XML-Parser-$PKGVERSION.tar.gz
+cd XML-Parser-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make CC="$CC" DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make CC="$CC" DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf XML-Parser-$PKGVERSION
-}
+cd ..
+rm -rf XML-Parser-$PKGVERSION
--- a/perl/p5-xml-sax-base/p5-xml-sax-base.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-sax-base/p5-xml-sax-base.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="https://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl"

-build()
-{
-	rm -rf XML-SAX-Base-$PKGVERSION
-	tar xvf XML-SAX-Base-$PKGVERSION.tar.gz
-	cd XML-SAX-Base-$PKGVERSION
+rm -rf XML-SAX-Base-$PKGVERSION
+tar xvf XML-SAX-Base-$PKGVERSION.tar.gz
+cd XML-SAX-Base-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf XML-SAX-Base-$PKGVERSION
-}
+cd ..
+rm -rf XML-SAX-Base-$PKGVERSION
--- a/perl/p5-xml-sax-expat/p5-xml-sax-expat.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-sax-expat/p5-xml-sax-expat.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,16 +27,13 @@
             p5-xml-sax
             p5-xml-sax-base"

-build()
-{
-	rm -rf XML-SAX-Expat-$PKGVERSION
-	tar xvf XML-SAX-Expat-$PKGVERSION.tar.gz
-	cd XML-SAX-Expat-$PKGVERSION
+rm -rf XML-SAX-Expat-$PKGVERSION
+tar xvf XML-SAX-Expat-$PKGVERSION.tar.gz
+cd XML-SAX-Expat-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR pure_install
-	rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/Expat/.packlist
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR pure_install
+rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/Expat/.packlist

-	cd ..
-	rm -rf XML-SAX-Expat-$PKGVERSION
-}
+cd ..
+rm -rf XML-SAX-Expat-$PKGVERSION
--- a/perl/p5-xml-sax/p5-xml-sax.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-sax/p5-xml-sax.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,18 +23,15 @@
 PKGDOWNLOAD="https://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl p5-xml-sax-base p5-xml-namespacesupport"

-build()
-{
-	rm -rf XML-SAX-$PKGVERSION
-	tar xvf XML-SAX-$PKGVERSION.tar.gz
-	cd XML-SAX-$PKGVERSION
+rm -rf XML-SAX-$PKGVERSION
+tar xvf XML-SAX-$PKGVERSION.tar.gz
+cd XML-SAX-$PKGVERSION

-	patch -p0 < ../patch-disable-install.patch
-	perl Makefile.PL INSTALLDIRS=vendor
-	PERLLIB=blib/lib make DESTDIR=$DESTDIR install
-	rm -f $DESTDIR/lib/perl5/core_perllocal.pod
-	rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/.packlist
+patch -p0 < ../patch-disable-install.patch
+perl Makefile.PL INSTALLDIRS=vendor
+PERLLIB=blib/lib make DESTDIR=$DESTDIR install
+rm -f $DESTDIR/lib/perl5/core_perllocal.pod
+rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/.packlist

-	cd ..
-	rm -rf XML-SAX-$PKGVERSION
-}
+cd ..
+rm -rf XML-SAX-$PKGVERSION
--- a/perl/p5-xml-simple/p5-xml-simple.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/p5-xml-simple/p5-xml-simple.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="ftp://ftp.cpan.org/pub/CPAN/authors/id/G/GR/GRANTM/XML-Simple-$PKGVERSION.tar.gz"
 PKGDEPENDS="perl p5-xml-sax-expat"

-build()
-{
-	rm -rf XML-Simple-$PKGVERSION
-	tar xvf XML-Simple-$PKGVERSION.tar.gz
-	cd XML-Simple-$PKGVERSION
+rm -rf XML-Simple-$PKGVERSION
+tar xvf XML-Simple-$PKGVERSION.tar.gz
+cd XML-Simple-$PKGVERSION

-	perl Makefile.PL INSTALLDIRS=vendor
-	make DESTDIR=$DESTDIR install
+perl Makefile.PL INSTALLDIRS=vendor
+make DESTDIR=$DESTDIR install

-	cd ..
-	rm -rf XML-Simple-$PKGVERSION
-}
+cd ..
+rm -rf XML-Simple-$PKGVERSION
--- a/perl/perl/perl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/perl/perl/perl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,44 +30,41 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	BUILD_ZLIB=0 \
-	BUILD_BZIP2=0 \
-	./Configure -des \
-		-Dcc="$CC" \
-		-Doptimize="$CFLAGS" \
-		-Dprefix=/ \
-		-Dprivlib=/share/perl5/core_perl \
-		-Darchlib=/lib/perl5/core_perl \
-		-Dvendorprefix=/ \
-		-Dvendorlib=/share/perl5/vendor_perl \
-		-Dvendorarch=/lib/perl5/vendor_perl \
-		-Dsiteprefix=/local \
-		-Dsitelib=/local/share/perl5/site_perl \
-		-Dsitearch=/local/lib/perl5/site_perl \
-		-Dlocincpth=' ' \
-		-Duselargefiles \
-		-Dusethreads \
-		-Duseshrplib \
-		-Dd_semctl_semun \
-		-Dman1dir=/share/man/man1 \
-		-Dman3dir=/share/man/man3 \
-		-Dinstallman1dir=/share/man/man1 \
-		-Dinstallman3dir=/share/man/man3 \
-		-Dman1ext='1pm' \
-		-Dman3ext='3pm' \
-		-Dcf_by='Vanilla' \
-		-Ud_csh \
-		-Dusenm \
+BUILD_ZLIB=0 \
+BUILD_BZIP2=0 \
+./Configure -des \
+	-Dcc="$CC" \
+	-Doptimize="$CFLAGS" \
+	-Dprefix=/ \
+	-Dprivlib=/share/perl5/core_perl \
+	-Darchlib=/lib/perl5/core_perl \
+	-Dvendorprefix=/ \
+	-Dvendorlib=/share/perl5/vendor_perl \
+	-Dvendorarch=/lib/perl5/vendor_perl \
+	-Dsiteprefix=/local \
+	-Dsitelib=/local/share/perl5/site_perl \
+	-Dsitearch=/local/lib/perl5/site_perl \
+	-Dlocincpth=' ' \
+	-Duselargefiles \
+	-Dusethreads \
+	-Duseshrplib \
+	-Dd_semctl_semun \
+	-Dman1dir=/share/man/man1 \
+	-Dman3dir=/share/man/man3 \
+	-Dinstallman1dir=/share/man/man1 \
+	-Dinstallman3dir=/share/man/man3 \
+	-Dman1ext='1pm' \
+	-Dman3ext='3pm' \
+	-Dcf_by='Vanilla' \
+	-Ud_csh \
+	-Dusenm \

-	make
-	make install DESTDIR=$DESTDIR
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/print/cups/cups.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/print/cups/cups.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,43 +62,40 @@
 	with_pam="--disable-pam"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION-source.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION-source.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --without-rcdir: do not install custom init scripts.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--disable-systemd \
-		--enable-shared \
-		--without-rcdir \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=wheel \
-		--with-icondir=/share/icons \
-		--with-menudir=/share/applications \
-		$with_acl \
-		$with_dbus \
-		$with_pam
-	make
-	make install BUILDROOT=$DESTDIR
-	install -Dm0644 ../cupsd $DESTDIR/etc/rc.d/cupsd
+# --without-rcdir: do not install custom init scripts.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--disable-systemd \
+	--enable-shared \
+	--without-rcdir \
+	--with-cups-user=lp \
+	--with-cups-group=lp \
+	--with-system-groups=wheel \
+	--with-icondir=/share/icons \
+	--with-menudir=/share/applications \
+	$with_acl \
+	$with_dbus \
+	$with_pam
+make
+make install BUILDROOT=$DESTDIR
+install -Dm0644 ../cupsd $DESTDIR/etc/rc.d/cupsd

-	if [ "$PAM" = "yes" ]; then
-		install -Dm0644 ../cups $DESTDIR/etc/pam.d/cups
-	fi
+if [ "$PAM" = "yes" ]; then
+	install -Dm0644 ../cups $DESTDIR/etc/pam.d/cups
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/print/libpaper/libpaper.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/print/libpaper/libpaper.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,26 +29,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf ${PKGNAME}_$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf ${PKGNAME}_$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/python/py-ansicolor/py-ansicolor.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-ansicolor/py-ansicolor.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/a/ansicolor/ansicolor-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf ansicolor-$PKGVERSION
-	tar xvf ansicolor-$PKGVERSION.tar.gz
-	cd ansicolor-$PKGVERSION
+rm -rf ansicolor-$PKGVERSION
+tar xvf ansicolor-$PKGVERSION.tar.gz
+cd ansicolor-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf ansicolor-$PKGVERSION
-}
+cd ..
+rm -rf ansicolor-$PKGVERSION
--- a/python/py-commonmark/py-commonmark.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-commonmark/py-commonmark.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://github.com/rtfd/CommonMark-py/archive/$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf commonmark.py-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd commonmark.py-$PKGVERSION
+rm -rf commonmark.py-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd commonmark.py-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf commonmark.py-$PKGVERSION
-}
+cd ..
+rm -rf commonmark.py-$PKGVERSION
--- a/python/py-daemon/py-daemon.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-daemon/py-daemon.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/99/2a/75fe6aa7086e838570f29899f674e7896a42be26d9fff33f90d990e599d2/python-daemon-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf python-daemon-$PKGVERSION
-	tar xvf python-daemon-$PKGVERSION.tar.gz
-	cd python-daemon-$PKGVERSION
+rm -rf python-daemon-$PKGVERSION
+tar xvf python-daemon-$PKGVERSION.tar.gz
+cd python-daemon-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf python-daemon-$PKGVERSION
-}
+cd ..
+rm -rf python-daemon-$PKGVERSION
--- a/python/py-dateutil/py-dateutil.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-dateutil/py-dateutil.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf python-dateutil-$PKGVERSION
-	tar xvf python-dateutil-$PKGVERSION.tar.gz
-	cd python-dateutil-$PKGVERSION
+rm -rf python-dateutil-$PKGVERSION
+tar xvf python-dateutil-$PKGVERSION.tar.gz
+cd python-dateutil-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf python-dateutil-$PKGVERSION
-}
+cd ..
+rm -rf python-dateutil-$PKGVERSION
--- a/python/py-docker/py-docker.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-docker/py-docker.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://github.com/docker/docker-py/archive/$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf docker-py-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd docker-py-$PKGVERSION
+rm -rf docker-py-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd docker-py-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf docker-py-$PKGVERSION
-}
+cd ..
+rm -rf docker-py-$PKGVERSION
--- a/python/py-docutils/py-docutils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-docutils/py-docutils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,17 +24,14 @@
 PKGDOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-$PKGVERSION.tar.gz"
 PKGDEPENDS="python python2"

-build()
-{
-	for py in python python2; do
-		rm -rf docutils-$PKGVERSION
-		tar xvf docutils-$PKGVERSION.tar.gz
-		cd docutils-$PKGVERSION
+for py in python python2; do
+	rm -rf docutils-$PKGVERSION
+	tar xvf docutils-$PKGVERSION.tar.gz
+	cd docutils-$PKGVERSION

-		$py setup.py build
-		$py setup.py install --root=$DESTDIR --prefix=/.
+	$py setup.py build
+	$py setup.py install --root=$DESTDIR --prefix=/.

-		cd ..
-		rm -rf docutils-$PKGVERSION
-	done
-}
+	cd ..
+	rm -rf docutils-$PKGVERSION
+done
--- a/python/py-editorconfig/py-editorconfig.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-editorconfig/py-editorconfig.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://pypi.io/packages/source/E/EditorConfig/EditorConfig-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf EditorConfig-$PKGVERSION
-	tar xvf EditorConfig-$PKGVERSION.tar.gz
-	cd EditorConfig-$PKGVERSION
+rm -rf EditorConfig-$PKGVERSION
+tar xvf EditorConfig-$PKGVERSION.tar.gz
+cd EditorConfig-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf EditorConfig-$PKGVERSION
-}
+cd ..
+rm -rf EditorConfig-$PKGVERSION
--- a/python/py-isodate/py-isodate.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-isodate/py-isodate.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,14 +24,11 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/i/isodate/isodate-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf isodate-$PKGVERSION
-	tar xvf isodate-$PKGVERSION.tar.gz
-	cd isodate-$PKGVERSION
+rm -rf isodate-$PKGVERSION
+tar xvf isodate-$PKGVERSION.tar.gz
+cd isodate-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf isodate-$PKGVERSION
-}
+cd ..
+rm -rf isodate-$PKGVERSION
--- a/python/py-jinja2/py-jinja2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-jinja2/py-jinja2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/93/ea/d884a06f8c7f9b7afbc8138b762e80479fb17aedbbe2b06515a12de9378d/Jinja2-$PKGVERSION.tar.gz"
 PKGDEPENDS="python py-setuptools py-markupsafe"

-build()
-{
-	rm -rf Jinja2-$PKGVERSION
-	tar xvf Jinja2-$PKGVERSION.tar.gz
-	cd Jinja2-$PKGVERSION
+rm -rf Jinja2-$PKGVERSION
+tar xvf Jinja2-$PKGVERSION.tar.gz
+cd Jinja2-$PKGVERSION

-	python setup.py build
-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py build
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf Jinja2-$PKGVERSION
-}
+cd ..
+rm -rf Jinja2-$PKGVERSION
--- a/python/py-mako/py-mako.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-mako/py-mako.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,19 +23,16 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/eb/69/6137c60cae2ab8c911bff510bb6d1d23a0189f75d114bb277606c6486b5f/Mako-1.0.8.tar.gz"
 PKGDEPENDS="python py-setuptools"

-build()
-{
-	rm -rf Mako-$PKGVERSION
-	tar xvf Mako-$PKGVERSION.tar.gz
-	cd Mako-$PKGVERSION
+rm -rf Mako-$PKGVERSION
+tar xvf Mako-$PKGVERSION.tar.gz
+cd Mako-$PKGVERSION

-	python setup.py build
-	python setup.py install \
-		--root=$DESTDIR \
-		--prefix=/ \
-		--install-purelib=/lib/python3.7/site-packages \
-		--install-platlib=/lib/python3.7/lib-dynload
+python setup.py build
+python setup.py install \
+	--root=$DESTDIR \
+	--prefix=/ \
+	--install-purelib=/lib/python3.7/site-packages \
+	--install-platlib=/lib/python3.7/lib-dynload

-	cd ..
-	rm -rf Mako-$PKGVERSION
-}
+cd ..
+rm -rf Mako-$PKGVERSION
--- a/python/py-markupsafe/py-markupsafe.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-markupsafe/py-markupsafe.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,19 +23,16 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-$PKGVERSION.tar.gz"
 PKGDEPENDS="python py-setuptools"

-build()
-{
-	rm -rf MarkupSafe-$PKGVERSION
-	tar xvf MarkupSafe-$PKGVERSION.tar.gz
-	cd MarkupSafe-$PKGVERSION
+rm -rf MarkupSafe-$PKGVERSION
+tar xvf MarkupSafe-$PKGVERSION.tar.gz
+cd MarkupSafe-$PKGVERSION

-	python setup.py build
-	python setup.py install \
-		--root=$DESTDIR \
-		--prefix=/ \
-		--install-purelib=/lib/python3.7/site-packages \
-		--install-platlib=/lib/python3.7/lib-dynload
+python setup.py build
+python setup.py install \
+	--root=$DESTDIR \
+	--prefix=/ \
+	--install-purelib=/lib/python3.7/site-packages \
+	--install-platlib=/lib/python3.7/lib-dynload

-	cd ..
-	rm -rf MarkupSafe-$PKGVERSION
-}
+cd ..
+rm -rf MarkupSafe-$PKGVERSION
--- a/python/py-pygments/py-pygments.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-pygments/py-pygments.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,14 +23,11 @@
 PKGDOWNLOAD="https://pypi.org/packages/source/P/Pygments/Pygments-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf Pygments-$PKGVERSION
-	tar xvf Pygments-$PKGVERSION.tar.gz
-	cd Pygments-$PKGVERSION
+rm -rf Pygments-$PKGVERSION
+tar xvf Pygments-$PKGVERSION.tar.gz
+cd Pygments-$PKGVERSION

-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf Pygments-$PKGVERSION
-}
+cd ..
+rm -rf Pygments-$PKGVERSION
--- a/python/py-pyyaml/py-pyyaml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-pyyaml/py-pyyaml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,15 +23,12 @@
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe/PyYAML-$PKGVERSION.tar.gz"
 PKGDEPENDS="python py-setuptools yaml"

-build()
-{
-	rm -rf PyYAML-$PKGVERSION
-	tar xvf PyYAML-$PKGVERSION.tar.gz
-	cd PyYAML-$PKGVERSION
+rm -rf PyYAML-$PKGVERSION
+tar xvf PyYAML-$PKGVERSION.tar.gz
+cd PyYAML-$PKGVERSION

-	python setup.py build
-	python setup.py install --root=$DESTDIR --prefix=/.
+python setup.py build
+python setup.py install --root=$DESTDIR --prefix=/.

-	cd ..
-	rm -rf PyYAML-$PKGVERSION
-}
+cd ..
+rm -rf PyYAML-$PKGVERSION
--- a/python/py-setuptools/py-setuptools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/py-setuptools/py-setuptools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,30 +23,27 @@
 PKGDOWNLOAD="https://github.com/pypa/setuptools/archive/v$PKGVERSION.tar.gz"
 PKGDEPENDS="python python2"

-build()
-{
-	for py in python python2; do
-		rm -rf v$PKGVERSION
-		tar xvf v$PKGVERSION.tar.gz
-		cd setuptools-$PKGVERSION
+for py in python python2; do
+	rm -rf v$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd setuptools-$PKGVERSION

-		case $py in
-		"python")
-			directory="3.7"
-			;;
-		"python2")
-			directory="2.7"
-			;;
-		esac
+	case $py in
+	"python")
+		directory="3.7"
+		;;
+	"python2")
+		directory="2.7"
+		;;
+	esac

-		$py bootstrap.py
-		$py setup.py install \
-			--root=$DESTDIR \
-			--prefix=/ \
-			--install-purelib=/lib/python$directory/site-packages \
-			--install-platlib=/lib/python$directory/lib-dynload
+	$py bootstrap.py
+	$py setup.py install \
+		--root=$DESTDIR \
+		--prefix=/ \
+		--install-purelib=/lib/python$directory/site-packages \
+		--install-platlib=/lib/python$directory/lib-dynload

-		cd ..
-		rm -rf setuptools-$PKGVERSION
-	done
-}
+	cd ..
+	rm -rf setuptools-$PKGVERSION
+done
--- a/python/python/python.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/python/python.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,31 +39,28 @@
 	with_ipv6="--disable-ipv6"
 fi

-build()
-{
-	rm -rf Python-$PKGVERSION
-	tar xvf Python-$PKGVERSION.tar.xz
-	cd Python-$PKGVERSION
+rm -rf Python-$PKGVERSION
+tar xvf Python-$PKGVERSION.tar.xz
+cd Python-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix=/ \
-		--enable-shared \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip \
-		$with_ipv6
-	make
-	make install DESTDIR=$DESTDIR
-	ln -sf python3.7 $DESTDIR/bin/python
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix=/ \
+	--enable-shared \
+	--with-system-expat \
+	--with-system-ffi \
+	--without-ensurepip \
+	$with_ipv6
+make
+make install DESTDIR=$DESTDIR
+ln -sf python3.7 $DESTDIR/bin/python
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf Python-$PKGVERSION
-}
+cd ..
+rm -rf Python-$PKGVERSION
--- a/python/python2/python2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/python/python2/python2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -40,35 +40,32 @@
 	with_ipv6="--disable-ipv6"
 fi

-build()
-{
-	rm -rf Python-$PKGVERSION
-	tar xvf Python-$PKGVERSION.tar.xz
-	cd Python-$PKGVERSION
+rm -rf Python-$PKGVERSION
+tar xvf Python-$PKGVERSION.tar.xz
+cd Python-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix=/. \
-		--enable-shared \
-		--with-system-expat \
-		--with-system-ffi \
-		$with_ipv6
-	make
-	make DESTDIR=$DESTDIR altinstall maninstall
-	ln -sf python2.7 $DESTDIR/bin/python2
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix=/. \
+	--enable-shared \
+	--with-system-expat \
+	--with-system-ffi \
+	$with_ipv6
+make
+make DESTDIR=$DESTDIR altinstall maninstall
+ln -sf python2.7 $DESTDIR/bin/python2

-	# Avoid conflicts with Python 3.
-	rm -f $DESTDIR/bin/2to3
-	mv $DESTDIR/bin/smtpd.py $DESTDIR/bin/smtpd.py2.7
-	mv $DESTDIR/bin/idle $DESTDIR/bin/idle2.7
-	mv $DESTDIR/bin/pydoc $DESTDIR/bin/pydoc2.7
+# Avoid conflicts with Python 3.
+rm -f $DESTDIR/bin/2to3
+mv $DESTDIR/bin/smtpd.py $DESTDIR/bin/smtpd.py2.7
+mv $DESTDIR/bin/idle $DESTDIR/bin/idle2.7
+mv $DESTDIR/bin/pydoc $DESTDIR/bin/pydoc2.7

-	cd ..
-	rm -rf Python-$PKGVERSION
-}
+cd ..
+rm -rf Python-$PKGVERSION
--- a/qt/qt3d/qt3d.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qt3d/qt3d.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtbase/qtbase.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtbase/qtbase.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -246,54 +246,51 @@
 	with_zlib="-no-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	# https://github.com/void-linux/void-packages/tree/master/srcpkgs/qt5/patches
-	patch -p0 < ../patch-libressl.patch
-	patch -p0 < ../patch-musl.patch
-	patch -p0 < ../patch-fhs.patch
-	PKG_CONFIG_PATH=/lib/pkgconfig \
-	./configure \
-		-opensource \
-		-prefix / \
-		-archdatadir /lib/qt \
-		-datadir /share/qt \
-		-docdir /share/doc/qt \
-		-libexecdir /libexec \
-		-confirm-license \
-		-release \
-		-platform $platform \
-		-nomake examples \
-		-nomake tests \
-		-system-pcre \
-		$with_cups \
-		$with_databases \
-		$with_dbus \
-		$with_evdev \
-		$with_fontconfig \
-		$with_glib \
-		$with_gtk \
-		$with_gui \
-		$with_harfbuzz \
-		$with_icu \
-		$with_kms \
-		$with_libinput \
-		$with_opengl \
-		$with_png \
-		$with_ssl \
-		$with_syslog \
-		$with_ttf \
-		$with_udev \
-		$with_x \
-		$with_zlib
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# https://github.com/void-linux/void-packages/tree/master/srcpkgs/qt5/patches
+patch -p0 < ../patch-libressl.patch
+patch -p0 < ../patch-musl.patch
+patch -p0 < ../patch-fhs.patch
+PKG_CONFIG_PATH=/lib/pkgconfig \
+./configure \
+	-opensource \
+	-prefix / \
+	-archdatadir /lib/qt \
+	-datadir /share/qt \
+	-docdir /share/doc/qt \
+	-libexecdir /libexec \
+	-confirm-license \
+	-release \
+	-platform $platform \
+	-nomake examples \
+	-nomake tests \
+	-system-pcre \
+	$with_cups \
+	$with_databases \
+	$with_dbus \
+	$with_evdev \
+	$with_fontconfig \
+	$with_glib \
+	$with_gtk \
+	$with_gui \
+	$with_harfbuzz \
+	$with_icu \
+	$with_kms \
+	$with_libinput \
+	$with_opengl \
+	$with_png \
+	$with_ssl \
+	$with_syslog \
+	$with_ttf \
+	$with_udev \
+	$with_x \
+	$with_zlib
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtconnectivity/qtconnectivity.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtconnectivity/qtconnectivity.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtdeclarative/qtdeclarative.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtdeclarative/qtdeclarative.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtgamepad/qtgamepad.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtgamepad/qtgamepad.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtlocation/qtlocation.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtlocation/qtlocation.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,24 +28,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	patch -p0 < ../patch-disable-mapbox.patch
-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+patch -p0 < ../patch-disable-mapbox.patch
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtmultimedia/qtmultimedia.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtmultimedia/qtmultimedia.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,26 +47,23 @@
 	with_pulseaudio="-no-pulseaudio"
 fi

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake .. \
-		-- \
-		$with_alsa \
-		$with_pulseaudio
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake .. \
+	-- \
+	$with_alsa \
+	$with_pulseaudio
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtnetworkauth/qtnetworkauth.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtnetworkauth/qtnetworkauth.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtquickcontrols/qtquickcontrols.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtquickcontrols/qtquickcontrols.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtquickcontrols2/qtquickcontrols2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtquickcontrols2/qtquickcontrols2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtremoteobjects/qtremoteobjects.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtremoteobjects/qtremoteobjects.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtscript/qtscript.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtscript/qtscript.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtsensors/qtsensors.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtsensors/qtsensors.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtspeech/qtspeech.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtspeech/qtspeech.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtsvg/qtsvg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtsvg/qtsvg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qttools/qttools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qttools/qttools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,24 +28,21 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	patch -p0 < ../patch-qdoc.patch
-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+patch -p0 < ../patch-qdoc.patch
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtwayland/qtwayland.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtwayland/qtwayland.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtwebchannel/qtwebchannel.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtwebchannel/qtwebchannel.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtwebsockets/qtwebsockets.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtwebsockets/qtwebsockets.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtwebview/qtwebview.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtwebview/qtwebview.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtx11extras/qtx11extras.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtx11extras/qtx11extras.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/qt/qtxmlpatterns/qtxmlpatterns.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/qt/qtxmlpatterns/qtxmlpatterns.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,23 +28,20 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-	tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
-	cd $PKGNAME-everywhere-src-$PKGVERSION
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
+tar xvf $PKGNAME-everywhere-src-$PKGVERSION.tar.xz
+cd $PKGNAME-everywhere-src-$PKGVERSION

-	mkdir build && cd build
-	QMAKE_CC="$CC" \
-	QMAKE_CFLAGS="$CFLAGS" \
-	QMAKE_CXX="$CXX" \
-	QMAKE_CXXFLAGS="$CXXFLAGS" \
-	qmake ..
-	make
-	make install INSTALL_ROOT=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	cd ..
+mkdir build && cd build
+QMAKE_CC="$CC" \
+QMAKE_CFLAGS="$CFLAGS" \
+QMAKE_CXX="$CXX" \
+QMAKE_CXXFLAGS="$CXXFLAGS" \
+qmake ..
+make
+make install INSTALL_ROOT=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+cd ..

-	cd ..
-	rm -rf $PKGNAME-everywhere-src-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-everywhere-src-$PKGVERSION
--- a/ruby/rb-coderay/rb-coderay.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-coderay/rb-coderay.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-concurrent-ruby/rb-concurrent-ruby.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-concurrent-ruby/rb-concurrent-ruby.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-gosu/rb-gosu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-gosu/rb-gosu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,12 +32,9 @@
             ruby
             sdl2"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-i18n/rb-i18n.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-i18n/rb-i18n.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby rb-concurrent-ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-mail/rb-mail.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-mail/rb-mail.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby rb-mini-mime"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-mime-types-data/rb-mime-types-data.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-mime-types-data/rb-mime-types-data.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-mime-types/rb-mime-types.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-mime-types/rb-mime-types.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby rb-mime-types-data"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-mini-mime/rb-mini-mime.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-mini-mime/rb-mini-mime.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-multi-json/rb-multi-json.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-multi-json/rb-multi-json.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-multi-xml/rb-multi-xml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-multi-xml/rb-multi-xml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-mustermann/rb-mustermann.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-mustermann/rb-mustermann.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-rack-protection/rb-rack-protection.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-rack-protection/rb-rack-protection.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby rb-rack"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-rack/rb-rack.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-rack/rb-rack.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-rainbow/rb-rainbow.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-rainbow/rb-rainbow.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-sinatra/rb-sinatra.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-sinatra/rb-sinatra.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="rb-mustermann rb-rack rb-rack-protection rb-tilt ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/rb-tilt/rb-tilt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/rb-tilt/rb-tilt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/ruby/ruby/ruby.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/ruby/ruby/ruby.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,28 +32,25 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-clang.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--without-git
-	make
-	make install DESTDIR=$DESTDIR
+patch -p0 < ../patch-clang.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--without-git
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/libsecret/libsecret.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/libsecret/libsecret.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -56,28 +56,25 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_crypto \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_crypto \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/security/linux-pam/linux-pam.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/linux-pam/linux-pam.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -58,44 +58,41 @@
 	with_selinux="--disable-selinux"
 fi

-build()
-{
-	rm -rf Linux-PAM-$PKGVERSION
-	tar xvf Linux-PAM-$PKGVERSION.tar.xz
-	cd Linux-PAM-$PKGVERSION
+rm -rf Linux-PAM-$PKGVERSION
+tar xvf Linux-PAM-$PKGVERSION.tar.xz
+cd Linux-PAM-$PKGVERSION

-	# https://git.alpinelinux.org/aports/tree/main/linux-pam/APKBUILD#n32
-	sed -i -e 's/pam_rhosts//g' modules/Makefile.am
+# https://git.alpinelinux.org/aports/tree/main/linux-pam/APKBUILD#n32
+sed -i -e 's/pam_rhosts//g' modules/Makefile.am

-	# https://git.alpinelinux.org/aports/plain/main/linux-pam/musl-fix-pam_exec.patch
-	# https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch
-	patch -p0 < ../musl.patch
+# https://git.alpinelinux.org/aports/plain/main/linux-pam/musl-fix-pam_exec.patch
+# https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch
+patch -p0 < ../musl.patch

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--includedir=/include/security \
-		--disable-db \
-		--libdir=/lib \
-		--docdir=/share/doc/linux-pam \
-		$with_nls \
-		$with_selinux
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0600 ../other $DESTDIR/etc/pam.d/other
-	install -Dm0600 ../system-account $DESTDIR/etc/pam.d/system-account
-	install -Dm0600 ../system-auth $DESTDIR/etc/pam.d/system-auth
-	install -Dm0600 ../system-password $DESTDIR/etc/pam.d/system-password
-	install -Dm0600 ../system-session $DESTDIR/etc/pam.d/system-session
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--includedir=/include/security \
+	--disable-db \
+	--libdir=/lib \
+	--docdir=/share/doc/linux-pam \
+	$with_nls \
+	$with_selinux
+make
+make install DESTDIR=$DESTDIR
+install -Dm0600 ../other $DESTDIR/etc/pam.d/other
+install -Dm0600 ../system-account $DESTDIR/etc/pam.d/system-account
+install -Dm0600 ../system-auth $DESTDIR/etc/pam.d/system-auth
+install -Dm0600 ../system-password $DESTDIR/etc/pam.d/system-password
+install -Dm0600 ../system-session $DESTDIR/etc/pam.d/system-session
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf Linux-PAM-$PKGVERSION
-}
+cd ..
+rm -rf Linux-PAM-$PKGVERSION
--- a/security/nss/nss.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/nss/nss.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,54 +30,51 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvzf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvzf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	make -C nss \
-		BUILD_OPT=1 \
-		CC="$CC" \
-		CCC="$CXX" \
-		CXX="$CXX" \
-		NSPR_INCLUDE_DIR=/include/nspr \
-		NSPR_LIB_DIR=/lib \
-		NSS_DISABLE_GTESTS=1 \
-		NSS_USE_SYSTEM_SQLITE=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_64=1
+make -C nss \
+	BUILD_OPT=1 \
+	CC="$CC" \
+	CCC="$CXX" \
+	CXX="$CXX" \
+	NSPR_INCLUDE_DIR=/include/nspr \
+	NSPR_LIB_DIR=/lib \
+	NSS_DISABLE_GTESTS=1 \
+	NSS_USE_SYSTEM_SQLITE=1 \
+	USE_SYSTEM_ZLIB=1 \
+	USE_64=1

-	mkdir -p $DESTDIR/lib/pkgconfig
-	mkdir -p $DESTDIR/bin
-	mkdir -p $DESTDIR/include/nss
+mkdir -p $DESTDIR/lib/pkgconfig
+mkdir -p $DESTDIR/bin
+mkdir -p $DESTDIR/include/nss

-	# Copy only stuff as recommended per BLFS.
-	cp -p dist/Linux*/lib/*.so $DESTDIR/lib
-	cp -p dist/Linux*/lib/*.chk $DESTDIR/lib
-	cp -p dist/Linux*/lib/libcrmf.a $DESTDIR/lib
-	cp -p dist/Linux*/bin/*util $DESTDIR/bin
-	cp -p dist/public/nss/*.h $DESTDIR/include/nss
+# Copy only stuff as recommended per BLFS.
+cp -p dist/Linux*/lib/*.so $DESTDIR/lib
+cp -p dist/Linux*/lib/*.chk $DESTDIR/lib
+cp -p dist/Linux*/lib/libcrmf.a $DESTDIR/lib
+cp -p dist/Linux*/bin/*util $DESTDIR/bin
+cp -p dist/public/nss/*.h $DESTDIR/include/nss

-	# Obtain version from header.
-	major=$(awk '/^#define NSS_VMAJOR/ { print $3 }' nss/lib/nss/nss.h)
-	minor=$(awk '/^#define NSS_VMINOR/ { print $3 }' nss/lib/nss/nss.h)
-	patch=$(awk '/^#define NSS_VPATCH/ { print $3 }' nss/lib/nss/nss.h)
+# Obtain version from header.
+major=$(awk '/^#define NSS_VMAJOR/ { print $3 }' nss/lib/nss/nss.h)
+minor=$(awk '/^#define NSS_VMINOR/ { print $3 }' nss/lib/nss/nss.h)
+patch=$(awk '/^#define NSS_VPATCH/ { print $3 }' nss/lib/nss/nss.h)

-	sed nss/pkg/pkg-config/nss.pc.in \
-		-e "s|%NSPR_VERSION%|$(pkgconf --modversion nspr)|" \
-		-e "s|%NSS_VERSION%|$major.$minor.$patch|" \
-		-e "s|%exec_prefix%||" \
-		-e "s|%includedir%|/include/nss|" \
-		-e "s|%libdir%|/lib|" \
-		-e "s|%prefix%||" > $DESTDIR/lib/pkgconfig/nss.pc
-	sed nss/pkg/pkg-config/nss-config.in \
-		-e "s|@MOD_MAJOR_VERSION@|$major|" \
-		-e "s|@MOD_MINOR_VERSION@|$minor|" \
-		-e "s|@MOD_PATCH_VERSION@|$patch|" \
-		-e "s|@prefix@||" > $DESTDIR/bin/nss-config
-	chmod 0755 $DESTDIR/bin/nss-config
+sed nss/pkg/pkg-config/nss.pc.in \
+	-e "s|%NSPR_VERSION%|$(pkgconf --modversion nspr)|" \
+	-e "s|%NSS_VERSION%|$major.$minor.$patch|" \
+	-e "s|%exec_prefix%||" \
+	-e "s|%includedir%|/include/nss|" \
+	-e "s|%libdir%|/lib|" \
+	-e "s|%prefix%||" > $DESTDIR/lib/pkgconfig/nss.pc
+sed nss/pkg/pkg-config/nss-config.in \
+	-e "s|@MOD_MAJOR_VERSION@|$major|" \
+	-e "s|@MOD_MINOR_VERSION@|$minor|" \
+	-e "s|@MOD_PATCH_VERSION@|$patch|" \
+	-e "s|@prefix@||" > $DESTDIR/bin/nss-config
+chmod 0755 $DESTDIR/bin/nss-config

-	cd -
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd -
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/pinentry/pinentry.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/pinentry/pinentry.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -74,32 +74,29 @@
 	with_qt="--disable-pinentry-qt5"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# --disable-pinentry-gtk2: Gtk 2 is deprecated in Vanilla Linux.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-pinentry-gtk2 \
-		$with_fltk \
-		$with_gtk \
-		$with_libsecret \
-		$with_ncurses \
-		$with_qt
-	make
-	make install DESTDIR=$DESTDIR
+# --disable-pinentry-gtk2: Gtk 2 is deprecated in Vanilla Linux.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-pinentry-gtk2 \
+	$with_fltk \
+	$with_gtk \
+	$with_libsecret \
+	$with_ncurses \
+	$with_qt
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/polkit/polkit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/polkit/polkit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,37 +44,34 @@
 	with_pam="--with-authfw=shadow"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# credits to void-linux.
-	patch -p0 < ../CVE-2018-19788.patch
-	patch -p0 < ../make-innetgr-optional.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-libsystemd-login \
-		--disable-libelogind \
-		--enable-introspection=yes \
-		$with_pam
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# credits to void-linux.
+patch -p0 < ../CVE-2018-19788.patch
+patch -p0 < ../make-innetgr-optional.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-libsystemd-login \
+	--disable-libelogind \
+	--enable-introspection=yes \
+	$with_pam
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	if [ "$PAM" = "yes" ]; then
-		install -Dm0644 ../polkit-1 $DESTDIR/etc/pam.d/polkit-1
-	fi
+if [ "$PAM" = "yes" ]; then
+	install -Dm0644 ../polkit-1 $DESTDIR/etc/pam.d/polkit-1
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/shadow/shadow.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/shadow/shadow.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -87,49 +87,46 @@
 	with_selinux="--without-selinux"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	#
-	# Disable groups, it's provided by busybox/coreutils and documentation
-	# by man-pages.
-	#
-	sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-	find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
-	find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
-	find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;
+#
+# Disable groups, it's provided by busybox/coreutils and documentation
+# by man-pages.
+#
+sed -i 's/groups$(EXEEXT) //' src/Makefile.in
+find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
+find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
+find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--bindir=/bin \
-		--sbindir=/bin \
-		--enable-shared \
-		$with_acl \
-		$with_attr \
-		$with_nls \
-		$with_pam \
-		$with_selinux
-	make ubindir=/bin usbindir=/bin
-	make DESTDIR=$DESTDIR ubindir=/bin usbindir=/bin install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--bindir=/bin \
+	--sbindir=/bin \
+	--enable-shared \
+	$with_acl \
+	$with_attr \
+	$with_nls \
+	$with_pam \
+	$with_selinux
+make ubindir=/bin usbindir=/bin
+make DESTDIR=$DESTDIR ubindir=/bin usbindir=/bin install

-	if [ "$PAM" = "yes" ]; then
-		for i in \
-		    chage chfn chgpasswd chpasswd chsh groupadd groupdel \
-		    groupmems groupmod login newusers passwd su useradd \
-		    userdel usermod; do
-			install -Dm0600 ../$i $DESTDIR/etc/pam.d/$i
-		done
-	fi
+if [ "$PAM" = "yes" ]; then
+	for i in \
+	    chage chfn chgpasswd chpasswd chsh groupadd groupdel \
+	    groupmems groupmod login newusers passwd su useradd \
+	    userdel usermod; do
+		install -Dm0600 ../$i $DESTDIR/etc/pam.d/$i
+	done
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/sudo/sudo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/sudo/sudo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -50,31 +50,28 @@
 	with_pam="--without-pam"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_nls \
-		$with_pam
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_nls \
+	$with_pam
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	if [ "$PAM" = "yes" ]; then
-		install -Dm0600 ../sudo $DESTDIR/etc/pam.d/sudo
-	fi
+if [ "$PAM" = "yes" ]; then
+	install -Dm0600 ../sudo $DESTDIR/etc/pam.d/sudo
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/security/swaylock/swaylock.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/security/swaylock/swaylock.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,36 +46,33 @@
 	with_pam="-D pam=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		$with_gdk_pixbuf \
-		$with_pam
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	$with_gdk_pixbuf \
+	$with_pam
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	if [ "$PAM" = "yes" ]; then
-		cat > $DESTDIR/etc/pam.d/swaylock <<-EOF
-		#
-		# /etc/pam.d/swaylock -- PAM configuration file for swaylock
-		#
+if [ "$PAM" = "yes" ]; then
+	cat > $DESTDIR/etc/pam.d/swaylock <<-EOF
+	#
+	# /etc/pam.d/swaylock -- PAM configuration file for swaylock
+	#

-		auth include login
-		EOF
-	else
-		# Upstream documentation recommends setuid bit.
-		chmod 4755 $DESTDIR/bin/swaylock
-	fi
+	auth include login
+	EOF
+else
+	# Upstream documentation recommends setuid bit.
+	chmod 4755 $DESTDIR/bin/swaylock
+fi

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/shells/dash/dash.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/shells/dash/dash.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,24 +38,21 @@
 	with_libedit="--without-libedit"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_libedit
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_libedit
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/shells/tcsh/tcsh.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/shells/tcsh/tcsh.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/tree/community/tcsh/001-sysmalloc.patch
-	patch -p1 < ../patch-sysmalloc.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+# https://git.alpinelinux.org/aports/tree/community/tcsh/001-sysmalloc.patch
+patch -p1 < ../patch-sysmalloc.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/shells/zsh/zsh.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/shells/zsh/zsh.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -57,29 +57,26 @@
 	with_pcre="--disable-pcre"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-multibyte \
-		$with_cap \
-		$with_gdbm \
-		$with_pcre
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-multibyte \
+	$with_cap \
+	$with_gdbm \
+	$with_pcre
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/accountsservice/accountsservice.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/accountsservice/accountsservice.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -27,30 +27,27 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# credits to void-linux.
-	patch -p0 < ../musl-fgetspent_r.patch
-	patch -p0 < ../musl-wtmp.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared \
-		-D admin_group=wheel \
-		-D systemd=false \
-		-D elogind=false \
-		-D systemdsystemunitdir=no
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+# credits to void-linux.
+patch -p0 < ../musl-fgetspent_r.patch
+patch -p0 < ../musl-wtmp.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared \
+	-D admin_group=wheel \
+	-D systemd=false \
+	-D elogind=false \
+	-D systemdsystemunitdir=no
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/acpi/acpi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/acpi/acpi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/acpid/acpid.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/acpid/acpid.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin
-	make
-	make install DESTDIR=$DESTDIR
-	mkdir -p $DESTDIR/etc/rc.d
-	cp ../acpid $DESTDIR/etc/rc.d
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin
+make
+make install DESTDIR=$DESTDIR
+mkdir -p $DESTDIR/etc/rc.d
+cp ../acpid $DESTDIR/etc/rc.d

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/dosfstools/dosfstools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/dosfstools/dosfstools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,25 +39,22 @@
 	with_udev="--without-udev"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/ndctl/ndctl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/ndctl/ndctl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -32,28 +32,25 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf v$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf v$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-systemd \
-		--without-keyutils \
-		--disable-docs
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-systemd \
+	--without-keyutils \
+	--disable-docs
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/pm-utils/pm-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/pm-utils/pm-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/rsync/rsync.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/rsync/rsync.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,27 +35,24 @@
 : ${LIBS:=}
 : ${IPV6:=yes}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-included-popt \
-		--with-included-zlib
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-included-popt \
+	--with-included-zlib
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/sdparm/sdparm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/sdparm/sdparm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/sg3-utils/sg3-utils.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/sg3-utils/sg3-utils.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf sg3_utils-$PKGVERSION
-	tar xvf sg3_utils-$PKGVERSION.tar.xz
-	cd sg3_utils-$PKGVERSION
+rm -rf sg3_utils-$PKGVERSION
+tar xvf sg3_utils-$PKGVERSION.tar.xz
+cd sg3_utils-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf sg3_utils-$PKGVERSION
-}
+cd ..
+rm -rf sg3_utils-$PKGVERSION
--- a/system/smartmontools/smartmontools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/smartmontools/smartmontools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -42,28 +42,25 @@
 	with_selinux="--without-selinux"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		$with_selinux
-	make
-	make install DESTDIR=$DESTDIR
-	install -Dm0644 ../smartd $DESTDIR/etc/rc.d/smartd
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	$with_selinux
+make
+make install DESTDIR=$DESTDIR
+install -Dm0644 ../smartd $DESTDIR/etc/rc.d/smartd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/system/upower/upower.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/system/upower/upower.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,30 +44,27 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-idevice \
-		--with-systemdutildir=no \
-		--with-systemdsystemunitdir=no \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-idevice \
+	--with-systemdutildir=no \
+	--with-systemdsystemunitdir=no \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/terminals/alacritty/alacritty.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/terminals/alacritty/alacritty.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -45,35 +45,32 @@
 	rm -rf $PKGNAME-$PKGVERSION
 }

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION
+
+# TODO: remove -C target-feature once rustc was patched
+# TODO: strip in vpk instead.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+CARGO_HOME=vendor \
+RUSTFLAGS="-C target-feature=-crt-static" \
+cargo build --release --verbose --offline
+$STRIP target/release/alacritty

-	# TODO: remove -C target-feature once rustc was patched
-	# TODO: strip in vpk instead.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	CARGO_HOME=vendor \
-	RUSTFLAGS="-C target-feature=-crt-static" \
-	cargo build --release --verbose --offline
-	$STRIP target/release/alacritty
+desktop-file-install \
+	-m 0644 \
+	--dir $DESTDIR/share/applications \
+	extra/linux/alacritty.desktop

-	desktop-file-install \
-		-m 0644 \
-		--dir $DESTDIR/share/applications \
-		extra/linux/alacritty.desktop
+install -Dm0755 target/release/alacritty $DESTDIR/bin/alacritty
+install -Dm0644 extra/alacritty.man $DESTDIR/share/man/man1/alacritty.1
+install -Dm0644 extra/completions/alacritty.bash $DESTDIR/share/bash-completion/completions/alacritty
+install -Dm0644 extra/completions/_alacritty $DESTDIR/share/zsh/site-functions/_alacritty
+install -Dm0644 extra/completions/alacritty.fish $DESTDIR/share/fish/completions/alacritty.fish
+install -Dm0644 extra/logo/alacritty-term.svg $DESTDIR/share/pixmaps/Alacritty.svg

-	install -Dm0755 target/release/alacritty $DESTDIR/bin/alacritty
-	install -Dm0644 extra/alacritty.man $DESTDIR/share/man/man1/alacritty.1
-	install -Dm0644 extra/completions/alacritty.bash $DESTDIR/share/bash-completion/completions/alacritty
-	install -Dm0644 extra/completions/_alacritty $DESTDIR/share/zsh/site-functions/_alacritty
-	install -Dm0644 extra/completions/alacritty.fish $DESTDIR/share/fish/completions/alacritty.fish
-	install -Dm0644 extra/logo/alacritty-term.svg $DESTDIR/share/pixmaps/Alacritty.svg
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/terminals/xterm/xterm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/terminals/xterm/xterm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,32 +39,29 @@
 	with_ttf="--disable-freetype"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tgz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tgz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/tree/community/xterm/posix-ptys.patch
-	patch -p1 < ../posix-ptys.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-luit \
-		$with_ttf
-	make
-	make install DESTDIR=$DESTDIR
+# https://git.alpinelinux.org/aports/tree/community/xterm/posix-ptys.patch
+patch -p1 < ../posix-ptys.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-luit \
+	$with_ttf
+make
+make install DESTDIR=$DESTDIR

-	# Those are not installed from the Makefile even though pixmaps are, so
-	# install them anyway.
-	install -Dm0644 xterm.desktop $DESTDIR/share/applications/xterm.desktop
-	install -Dm0644 uxterm.desktop $DESTDIR/share/applications/uxterm.desktop
+# Those are not installed from the Makefile even though pixmaps are, so
+# install them anyway.
+install -Dm0644 xterm.desktop $DESTDIR/share/applications/xterm.desktop
+install -Dm0644 uxterm.desktop $DESTDIR/share/applications/uxterm.desktop

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/asciidoc/asciidoc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/asciidoc/asciidoc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -24,21 +24,18 @@
 PKGDEPENDS="python2 libxml2 docbook-xsl"
 PKGTAGS="DEPRECATED"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e "s|python a2x.py|python2 a2x.py|" Makefile.in
-	autoreconf -vif
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+sed -i -e "s|python a2x.py|python2 a2x.py|" Makefile.in
+autoreconf -vif
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/asciidoctor/asciidoctor.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/asciidoctor/asciidoctor.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -25,12 +25,9 @@
 PKGDOWNLOAD="https://rubygems.org/downloads/$_GEM-$PKGVERSION.gem"
 PKGDEPENDS="ruby"

-build()
-{
-	gem install -l \
-		--ignore-dependencies \
-		--no-user-install \
-		-i $DESTDIR/$(gem env gemdir) \
-		-n $DESTDIR/bin \
-		$_GEM-$PKGVERSION.gem
-}
+gem install -l \
+	--ignore-dependencies \
+	--no-user-install \
+	-i $DESTDIR/$(gem env gemdir) \
+	-n $DESTDIR/bin \
+	$_GEM-$PKGVERSION.gem
--- a/text/docbook-xml/docbook-xml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/docbook-xml/docbook-xml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -106,13 +106,10 @@
 		$DESTDIR/etc/xml/docbook
 }

-build()
-{
-	install -dm755 $DESTDIR/etc/xml
-	xmlcatalog --noout --create $DESTDIR/etc/xml/docbook
+install -dm755 $DESTDIR/etc/xml
+xmlcatalog --noout --create $DESTDIR/etc/xml/docbook

-	for v in 4.1.2 4.2 4.3 4.4 4.5; do
-		extract $v
-		catalog $v
-	done
-}
+for v in 4.1.2 4.2 4.3 4.4 4.5; do
+	extract $v
+	catalog $v
+done
--- a/text/docbook-xsl/docbook-xsl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/docbook-xsl/docbook-xsl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,22 +22,19 @@
 PKGSUMMARY="DocBook XML stylesheets"
 PKGDOWNLOAD="https://downloads.sourceforge.net/docbook/$PKGNAME-$PKGVERSION.tar.bz2"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	install -dm755 $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION
+install -dm755 $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION

-	cp -R \
-		VERSION assembly common eclipse epub epub3 extensions fo \
-		highlighting html htmlhelp images javahelp lib manpages params \
-		profiling roundtrip slides template tests tools webhelp website \
-		xhtml xhtml-1_1 xhtml5 \
-		$DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION
-	ln -s VERSION $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION/VERSION.xsl
+cp -R \
+	VERSION assembly common eclipse epub epub3 extensions fo \
+	highlighting html htmlhelp images javahelp lib manpages params \
+	profiling roundtrip slides template tests tools webhelp website \
+	xhtml xhtml-1_1 xhtml5 \
+	$DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION
+ln -s VERSION $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION/VERSION.xsl

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/dos2unix/dos2unix.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/dos2unix/dos2unix.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,33 +34,30 @@
 	PKGDEPENDS="gettext $PKGDEPENDS"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	if [ "$CC" = "clang" ]; then
-		cpp="clang-cpp"
-	else
-		cpp="cpp"
-	fi
+if [ "$CC" = "clang" ]; then
+	cpp="clang-cpp"
+else
+	cpp="cpp"
+fi
+
+if [ "$NLS" != "yes" ]; then
+	sed -i -e "/^ENABLE_NLS/d" Makefile
+fi

-	if [ "$NLS" != "yes" ]; then
-		sed -i -e "/^ENABLE_NLS/d" Makefile
-	fi
+make \
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	DESTDIR=$DESTDIR \
+	prefix= \
+	docdir=/share/doc/$PKGNAME \
+	$with_nls \
+	all install

-	make \
-		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS" \
-		LIBS="$LIBS" \
-		DESTDIR=$DESTDIR \
-		prefix= \
-		docdir=/share/doc/$PKGNAME \
-		$with_nls \
-		all install
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/hunspell/hunspell.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/hunspell/hunspell.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -57,29 +57,26 @@
 	with_readline="--without-readline"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_ncurses \
-		$with_nls \
-		$with_readline
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_ncurses \
+	$with_nls \
+	$with_readline
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/jansson/jansson.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/jansson/jansson.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,23 +26,20 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DJANSSON_BUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DJANSSON_BUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/json-c/json-c.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/json-c/json-c.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./autogen.sh
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+./autogen.sh
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/json-glib/json-glib.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/json-glib/json-glib.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -38,25 +38,22 @@
 	with_introspection="-D introspection=true"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		$with_introspection
-	CC="$CC" ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	$with_introspection
+CC="$CC" ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/jsoncpp/jsoncpp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/jsoncpp/jsoncpp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,27 +29,24 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		--default-library shared
-	# https://github.com/open-source-parsers/jsoncpp/issues/910
-	rm -f version
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
-	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	--default-library shared
+# https://github.com/open-source-parsers/jsoncpp/issues/910
+rm -f version
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install
+sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/libcroco/libcroco.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/libcroco/libcroco.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/libxml2/libxml2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/libxml2/libxml2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,38 +62,35 @@
 	with_zlib="--without-zlib"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e '/SUBDIRS/ s/tests//' python/Makefile.am
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--docdir=/share/doc/$PKGNAME \
-		--with-html-dir=/share/doc/$PKGNAME/html \
-		--with-html-subdir="" \
-		--enable-shared \
-		$with_icu \
-		$with_lzma \
-		$with_python \
-		$with_zlib
-	make
-	make \
-		DESTDIR=$DESTDIR \
-		DOC_MODULE=$PKGNAME \
-		docsdir=/share/doc/$PKGNAME/python \
-		install
-	find $DESTDIR -type f -name "*.la" -delete
+sed -i -e '/SUBDIRS/ s/tests//' python/Makefile.am
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--docdir=/share/doc/$PKGNAME \
+	--with-html-dir=/share/doc/$PKGNAME/html \
+	--with-html-subdir="" \
+	--enable-shared \
+	$with_icu \
+	$with_lzma \
+	$with_python \
+	$with_zlib
+make
+make \
+	DESTDIR=$DESTDIR \
+	DOC_MODULE=$PKGNAME \
+	docsdir=/share/doc/$PKGNAME/python \
+	install
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/libxslt/libxslt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/libxslt/libxslt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -41,30 +41,27 @@
 	with_crypto="--without-crypto"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--with-html-dir=/share/doc/$PKGNAME/html \
-		--with-html-subdir="" \
-		--enable-shared \
-		$with_crypto
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--with-html-dir=/share/doc/$PKGNAME/html \
+	--with-html-subdir="" \
+	--enable-shared \
+	$with_crypto
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/raptor2/raptor2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/raptor2/raptor2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/rarian/rarian.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/rarian/rarian.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,27 +33,24 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	# find $DESTDIR -type f -name "*.la" -delete
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+# find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/rasqal/rasqal.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/rasqal/rasqal.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,28 +39,25 @@
 	with_regex="--disable-pcre"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# We don't provide a XML option because raptor requires libxml2 anyway.
-	autoreconf -vif
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-release \
-		$with_regex
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# We don't provide a XML option because raptor requires libxml2 anyway.
+autoreconf -vif
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-release \
+	$with_regex
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/scdoc/scdoc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/scdoc/scdoc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,22 +33,19 @@
 	with_static="-static"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# Disable default -static, provide user option.
-	patch -p0 < ../patch-makefile.patch
-	make \
-		CC="$CC" \
-		DESTDIR=$DESTDIR \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_LDFLAGS="$LDFLAGS $with_static" \
-		PREFIX= \
-		all install
+# Disable default -static, provide user option.
+patch -p0 < ../patch-makefile.patch
+make \
+	CC="$CC" \
+	DESTDIR=$DESTDIR \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_LDFLAGS="$LDFLAGS $with_static" \
+	PREFIX= \
+	all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/xmlto/xmlto.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/xmlto/xmlto.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/yajl/yajl.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/yajl/yajl.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -26,25 +26,22 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	sed -i -e "/INSTALL/ s|share/pkgconfig|lib/pkgconfig|" src/CMakeLists.txt
-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DshareDir=lib/pkgconfig
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+sed -i -e "/INSTALL/ s|share/pkgconfig|lib/pkgconfig|" src/CMakeLists.txt
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DshareDir=lib/pkgconfig
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/text/yaml/yaml.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/text/yaml/yaml.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,24 +29,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/themes/hicolor-icon-theme/hicolor-icon-theme.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/themes/hicolor-icon-theme/hicolor-icon-theme.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -22,16 +22,13 @@
 PKGSUMMARY="fallback theme for icon theme implementation"
 PKGDOWNLOAD="http://icon-theme.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.xz"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/wm/fluxbox/fluxbox.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/wm/fluxbox/fluxbox.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -114,37 +114,34 @@
 	with_ttf="--disable-freetype2"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# --disable-nls: does not build (error related to fluxbox.cat)
-	patch -p1 < ../patch-clang.patch
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-nls \
-		$with_ewmh \
-		$with_fribidi \
-		$with_imlib2 \
-		$with_regex \
-		$with_remember \
-		$with_slit \
-		$with_systray \
-		$with_toolbar \
-		$with_ttf
-	make
-	make install DESTDIR=$DESTDIR
+# --disable-nls: does not build (error related to fluxbox.cat)
+patch -p1 < ../patch-clang.patch
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-nls \
+	$with_ewmh \
+	$with_fribidi \
+	$with_imlib2 \
+	$with_regex \
+	$with_remember \
+	$with_slit \
+	$with_systray \
+	$with_toolbar \
+	$with_ttf
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/wm/sway/sway.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/wm/sway/sway.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -64,24 +64,21 @@
 	with_x="-D xwayland=disabled"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	meson . build \
-		--prefix / \
-		--buildtype release \
-		$with_gdk_pixbuf \
-		$with_tray \
-		$with_x
-	ninja -C build
-	DESTDIR=$DESTDIR ninja -C build install
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+meson . build \
+	--prefix / \
+	--buildtype release \
+	$with_gdk_pixbuf \
+	$with_tray \
+	$with_x
+ninja -C build
+DESTDIR=$DESTDIR ninja -C build install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/www/midori/midori.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/www/midori/midori.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,24 +34,21 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}

-build()
-{
-	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvf $PKGNAME-v$PKGVERSION.tar.gz
-	cd $PKGNAME-v$PKGVERSION
+rm -rf $PKGNAME-v$PKGVERSION
+tar xvf $PKGNAME-v$PKGVERSION.tar.gz
+cd $PKGNAME-v$PKGVERSION

-	mkdir build && cd build
-	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib
-	make
-	make install DESTDIR=$DESTDIR
-	cd ..
+mkdir build && cd build
+cmake .. \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCMAKE_INSTALL_LIBDIR=/lib
+make
+make install DESTDIR=$DESTDIR
+cd ..

-	cd ..
-	rm -rf $PKGNAME-v$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-v$PKGVERSION
--- a/www/vimb/vimb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/www/vimb/vimb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,22 +28,19 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar -xvf $PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar -xvf $PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	patch -p0 < ../patch-make.patch
-	make \
-		CC="$CC" \
-		DESTDIR="$DESTDIR" \
-		EXTRA_CFLAGS="$CFLAGS" \
-		EXTRA_LDFLAGS="$LDFLAGS" \
-		PREFIX= \
-		V=1 \
-		all install
+patch -p0 < ../patch-make.patch
+make \
+	CC="$CC" \
+	DESTDIR="$DESTDIR" \
+	EXTRA_CFLAGS="$CFLAGS" \
+	EXTRA_LDFLAGS="$LDFLAGS" \
+	PREFIX= \
+	V=1 \
+	all install

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/www/webkitgtk/webkitgtk.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/www/webkitgtk/webkitgtk.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -154,45 +154,42 @@
 	with_x="-DENABLE_X11_TARGET=Off"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.xz
+cd $PKGNAME-$PKGVERSION

-	# -DENABLE_PLUGIN_PROCESS_GTK2=Off: in Vanilla Gtk 2 is deprecated.
-	patch -p0 < ../patch-clang.patch
-	patch -p1 < ../patch-musl.patch
-	patch -p1 < ../patch-isystem.patch
-	mkdir build && cd build
-	cmake .. \
-		-GNinja \
-		-DBUILD_SHARED_LIBS=On \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_COMPILER="$CXX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_COMPILER="$CC" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		-DLIB_INSTALL_DIR=/lib \
-		-DPORT=GTK \
-		-DENABLE_PLUGIN_PROCESS_GTK2=Off \
-		$with_geolocation \
-		$with_gstreamer \
-		$with_hyphen \
-		$with_introspection \
-		$with_jpeg \
-		$with_notifications \
-		$with_libsecret \
-		$with_opengl \
-		$with_spell \
-		$with_wayland \
-		$with_woff2 \
-		$with_x
-	CC="$CC" CXX="$CXX" ninja
-	DESTDIR=$DESTDIR ninja install
-	cd ..
+# -DENABLE_PLUGIN_PROCESS_GTK2=Off: in Vanilla Gtk 2 is deprecated.
+patch -p0 < ../patch-clang.patch
+patch -p1 < ../patch-musl.patch
+patch -p1 < ../patch-isystem.patch
+mkdir build && cd build
+cmake .. \
+	-GNinja \
+	-DBUILD_SHARED_LIBS=On \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_CXX_COMPILER="$CXX" \
+	-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+	-DCMAKE_C_COMPILER="$CC" \
+	-DCMAKE_C_FLAGS="$CFLAGS" \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DLIB_INSTALL_DIR=/lib \
+	-DPORT=GTK \
+	-DENABLE_PLUGIN_PROCESS_GTK2=Off \
+	$with_geolocation \
+	$with_gstreamer \
+	$with_hyphen \
+	$with_introspection \
+	$with_jpeg \
+	$with_notifications \
+	$with_libsecret \
+	$with_opengl \
+	$with_spell \
+	$with_wayland \
+	$with_woff2 \
+	$with_x
+CC="$CC" CXX="$CXX" ninja
+DESTDIR=$DESTDIR ninja install
+cd ..

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/appres/appres.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/appres/appres.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/bdftopcf/bdftopcf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/bdftopcf/bdftopcf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/bitmap/bitmap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/bitmap/bitmap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/font-util/font-util.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/font-util/font-util.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/iceauth/iceauth.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/iceauth/iceauth.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/imake/imake.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/imake/imake.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libdmx/libdmx.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libdmx/libdmx.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libfontenc/libfontenc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libfontenc/libfontenc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libfs/libfs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libfs/libfs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -28,21 +28,18 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libFS-$PKGVERSION
-	tar xvf libFS-$PKGVERSION.tar.gz
-	cd libFS-$PKGVERSION
+rm -rf libFS-$PKGVERSION
+tar xvf libFS-$PKGVERSION.tar.gz
+cd libFS-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix= --enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix= --enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libFS-$PKGVERSION
-}
+cd ..
+rm -rf libFS-$PKGVERSION
--- a/x11/libice/libice.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libice/libice.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libICE-$PKGVERSION
-	tar xvf libICE-$PKGVERSION.tar.gz
-	cd libICE-$PKGVERSION
+rm -rf libICE-$PKGVERSION
+tar xvf libICE-$PKGVERSION.tar.gz
+cd libICE-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libICE-$PKGVERSION
-}
+cd ..
+rm -rf libICE-$PKGVERSION
--- a/x11/libpciaccess/libpciaccess.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libpciaccess/libpciaccess.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libpthread-stubs/libpthread-stubs.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libpthread-stubs/libpthread-stubs.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libsm/libsm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libsm/libsm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,26 +39,23 @@
 	with_uuid="--without-libuuid"
 fi

-build()
-{
-	rm -rf libSM-$PKGVERSION
-	tar xvf libSM-$PKGVERSION.tar.gz
-	cd libSM-$PKGVERSION
+rm -rf libSM-$PKGVERSION
+tar xvf libSM-$PKGVERSION.tar.gz
+cd libSM-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_uuid
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_uuid
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libSM-$PKGVERSION
-}
+cd ..
+rm -rf libSM-$PKGVERSION
--- a/x11/libx11/libx11.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libx11/libx11.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,25 +33,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libX11-$PKGVERSION
-	tar xvf libX11-$PKGVERSION.tar.gz
-	cd libX11-$PKGVERSION
+rm -rf libX11-$PKGVERSION
+tar xvf libX11-$PKGVERSION.tar.gz
+cd libX11-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libX11-$PKGVERSION
-}
+cd ..
+rm -rf libX11-$PKGVERSION
--- a/x11/libxau/libxau.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxau/libxau.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXau-$PKGVERSION
-	tar xvf libXau-$PKGVERSION.tar.gz
-	cd libXau-$PKGVERSION
+rm -rf libXau-$PKGVERSION
+tar xvf libXau-$PKGVERSION.tar.gz
+cd libXau-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXau-$PKGVERSION
-}
+cd ..
+rm -rf libXau-$PKGVERSION
--- a/x11/libxaw/libxaw.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxaw/libxaw.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,25 +36,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXaw-$PKGVERSION
-	tar xvf libXaw-$PKGVERSION.tar.gz
-	cd libXaw-$PKGVERSION
+rm -rf libXaw-$PKGVERSION
+tar xvf libXaw-$PKGVERSION.tar.gz
+cd libXaw-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXaw-$PKGVERSION
-}
+cd ..
+rm -rf libXaw-$PKGVERSION
--- a/x11/libxcb/libxcb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxcb/libxcb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxcomposite/libxcomposite.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxcomposite/libxcomposite.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXcomposite-$PKGVERSION
-	tar xvf libXcomposite-$PKGVERSION.tar.gz
-	cd libXcomposite-$PKGVERSION
+rm -rf libXcomposite-$PKGVERSION
+tar xvf libXcomposite-$PKGVERSION.tar.gz
+cd libXcomposite-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXcomposite-$PKGVERSION
-}
+cd ..
+rm -rf libXcomposite-$PKGVERSION
--- a/x11/libxcursor/libxcursor.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxcursor/libxcursor.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,24 +34,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXcursor-$PKGVERSION
-	tar xvf libXcursor-$PKGVERSION.tar.gz
-	cd libXcursor-$PKGVERSION
+rm -rf libXcursor-$PKGVERSION
+tar xvf libXcursor-$PKGVERSION.tar.gz
+cd libXcursor-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXcursor-$PKGVERSION
-}
+cd ..
+rm -rf libXcursor-$PKGVERSION
--- a/x11/libxdamage/libxdamage.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxdamage/libxdamage.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXdamage-$PKGVERSION
-	tar xvf libXdamage-$PKGVERSION.tar.gz
-	cd libXdamage-$PKGVERSION
+rm -rf libXdamage-$PKGVERSION
+tar xvf libXdamage-$PKGVERSION.tar.gz
+cd libXdamage-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXdamage-$PKGVERSION
-}
+cd ..
+rm -rf libXdamage-$PKGVERSION
--- a/x11/libxdmcp/libxdmcp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxdmcp/libxdmcp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXdmcp-$PKGVERSION
-	tar xvf libXdmcp-$PKGVERSION.tar.gz
-	cd libXdmcp-$PKGVERSION
+rm -rf libXdmcp-$PKGVERSION
+tar xvf libXdmcp-$PKGVERSION.tar.gz
+cd libXdmcp-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXdmcp-$PKGVERSION
-}
+cd ..
+rm -rf libXdmcp-$PKGVERSION
--- a/x11/libxext/libxext.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxext/libxext.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXext-$PKGVERSION
-	tar xvf libXext-$PKGVERSION.tar.gz
-	cd libXext-$PKGVERSION
+rm -rf libXext-$PKGVERSION
+tar xvf libXext-$PKGVERSION.tar.gz
+cd libXext-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXext-$PKGVERSION
-}
+cd ..
+rm -rf libXext-$PKGVERSION
--- a/x11/libxfixes/libxfixes.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxfixes/libxfixes.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXfixes-$PKGVERSION
-	tar xvf libXfixes-$PKGVERSION.tar.gz
-	cd libXfixes-$PKGVERSION
+rm -rf libXfixes-$PKGVERSION
+tar xvf libXfixes-$PKGVERSION.tar.gz
+cd libXfixes-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXfixes-$PKGVERSION
-}
+cd ..
+rm -rf libXfixes-$PKGVERSION
--- a/x11/libxfont2/libxfont2.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxfont2/libxfont2.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,27 +47,24 @@
 	with_freetype="--disable-freetype"
 fi

-build()
-{
-	rm -rf libXfont2-$PKGVERSION
-	tar xvf libXfont2-$PKGVERSION.tar.gz
-	cd libXfont2-$PKGVERSION
+rm -rf libXfont2-$PKGVERSION
+tar xvf libXfont2-$PKGVERSION.tar.gz
+cd libXfont2-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		$with_bzip2 \
-		$with_freetype
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	$with_bzip2 \
+	$with_freetype
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXfont2-$PKGVERSION
-}
+cd ..
+rm -rf libXfont2-$PKGVERSION
--- a/x11/libxft/libxft.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxft/libxft.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,25 +33,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXft-$PKGVERSION
-	tar xvf libXft-$PKGVERSION.tar.gz
-	cd libXft-$PKGVERSION
+rm -rf libXft-$PKGVERSION
+tar xvf libXft-$PKGVERSION.tar.gz
+cd libXft-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXft-$PKGVERSION
-}
+cd ..
+rm -rf libXft-$PKGVERSION
--- a/x11/libxi/libxi.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxi/libxi.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXi-$PKGVERSION
-	tar xvf libXi-$PKGVERSION.tar.gz
-	cd libXi-$PKGVERSION
+rm -rf libXi-$PKGVERSION
+tar xvf libXi-$PKGVERSION.tar.gz
+cd libXi-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXi-$PKGVERSION
-}
+cd ..
+rm -rf libXi-$PKGVERSION
--- a/x11/libxinerama/libxinerama.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxinerama/libxinerama.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXinerama-$PKGVERSION
-	tar xvf libXinerama-$PKGVERSION.tar.gz
-	cd libXinerama-$PKGVERSION
+rm -rf libXinerama-$PKGVERSION
+tar xvf libXinerama-$PKGVERSION.tar.gz
+cd libXinerama-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXinerama-$PKGVERSION
-}
+cd ..
+rm -rf libXinerama-$PKGVERSION
--- a/x11/libxkbfile/libxkbfile.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxkbfile/libxkbfile.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxmu/libxmu.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxmu/libxmu.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXmu-$PKGVERSION
-	tar xvf libXmu-$PKGVERSION.tar.gz
-	cd libXmu-$PKGVERSION
+rm -rf libXmu-$PKGVERSION
+tar xvf libXmu-$PKGVERSION.tar.gz
+cd libXmu-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXmu-$PKGVERSION
-}
+cd ..
+rm -rf libXmu-$PKGVERSION
--- a/x11/libxpm/libxpm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxpm/libxpm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,26 +34,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXpm-$PKGVERSION
-	tar xvf libXpm-$PKGVERSION.tar.gz
-	cd libXpm-$PKGVERSION
+rm -rf libXpm-$PKGVERSION
+tar xvf libXpm-$PKGVERSION.tar.gz
+cd libXpm-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--target=$CTARGET \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXpm-$PKGVERSION
-}
+cd ..
+rm -rf libXpm-$PKGVERSION
--- a/x11/libxpresent/libxpresent.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxpresent/libxpresent.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXpresent-$PKGVERSION
-	tar xvf libXpresent-$PKGVERSION.tar.gz
-	cd libXpresent-$PKGVERSION
+rm -rf libXpresent-$PKGVERSION
+tar xvf libXpresent-$PKGVERSION.tar.gz
+cd libXpresent-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXpresent-$PKGVERSION
-}
+cd ..
+rm -rf libXpresent-$PKGVERSION
--- a/x11/libxrandr/libxrandr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxrandr/libxrandr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXrandr-$PKGVERSION
-	tar xvf libXrandr-$PKGVERSION.tar.gz
-	cd libXrandr-$PKGVERSION
+rm -rf libXrandr-$PKGVERSION
+tar xvf libXrandr-$PKGVERSION.tar.gz
+cd libXrandr-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXrandr-$PKGVERSION
-}
+cd ..
+rm -rf libXrandr-$PKGVERSION
--- a/x11/libxrender/libxrender.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxrender/libxrender.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXrender-$PKGVERSION
-	tar xvf libXrender-$PKGVERSION.tar.gz
-	cd libXrender-$PKGVERSION
+rm -rf libXrender-$PKGVERSION
+tar xvf libXrender-$PKGVERSION.tar.gz
+cd libXrender-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXrender-$PKGVERSION
-}
+cd ..
+rm -rf libXrender-$PKGVERSION
--- a/x11/libxres/libxres.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxres/libxres.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXres-$PKGVERSION
-	tar xvf libXres-$PKGVERSION.tar.gz
-	cd libXres-$PKGVERSION
+rm -rf libXres-$PKGVERSION
+tar xvf libXres-$PKGVERSION.tar.gz
+cd libXres-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXres-$PKGVERSION
-}
+cd ..
+rm -rf libXres-$PKGVERSION
--- a/x11/libxscrnsaver/libxscrnsaver.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxscrnsaver/libxscrnsaver.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,25 +33,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXScrnSaver-$PKGVERSION
-	tar xvf libXScrnSaver-$PKGVERSION.tar.gz
-	cd libXScrnSaver-$PKGVERSION
+rm -rf libXScrnSaver-$PKGVERSION
+tar xvf libXScrnSaver-$PKGVERSION.tar.gz
+cd libXScrnSaver-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXScrnSaver-$PKGVERSION
-}
+cd ..
+rm -rf libXScrnSaver-$PKGVERSION
--- a/x11/libxshmfence/libxshmfence.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxshmfence/libxshmfence.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared \
-		--enable-futex
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared \
+	--enable-futex
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxt/libxt.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxt/libxt.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXt-$PKGVERSION
-	tar xvf libXt-$PKGVERSION.tar.gz
-	cd libXt-$PKGVERSION
+rm -rf libXt-$PKGVERSION
+tar xvf libXt-$PKGVERSION.tar.gz
+cd libXt-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXt-$PKGVERSION
-}
+cd ..
+rm -rf libXt-$PKGVERSION
--- a/x11/libxtrap/libxtrap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxtrap/libxtrap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXTrap-$PKGVERSION
-	tar xvf libXTrap-$PKGVERSION.tar.gz
-	cd libXTrap-$PKGVERSION
+rm -rf libXTrap-$PKGVERSION
+tar xvf libXTrap-$PKGVERSION.tar.gz
+cd libXTrap-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXTrap-$PKGVERSION
-}
+cd ..
+rm -rf libXTrap-$PKGVERSION
--- a/x11/libxtst/libxtst.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxtst/libxtst.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXtst-$PKGVERSION
-	tar xvf libXtst-$PKGVERSION.tar.gz
-	cd libXtst-$PKGVERSION
+rm -rf libXtst-$PKGVERSION
+tar xvf libXtst-$PKGVERSION.tar.gz
+cd libXtst-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXtst-$PKGVERSION
-}
+cd ..
+rm -rf libXtst-$PKGVERSION
--- a/x11/libxv/libxv.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxv/libxv.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXv-$PKGVERSION
-	tar xvf libXv-$PKGVERSION.tar.gz
-	cd libXv-$PKGVERSION
+rm -rf libXv-$PKGVERSION
+tar xvf libXv-$PKGVERSION.tar.gz
+cd libXv-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXv-$PKGVERSION
-}
+cd ..
+rm -rf libXv-$PKGVERSION
--- a/x11/libxvmc/libxvmc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxvmc/libxvmc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXvMC-$PKGVERSION
-	tar xvf libXvMC-$PKGVERSION.tar.gz
-	cd libXvMC-$PKGVERSION
+rm -rf libXvMC-$PKGVERSION
+tar xvf libXvMC-$PKGVERSION.tar.gz
+cd libXvMC-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXvMC-$PKGVERSION
-}
+cd ..
+rm -rf libXvMC-$PKGVERSION
--- a/x11/libxxf86dga/libxxf86dga.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxxf86dga/libxxf86dga.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXxf86dga-$PKGVERSION
-	tar xvf libXxf86dga-$PKGVERSION.tar.gz
-	cd libXxf86dga-$PKGVERSION
+rm -rf libXxf86dga-$PKGVERSION
+tar xvf libXxf86dga-$PKGVERSION.tar.gz
+cd libXxf86dga-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXxf86dga-$PKGVERSION
-}
+cd ..
+rm -rf libXxf86dga-$PKGVERSION
--- a/x11/libxxf86misc/libxxf86misc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxxf86misc/libxxf86misc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXxf86misc-$PKGVERSION
-	tar xvf libXxf86misc-$PKGVERSION.tar.gz
-	cd libXxf86misc-$PKGVERSION
+rm -rf libXxf86misc-$PKGVERSION
+tar xvf libXxf86misc-$PKGVERSION.tar.gz
+cd libXxf86misc-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXxf86misc-$PKGVERSION
-}
+cd ..
+rm -rf libXxf86misc-$PKGVERSION
--- a/x11/libxxf86vm/libxxf86vm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/libxxf86vm/libxxf86vm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf libXxf86vm-$PKGVERSION
-	tar xvf libXxf86vm-$PKGVERSION.tar.gz
-	cd libXxf86vm-$PKGVERSION
+rm -rf libXxf86vm-$PKGVERSION
+tar xvf libXxf86vm-$PKGVERSION.tar.gz
+cd libXxf86vm-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf libXxf86vm-$PKGVERSION
-}
+cd ..
+rm -rf libXxf86vm-$PKGVERSION
--- a/x11/luit/luit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/luit/luit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -31,20 +31,17 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/makedepend/makedepend.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/makedepend/makedepend.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/mkfontscale/mkfontscale.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/mkfontscale/mkfontscale.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,24 +43,21 @@
 	with_bzip2="--without-bzip2"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_bzip2
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_bzip2
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/rendercheck/rendercheck.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/rendercheck/rendercheck.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,23 +33,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/rgb/rgb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/rgb/rgb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/sessreg/sessreg.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/sessreg/sessreg.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,26 +30,23 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# https://git.alpinelinux.org/aports/plain/main/sessreg/missing_path_wtmpx.patch
-	patch -p1 < ../wtmpx.patch
+# https://git.alpinelinux.org/aports/plain/main/sessreg/missing_path_wtmpx.patch
+patch -p1 < ../wtmpx.patch

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/setxkbmap/setxkbmap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/setxkbmap/setxkbmap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/twm/twm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/twm/twm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -37,23 +37,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/util-macros/util-macros.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/util-macros/util-macros.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,23 +29,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/x11perf/x11perf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/x11perf/x11perf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,23 +36,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xauth/xauth.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xauth/xauth.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xbacklight/xbacklight.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xbacklight/xbacklight.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xbitmaps/xbitmaps.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xbitmaps/xbitmaps.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcalc/xcalc.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcalc/xcalc.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,23 +34,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-proto/xcb-proto.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-proto/xcb-proto.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -23,16 +23,13 @@
 PKGDOWNLOAD="https://xcb.freedesktop.org/dist/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="python"

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	./configure --prefix=
-	make
-	make install DESTDIR=$DESTDIR
+./configure --prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-image/xcb-util-image.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util-image/xcb-util-image.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-wm/xcb-util-wm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util-wm/xcb-util-wm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util/xcb-util.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcb-util/xcb-util.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -29,25 +29,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-shared
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-shared
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xclock/xclock.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xclock/xclock.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -43,24 +43,21 @@
 	with_ttf="--without-xft"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_ttf
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_ttf
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcompmgr/xcompmgr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcompmgr/xcompmgr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,23 +36,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcursorgen/xcursorgen.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xcursorgen/xcursorgen.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,23 +34,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xdm/xdm.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xdm/xdm.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,27 +54,24 @@
 	with_selinux="--without-selinux"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-systemd-daemon \
-		$with_pam \
-		$with_selinux
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-systemd-daemon \
+	$with_pam \
+	$with_selinux
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xdpyinfo/xdpyinfo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xdpyinfo/xdpyinfo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -42,23 +42,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xdriinfo/xdriinfo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xdriinfo/xdriinfo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xev/xev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xev/xev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,23 +33,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-evdev/xf86-input-evdev.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xf86-input-evdev/xf86-input-evdev.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,24 +35,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-libinput/xf86-input-libinput.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xf86-input-libinput/xf86-input-libinput.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,24 +33,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-mouse/xf86-input-mouse.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xf86-input-mouse/xf86-input-mouse.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-video-vesa/xf86-video-vesa.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xf86-video-vesa/xf86-video-vesa.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xfontsel/xfontsel.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xfontsel/xfontsel.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xgamma/xgamma.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xgamma/xgamma.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -33,23 +33,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xhost/xhost.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xhost/xhost.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xinit/xinit.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xinit/xinit.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xinput/xinput.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xinput/xinput.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -36,23 +36,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xkbcomp/xkbcomp.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xkbcomp/xkbcomp.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,23 +34,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xkeyboard-config/xkeyboard-config.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xkeyboard-config/xkeyboard-config.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,24 +39,21 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	$with_nls
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xkill/xkill.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xkill/xkill.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xlsfonts/xlsfonts.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xlsfonts/xlsfonts.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xmag/xmag.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xmag/xmag.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xmodmap/xmodmap.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xmodmap/xmodmap.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xorg-server/xorg-server.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xorg-server/xorg-server.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -55,31 +55,28 @@
 	with_wayland="--disable-xwayland"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-pciaccess \
-		--enable-libdrm \
-		--disable-systemd-logind \
-		--disable-unit-tests \
-		$with_glamor \
-		$with_udev \
-		$with_wayland
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-pciaccess \
+	--enable-libdrm \
+	--disable-systemd-logind \
+	--disable-unit-tests \
+	$with_glamor \
+	$with_udev \
+	$with_wayland
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xorgproto/xorgproto.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xorgproto/xorgproto.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,24 +30,21 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--datadir=/lib \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--datadir=/lib \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xprop/xprop.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xprop/xprop.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xrandr/xrandr.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xrandr/xrandr.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,23 +34,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xrdb/xrdb.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xrdb/xrdb.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xset/xset.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xset/xset.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -34,25 +34,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	# --without-fontcache => libXfontcache is outdated.
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--without-fontcache
-	make
-	make install DESTDIR=$DESTDIR
+# --without-fontcache => libXfontcache is outdated.
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--without-fontcache
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xsetroot/xsetroot.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xsetroot/xsetroot.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -35,23 +35,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xtrans/xtrans.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xtrans/xtrans.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xvinfo/xvinfo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xvinfo/xvinfo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xwininfo/xwininfo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/x11/xwininfo/xwininfo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,23 +30,20 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix=
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/exo/exo.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/exo/exo.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -39,28 +39,25 @@
 : ${NLS:=yes}
 : ${VALA:=yes}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--sysconfdir=/etc \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--sysconfdir=/etc \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/garcon/garcon.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/garcon/garcon.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -46,28 +46,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		--disable-gtk2 \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	--disable-gtk2 \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/libxfce4ui/libxfce4ui.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/libxfce4ui/libxfce4ui.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -68,30 +68,27 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-gtk2 \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-gtk2 \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/libxfce4util/libxfce4util.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/libxfce4util/libxfce4util.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -55,30 +55,27 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/mousepad/mousepad.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/mousepad/mousepad.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,27 +47,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--enable-gtk3 \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_dbus
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--enable-gtk3 \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_dbus
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/parole/parole.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/parole/parole.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -81,36 +81,33 @@
 	with_tray="--disable-tray-plugin"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	# No tunable for pixmapsdir, quick patch.
-	sed -i -e '/pixmapsdir/ s/${DATADIRNAME}/share/' configure
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-debug \
-		--datadir=/share \
-		--localedir=/share/local \
-		$with_mpris \
-		$with_nls \
-		$with_notifications \
-		$with_taglib \
-		$with_tray
-	make
-	make install localedir=/share/locale DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+# No tunable for pixmapsdir, quick patch.
+sed -i -e '/pixmapsdir/ s/${DATADIRNAME}/share/' configure
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+CXX="$CXX" \
+CXXFLAGS="$CXXFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-debug \
+	--datadir=/share \
+	--localedir=/share/local \
+	$with_mpris \
+	$with_nls \
+	$with_notifications \
+	$with_taglib \
+	$with_tray
+make
+make install localedir=/share/locale DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/ristretto/ristretto.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/ristretto/ristretto.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -47,27 +47,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-debug \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-debug \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/thunar-volman/thunar-volman.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/thunar-volman/thunar-volman.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -53,27 +53,24 @@
 	with_notifications="--disable-notifications"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls \
-		$with_notifications
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls \
+	$with_notifications
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/thunar/thunar.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/thunar/thunar.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -103,34 +103,31 @@
 	with_udev="--disable-gudev"
 fi

-build()
-{
-	rm -rf Thunar-$PKGVERSION
-	tar xvf Thunar-$PKGVERSION.tar.bz2
-	cd Thunar-$PKGVERSION
+rm -rf Thunar-$PKGVERSION
+tar xvf Thunar-$PKGVERSION.tar.bz2
+cd Thunar-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_dbus \
-		$with_exif \
-		$with_introspection \
-		$with_nls \
-		$with_notifications \
-		$with_pcre \
-		$with_startup \
-		$with_udev
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_dbus \
+	$with_exif \
+	$with_introspection \
+	$with_nls \
+	$with_notifications \
+	$with_pcre \
+	$with_startup \
+	$with_udev
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf Thunar-$PKGVERSION
-}
+cd ..
+rm -rf Thunar-$PKGVERSION
--- a/xfce/xfce4-appfinder/xfce4-appfinder.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-appfinder/xfce4-appfinder.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,26 +44,23 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-dev-tools/xfce4-dev-tools.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-dev-tools/xfce4-dev-tools.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -30,25 +30,22 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-notifyd/xfce4-notifyd.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-notifyd/xfce4-notifyd.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,28 +44,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
-	rm -rf $DESTDIR/lib/systemd
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete
+rm -rf $DESTDIR/lib/systemd

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-panel/xfce4-panel.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-panel/xfce4-panel.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -65,30 +65,27 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-gtk2 \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-gtk2 \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-power-manager/xfce4-power-manager.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-power-manager/xfce4-power-manager.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -66,30 +66,27 @@
 	with_xfce="--disable-xfce4panel --disable-panel-plugins"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--sbindir=/bin \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls \
-		$with_polkit \
-		$with_xfce
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--sbindir=/bin \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls \
+	$with_polkit \
+	$with_xfce
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-screensaver/xfce4-screensaver.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-screensaver/xfce4-screensaver.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -73,30 +73,27 @@
 	with_shadow="--disable-shadow"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		--without-systemd \
-		$with_consolekit \
-		$with_nls \
-		$with_pam \
-		$with_shadow
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	--without-systemd \
+	$with_consolekit \
+	$with_nls \
+	$with_pam \
+	$with_shadow
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-screenshooter/xfce4-screenshooter.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-screenshooter/xfce4-screenshooter.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -49,28 +49,25 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-debug \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-debug \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-session/xfce4-session.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-session/xfce4-session.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,27 +54,24 @@
 	with_polkit="--disable-polkit"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		--with-xsession-prefix= \
-		$with_nls \
-		$with_polkit \
-		$with_upower
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	--with-xsession-prefix= \
+	$with_nls \
+	$with_polkit \
+	$with_upower
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-settings/xfce4-settings.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-settings/xfce4-settings.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,27 +62,24 @@
 	with_notifications="--disable-libnotify"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls \
-		$with_notifications
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls \
+	$with_notifications
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-terminal/xfce4-terminal.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfce4-terminal/xfce4-terminal.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -44,27 +44,24 @@
 	with_nls="--disable-nls"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-debug \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--disable-debug \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfconf/xfconf.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfconf/xfconf.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -64,29 +64,26 @@
 	with_vala="--disable-vala"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_introspection \
-		$with_nls \
-		$with_vala
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_introspection \
+	$with_nls \
+	$with_vala
+make
+make install DESTDIR=$DESTDIR
+find $DESTDIR -type f -name "*.la" -delete

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfdesktop/xfdesktop.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfdesktop/xfdesktop.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -54,27 +54,24 @@
 	with_notifications="--disable-notifications"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls \
-		$with_notifications
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls \
+	$with_notifications
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfwm4/xfwm4.sh	Wed Jul 28 15:24:46 2021 +0200
+++ b/xfce/xfwm4/xfwm4.sh	Wed Sep 29 13:49:32 2021 +0200
@@ -62,27 +62,24 @@
 	with_startup="--disable-startup-notification"
 fi

-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
-	cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+cd $PKGNAME-$PKGVERSION

-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--localedir=/share/locale \
-		--with-locales-dir=/share/locale \
-		$with_nls \
-		$with_startup
-	make
-	make install DESTDIR=$DESTDIR
+CC="$CC" \
+CFLAGS="$CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+LIBS="$LIBS" \
+./configure \
+	--build=$CBUILD \
+	--host=$CHOST \
+	--prefix= \
+	--localedir=/share/locale \
+	--with-locales-dir=/share/locale \
+	$with_nls \
+	$with_startup
+make
+make install DESTDIR=$DESTDIR

-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
+cd ..
+rm -rf $PKGNAME-$PKGVERSION