Re: [PR PATCH] [Updated] common/build-style/gnu-makefile.sh: define prefix, PREFIX for build

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages gnu-make-build-pfx
https://github.com/void-linux/void-packages/pull/38823

common/build-style/gnu-makefile.sh: define prefix, PREFIX for build
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Should fix some issues where PREFIX or prefix is used during build, like with netsurf (b7853685fb20db4c91bbc5a1cd7a9cfe6c15cbd1)

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/38823.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnu-make-build-pfx-38823.patch --]
[-- Type: text/x-diff, Size: 51718 bytes --]

From 158da935d94df1af3b8faf2987c8db8ef6d37f0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 00:40:54 -0400
Subject: [PATCH 01/55] common/build-style/gnu-makefile.sh: define prefix,
 PREFIX for build

this allows removing the definition from templates, and avoids issues
where the prefix is used during build.
---
 common/build-style/gnu-makefile.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index 04e407af255c..f81ef4e21db4 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -9,8 +9,10 @@ do_build() {
 			CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 			CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
 			CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+			PREFIX=/usr prefix=/usr \
 			${makejobs} ${make_build_args} ${make_build_target}
 	else
+		export PREFIX=/usr prefix=/usr
 		${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 	fi
 }
@@ -37,5 +39,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	${make_cmd} STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+	${make_cmd} STRIP=true PREFIX=/usr prefix=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }

From 1a00c995ee1d272f0a29eb91381f916a182f538c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:28:47 -0400
Subject: [PATCH 02/55] Manual.md: update description of make_install_args

make_install_args is not set to anything by default.
STRIP=true PREFIX=/usr prefix=/usr DESTDIR=${DESTDIR} is set outside of
make_install_args for gnu-makefile only.
---
 Manual.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Manual.md b/Manual.md
index f22e878277ab..c24be6e90a74 100644
--- a/Manual.md
+++ b/Manual.md
@@ -545,10 +545,8 @@ build methods. Unset by default.
 `${build_style}` is set to `configure`, `gnu-configure` or `gnu-makefile`
 build methods. Unset by default.
 
-- `make_install_args` The arguments to be passed in to `${make_cmd}` at the `install-destdir`
-phase if `${build_style}` is set to `configure`, `gnu-configure` or
-`gnu-makefile` build methods. By default set to
-`PREFIX=/usr DESTDIR=${DESTDIR}`.
+- `make_install_args` The arguments to be passed in to `${make_cmd}` at the `install`
+phase if `${build_style}` is set to `configure`, `gnu-configure` or `gnu-makefile` build methods.
 
 - `make_build_target` The build target. If `${build_style}` is set to `configure`, `gnu-configure`
 or `gnu-makefile`, this is the target passed to `${make_cmd}` in the build phase;

From 536e3add9e5c1075518e18820c880af12aa1401d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:47 -0400
Subject: [PATCH 03/55] Ice: remove unnecessary PREFIX=, clean up

---
 srcpkgs/Ice/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 90ede78d19ad..243869a33eb0 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,12 +1,12 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.7
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
-make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
- USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
-make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
+make_build_args="LANGUAGES=cpp OPTIMIZE=yes USR_DIR_INSTALL=yes CONFIGS=shared
+ CONFIGS+=cpp11-shared"
+make_install_args="LANGUAGES=cpp lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
  openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"

From 03069092a086118c776c7904cc05d13fffe72695 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:49 -0400
Subject: [PATCH 04/55] baresip: remove unnecessary PREFIX=, clean up

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..84e15e632d3b 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,9 +1,9 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
-make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
+make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
  LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
  USE_SNAPSHOT=$(vopt_if video yes) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes

From b527d9460d2d90c362fb9d7681b2d49b9fcf0ab1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:50 -0400
Subject: [PATCH 05/55] capstone: remove unnecessary PREFIX=, clean up

---
 srcpkgs/capstone/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index a1a88c198f18..99c20894520b 100644
--- a/srcpkgs/capstone/template
+++ b/srcpkgs/capstone/template
@@ -1,9 +1,9 @@
 # Template file for 'capstone'
 pkgname=capstone
 version=4.0.2
-revision=4
+revision=5
 build_style=gnu-makefile
-make_use_env=1
+make_use_env=yes
 hostmakedepends="python3-setuptools"
 short_desc="Lightweight multi-platform, multi-architecture disassembly framework"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,8 +12,7 @@ homepage="https://www.capstone-engine.org/"
 distfiles="https://github.com/aquynh/${pkgname}/archive/${version}.tar.gz"
 checksum=7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a
 
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
+post_install() {
 	make -C bindings/python PREFIX=/usr DESTDIR=${DESTDIR} install3
 	vlicense LICENSE.TXT LICENSE
 }

From 9de1812e32b0def74d79f895a9e97af648dc7f60 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:52 -0400
Subject: [PATCH 06/55] figlet: remove unnecessary PREFIX=, clean up

---
 srcpkgs/figlet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template
index 01e76d59ad29..96b6fe343f15 100644
--- a/srcpkgs/figlet/template
+++ b/srcpkgs/figlet/template
@@ -1,9 +1,9 @@
 # Template file for 'figlet'
 pkgname=figlet
 version=2.2.5
