void-linux · classabbyamp · Aug 24, 2022 · Aug 22, 2022 · Aug 22, 2022 · Aug 22, 2022
diff --git 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;

diff --git 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}
 }
diff --git a/srcpkgs/64tass/template b/srcpkgs/64tass/template
@@ -4,8 +4,6 @@ version=1.55.2200
 revision=2
 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>"

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
@@ -4,9 +4,9 @@ version=3.7.7
 revision=1
 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)"

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
@@ -3,7 +3,7 @@ pkgname=baresip
 version=1.1.0
 revision=1
 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

diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
@@ -3,7 +3,6 @@ pkgname=bemenu
 version=0.6.10
 revision=1
 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

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
@@ -3,7 +3,6 @@ pkgname=bleachbit
 version=4.4.2
 revision=1
 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"

diff --git a/srcpkgs/blktrace/template b/srcpkgs/blktrace/template
@@ -3,7 +3,7 @@ pkgname=blktrace
 version=1.3.0
 revision=1
 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>"

diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template
@@ -3,7 +3,6 @@ pkgname=bootiso
 version=4.2.0
 revision=2
 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"

diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
@@ -3,7 +3,7 @@ pkgname=capstone
 version=4.0.2
 revision=4
 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
 }

diff --git a/srcpkgs/chibi-scheme/template b/srcpkgs/chibi-scheme/template
@@ -4,7 +4,6 @@ version=0.10
 revision=1
 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"

diff --git 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
 }
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
@@ -5,7 +5,6 @@ version=8.3.0
 revision=1
 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
 }

diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
@@ -3,8 +3,8 @@ pkgname=dmidecode
 version=3.4
 revision=1
 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"

diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
@@ -3,7 +3,6 @@ pkgname=dte
 version=1.10
 revision=1
 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"

diff --git 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/"

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
@@ -4,7 +4,7 @@ version=3.9
 revision=1
 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"

diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template
@@ -3,7 +3,7 @@ pkgname=figlet
 version=2.2.5
 revision=6
 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"

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
@@ -4,8 +4,7 @@ version=0.7.2
 revision=1
 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
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
@@ -4,7 +4,7 @@ version=0.16
 revision=1
 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>"

diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
@@ -3,7 +3,6 @@ pkgname=git-secret
 version=0.4.0
 revision=2
 build_style=gnu-makefile
-make_install_args="PREFIX=/usr"
 make_check_target=test
 depends="bash gawk gnupg coreutils git"
 checkdepends="gnupg procps-ng git"

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
@@ -3,15 +3,12 @@ pkgname=gkrellm
 version=2.3.11
 revision=4
 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
-}
diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
@@ -7,7 +7,6 @@ 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

diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
@@ -4,7 +4,6 @@ version=1.3.4
 revision=1
 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"

diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
@@ -3,15 +3,9 @@ pkgname=hashcat
 version=6.2.5
 revision=1
 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"

diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template
@@ -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
 }
diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template
@@ -3,7 +3,6 @@ pkgname=hiredis
 version=1.0.0
 revision=2
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
 checkdepends="redis"
 short_desc="Minimalistic C client for Redis"
 maintainer="Enno Boland <gottox@voidlinux.org>"

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
@@ -3,7 +3,6 @@ pkgname=httpdirfs
 version=1.2.0
 revision=5
 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"

diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template
@@ -3,7 +3,7 @@ pkgname=id3
 version=0.80
 revision=3
 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"

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
@@ -3,7 +3,7 @@ pkgname=imapfilter
 version=2.6.12
 revision=6
 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"

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
@@ -6,7 +6,7 @@ revision=1
 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() {

diff --git 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