From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] common/build-style/gnu-makefile.sh: define prefix, PREFIX for build
Date: Wed, 24 Aug 2022 08:27:43 +0200 [thread overview]
Message-ID: <20220824062743.t55Z73q_n67nmGdSrkuLNLVih5Vd6Q6cLAg8Q-Nzo_c@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38823@inbox.vuxu.org>
[-- 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: 48320 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 90ec5626f3b8f594a0889931696c6bffd3ada5fc 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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 90ede78d19ad..81d18790290f 100644
--- 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)"
From 8cd4c9ad7d32c95a659c9438220cc600e52710f5 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..7ef339536933 100644
--- 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
From d7156498e16322228aaa4e784a49ffc2ad00130f 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 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index a1a88c198f18..ed69d7811da8 100644
--- 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
}
From 755df02e71e35ad225d16214f4cd9b745ec1652f 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template
index 01e76d59ad29..e7d7298121f9 100644
--- 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"
From c3ea42184c9c159243f28e214ae57a995d125870 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 | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index d981d2576274..10adedd46a4d 100644
--- 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
-}
From 205b7996692cd514e7473606a01a11c6963f5957 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 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template
index c067f59f9aba..d252667da906 100644
--- 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
}
From baffbf751e87df65911887cba3984fbc69a7f286 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 8f516f768c9b..162277fee9cd 100644
--- 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"
From 9d45c9a95ceec1eaf799984cb19b74e42ef4690f 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 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lm_sensors/template b/srcpkgs/lm_sensors/template
index 10d2a8fd9617..f8447a2ebe8d 100644
--- a/srcpkgs/lm_sensors/template
+++ b/srcpkgs/lm_sensors/template
@@ -5,8 +5,7 @@ revision=1
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 e637e7ed57fd2a78bfd8d35a6d829a0f134d8eb4 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index b7c019b828d3..aeead50858f6 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -5,8 +5,7 @@ revision=1
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 630c517764898561bda6080ca9efb8d4260c9ab8 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 1bfbdb432420..2c0bd950893d 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -5,7 +5,7 @@ revision=3
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 a843a4ee7f919ecb88aa07fcd6e42caa7b95e32e 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spectrwm/template b/srcpkgs/spectrwm/template
index 0ac86b1149d6..70701e7f1f2e 100644
--- a/srcpkgs/spectrwm/template
+++ b/srcpkgs/spectrwm/template
@@ -5,7 +5,7 @@ revision=2
_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 ad5121723aeebb51c7b8e7d917677a5d6a7af036 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 | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index bebc7eb1bd31..8e3f90d91385 100644
--- 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"
From fd6c57902ea467f5d38d3efbfb09be084a56cc95 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 038c4aab43720e613b8aaf2e4ef9b925805fe585 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 | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/64tass/template b/srcpkgs/64tass/template
index ae06411d48bc..c70c277cd590 100644
--- 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>"
From e0bf41f603547024733305959e553262e67e6f60 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 6a15fa4b5001..7838ae5483ab 100644
--- 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
From 848d56da812455b41c0bca3f9bb928506fc5f5fc 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index 7bca1dfd6a27..aa52017171a1 100644
--- 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"
From 22a450e86f662c70a4d95dc08ca5795757074c06 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blktrace/template b/srcpkgs/blktrace/template
index 5a0dc70c9fde..bd63b1574b1d 100644
--- 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>"
From 7c9708a12a6342ab64d5f4b287ad04a7018b78ed 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template
index 4c443dae0273..db30bfb9db19 100644
--- 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"
From e4eaf54168f84bfff17d4f5b9130d662baa2353e 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/chibi-scheme/template b/srcpkgs/chibi-scheme/template
index 3888133da058..7cdf282791ee 100644
--- 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"
From bcb1a67c29835b3382b268acc7f7c34037b9f548 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 da2938bdad660dbdef42019e09d9be1cc3aab0f8 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 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index b524377319ea..7707a98c54ff 100644
--- 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
}
From 1c7a20c741d48000b5e40e6737cd98a7c8d36f07 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
index d21a78287a8f..38b39b5c56b5 100644
--- 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"
From 42da67669da8912560ee95cf846ff40f85f34b23 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index 99d194321313..7691ca7726c7 100644
--- 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"
From 42fbd886f1bf7d06bc6c18cfc9399f8a0dc2dd89 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 a19febd390c0d38619a257cc3677d6b337a0be99 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 56a2eb9f2751..15434c81744c 100644
--- 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"
From 1531d1f0bbb6c87a0982ecea19bf16671cad455b 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 | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index 21b0e6d3a0d3..5b24c81c4847 100644
--- 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
From 2d9b6f7db90c44f54fce629f361c4979730161be 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 9993c3a0cd69..ac1c146496c8 100644
--- 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>"
From 9f61b67c4ccb5a4d20a5d07b072cbf05a82eb3f8 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 7d2da706b1ba..34b1275685d6 100644
--- 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"
From 3bcdb5dc67c0c63c3037a1440417a50aba036154 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index c12144b9d54e..9e866084d0b2 100644
--- 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
From 431eaf88ed04cebdd4c7db3b0bafafc7735b8b44 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
index 138d4cedbec7..381e97f874aa 100644
--- 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"
From 72917b186493b8c279e272e01f15326a60c5b3c2 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template
index 05e5d6cf565f..db8f3a11ddb6 100644
--- 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>"
From e3cbc0dabd4ddc8565ac8386a1f101edc24d63f6 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 0028d235c5db..571a34cb5f80 100644
--- 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"
From e7ce7b907ec28db017bd3e33ee0ad61289acdf62 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template
index 4c6330ff92ea..83f6a322686e 100644
--- 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"
From 9abe06c2c5fd876b50d40b8ab468db4a6ee482af 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index cb2063a8adf6..f90a4d9183ac 100644
--- 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() {
From fbb7f4737dde4b188b96e3c83066d3c19dd797b8 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 cfcface67378c31aaa6d30bc91a1b8c631b59c27 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template
index 2f349365a7c8..bc456ae3623d 100644
--- a/srcpkgs/mle/template
+++ b/srcpkgs/mle/template
@@ -3,7 +3,6 @@ pkgname=mle
version=1.4.3
revision=1
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 0bc4ed30fd82b35c795dfbf945454cabc46ac647 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpdas/template b/srcpkgs/mpdas/template
index 4e64f1f8fdf1..9bcc7688aa56 100644
--- a/srcpkgs/mpdas/template
+++ b/srcpkgs/mpdas/template
@@ -3,7 +3,7 @@ pkgname=mpdas
version=0.4.5
revision=2
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 c00d8012c9977b0d37444b84b39dac7d65a3185f 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index 9bc29cf33078..8f67acf3fb82 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -4,7 +4,7 @@ version=3.6.2
revision=1
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 871d816f66f702313e4dd909a8f51d1d64d91292 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 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index be1b0c28c5c1..5503e9cb55ab 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -3,6 +3,7 @@ pkgname=netbsd-wtf
version=20180621
revision=3
_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 5326e26fba94f6cb288e682805e3612ea7830618 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index dd235c1d11ac..60e67188fc0e 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -4,7 +4,7 @@ version=3.10
revision=4
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 a025bf400bb22830a7ee1859a4e47484e2cc05e9 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 | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index b1349909f784..056e497a8b28 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -3,8 +3,6 @@ pkgname=ocamlbuild
version=0.14.1
revision=2
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 2273de9b714a88bcb28b9b1d431e118d0969fb2e 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 4a55528f83b5..eea29908c1f9 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -3,8 +3,8 @@ pkgname=pev
version=0.81
revision=2
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 c79588e0a704630be21af8eaa1d7618c52bc6a5e 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/py3c/template b/srcpkgs/py3c/template
index 2eaae9d74fb2..c3b8101a0cc6 100644
--- a/srcpkgs/py3c/template
+++ b/srcpkgs/py3c/template
@@ -3,7 +3,6 @@ pkgname=py3c
version=1.4
revision=1
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 6850e938ddc349350f8c9e75d5732a3f3a0fb267 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 8eda81468731..ab02cbc4bbcb 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -4,7 +4,6 @@ version=2020.06.01
revision=1
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 e968dc1f07cb13824082e4e45243b43daa22f5fb 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index f2900d5ca98f..5ef6a773fe89 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -4,8 +4,7 @@ version=0.8.2
revision=4
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 6adbc01887d855289db788d8bcb9baee13a50920 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index d8c0db8aea4a..39757895700d 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -3,7 +3,6 @@ pkgname=scdoc
version=1.11.2
revision=1
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 e765f979c10d0ce2053b595e13780e2e94a5fa1d 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index b9d403940329..391c20a27de3 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -4,7 +4,6 @@ version=0.9.28
revision=1
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 96d695999633222ed469b6e8662998c4689b1d41 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/unifdef/template b/srcpkgs/unifdef/template
index bfd669c2eb87..24b97a437088 100644
--- a/srcpkgs/unifdef/template
+++ b/srcpkgs/unifdef/template
@@ -3,7 +3,6 @@ pkgname=unifdef
version=2.11
revision=2
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 72aa0f3e916ac8d26f2f8857f3d665cd40fc9b00 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index ecc647d81960..bb3cce60eb1e 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -4,8 +4,8 @@ version=5.5.13
revision=1
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 dd4fa803f99f420611c52e664765da8dbd8193f0 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
index 89fe76a4e8a1..0724ef53a2fa 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -4,7 +4,6 @@ version=4.1.0.3
revision=2
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 bae4d8bea1a711b1bcdd695a872db1683cf38de9 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/xnots/template b/srcpkgs/xnots/template
index c08b06c26d6f..a323b1253685 100644
--- a/srcpkgs/xnots/template
+++ b/srcpkgs/xnots/template
@@ -4,7 +4,6 @@ version=0.2.1
revision=2
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 7e3020bc90c035e60a215edf0a264bdafd43de6f 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index dfac3851302c..f988c84a0e7f 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -3,7 +3,7 @@ pkgname=xob
version=0.3
revision=2
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 a5ba4090f29bedb2d9e017d454e47073af6ff6d0 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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index 9325c5930ac5..5693e420e627 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -4,7 +4,6 @@ version=0.6.2
revision=3
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"
next prev parent reply other threads:[~2022-08-24 6:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 4:42 [PR PATCH] " classabbyamp
2022-08-22 5:22 ` [PR REVIEW] " sgn
2022-08-22 5:28 ` [PR PATCH] [Updated] " classabbyamp
2022-08-22 12:09 ` ericonr
2022-08-22 22:58 ` [PR PATCH] [Updated] " classabbyamp
2022-08-22 23:00 ` classabbyamp
2022-08-22 23:05 ` [PR PATCH] [Updated] " classabbyamp
2022-08-24 6:27 ` classabbyamp [this message]
2022-08-24 19:06 ` classabbyamp
2022-08-24 19:07 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220824062743.t55Z73q_n67nmGdSrkuLNLVih5Vd6Q6cLAg8Q-Nzo_c@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).