-revision=6
+revision=7
 build_style=gnu-makefile
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
+make_install_args="MANDIR=/usr/share/man"
 short_desc="Program for making large letters out of ordinary text"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 3d978580d964cb04759589b7dc62af1650681f88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:53 -0400
Subject: [PATCH 07/55] gkrellm: remove unnecessary PREFIX=, clean up

---
 srcpkgs/gkrellm/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index d981d2576274..db84c1aed744 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,17 +1,14 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=4
+revision=5
 build_style=gnu-makefile
+make_install_args="STRIP="
 hostmakedepends="pkg-config gettext which"
 makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0.or-later"
 homepage="http://gkrellm.srcbox.net"
-distfiles="${homepage}/releases/gkrellm-${version}.tar.bz2"
+distfiles="http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2"
 checksum=1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06
-
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} STRIP= install
-}

From 651a529dd1a013748a6093d21bd0a174011a37ad Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:54 -0400
Subject: [PATCH 08/55] hblock: remove unnecessary PREFIX=, clean up

---
 srcpkgs/hblock/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template
index c067f59f9aba..ff7ed3844fc1 100644
--- a/srcpkgs/hblock/template
+++ b/srcpkgs/hblock/template
@@ -1,7 +1,7 @@
 # Template file for 'hblock'
 pkgname=hblock
 version=3.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="curl"
 short_desc="Adblocker that creates a hosts file from multiple sources"
@@ -11,8 +11,6 @@ homepage="https://github.com/hectorm/hblock"
 distfiles="https://github.com/hectorm/${pkgname}/archive/v${version}.tar.gz"
 checksum=762dbe5f2a0ea84078b194190f4fb51b9fe3e6ef043c1899fdda6a083328225f
 
