main/*: remove unnecessary braces

AL32: unnecessary usage of braces

23 files changed, 70 insertions, 70 deletions

diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index b610612163e..9cb87295ca2 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 license="GPL-2.0-only"
 pkggroups="shadow"
 options="!fhs !check"
-depends="$pkgname-data=${pkgver}-r${pkgrel}"
+depends="$pkgname-data=$pkgver-r$pkgrel"
 subpackages="$pkgname-data"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
 	$pkgname.post-install"
diff --git a/main/apg/APKBUILD b/main/apg/APKBUILD
index e40ec8f69cd..34b521c53cd 100644
--- a/main/apg/APKBUILD
+++ b/main/apg/APKBUILD
@@ -9,7 +9,7 @@ license="BSD-3-Clause"
 # no check provided by upstream
 options="!check"
 subpackages="$pkgname-doc"
-source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${pkgver}.orig.tar.gz"
+source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_$pkgver.orig.tar.gz"
 
 build() {
 	sed -i 's:^#\(CS_LIBS = -lnsl\)$:\1:' Makefile
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 9a02fb4f4bb..7c26a5fae76 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -65,8 +65,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	local daemon; for daemon in dir sd fd; do
-		install -Dm755 "$srcdir"/$pkgname-${daemon}.initd \
-			"$pkgdir"/etc/init.d/$pkgname-${daemon}
+		install -Dm755 "$srcdir"/$pkgname-$daemon.initd \
+			"$pkgdir"/etc/init.d/$pkgname-$daemon
 	done
 
 	install -Dm644 examples/sample-query.sql \
@@ -100,14 +100,14 @@ _mv_backend() {
 	mkdir -p "$subpkgdir"/usr/lib
 	mkdir -p "$subpkgdir"/etc/$pkgname/scripts
 
-	mv "$pkgdir"/usr/lib/libbaccats-${1}-${pkgver}.so \
+	mv "$pkgdir"/usr/lib/libbaccats-$1-$pkgver.so \
 		"$subpkgdir"/usr/lib
 
-	ln -s libbaccats-${pkgver}.so "$subpkgdir"/usr/lib/libbaccats.so
-	ln -s libbaccats-${1}-${pkgver}.so \
-		"$subpkgdir"/usr/lib/libbaccats-${pkgver}.so
+	ln -s libbaccats-$pkgver.so "$subpkgdir"/usr/lib/libbaccats.so
+	ln -s libbaccats-$1-$pkgver.so \
+		"$subpkgdir"/usr/lib/libbaccats-$pkgver.so
 
-	mv "$pkgdir"/etc/$pkgname/scripts/*_${1}_* \
+	mv "$pkgdir"/etc/$pkgname/scripts/*_$1_* \
 		"$subpkgdir"/etc/$pkgname/scripts
 }
 
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index e68c8407e90..9772b61fa26 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -153,13 +153,13 @@ build() {
 
 	# build bbsuid
 	msg "Building bbsuid"
-	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} \
-		${LDFLAGS} "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid
+	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS \
+		$LDFLAGS "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid
 
 	msg "Building ssl_client"
 	# shellcheck disable=SC2046  # Allow wordsplitting for pkg-config
-	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libcrypto libssl) \
-		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libcrypto libssl)
+	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $(pkg-config --cflags libcrypto libssl) \
+		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client $LDFLAGS $(pkg-config --libs libcrypto libssl)
 
 	# build dynamic
 	cd "$_dyndir"
@@ -228,10 +228,10 @@ package() {
 	chmod 1777 "$pkgdir"/tmp
 	cd "$srcdir"
 	for file in *.confd ; do
-		install -D -m 0644 ${file} "$pkgdir"/etc/conf.d/${file%%\.confd}
+		install -D -m 0644 $file "$pkgdir"/etc/conf.d/${file%%\.confd}
 	done
 	for file in *.initd ; do
-		install -D -m 0755 ${file} "$pkgdir"/etc/init.d/${file%%\.initd}
+		install -D -m 0755 $file "$pkgdir"/etc/init.d/${file%%\.initd}
 	done
 
 	cd "$_dyndir"
@@ -332,9 +332,9 @@ binsh() {
 _helper_openrc() {
 	local file
 	for file ; do
-		if test ${file%%\.confd} != ${file} ; then
+		if test ${file%%\.confd} != $file ; then
 			amove "etc/conf.d/${file%%\.confd}"
-		elif test ${file%%\.initd} != ${file} ; then
+		elif test ${file%%\.initd} != $file ; then
 			amove "etc/init.d/${file%%\.initd}"
 		fi
 	done
diff --git a/main/dev86/APKBUILD b/main/dev86/APKBUILD
index f6aa8974568..05a521a753b 100644
--- a/main/dev86/APKBUILD
+++ b/main/dev86/APKBUILD
@@ -19,7 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lkundrak/dev86/archive/v$pkg
 prepare() {
 	default_prepare
 	# use our CFLAGS
-	sed -i -e "s/-O2 -g/${CFLAGS}/" \
+	sed -i -e "s/-O2 -g/$CFLAGS/" \
 		makefile.in
 #	if [ "$CARCH" = x86_64 ]; then
 		sed -i \
@@ -28,7 +28,7 @@ prepare() {
 			makefile.in
 #	fi
 	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
+		-e "s:-O2 -g:$CFLAGS:" \
 		-e '/INEXE=/s:-s::' \
 		makefile.in
 	# no stripping
diff --git a/main/dmraid/APKBUILD b/main/dmraid/APKBUILD
index 0ceb6014f3f..0d04290a48b 100644
--- a/main/dmraid/APKBUILD
+++ b/main/dmraid/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0-only LGPL-2.1-only"
 makedepends="lvm2-dev"
 options="!check" # No tests to run
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${pkgver/_/.}-${_distver}.tar.bz2
+source="https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${pkgver/_/.}-$_distver.tar.bz2
 	001-do_not_use_p_for_partition.patch
 	002-support_virtio_devices.patch
 	003-isw-probe-hpa.patch
@@ -19,7 +19,7 @@ source="https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${pkgver/_/.}-${_
 	005-fix_isw_sectors_calculation.patch
 	006-musl-libc.patch
 	007-fix-loff_t-musl.patch"
-builddir="$srcdir/dmraid/${pkgver/_/.}-${_distver}/dmraid"
+builddir="$srcdir/dmraid/${pkgver/_/.}-$_distver/dmraid"
 
 prepare() {
 	default_prepare
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index 9424c706925..2f267edc455 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="A program that emulates the detach feature of screen"
 url="https://dtach.sourceforge.net/"
 arch="all"
 license="GPL"
-source="https://downloads.sourceforge.net/project/dtach/dtach/${pkgver}/dtach-${pkgver}.tar.gz"
+source="https://downloads.sourceforge.net/project/dtach/dtach/$pkgver/dtach-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
 build() {
diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD
index 88ac914873a..4d1ec8b8aff 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -22,7 +22,7 @@ source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapsh
 
 prepare() {
 	default_prepare
-	sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign -O2/" Make.rules
+	sed -i "s/-O2/$CFLAGS -Wno-pointer-sign -O2/" Make.rules
 }
 
 build() {
diff --git a/main/ferm/APKBUILD b/main/ferm/APKBUILD
index 0041ef8f627..a971700b60b 100644
--- a/main/ferm/APKBUILD
+++ b/main/ferm/APKBUILD
@@ -15,7 +15,7 @@ license="GPL"
 depends="perl iptables"
 makedepends="perl-net-dns-resolver-mock"
 source="
-	http://ferm.foo-projects.org/download/${_pkgver}/ferm-$pkgver.tar.xz
+	http://ferm.foo-projects.org/download/$_pkgver/ferm-$pkgver.tar.xz
 	ferm.confd
 	ferm.initd
 	"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index c1b3e7a4d83..5aa01055517 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=gcc
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
@@ -191,7 +191,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-${_pkgbase%%.*}-${_pkgsnap}.tar.xz
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -241,7 +241,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -348,9 +348,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -420,7 +420,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD
index e9baa89b0de..f8b97e3b9d5 100644
--- a/main/groff/APKBUILD
+++ b/main/groff/APKBUILD
@@ -33,8 +33,8 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 	for f in man mdoc; do
-		cat ${srcdir}/site.tmac >> \
-			${pkgdir}/usr/share/groff/site-tmac/${f}.local
+		cat $srcdir/site.tmac >> \
+			$pkgdir/usr/share/groff/site-tmac/$f.local
 	done
 
 	# Prevent conflict with mandoc-doc
diff --git a/main/gvpe/APKBUILD b/main/gvpe/APKBUILD
index f159931d6df..7c53d7e908d 100644
--- a/main/gvpe/APKBUILD
+++ b/main/gvpe/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
 license="GPL-2.0"
 depends=""
 makedepends="openssl-dev>3 libev-dev zlib-dev gmp-dev linux-headers"
-source="https://ftp.gnu.org/gnu/gvpe/gvpe-${pkgver}.tar.gz
+source="https://ftp.gnu.org/gnu/gvpe/gvpe-$pkgver.tar.gz
 	compile-fix.patch
 	musl-getopt_long.patch
 	gvpe.conf.example
@@ -31,12 +31,12 @@ build() {
 }
 
 package() {
-	make DESTDIR="${pkgdir}" install
-	install -D -m0644 "${srcdir}"/gvpe.confd "${pkgdir}"/etc/conf.d/gvpe
-	install -D -m0644 "${srcdir}"/gvpe.conf.example \
-		"${pkgdir}"/etc/gvpe/gvpe.conf.example
-	install -D -m0755 "${srcdir}"/if-up "${pkgdir}"/etc/gvpe/if-up
-	install -D -m0755 "${srcdir}"/gvpe.initd "${pkgdir}"/etc/init.d/gvpe
+	make DESTDIR="$pkgdir" install
+	install -D -m0644 "$srcdir"/gvpe.confd "$pkgdir"/etc/conf.d/gvpe
+	install -D -m0644 "$srcdir"/gvpe.conf.example \
+		"$pkgdir"/etc/gvpe/gvpe.conf.example
+	install -D -m0755 "$srcdir"/if-up "$pkgdir"/etc/gvpe/if-up
+	install -D -m0755 "$srcdir"/gvpe.initd "$pkgdir"/etc/init.d/gvpe
 }
 
 sha512sums="4deeefb5b9773e3eb46f5fcbff1fe61e64824f7b29615b84b3415ff2a240071d5e19f00a6ecac5dd491a8dbf8c9636efc4a9cde943dbdba5ef4c6bc04597840a  gvpe-3.1.tar.gz
diff --git a/main/hunspell-pt-br/APKBUILD b/main/hunspell-pt-br/APKBUILD
index 4375dbce152..d442963b3d9 100644
--- a/main/hunspell-pt-br/APKBUILD
+++ b/main/hunspell-pt-br/APKBUILD
@@ -28,8 +28,8 @@ package() {
 	install -m644 pt_BR.dic pt_BR.aff $pkgdir/usr/share/hunspell
 
 	# docs
-	install -dm755 ${pkgdir}/usr/share/doc/$pkgname
-	install -m644 README_pt_BR.txt ${pkgdir}/usr/share/doc/$pkgname
+	install -dm755 $pkgdir/usr/share/doc/$pkgname
+	install -m644 README_pt_BR.txt $pkgdir/usr/share/doc/$pkgname
 }
 
 sha512sums="217d25ecc532c4b3386593cea4d430094ec4badb81e12648d3ca87a7f2e29243a94028a1287ff50db4532c6e1a33e52a0839fd0d45ae8c167bc89df940209b14  VeroptBRV320AOC.oxt"
diff --git a/main/isl24/APKBUILD b/main/isl24/APKBUILD
index 820181f19a1..e8e75cbcda5 100644
--- a/main/isl24/APKBUILD
+++ b/main/isl24/APKBUILD
@@ -28,7 +28,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-sysroot=${CBUILDROOT}
+		--with-sysroot=$CBUILDROOT
 	make
 }
 
diff --git a/main/isl25/APKBUILD b/main/isl25/APKBUILD
index 2804f6da8b2..4da37aff111 100644
--- a/main/isl25/APKBUILD
+++ b/main/isl25/APKBUILD
@@ -29,7 +29,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-sysroot=${CBUILDROOT}
+		--with-sysroot=$CBUILDROOT
 	make
 }
 
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 56aa4873a40..6e745d10855 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -12,7 +12,7 @@ makedepends="libpcap-dev autoconf automake"
 subpackages="$pkgname-doc $pkgname-openrc"
 # Original hasnt been maintained in a long time - use this fork instead - includes IPv6 support
 _fork="TDFKAOlli"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$_fork/knock/archive/${pkgver}.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/$_fork/knock/archive/$pkgver.tar.gz
 	knock.initd
 	knock.confd"
 options="!check"
diff --git a/main/ldapvi/APKBUILD b/main/ldapvi/APKBUILD
index 6d691391be8..5036547d9c0 100644
--- a/main/ldapvi/APKBUILD
+++ b/main/ldapvi/APKBUILD
@@ -10,7 +10,7 @@ license="GPL"
 depends=""
 makedepends="ncurses-dev openldap-dev popt-dev readline-dev glib-dev openssl-dev>3"
 subpackages="$pkgname-doc"
-source="http://www.lichteblau.com/download/ldapvi-${pkgver}.tar.gz
+source="http://www.lichteblau.com/download/ldapvi-$pkgver.tar.gz
 	GNUmakefile.in.diff
 	ldapvi_vim_modeline_fix.patch
 	ldapvi_getline.patch"
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 87099c69df9..c71a4fac404 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -4,7 +4,7 @@ pkgname=linux-rpi
 pkgver=5.15.83
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
-*.*)	_kernver=${pkgver};;
+*.*)	_kernver=$pkgver;;
 esac
 pkgrel=0
 pkgdesc="Linux kernel with Raspberry Pi patches"
@@ -38,9 +38,9 @@ for _i in $source; do
 	config-*.$CARCH)
 		_f=${_i%.$CARCH}
 		_f=${_f#config-changes-}
-		_flavors="$_flavors ${_f}"
-		[ "linux-$_f" != "$pkgname" ] && subpackages="$subpackages linux-${_f}::$CBUILD_ARCH"
-		subpackages="$subpackages linux-${_f}-dev:_dev:$CBUILD_ARCH"
+		_flavors="$_flavors $_f"
+		[ "linux-$_f" != "$pkgname" ] && subpackages="$subpackages linux-$_f::$CBUILD_ARCH"
+		subpackages="$subpackages linux-$_f-dev:_dev:$CBUILD_ARCH"
 		;;
 	esac
 done
@@ -130,8 +130,8 @@ _genconfig() {
 		msg "[$flavor] $cmd: $option $str"
 		"$srcdir"/linux-$_kernver/scripts/config \
 			--file "$builddir"/.config \
-			--${cmd} "$option" "${str//\"/}"
-	done < "$srcdir"/config-changes-$flavor.${CARCH}
+			--$cmd "$option" "${str//\"/}"
+	done < "$srcdir"/config-changes-$flavor.$CARCH
 }
 
 # verify if options are set to correct value
@@ -152,7 +152,7 @@ _verifyconfig() {
 		esac
 		grep -q $invert "^$str" "$builddir"/.config || \
 			die "Config: $option not properly set!"
-	done < "$srcdir"/config-changes-$flavor.${CARCH}
+	done < "$srcdir"/config-changes-$flavor.$CARCH
 }
 
 build() {
@@ -171,7 +171,7 @@ build() {
 
 _package() {
 	local _buildflavor="$1" _outdir="$2"
-	local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
+	local _abi_release=$pkgver-$pkgrel-$_buildflavor
 
 	cd "$srcdir"/build-$_buildflavor
 
@@ -203,8 +203,8 @@ _package() {
 		INSTALL_DTBS_PATH="$INSTALL_DTBS_PATH"
 	cp Module.symvers.backup Module.symvers
 
-	rm -f "$_outdir"/lib/modules/${_abi_release}/build \
-		"$_outdir"/lib/modules/${_abi_release}/source
+	rm -f "$_outdir"/lib/modules/$_abi_release/build \
+		"$_outdir"/lib/modules/$_abi_release/source
 	rm -rf "$_outdir"/lib/firmware
 
 	install -D -m644 include/config/kernel.release \
@@ -253,7 +253,7 @@ rpi4() {
 
 _dev() {
 	local _flavor=$(echo $subpkgname | sed -E 's/(^linux-|-dev$)//g')
-	local _abi_release=${pkgver}-${pkgrel}-$_flavor
+	local _abi_release=$pkgver-$pkgrel-$_flavor
 	# copy the only the parts that we really need for build 3rd party
 	# kernel modules and install those as /usr/src/linux-headers,
 	# simlar to what ubuntu does
@@ -263,7 +263,7 @@ _dev() {
 	#
 	pkgdesc="Headers and script for third party modules for $_flavor kernel"
 	depends="$_depends_dev"
-	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
+	local dir="$subpkgdir"/usr/src/linux-headers-$_abi_release
 
 	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
@@ -296,9 +296,9 @@ _dev() {
 	install -Dm644 "$srcdir"/build-$_flavor/Module.symvers \
 		"$dir"/Module.symvers
 
-	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
-	ln -sf /usr/src/linux-headers-${_abi_release} \
-		"$subpkgdir"/lib/modules/${_abi_release}/build
+	mkdir -p "$subpkgdir"/lib/modules/$_abi_release
+	ln -sf /usr/src/linux-headers-$_abi_release \
+		"$subpkgdir"/lib/modules/$_abi_release/build
 }
 
 sha512sums="
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index a86932f6007..aef18185de5 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -26,8 +26,8 @@ source="http://www.acme.com/software/mini_httpd/mini_httpd-$pkgver.tar.gz
 #     - CVE-2017-17663
 
 build() {
-	make CFLAGS="${CFLAGS} -DUSE_SSL" \
-		LDFLAGS="${LDFLAGS}" \
+	make CFLAGS="$CFLAGS -DUSE_SSL" \
+		LDFLAGS="$LDFLAGS" \
 		SSL_LIBS="-lssl -lcrypto"
 }
 
diff --git a/main/perl-dbd-mysql/APKBUILD b/main/perl-dbd-mysql/APKBUILD
index 9cd676dacb5..1a09e6c0be4 100644
--- a/main/perl-dbd-mysql/APKBUILD
+++ b/main/perl-dbd-mysql/APKBUILD
@@ -14,7 +14,7 @@ makedepends="perl-dev mariadb-connector-c-dev zlib-dev perl-devel-checklib"
 source="https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 options="!check" # requires a running dbms
-builddir="$srcdir"/${_pkgname}-$pkgver
+builddir="$srcdir"/$_pkgname-$pkgver
 
 prepare() {
 	default_prepare
diff --git a/main/pstree/APKBUILD b/main/pstree/APKBUILD
index 97558e02486..e0391633106 100644
--- a/main/pstree/APKBUILD
+++ b/main/pstree/APKBUILD
@@ -13,7 +13,7 @@ options="!check" # no test suite
 source="$pkgname-$pkgver.tar.gz::https://github.com/FredHucht/pstree/archive/refs/tags/v$pkgver.tar.gz"
 
 build() {
-	${CC:-gcc} ${CFLAGS} -o $pkgname $pkgname.c
+	${CC:-gcc} $CFLAGS -o $pkgname $pkgname.c
 }
 
 package() {
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index b1862310ef4..d9a40cecadc 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -12,7 +12,7 @@ license="GPL-2.0"
 depends=
 makedepends="openssl-dev>3 autoconf"
 options="!check"
-source="https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_${pkgver}.orig.tar.bz2
+source="https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_$pkgver.orig.tar.bz2
 	generate_config.patch
 	libcrypto-underlinking.patch
 	inet6-getaddrinfo.patch
diff --git a/main/zip/APKBUILD b/main/zip/APKBUILD
index ddcc9b2e22f..1b76f9d4008 100644
--- a/main/zip/APKBUILD
+++ b/main/zip/APKBUILD
@@ -11,20 +11,20 @@ license="Info-ZIP"
 depends="unzip" #unzip is needed for `zip -T`
 makedepends=""
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/infozip/zip${_pkgver}.tar.gz
+source="https://downloads.sourceforge.net/infozip/zip$_pkgver.tar.gz
 	10-zip-3.0-build.patch
 	20-zip-3.0-exec-stack.patch
 	30-zip-3.0-pic.patch
 	40-fix-zipnote.patch"
 
-builddir="$srcdir"/${pkgname}${_pkgver}
+builddir="$srcdir"/${pkgname}$_pkgver
 
 build() {
-	make -f unix/Makefile LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" prefix=/usr generic
+	make -f unix/Makefile LOCAL_ZIP="$CFLAGS $CPPFLAGS" prefix=/usr generic
 }
 
 package() {
-	make -f unix/Makefile prefix=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man/man1 install
+	make -f unix/Makefile prefix=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }