diff --git a/Manual.md b/Manual.md index f22e878277ab3b..c24be6e90a745c 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; diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index 04e407af255ccf..f81ef4e21db420 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} } diff --git a/srcpkgs/64tass/template b/srcpkgs/64tass/template index ae06411d48bce8..c70c277cd590d5 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 " diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 90ede78d19adf9..81d18790290faf 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)" diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index 203250ecebfe05..7ef339536933a4 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 diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template index 6a15fa4b50014c..7838ae5483ab47 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 diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index 7bca1dfd6a2706..aa52017171a182 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" diff --git a/srcpkgs/blktrace/template b/srcpkgs/blktrace/template index 5a0dc70c9fde16..bd63b1574b1d0f 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 " diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template index 4c443dae027325..db30bfb9db19f9 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" diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template index a1a88c198f18cb..ed69d7811da8b6 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 " @@ -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 index 3888133da058e7..7cdf282791ee6a 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 " license="BSD-3-Clause" diff --git a/srcpkgs/cronutils/template b/srcpkgs/cronutils/template index 8b67840fcf4093..31ff81d4834ca9 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 " 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 index b524377319ea14..7707a98c54ff68 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 } diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template index d21a78287a8f96..38b39b5c56b583 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 " license="GPL-2.0-or-later" diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template index 99d1943213135b..7691ca7726c757 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 " license="GPL-2.0-only" diff --git a/srcpkgs/ex-vi/template b/srcpkgs/ex-vi/template index ea54bb43789547..b075077f8ddf9d 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 " license="BSD-4-Clause-UC" homepage="http://ex-vi.sourceforge.net/" diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index 56a2eb9f275128..15434c81744c5c 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" diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template index 01e76d59ad290c..e7d7298121f9e5 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 " license="BSD-3-Clause" diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template index 21b0e6d3a0d3f1..5b24c81c4847ef 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 diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index 9993c3a0cd6972..ac1c146496c889 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 " diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template index 7d2da706b1bae5..34b1275685d639 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" diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index d981d2576274fb..10adedd46a4df7 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 " 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 index c12144b9d54eda..9e866084d0b26a 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 diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index 138d4cedbec725..381e97f874aa46 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" diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template index bebc7eb1bd3145..8e3f90d9138596 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" diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template index c067f59f9aba47..d252667da9065a 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 } diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template index 05e5d6cf565f56..db8f3a11ddb648 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 " diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template index 0028d235c5db39..571a34cb5f804c 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" diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template index 4c6330ff92eaac..83f6a322686ed1 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 " license="BSD-2-Clause" diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 8f516f768c9b6e..162277fee9cd25 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" diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index cb2063a8adf67a..f90a4d9183acc0 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() { diff --git a/srcpkgs/libowfat/template b/srcpkgs/libowfat/template index 95c7e9a812bfd4..444370f6eab2b4 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 " -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 diff --git a/srcpkgs/lm_sensors/template b/srcpkgs/lm_sensors/template index 10d2a8fd961786..f8447a2ebe8d0a 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 } diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template index b7c019b828d341..aeead50858f60f 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" diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template index 2f349365a7c8c0..bc456ae3623d3b 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)" diff --git a/srcpkgs/mpdas/template b/srcpkgs/mpdas/template index 4e64f1f8fdf1e5..9bcc7688aa56c7 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" diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template index 9bc29cf33078ca..8f67acf3fb823f 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" diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index be1b0c28c5c1ef..5503e9cb55ab0f 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 " @@ -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 diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index dd235c1d11ac7a..60e67188fc0e67 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 diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index 8fdd7215cd90a4..d3d1c20fe9cdc7 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 } diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template index b1349909f7847a..056e497a8b28ce 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 " diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template index 4a55528f83b5f1..eea29908c1f9c6 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" diff --git a/srcpkgs/py3c/template b/srcpkgs/py3c/template index 2eaae9d74fb2fc..c3b8101a0cc68c 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" diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template index 1bfbdb43242021..2c0bd950893d91 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 " diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template index 8eda81468731d1..ab02cbc4bbcbe1 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 " license="BSD-3-Clause" diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template index f2900d5ca98f3c..5ef6a773fe8994 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" diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template index d8c0db8aea4af6..39757895700dd9 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 " license="MIT" diff --git a/srcpkgs/spectrwm/template b/srcpkgs/spectrwm/template index 0ac86b1149d69e..70701e7f1f2e8e 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 diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template index b9d403940329ad..391c20a27de371 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 diff --git a/srcpkgs/unifdef/template b/srcpkgs/unifdef/template index bfd669c2eb87ca..24b97a43708818 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 " license="BSD-2-Clause" diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index ecc647d819605e..bb3cce60eb1e57 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" diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template index 89fe76a4e8a195..0724ef53a2fa10 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 diff --git a/srcpkgs/xnots/template b/srcpkgs/xnots/template index c08b06c26d6fb0..a323b12536853a 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" diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template index dfac3851302c28..f988c84a0e7fea 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" diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template index 9325c5930ac528..5693e420e627a0 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"