-do_install() {
-	make DESTDIR=$DESTDIR prefix=/usr install
-
+post_install() {
 	vlicense LICENSE.md
 }

From b8555e3874f953d6db956bbc8c7465d3aab32808 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:55 -0400
Subject: [PATCH 09/55] imapfilter: remove unnecessary PREFIX=, clean up

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 8f516f768c9b..db33ffd4091c 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,9 +1,9 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=6
+revision=7
 build_style=gnu-makefile
-make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
+make_build_args="LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
 makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"

From c0cafc3b7b07549f03c635126f1bb6bb87c9d2bd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:56 -0400
Subject: [PATCH 10/55] lm_sensors: remove unnecessary PREFIX=, clean up

---
 srcpkgs/lm_sensors/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lm_sensors/template b/srcpkgs/lm_sensors/template
index 10d2a8fd9617..12f8e1ebcffa 100644
--- a/srcpkgs/lm_sensors/template
+++ b/srcpkgs/lm_sensors/template
@@ -1,12 +1,11 @@
 # Template file for 'lm_sensors'
 pkgname=lm_sensors
 version=3.6.0
-revision=1
+revision=2
 wrksrc="${pkgname/_/-}-${version//./-}"
 build_style=gnu-makefile
 make_build_args="MACHINE=${XBPS_TARGET_MACHINE#-musl}"
-make_install_args="${make_build_args} PREFIX=/usr SBINDIR=/usr/bin
- MANDIR=/usr/share/man"
+make_install_args="${make_build_args} SBINDIR=/usr/bin MANDIR=/usr/share/man"
 hostmakedepends="flex perl which"
 depends="perl"
 short_desc="Utilities to read temperature/voltage/fan sensors"
@@ -18,7 +17,7 @@ checksum=0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197
 
 conf_files="/etc/sensors3.conf"
 
-pre_build() {
+post_patch() {
 	vsed -e 's,CC :=,CC ?=,' -i Makefile
 }
 

From f5cf5841c396aca8a27cd51ac5069ac5686cd431 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:56 -0400
Subject: [PATCH 11/55] mk-configure: remove unnecessary PREFIX=, clean up

---
 srcpkgs/mk-configure/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index b7c019b828d3..edb3db577e1a 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,12 +1,11 @@
 # Template file for 'mk-configure'
 pkgname=mk-configure
 version=0.37.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
 make_cmd=bmake
-make_build_args="PREFIX=/usr"
-make_install_args="${make_build_args} MANDIR=/usr/share/man"
+make_install_args="MANDIR=/usr/share/man"
 make_check_target="test"
 hostmakedepends="bmake bmkdep tar texinfo"
 depends="bmake bmkdep"

From f6451b833154e891902470afaaf60332777765f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:57 -0400
Subject: [PATCH 12/55] quickjs: remove unnecessary PREFIX=, clean up

---
 srcpkgs/quickjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 1bfbdb432420..6a8e56ec9618 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -1,11 +1,11 @@
 # Template file for 'quickjs'
 pkgname=quickjs
 version=2021.03.27
-revision=3
+revision=4
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
 make_use_env=true
-make_build_args="CONFIG_LTO= prefix=/usr"
+make_build_args="CONFIG_LTO="
 make_install_args="${make_build_args}"
 short_desc="Small and embeddable Javascript engine"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ab03a581eedb96afffcf69a887465993f111a5e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:34:58 -0400
Subject: [PATCH 13/55] spectrwm: remove unnecessary PREFIX=, clean up

---
 srcpkgs/spectrwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectrwm/template b/srcpkgs/spectrwm/template
index 0ac86b1149d6..49ab9c504cab 100644
--- a/srcpkgs/spectrwm/template
+++ b/srcpkgs/spectrwm/template
@@ -1,11 +1,11 @@
 # Template file for 'spectrwm'
 pkgname=spectrwm
 version=3.4.1
-revision=2
+revision=3
 _distname=SPECTRWM_${version//./_}
 wrksrc="spectrwm-${_distname}"
 build_style=gnu-makefile
-make_build_args='-C linux PREFIX=/usr'
+make_build_args='-C linux'
 make_install_args="$make_build_args"
 hostmakedepends="pkg-config"
 makedepends="libXcursor-devel libXft-devel libXrandr-devel libXt-devel

From 7bfefc2eab739a10caedc94e8396e74d7b061493 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:36:17 -0400
Subject: [PATCH 14/55] hashcat: remove unnecessary PREFIX=, clean up

---
 srcpkgs/hashcat/template | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index bebc7eb1bd31..eb50349f51ff 100644
--- a/srcpkgs/hashcat/template
+++ b/srcpkgs/hashcat/template
@@ -1,17 +1,11 @@
 # Template file for 'hashcat'
 pkgname=hashcat
 version=6.2.5
-revision=1
+revision=2
 build_style=gnu-makefile
-make_build_args="
- PREFIX=/usr
- ENABLE_UNRAR=$(vopt_if unrar 1 0)
- USE_SYSTEM_OPENCL=1
- USE_SYSTEM_XXHASH=1
- USE_SYSTEM_ZLIB=1
- DEPS_OPENCL_PATH=${XBPS_CROSS_BASE}/usr/include
- DEPS_XXHASH_PATH=${XBPS_CROSS_BASE}/usr/include
- DEPS_ZLIB_PATH=${XBPS_CROSS_BASE}/usr/include
+make_build_args="ENABLE_UNRAR=$(vopt_if unrar 1 0) USE_SYSTEM_OPENCL=1
+ USE_SYSTEM_XXHASH=1 USE_SYSTEM_ZLIB=1 DEPS_OPENCL_PATH=${XBPS_CROSS_BASE}/usr/include
+ DEPS_XXHASH_PATH=${XBPS_CROSS_BASE}/usr/include DEPS_ZLIB_PATH=${XBPS_CROSS_BASE}/usr/include
  SHARED_FOLDER=/usr/lib/hashcat"
 make_use_env=yes
 make_install_args="$make_build_args"
@@ -27,9 +21,7 @@ checksum=6f6899d7ad899659f7b43a4d68098543ab546d2171f8e51d691d08a659378969
 
 build_options="unrar"
 desc_option_unrar="Enable support for unrar"
-
 # unrar option disabled by default because of license issues
-build_options_default=""
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Not supported on big endian"

From 4a94712b3a6f3d95bac96ae643fb22c8947b6946 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 15:36:42 -0400
Subject: [PATCH 15/55] nyxt: remove unnecessary PREFIX=, clean up

not revbumping due to build failure (#38835)
---
 srcpkgs/nyxt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index 8fdd7215cd90..d3d1c20fe9cd 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -21,8 +21,7 @@ nopie=yes
 nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
 shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
 
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
+post_install() {
 	vlicense licenses/ASSET-LICENSE
 	vlicense licenses/SOURCE-LICENSE
 }

From 0a5ea656a274becdf1f620a5acf65f86e0b5180b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:36 -0400
Subject: [PATCH 16/55] 64tass: remove unnecessary PREFIX=, clean up

---
 srcpkgs/64tass/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/64tass/template b/srcpkgs/64tass/template
index ae06411d48bc..eb61079942dd 100644
--- a/srcpkgs/64tass/template
+++ b/srcpkgs/64tass/template
@@ -1,11 +1,9 @@
 # Template file for '64tass'
 pkgname=64tass
 version=1.55.2200
-revision=2
+revision=3
 wrksrc="64tass-${version}-src"
 build_style=gnu-makefile
-make_build_args="prefix=/usr"
-make_install_args="prefix=/usr"
 hostmakedepends="unzip"
 short_desc="6502/6510 assembler"
 maintainer="Jakub Skrzypnik <jakub.skrzypnik@interia.pl>"

From 2494dab0dfa6388a97c47f99be9f285a7ca80fc4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:39 -0400
Subject: [PATCH 17/55] bemenu: remove unnecessary PREFIX=, clean up

---
 srcpkgs/bemenu/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 6a15fa4b5001..8435f41d1770 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,9 +1,8 @@
 # Template file for 'bemenu'
 pkgname=bemenu
 version=0.6.10
-revision=1
+revision=2
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="ncurses-devel cairo-devel pango-devel
  libxkbcommon-devel libXinerama-devel wayland-devel

From 7c78e1c84ec8e3af561942b7e5a431e37f83f9d8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:40 -0400
Subject: [PATCH 18/55] bleachbit: remove unnecessary PREFIX=, clean up

---
 srcpkgs/bleachbit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index 7bca1dfd6a27..2c8dd9d4c738 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -1,9 +1,8 @@
 # Template file for 'bleachbit'
 pkgname=bleachbit
 version=4.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 hostmakedepends="python3 gettext desktop-file-utils"
 depends="gtk+3 python3-gobject python3-scandir python3-chardet"
 short_desc="Deletes unneeded files to free disk space and maintain privacy"

From b530f74bb2fe2887576094da5221b88379208843 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:41 -0400
Subject: [PATCH 19/55] blktrace: remove unnecessary PREFIX=, clean up

---
 srcpkgs/blktrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blktrace/template b/srcpkgs/blktrace/template
index 5a0dc70c9fde..0cb3b27564fd 100644
--- a/srcpkgs/blktrace/template
+++ b/srcpkgs/blktrace/template
@@ -1,9 +1,9 @@
 # Template file for 'blktrace'
 pkgname=blktrace
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr mandir=/usr/share/man"
+make_install_args="mandir=/usr/share/man"
 makedepends="libaio-devel"
 short_desc="Userspace utilities for tracing Linux block layer I/O"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 02c279dbe413b648c99a87c85a8a5dcb7cfc2437 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:42 -0400
Subject: [PATCH 20/55] bootiso: remove unnecessary PREFIX=, clean up

---
 srcpkgs/bootiso/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template
index 4c443dae0273..2e25536c520d 100644
--- a/srcpkgs/bootiso/template
+++ b/srcpkgs/bootiso/template
@@ -1,9 +1,8 @@
 # Template file for 'bootiso'
 pkgname=bootiso
 version=4.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 depends="bash bc binutils coreutils curl dosfstools e2fsprogs eudev exfat-utils
  f2fs-tools file findutils gawk grep ncurses ntfs-3g rsync syslinux tar util-linux
  wimlib jq"

From 043173c244170a7cce2e76d136f81be45b71e4b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:43 -0400
Subject: [PATCH 21/55] chibi-scheme: remove unnecessary PREFIX=, clean up

---
 srcpkgs/chibi-scheme/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/chibi-scheme/template b/srcpkgs/chibi-scheme/template
index 3888133da058..8f4611f960be 100644
--- a/srcpkgs/chibi-scheme/template
+++ b/srcpkgs/chibi-scheme/template
@@ -1,10 +1,9 @@
 # Template file for 'chibi-scheme'
 pkgname=chibi-scheme
 version=0.10
-revision=1
+revision=2
 build_helper="qemu"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 short_desc="Small Footprint R7RS Scheme for use as a C Extension Language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 3227bfdfdd8911009b3dc040d61de7b0c38277e3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:43 -0400
Subject: [PATCH 22/55] cronutils: remove unnecessary PREFIX=, clean up

---
 srcpkgs/cronutils/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/cronutils/template b/srcpkgs/cronutils/template
index 8b67840fcf40..31ff81d4834c 100644
--- a/srcpkgs/cronutils/template
+++ b/srcpkgs/cronutils/template
@@ -1,10 +1,9 @@
 # Template file for 'cronutils'
 pkgname=cronutils
 version=1.9
-revision=2
+revision=3
 wrksrc="${pkgname}-version-${version}"
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 short_desc="Set of tools to assist the reliable running periodic and batch jobs"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0"
@@ -13,6 +12,5 @@ distfiles="https://github.com/google/${pkgname}/archive/version/${version}.tar.g
 checksum=0109f165b193d3482ebf470e5d19fcef13bb692b173f65c966b0b8b8ebc79238
 
 post_install() {
-	vlicense LICENSE
 	vbin runcron
 }

From 72008383e009e603d953be4067a289f6a77c7243 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:44 -0400
Subject: [PATCH 23/55] crypto++: remove unnecessary PREFIX=, clean up

---
 srcpkgs/crypto++/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index b524377319ea..74c04c8621aa 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -2,10 +2,9 @@
 pkgname=crypto++
 reverts="820_2"
 version=8.3.0
-revision=1
+revision=2
 wrksrc="${pkgname//+/p}-CRYPTOPP_${version//./_}"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 make_build_target="dynamic static libcryptopp.pc"
 make_install_target="install-lib"
 short_desc="Free C++ class library of cryptographic schemes"
@@ -21,11 +20,6 @@ if [ "$XBPS_CROSS" ]; then
 	make_build_args+=" -f GNUmakefile-cross"
 fi
 
-do_check() {
-	# The gnu-makefile build style does not use ${makejobs}
-	make ${makejobs} ${make_build_args} check
-}
-
 post_install() {
 	vlicense License.txt LICENSE
 }

From 5ae991a4617922fbb6a097122ba632329a9d09f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:45 -0400
Subject: [PATCH 24/55] dmidecode: remove unnecessary PREFIX=, clean up

---
 srcpkgs/dmidecode/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
index d21a78287a8f..c85bd846bd95 100644
--- a/srcpkgs/dmidecode/template
+++ b/srcpkgs/dmidecode/template
@@ -1,10 +1,10 @@
 # Template file for 'dmidecode'
 pkgname=dmidecode
 version=3.4
-revision=1
+revision=2
 build_style=gnu-makefile
-make_build_args="prefix=/usr sbindir=/usr/bin"
-make_install_args="prefix=/usr sbindir=/usr/bin"
+make_build_args="sbindir=/usr/bin"
+make_install_args="sbindir=/usr/bin"
 short_desc="Desktop Management Interface table related utilities"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"

From 591b2054ac82cd82a2f9f4c51ca136819516361b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:45 -0400
Subject: [PATCH 25/55] dte: remove unnecessary PREFIX=, clean up

---
 srcpkgs/dte/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index 99d194321313..403f59f63897 100644
--- a/srcpkgs/dte/template
+++ b/srcpkgs/dte/template
@@ -1,9 +1,8 @@
 # Template file for 'dte'
 pkgname=dte
 version=1.10
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 short_desc="Small, configurable console text editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 31a456a6c895da76c0f9543af9325dc1a8d36ac4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:46 -0400
Subject: [PATCH 26/55] ex-vi: remove unnecessary PREFIX=, clean up

---
 srcpkgs/ex-vi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ex-vi/template b/srcpkgs/ex-vi/template
index ea54bb437895..b075077f8ddf 100644
--- a/srcpkgs/ex-vi/template
+++ b/srcpkgs/ex-vi/template
@@ -1,13 +1,13 @@
 # Template file for 'ex-vi'
 pkgname=ex-vi
 version=050325
-revision=10
+revision=11
 wrksrc="ex-${version}"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr TERMLIB=ncurses PRESERVEDIR=/var/tmp LARGEF=-DLARGEF"
+make_build_args="TERMLIB=ncurses PRESERVEDIR=/var/tmp LARGEF=-DLARGEF"
 make_install_args="INSTALL=/usr/bin/install PRESERVEDIR=/var/tmp STRIP="
 makedepends="ncurses-devel"
-short_desc="The original ex/vi text editor (Heirloom version)"
+short_desc="Original ex/vi text editor (Heirloom version)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause-UC"
 homepage="http://ex-vi.sourceforge.net/"

From 48ad742b89caafe201b0b8d0d39f5a19d112e8b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:46 -0400
Subject: [PATCH 27/55] feh: remove unnecessary PREFIX=, clean up

---
 srcpkgs/feh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 56a2eb9f2751..d40146d51e0d 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,10 +1,10 @@
 # Template file for 'feh'
 pkgname=feh
 version=3.9
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="PREFIX=/usr exif=1 help=1 stat64=1 inotify=1"
+make_build_args="exif=1 help=1 stat64=1 inotify=1"
 hostmakedepends="pkg-config"
 makedepends="giblib-devel libXinerama-devel libXt-devel libcurl-devel
  libexif-devel libjpeg-turbo-devel"

From 46a867323f682b4fd9afbc738dbb672cb1f492ce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:47 -0400
Subject: [PATCH 28/55] fuse-zip: remove unnecessary PREFIX=, clean up

---
 srcpkgs/fuse-zip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index 21b0e6d3a0d3..06bd8aa6d265 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -1,11 +1,10 @@
 # Template file for 'fuse-zip'
 pkgname=fuse-zip
 version=0.7.2
-revision=1
+revision=2
 wrksrc=agalanin-fuse-zip-9b01842a149d
 build_style=gnu-makefile
-make_build_args="all doc"
-make_install_args="prefix=/usr"
+make_build_target="all doc"
 hostmakedepends="pkg-config"
 makedepends="fuse-devel libzip-devel"
 short_desc="FUSE file system for ZIP archives"
@@ -14,7 +13,5 @@ license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/get/${version}.tar.gz"
 checksum=bba004193db9841a8d9a59e927fffe24f1b92f7ad15a5694c687456617b638a2
-
-do_check() {
-	: requires some tcl modules
-}
+# requires some tcl modules
+make_check=no

From 767fbcb6ed75b601b3373948b908d95ea590d1c0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:48 -0400
Subject: [PATCH 29/55] gatling: remove unnecessary PREFIX=, clean up

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 9993c3a0cd69..13ae68e98b1c 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,10 +1,10 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.16
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target="gatling dl getlinks"
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
+make_install_args="MANDIR=/usr/share/man"
 makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 509b70f4eca604ce014e7eb18575df95e5f88c89 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:48 -0400
Subject: [PATCH 30/55] git-secret: remove unnecessary PREFIX=, clean up

---
 srcpkgs/git-secret/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 7d2da706b1ba..7e7d688b82da 100644
--- a/srcpkgs/git-secret/template
+++ b/srcpkgs/git-secret/template
@@ -1,9 +1,8 @@
 # Template file for 'git-secret'
 pkgname=git-secret
 version=0.4.0
-revision=2
+revision=3
 build_style=gnu-makefile
-make_install_args="PREFIX=/usr"
 make_check_target=test
 depends="bash gawk gnupg coreutils git"
 checkdepends="gnupg procps-ng git"

From 532e000ec6d5928f2fa807b12c4f2d0b8deebafc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:49 -0400
Subject: [PATCH 31/55] gtkd: remove unnecessary PREFIX=, clean up

---
 srcpkgs/gtkd/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index c12144b9d54e..c376efa633eb 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,13 +1,12 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=8
+revision=9
 wrksrc="GtkD-${version}"
 build_style=gnu-makefile
 make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"
 make_build_target="shared-libs shared-gstreamer shared-vte shared-peas shared-gtkdgl"
 make_check_args="$make_build_args"
-make_install_args="prefix=/usr"
 make_install_target="install-shared-gstreamer install-headers-gstreamer
  install-shared-gtkdgl install-headers-gtkdgl install-shared install-headers
  install-shared-peas install-headers-peas install-shared-vte

From 68bb1ea821cb79eba075c39a06ce8ca4392b3537 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:49 -0400
Subject: [PATCH 32/55] gtklock: remove unnecessary PREFIX=, clean up

---
 srcpkgs/gtklock/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
index 138d4cedbec7..b73f3f921d5d 100644
--- a/srcpkgs/gtklock/template
+++ b/srcpkgs/gtklock/template
@@ -1,10 +1,9 @@
 # Template file for 'gtklock'
 pkgname=gtklock
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="PREFIX=/usr"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="pam-devel gtk+3-devel gtk-layer-shell-devel"
 short_desc="GTK-based lockscreen for Wayland"

From 920833c44484de28c12b7dfaa8944f3286ab67df Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:50 -0400
Subject: [PATCH 33/55] hiredis: remove unnecessary PREFIX=, clean up

---
 srcpkgs/hiredis/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template
index 05e5d6cf565f..778989644c8b 100644
--- a/srcpkgs/hiredis/template
+++ b/srcpkgs/hiredis/template
@@ -1,9 +1,8 @@
 # Template file for 'hiredis'
 pkgname=hiredis
 version=1.0.0
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 checkdepends="redis"
 short_desc="Minimalistic C client for Redis"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 78d543810b9e56412b96c871a6d5b2b84221bdd2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:51 -0400
Subject: [PATCH 34/55] httpdirfs: remove unnecessary PREFIX=, clean up

---
 srcpkgs/httpdirfs/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 0028d235c5db..a5a766bdcca9 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,9 +1,8 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=5
+revision=6
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel
  libuuid-devel expat-devel"
 short_desc="Mount HTTP directory listings, with a permanent cache"

From 1c2e583cea29192b2a422ffd696d6481266212aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:51 -0400
Subject: [PATCH 35/55] id3: remove unnecessary PREFIX=, clean up

---
 srcpkgs/id3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template
index 4c6330ff92ea..e83bac83761b 100644
--- a/srcpkgs/id3/template
+++ b/srcpkgs/id3/template
@@ -1,9 +1,9 @@
 # Template file for 'id3'
 pkgname=id3
 version=0.80
-revision=3
+revision=4
 build_style=gnu-makefile
-make_install_args="prefix=/usr mandir=/usr/share/man"
+make_install_args="mandir=/usr/share/man"
 short_desc="Tool for manipulating id3 and id3v2 tags in multiple files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2b1551bac0d8c5332c826884bdd7e30585dbac3b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:52 -0400
Subject: [PATCH 36/55] kore: remove unnecessary PREFIX=, clean up

---
 srcpkgs/kore/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index cb2063a8adf6..f13444387372 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,12 +1,12 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.2.2
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
+make_build_args="CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
 makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
@@ -25,7 +25,7 @@ fi
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" python3-devel"
-	make_build_args+="PYTHON=1"
+	make_build_args+=" PYTHON=1"
 fi
 
 post_install() {

From 0978e4bebfbee14cd97388c47f62d19a9b115573 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:53 -0400
Subject: [PATCH 37/55] libowfat: remove unnecessary PREFIX=, clean up

---
 srcpkgs/libowfat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libowfat/template b/srcpkgs/libowfat/template
index 95c7e9a812bf..444370f6eab2 100644
--- a/srcpkgs/libowfat/template
+++ b/srcpkgs/libowfat/template
@@ -1,12 +1,12 @@
 # Template file for 'libowfat'
 pkgname=libowfat
 version=0.32
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr MAN3DIR=/usr/share/man/man3"
+make_install_args="MAN3DIR=/usr/share/man/man3"
 short_desc="Reimplement libdjb"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://www.fefe.de/libowfat/"
 distfiles="https://www.fefe.de/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1

From 8a44b43d2e9beea4ba42ce6c9ae8bb0fd27c1c54 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:53 -0400
Subject: [PATCH 38/55] mle: remove unnecessary PREFIX=, clean up

---
 srcpkgs/mle/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template
index 2f349365a7c8..9563383cf52c 100644
--- a/srcpkgs/mle/template
+++ b/srcpkgs/mle/template
@@ -1,9 +1,8 @@
 # Template file for 'mle'
 pkgname=mle
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 hostmakedepends="libtool"
 makedepends="termbox-devel lua53-devel pcre-devel uthash"
 short_desc="Flexible terminal-based text editor (C)"

From 7a11773ce988893a33c786760c76ec6d1ff6cc67 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:54 -0400
Subject: [PATCH 39/55] mpdas: remove unnecessary PREFIX=, clean up

---
 srcpkgs/mpdas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpdas/template b/srcpkgs/mpdas/template
index 4e64f1f8fdf1..b1f22ae67352 100644
--- a/srcpkgs/mpdas/template
+++ b/srcpkgs/mpdas/template
@@ -1,9 +1,9 @@
 # Template file for 'mpdas'
 pkgname=mpdas
 version=0.4.5
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr CONFIG=/etc"
+make_build_args="CONFIG=/etc"
 make_install_args="MANPREFIX=/usr/share/man/man1"
 make_use_env=yes
 hostmakedepends="pkg-config"

From 72d7c0fd7aa0cae1f98d60cb294f2f6de5749f2b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:54 -0400
Subject: [PATCH 40/55] musescore: remove unnecessary PREFIX=, clean up

---
 srcpkgs/musescore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index 9bc29cf33078..63b35170e0ca 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,10 +1,10 @@
 # Template file for 'musescore'
 pkgname=musescore
 version=3.6.2
-revision=1
+revision=2
 wrksrc="MuseScore-${version}"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+make_build_args="USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
  DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
 make_install_args="-C build.release"
 hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-tools"

From 9d6bb2eb1192bacea5b68d9ac5b9297c72c18796 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:55 -0400
Subject: [PATCH 41/55] netbsd-wtf: remove unnecessary PREFIX=, clean up

---
 srcpkgs/netbsd-wtf/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index be1b0c28c5c1..0fe2eaadc6a5 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -1,8 +1,9 @@
 # Template file for 'netbsd-wtf'
 pkgname=netbsd-wtf
 version=20180621
-revision=3
+revision=4
 _commit=b1e5be48e340146f63b174cc14fef892a783168b
+wrksrc="$pkgname-$_commit"
 build_style=gnu-makefile
 short_desc="NetBSD's wtf(6) utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,9 +12,6 @@ homepage="https://www.netbsd.org"
 distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
 checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7
 
-wrksrc="$pkgname-$_commit"
-make_build_args="PREFIX=/usr"
-
 post_install() {
 	mv ${DESTDIR}/usr/bin/{wtf,$pkgname}
 	mv ${DESTDIR}/usr/share/man/man6/{wtf,$pkgname}.6

From a1214933c38f089e8e7fab134c3a907d5fcbed37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:55 -0400
Subject: [PATCH 42/55] netsurf: remove unnecessary PREFIX=, clean up

---
 srcpkgs/netsurf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index dd235c1d11ac..8aa9b8918966 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,10 +1,10 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=4
+revision=5
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="PREFIX=/usr TARGET=gtk3 NETSURF_USE_BMP=YES NETSURF_USE_WEBP=YES
+make_build_args="TARGET=gtk3 NETSURF_USE_BMP=YES NETSURF_USE_WEBP=YES
  NETSURF_USE_VIDEO=NO NETSURF_USE_HARU_PDF=NO"
 make_install_args="$make_build_args"
 hostmakedepends="pkg-config gperf flex nsgenbind gdk-pixbuf-devel

From 8ad0e4c1976e9a8186c148346a9b387669ef823f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:56 -0400
Subject: [PATCH 43/55] ocamlbuild: remove unnecessary PREFIX=, clean up

---
 srcpkgs/ocamlbuild/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index b1349909f784..231a95faf4f0 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,10 +1,8 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.1
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
-make_install_args="PREFIX=/usr"
 hostmakedepends="ocaml"
 short_desc="OCaml build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b9e5c93111d754d034379f7a9b33e1de61efd82b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:56 -0400
Subject: [PATCH 44/55] pev: remove unnecessary PREFIX=, clean up

---
 srcpkgs/pev/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 4a55528f83b5..13e332157186 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,10 +1,10 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="prefix=/usr sysconfdir=/etc"
-make_install_args="prefix=/usr sysconfdir=/etc"
+make_build_args="sysconfdir=/etc"
+make_install_args="sysconfdir=/etc"
 makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"

From 6283772bae1ec00c455004332d8bbdacf25baebd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:57 -0400
Subject: [PATCH 45/55] py3c: remove unnecessary PREFIX=, clean up

---
 srcpkgs/py3c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/py3c/template b/srcpkgs/py3c/template
index 2eaae9d74fb2..d4a354e57f5c 100644
--- a/srcpkgs/py3c/template
+++ b/srcpkgs/py3c/template
@@ -1,9 +1,8 @@
 # Template file for 'py3c'
 pkgname=py3c
 version=1.4
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 make_check_target="test-python3"
 checkdepends="python3-devel"
 short_desc="Python 2/3 compatibility layer for C extensions"

From d6a3a46ce984b24fc6940f0d62ac8321f9eb6b9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:58 -0400
Subject: [PATCH 46/55] re2: remove unnecessary PREFIX=, clean up

---
 srcpkgs/re2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 8eda81468731..3621b31554dc 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,10 +1,9 @@
 # Template file for 're2'
 pkgname=re2
 version=2020.06.01
-revision=1
+revision=2
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 short_desc="Efficient, principled regular expression library"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 01793f4159bebbdb70dcbaeb6a70b83c06fa4f9e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:58 -0400
Subject: [PATCH 47/55] sc-im: remove unnecessary PREFIX=, clean up

---
 srcpkgs/sc-im/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index f2900d5ca98f..d1d45fd65072 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,11 +1,10 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=4
+revision=5
 build_wrksrc="src"
 build_style=gnu-makefile
-make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
-make_install_args="prefix=/usr"
+make_build_args="CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 hostmakedepends="bison pkg-config gnuplot which"
 makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
  lua51-devel ncurses-devel"

From 70df6f6cb1004a0e2a7afb3bcd0ebbc58af3b015 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:59 -0400
Subject: [PATCH 48/55] scdoc: remove unnecessary PREFIX=, clean up

---
 srcpkgs/scdoc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index d8c0db8aea4a..1857247fd86b 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,9 +1,8 @@
 # Template file for 'scdoc'
 pkgname=scdoc
 version=1.11.2
-revision=1
+revision=2
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 short_desc="Tool for generating roff manual pages"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"

From 2115b1409a82192ed7b8d3b9bdd02b151ff017c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:57:59 -0400
Subject: [PATCH 49/55] tuxpaint: remove unnecessary PREFIX=, clean up

---
 srcpkgs/tuxpaint/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index b9d403940329..3a879600bd6b 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -1,10 +1,9 @@
 # Template file for 'tuxpaint'
 pkgname=tuxpaint
 version=0.9.28
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-sdl2"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 conf_files="/etc/tuxpaint/tuxpaint.conf"
 hostmakedepends="gettext gperf pkg-config ImageMagick"
 makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel cairo-devel

From dc4516f66ad6bf81acc81f15d0a6c41d27412555 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:00 -0400
Subject: [PATCH 50/55] unifdef: remove unnecessary PREFIX=, clean up

---
 srcpkgs/unifdef/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/unifdef/template b/srcpkgs/unifdef/template
index bfd669c2eb87..f2c4dbc3bc4d 100644
--- a/srcpkgs/unifdef/template
+++ b/srcpkgs/unifdef/template
@@ -1,9 +1,8 @@
 # Template file for 'unifdef'
 pkgname=unifdef
 version=2.11
-revision=2
+revision=3
 build_style=gnu-makefile
-make_install_args="prefix=/usr"
 short_desc="Selectively remove C preprocessor conditionals"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2bf975046c682e14e24bfcb8082dce0bdaf5901e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:01 -0400
Subject: [PATCH 51/55] whois: remove unnecessary PREFIX=, clean up

---
 srcpkgs/whois/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index ecc647d81960..495b46d6e163 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,11 +1,11 @@
 # Template file for 'whois'
 pkgname=whois
 version=5.5.13
-revision=1
+revision=2
 wrksrc=whois
 build_style=gnu-makefile
-make_build_args="prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
-make_install_args="prefix=/usr BASEDIR=\${DESTDIR}"
+make_build_args="HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
+make_install_args="BASEDIR=\${DESTDIR}"
 make_install_target="install-whois"
 hostmakedepends="perl pkg-config gettext"
 makedepends="libidn2-devel"

From c81170954097976ea7f555bd5a43e4985886b2bd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:01 -0400
Subject: [PATCH 52/55] x2goserver: remove unnecessary PREFIX=, clean up

---
 srcpkgs/x2goserver/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
index 89fe76a4e8a1..cfbb9d0a89e2 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,10 +1,9 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
 version=4.1.0.3
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin"
-make_build_args="PREFIX=/usr"
 hostmakedepends="pkg-config perl which"
 makedepends="libssh2-devel"
 depends="bash iproute2 openssh lsof xauth xhost xwininfo psmisc xkeyboard-config

From 32e08296775c0fea3e8ec8f15947d245a94e4183 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:02 -0400
Subject: [PATCH 53/55] xnots: remove unnecessary PREFIX=, clean up

---
 srcpkgs/xnots/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/xnots/template b/srcpkgs/xnots/template
index c08b06c26d6f..c633d609d1f9 100644
--- a/srcpkgs/xnots/template
+++ b/srcpkgs/xnots/template
@@ -1,10 +1,9 @@
 # Template file for 'xnots'
 pkgname=xnots
 version=0.2.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="CCOPT=\$CFLAGS"
-make_install_args="prefix=/usr"
 make_use_env=yes
 hostmakedepends="perl pkg-config"
 makedepends="libX11-devel libXrandr-devel pango-devel"

From 9cfb29b8a290aa0301600bf1d251f9780da68b61 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:02 -0400
Subject: [PATCH 54/55] xob: remove unnecessary PREFIX=, clean up

---
 srcpkgs/xob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index dfac3851302c..56fda2f2a62d 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -1,9 +1,9 @@
 # Template file for 'xob'
 pkgname=xob
 version=0.3
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="prefix=/usr sysconfdir=/etc"
+make_build_args="sysconfdir=/etc"
 make_install_args="$make_build_args"
 make_use_env=yes
 hostmakedepends="pkg-config"

From 927b0be309920760d80c05f506b60212ef672563 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 18:58:03 -0400
Subject: [PATCH 55/55] zita-at1: remove unnecessary PREFIX=, clean up

---
 srcpkgs/zita-at1/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index 9325c5930ac5..1c3972bc7427 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,10 +1,9 @@
 # Template file for 'zita-at1'
 pkgname=zita-at1
 version=0.6.2
-revision=3
+revision=4
 build_wrksrc=source
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 hostmakedepends="pkg-config"
 makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
  freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"