diff --git a/srcpkgs/tzutils/patches/only-check-relevant.patch b/srcpkgs/tzutils/patches/only-check-relevant.patch new file mode 100644 index 0000000000..c16a47ff57 --- /dev/null +++ b/srcpkgs/tzutils/patches/only-check-relevant.patch @@ -0,0 +1,16 @@ +Index: tzutils-2021b/Makefile +=================================================================== +--- tzutils-2021b.orig/Makefile ++++ tzutils-2021b/Makefile +@@ -751,9 +751,8 @@ tzselect: tzselect.ksh version + chmod +x $@.out + mv $@.out $@ + +-check: check_character_set check_white_space check_links \ +- check_name_lengths check_sorted \ +- check_tables check_web check_zishrink check_tzs ++check: check_links check_name_lengths check_sorted \ ++ check_tables check_zishrink check_tzs + + check_character_set: $(ENCHILADA) + test ! '$(UTF8_LOCALE)' || \ diff --git a/srcpkgs/tzutils/patches/reexec-with-bash.patch b/srcpkgs/tzutils/patches/reexec-with-bash.patch new file mode 100644 index 0000000000..756146177b --- /dev/null +++ b/srcpkgs/tzutils/patches/reexec-with-bash.patch @@ -0,0 +1,17 @@ +Avoid dependencies to bash, in order to reduce the bootstrap chain, +However, this utility works better with bash because of select builtin +Index: tzutils-2021b/tzselect.ksh +=================================================================== +--- tzutils-2021b.orig/tzselect.ksh ++++ tzutils-2021b/tzselect.ksh +@@ -2,6 +2,10 @@ + # Ask the user about the time zone, and output the resulting TZ value to stdout. + # Interact with the user via stderr and stdin. + ++if [ -z "$BASH_VERSION" ] && [ -x /bin/bash ]; then ++ exec /bin/bash "$0" "$@" ++fi ++ + PKGVERSION='(tzcode) ' + TZVERSION=see_Makefile + REPORT_BUGS_TO=tz@iana.org diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 252a714929..5d9dafdae2 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,7 +1,7 @@ # Template file for 'tzutils' pkgname=tzutils -version=2021a -revision=2 +version=2021b +revision=1 bootstrap=yes wrksrc="tz-${version}" short_desc="Time zone and daylight-saving time utilities" @@ -9,11 +9,16 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain, BSD-3-Clause" homepage="https://www.iana.org/time-zones" distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz" -checksum=bd7ecd99cbb0a2f15bb7e38be2cbc04dced89922fce4ac0ffcd1ca844ba9362f +checksum=97996d405c651d981288720f03b16e7ba9173c941728015de0cf681245bb7600 do_build() { echo "$version" >version - make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" + make TZDIR=/usr/share/zoneinfo KSHELL=/bin/sh \ + CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" +} + +do_check() { + make check } do_install() {