From 8a27a4b46bde4d6ae56a4bcc90406173f7f9dbc1 Mon Sep 17 00:00:00 2001 From: Kevin Daudt Date: Thu, 14 Mar 2024 15:25:15 +0000 Subject: [PATCH] main/haserl: modernize - Use default_prepare instead of custom patch logic - Use builddir - Use amove - Remove unused variable in _split --- main/haserl/APKBUILD | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD index 45b4ae9d4c0..37f858a1570 100644 --- a/main/haserl/APKBUILD +++ b/main/haserl/APKBUILD @@ -22,21 +22,16 @@ source="https://downloads.sourceforge.net/haserl/haserl-$pkgver.tar.gz" # 0.9.36-r0: # - CVE-2021-29133 -_sdir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_sdir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i;; - esac - done + default_prepare + sed -i -e 's/^ /\t/' src/Makefile.am rm -f src/haserl_lualib.inc aclocal && autoconf && autoheader && automake --add-missing for _i in $_luaversions; do - cp -r "$_sdir" "$srcdir"/build-$_i + cp -r "$builddir" "$srcdir"/build-$_i done } @@ -63,14 +58,12 @@ package() { } _split() { - local d= _ver=$1 + local _ver=$1 pkgdesc="Html And Shell Embedded Report Language with Lua $_ver support" replaces="$pkgname" depends= - if [ -f "$pkgdir"/usr/bin/haserl-lua$_ver ]; then - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/haserl-lua$_ver "$subpkgdir"/usr/bin/ - fi + + amove usr/bin/haserl-lua$_ver } for _i in $_luaversions; do