From 037820a5ece6ea026a26991da1629ea2d1c2bcfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 23:59:42 +0700 Subject: [PATCH 1/7] hitch: stop breaking masterdir With grep in checkdepends, xbps-src will remove it on do_clean, which will remove base_chroot. --- srcpkgs/hitch/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index b34b15e16b4..37207973dca 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes" hostmakedepends="pkg-config automake" makedepends="libev-devel libressl-devel" -checkdepends="lsof curl grep" +checkdepends="lsof curl" short_desc="Libev-based high performance SSL/TLS proxy" maintainer="Jannis Christ " license="BSD-2-Clause" @@ -17,6 +17,11 @@ system_accounts="_hitch" CFLAGS="-fcommon" +post_patch() { + vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \ + src/tests/test32-proxy-authority.sh +} + pre_configure() { autoreconf -fi } From 830c381bf5f87ebf66127c6a277b9f9ab44e4bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:05:28 +0700 Subject: [PATCH 2/7] e2fsprogs+fatsort: stop breaking masterdir With diffutils in checkdepends, xbps-src will remove it on do_clean, which will remove base-chroot. --- srcpkgs/e2fsprogs/template | 2 +- srcpkgs/fatsort/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index 5dfcd9d51a3..c301f23ab6c 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -11,7 +11,7 @@ configure_args="--enable-elf-shlibs --disable-fsck make_install_args="install-libs" hostmakedepends="texinfo pkg-config" makedepends="libuuid-devel libblkid-devel" -checkdepends="diffutils perl" +checkdepends="perl" short_desc="Ext2/3/4 Filesystem Utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template index a31c5f1d9a5..5cba67f8dfe 100644 --- a/srcpkgs/fatsort/template +++ b/srcpkgs/fatsort/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile make_check_target=tests make_install_args="MANDIR=/usr/share/man/man1 SBINDIR=/usr/bin" -checkdepends="xz dosfstools diffutils valgrind" +checkdepends="xz dosfstools valgrind" short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions" maintainer="tibequadorian " license="GPL-2.0-or-later" From 0e65d5ad7a6ac3447889ef8933f919e35627cee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:05:28 +0700 Subject: [PATCH 3/7] srcpkgs: remove gzip from {hostmake,check}depends With gzip in {hostmake,check}depends, xbps-src will remove it on do_clean, which will remove base-chroot. --- srcpkgs/font-spleen/template | 2 +- srcpkgs/mesa/template | 2 +- srcpkgs/texinfo/template | 2 +- srcpkgs/xorg-server/template | 2 +- srcpkgs/zziplib/template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template index 8ebf0b1022f..1380eb905c8 100644 --- a/srcpkgs/font-spleen/template +++ b/srcpkgs/font-spleen/template @@ -6,7 +6,7 @@ wrksrc="spleen-${version}" build_style=gnu-makefile make_cmd=bmake make_build_target="pcf psf" -hostmakedepends="bmake bdftopcf bdf2psf gzip" +hostmakedepends="bmake bdftopcf bdf2psf" depends="font-util" short_desc="Monospaced bitmap fonts" maintainer="Renato Aguiar " diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index d6797b170dc..a9d95737050 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -8,7 +8,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true -Dlmsensors=true -Dplatforms=x11,wayland -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14" -hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip +hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang wayland-protocols wayland-devel" makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index 8b1addad559..94dc718ce7b 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -7,7 +7,7 @@ configure_args="--disable-static --disable-perl-xs" hostmakedepends="perl ncurses-devel" makedepends="ncurses-devel" depends="gzip perl" -checkdepends="ncurses gzip" +checkdepends="ncurses" short_desc="GNU Documentation System" maintainer="Enno Boland " license="GPL-3.0-or-later" diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index a6a7ca7f4d7..5e48034444e 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -10,7 +10,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false) -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true" -hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip" +hostmakedepends="pkg-config wayland-devel xkbcomp flex" makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template index 60a6da94452..74c093cff52 100644 --- a/srcpkgs/zziplib/template +++ b/srcpkgs/zziplib/template @@ -3,7 +3,7 @@ pkgname=zziplib version=0.13.71 revision=1 build_style=cmake -hostmakedepends="pkg-config python3 tar zip gzip" +hostmakedepends="pkg-config python3 tar zip" makedepends="zlib-devel" short_desc="Lightweight library to extract data from zip files" maintainer="Orphaned " From 561198b169ee8f4e01b1c446b3038bdd7ab09fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:05:28 +0700 Subject: [PATCH 4/7] docbook{,-xml}+ghidra+rdup: stop breaking masterdir With bsdtar in {hostmake,check}depends, xbps-src will remove it on do_clean, which will remove base-chroot. --- srcpkgs/docbook-xml/template | 1 - srcpkgs/docbook/template | 1 - srcpkgs/ghidra/template | 2 +- srcpkgs/rdup/template | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template index b5708c96dc9..b46f1d7646d 100644 --- a/srcpkgs/docbook-xml/template +++ b/srcpkgs/docbook-xml/template @@ -3,7 +3,6 @@ pkgname=docbook-xml version=4.5 revision=5 wrksrc="docbook" -hostmakedepends="bsdtar" makedepends="xmlcatmgr" depends="xmlcatmgr" short_desc="XML DTD designed for computer documentation" diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template index b77b4eb338c..3e5349aa9a4 100644 --- a/srcpkgs/docbook/template +++ b/srcpkgs/docbook/template @@ -2,7 +2,6 @@ pkgname=docbook version=4.5 revision=5 -hostmakedepends="bsdtar" depends="xmlcatmgr ISOEnts" short_desc="SGML DTD designed for computer documentation" maintainer="Orphaned " diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template index b96fb5df84d..8ca5e75d195 100644 --- a/srcpkgs/ghidra/template +++ b/srcpkgs/ghidra/template @@ -4,7 +4,7 @@ version=9.2 revision=1 archs="x86_64*" create_wrksrc=yes -hostmakedepends="gradle openjdk11 flex bsdtar unzip" +hostmakedepends="gradle openjdk11 flex unzip" depends="openjdk11" short_desc="Software reverse engineering (SRE) framework" maintainer="Andrew Benson " diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template index 82877b9bec5..d06b17e0cdf 100644 --- a/srcpkgs/rdup/template +++ b/srcpkgs/rdup/template @@ -5,8 +5,8 @@ revision=3 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="glib-devel libarchive-devel nettle-devel" -checkdepends="bsdtar dejagnu" -short_desc="The only backup program that doesn't make backups" +checkdepends="dejagnu" +short_desc="Backup program that doesn't make backups" maintainer="Rui Abreu Ferreira " license="GPL-3.0-or-later" homepage="https://github.com/miekg/rdup" From cbda268a3c81920560ae6a10707c7028fffe3382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:25:33 +0700 Subject: [PATCH 5/7] srcpkgs: remove ncurses from {hostmake,make,check}depends xbps-src will remove ncurses in do_clean, which removes base-chroot --- srcpkgs/fbterm/template | 2 +- srcpkgs/ghc-bin/template | 2 +- srcpkgs/gpsd/template | 2 +- srcpkgs/kitty/template | 2 +- srcpkgs/nmh/template | 2 +- srcpkgs/rxvt-unicode/template | 2 +- srcpkgs/texinfo/template | 1 - srcpkgs/util-linux-libs/template | 1 - srcpkgs/util-linux/template | 1 - 9 files changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/fbterm/template b/srcpkgs/fbterm/template index 299914c4b10..f97ecc509dc 100644 --- a/srcpkgs/fbterm/template +++ b/srcpkgs/fbterm/template @@ -5,7 +5,7 @@ revision=6 wrksrc="${pkgname}-${version%.*}" build_style=gnu-configure configure_args="--enable-gpm" -hostmakedepends="pkg-config ncurses" +hostmakedepends="pkg-config" makedepends="fontconfig-devel gpm-devel" short_desc="Fast frame buffer based terminal emulator" maintainer="Leah Neukirchen " diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template index b6009ed7c6b..3490190c209 100644 --- a/srcpkgs/ghc-bin/template +++ b/srcpkgs/ghc-bin/template @@ -4,7 +4,7 @@ version=8.8.4 revision=1 archs="i686 x86_64* ppc64le*" wrksrc="ghc-${version%[!0-9]}" -hostmakedepends="ncurses perl libffi libnuma" +hostmakedepends="perl libffi libnuma" depends="ncurses perl gcc libffi-devel gmp-devel" short_desc="Glorious Haskell Compiler - precompiled binaries" maintainer="Orphaned " diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index b4a1d8d5f6e..4198bf21493 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -7,7 +7,7 @@ make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC} qt_versioned=5" make_install_args="$make_build_args" make_install_target=udev-install -hostmakedepends="pkg-config bc python3-pyserial libxslt xmlto asciidoc ncurses" +hostmakedepends="pkg-config bc python3-pyserial libxslt xmlto asciidoc" makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel pps-tools-devel libcap-devel libbluetooth-devel qt5-devel" short_desc="GPS/AIS receiver monitoring daemon" diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index f0292dfb5c4..0b1d93b3911 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -3,7 +3,7 @@ pkgname=kitty version=0.19.3 revision=1 pycompile_dirs="usr/lib/kitty" -hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols" +hostmakedepends="pkg-config python3 wayland-devel wayland-protocols" makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel python3-devel wayland-devel wayland-protocols libcanberra-devel" depends="kitty-terminfo-${version}_${revision}" diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template index 6906aa7e01b..2f99163a95e 100644 --- a/srcpkgs/nmh/template +++ b/srcpkgs/nmh/template @@ -5,7 +5,7 @@ revision=5 build_style=gnu-configure configure_args="--with-cyrus-sasl --with-tls" makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel" -checkdepends="groff lynx ncurses tzdata" +checkdepends="groff lynx tzdata" conf_files="/etc/nmh/*" short_desc="Message Handling System (New RAND Mail Handler)" maintainer="Leah Neukirchen " diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index 15eaf7d84c3..483d4765916 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -13,7 +13,7 @@ configure_args=" $(vopt_if perl '--enable-perl' '--disable-perl') $(vopt_if startup_notification '--enable-startup-notification' '--disable-startup-notification') $(vopt_if unicode3 '--enable-unicode3' '--disable-unicode3')" -hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf') ncurses" +hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf')" makedepends="xorgproto fontconfig-devel libXrender-devel libXft-devel libSM-devel $(vopt_if gdk_pixbuf gdk-pixbuf-devel) $(vopt_if perl perl) diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index 94dc718ce7b..c183625028c 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -7,7 +7,6 @@ configure_args="--disable-static --disable-perl-xs" hostmakedepends="perl ncurses-devel" makedepends="ncurses-devel" depends="gzip perl" -checkdepends="ncurses" short_desc="GNU Documentation System" maintainer="Enno Boland " license="GPL-3.0-or-later" diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template index 2f639a72e07..53d166ba1e2 100644 --- a/srcpkgs/util-linux-libs/template +++ b/srcpkgs/util-linux-libs/template @@ -10,7 +10,6 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel" depends="libfdisk-${version}_${revision} libblkid-${version}_${revision} libmount-${version}_${revision} libsmartcols-${version}_${revision} libuuid-${version}_${revision}" -checkdepends="ncurses" # Some tests require terminfo-entries short_desc="Miscellaneous linux utilities - meta libraries" maintainer="Enno Boland " license="GPL-2.0-or-later" diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 8a9a2e30415..2d1f0759537 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -7,7 +7,6 @@ hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz" makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel eudev-libudev-devel" depends="util-linux-libs-${version}_${revision}" -checkdepends="ncurses" # Some tests require terminfo-entries short_desc="Miscellaneous linux utilities" maintainer="Enno Boland " license="GPL-2.0-or-later" From 70e213aa82a2b6bd830dbbd170aca560328954ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:27:02 +0700 Subject: [PATCH 6/7] ncurses: host always has tic(1) --- srcpkgs/ncurses/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index f6f70b36e06..90454e01ec1 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -11,10 +11,6 @@ homepage="http://www.gnu.org/software/ncurses/" distfiles="${GNU_SITE}/ncurses/$pkgname-$version.tar.gz" checksum=30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d -if [ "$CROSS_BUILD" ]; then - # needs host tic(1) - hostmakedepends="ncurses" -fi depends="ncurses-base-${version}_${revision}" do_configure() { From 2dec1dbe4d40ff925d72871b543cfb5bc60d2cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 00:28:45 +0700 Subject: [PATCH 7/7] toilet: don't include file in hostmakedepends --- srcpkgs/toilet/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/toilet/template b/srcpkgs/toilet/template index 6153c377466..5c72adad31f 100644 --- a/srcpkgs/toilet/template +++ b/srcpkgs/toilet/template @@ -1,23 +1,23 @@ -# Template build file for 'toilet' +# Template file for 'toilet' pkgname=toilet version=0.3 -revision=2 +revision=3 build_style=gnu-configure -short_desc="a program for making large letters out of ordinary text" +hostmakedepends="pkg-config unzip" +makedepends="libcaca-devel" +short_desc="Program for making large letters out of ordinary text" maintainer="Enno Boland " license="WTFPL" homepage="http://caca.zoy.org/wiki/toilet" -hostmakedepends="pkg-config file unzip" -makedepends="libcaca-devel" distfiles="http://caca.zoy.org/raw-attachment/wiki/${pkgname}/${pkgname}-${version}.tar.gz" checksum=89d4b530c394313cc3f3a4e07a7394fa82a6091f44df44dfcd0ebcb3300a81de -post_install() { - # Extract ZIP Files - - for i in $DESTDIR/usr/share/figlet/*.tlf; do - file --mime-type -b -- "$i" | grep -xF "application/zip" || continue - unzip -p -- "$i" > "${i}.out" - mv ${i}.out ${i} +post_extract() { + find fonts | + file --mime-type --files-from - | + awk -F: '/application\/zip$/ {print $1}' | + while read _file; do + unzip -p -- "$_file" >"$_file.out" + mv "$_file.out" "$_file" done }