feat: use instead

2025-03-14 01:49:41 -04:00 · 2025-03-14 01:49:41 -04:00 · 120cfdcc6a
commit 120cfdcc6a
parent ec21881388
57 changed files with 69 additions and 69 deletions
--- a/app-misc/neofetch-7.1.1.PKGBUILD
+++ b/app-misc/neofetch-7.1.1.PKGBUILD
@ -9,7 +9,7 @@ urls=("https://gitea.phywyj.dynv6.net/wyj/neofetch/archive/${pkgver}.tar.gz")
 md5sums=("421b7dc986ffb23bd8b0d74bcf20325b")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_install() {
--- a/app-shells/zsh-5.9.PKGBUILD
+++ b/app-shells/zsh-5.9.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("182e37ca3fe3fa6a44f69ad462c5c30e")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -e 's/set_from_init_file/texinfo_&/' -i Doc/Makefile.in
  sed 's|/etc/z|/etc/zsh/z|g' -i Doc/*.*
 }
--- a/dev-vcs/git-2.44.0.PKGBUILD
+++ b/dev-vcs/git-2.44.0.PKGBUILD
@ -7,10 +7,10 @@ sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://www.kernel.org/pub/software/scm/git/git-2.44.0.tar.xz")
 md5sums=("7e4eb7c45e9ba7c90fa51deeea49732f")

-distdir=${DIST_DIR}/${pkgname}-${pkgver}
+distdir=${distdir}

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_check(){
--- a/lfs/acl-2.3.2.PKGBUILD
+++ b/lfs/acl-2.3.2.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("590765dee95907dbc3c856f7255bd669")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/attr-2.5.2.PKGBUILD
+++ b/lfs/attr-2.5.2.PKGBUILD
@ -17,7 +17,7 @@ md5sums=("227043ec2f6ca03c0948df5517f9c927")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -i '/nfs/d' xattr.conf
 }

--- a/lfs/autoconf-2.72.PKGBUILD
+++ b/lfs/autoconf-2.72.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("1be79f7106ab6767f18391c5e22be701")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/automake-1.17.PKGBUILD
+++ b/lfs/automake-1.17.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("7ab3a02318fee6f5bd42adfc369abf10")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/bash-5.2.32.PKGBUILD
+++ b/lfs/bash-5.2.32.PKGBUILD
@ -10,7 +10,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("f204835b2e06c06e37b5ad776ff907f4")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/bc-6.7.6.PKGBUILD
+++ b/lfs/bc-6.7.6.PKGBUILD
@ -10,7 +10,7 @@ md5sums=("a47aa5e4e7395fbcd159a9228613b97b")
 options=(!strip)

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/binutils-2.43.1.PKGBUILD
+++ b/lfs/binutils-2.43.1.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("9202d02925c30969d1917e4bad5a2320")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  mkdir -v build
  cd       build
 }
--- a/lfs/bison-3.8.2.PKGBUILD
+++ b/lfs/bison-3.8.2.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("c28f119f405a2304ff0a7ccdcc629713")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/bzip2-1.0.8.PKGBUILD
+++ b/lfs/bzip2-1.0.8.PKGBUILD
@ -15,8 +15,8 @@ md5sums=("67e051268d0c475ea773822f7500d0e5"


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i "${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}"
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i "${distdir}/${sources[1]}"
 }

 src_build() {
--- a/lfs/dejagnu-1.6.3.PKGBUILD
+++ b/lfs/dejagnu-1.6.3.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("68c5208c58236eba447d7d6d1326b821")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  mkdir -v build
  cd       build
 }
--- a/lfs/expat-2.6.2.PKGBUILD
+++ b/lfs/expat-2.6.2.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://prdownloads.sourceforge.net/${pkgname}/${sources[0]}")
 md5sums=("101fe3e320a2800f36af8cf4045b45c7")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/expect-5.45.4.PKGBUILD
+++ b/lfs/expect-5.45.4.PKGBUILD
@ -18,8 +18,8 @@ src_prepare() {
  if ! python3 -c 'from pty import spawn; spawn(["echo", "ok"])'; then
    leaf_error "PTY issue. Cannot build."
  fi
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i ${distdir}/${sources[1]}
 }

 src_build() {
--- a/lfs/file-5.45.PKGBUILD
+++ b/lfs/file-5.45.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=("26b2a96d4e3a8938827a1e572afd527a")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/flex-2.6.4.PKGBUILD
+++ b/lfs/flex-2.6.4.PKGBUILD
@ -11,7 +11,7 @@ md5sums=("2882e3179748cc9f9c23ec593d6adc8d")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/gcc-14.2.0.PKGBUILD
+++ b/lfs/gcc-14.2.0.PKGBUILD
@ -7,7 +7,7 @@ urls=("https://ftp.gnu.org/gnu/gcc/${pkgname}-${pkgver}/${sources[0]}")
 md5sums=("2268420ba02dc01821960e274711bde0")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1 
+  tar -xf ${distdir}/${sources[0]} --strip-components=1 
  case $(uname -m) in
    x86_64)
      sed -e '/m64=/s/lib64/lib/' \
--- a/lfs/gdbm-1.24.PKGBUILD
+++ b/lfs/gdbm-1.24.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("c780815649e52317be48331c1773e987")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/gettext-0.22.5.PKGBUILD
+++ b/lfs/gettext-0.22.5.PKGBUILD
@ -13,7 +13,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("3ae5580599d84be93e6213930facb2db")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/glibc-2.40.PKGBUILD
+++ b/lfs/glibc-2.40.PKGBUILD
@ -21,8 +21,8 @@ md5sums=("b390feef233022114950317f10c4fa97"
 license=(GPL-2.0-or-later LGPL-2.1-or-later)

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i "${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}"
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i "${distdir}/${sources[1]}"
 }

 src_build() {
@ -95,10 +95,10 @@ src_install() {
  localedef -i zh_CN -f UTF-8 zh_CN.UTF-8

  if [ ! -f /etc/nsswitch.conf ]; then
-    install -m644 "${DIST_DIR}/${pkgname}-${pkgver}/nsswitch.conf" "${pkgdir}/etc/nsswitch.conf"
+    install -m644 "${distdir}/nsswitch.conf" "${pkgdir}/etc/nsswitch.conf"
  fi

-  tar -xf "${DIST_DIR}/${pkgname}-${pkgver}/tzdata2024a.tar.gz"
+  tar -xf "${distdir}/tzdata2024a.tar.gz"
  ZONEINFO=${pkgdir}/usr/share/zoneinfo
  mkdir -pv $ZONEINFO/{posix,right}
  for tz in etcetera southamerica northamerica europe africa antarctica  \
@ -112,7 +112,7 @@ src_install() {
  unset ZONEINFO

  if [ ! -f /etc/ld.so.conf ]; then
-    install -m644 "${DIST_DIR}/${pkgname}-${pkgver}/ld.so.conf" "${pkgdir}/etc/ld.so.conf"
+    install -m644 "${distdir}/ld.so.conf" "${pkgdir}/etc/ld.so.conf"
  fi
 }

--- a/lfs/gmp-6.3.0.PKGBUILD
+++ b/lfs/gmp-6.3.0.PKGBUILD
@ -10,7 +10,7 @@ md5sums=("956dc04e864001a9c22429f761f2c283")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/gperf-3.1.PKGBUILD
+++ b/lfs/gperf-3.1.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("9e251c0a618ad0824b51117d5d9db87e")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/grep-3.11.PKGBUILD
+++ b/lfs/grep-3.11.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=('7c9bbd74492131245f7cdb291fa142c0')

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/iana-etc-20240806.PKGBUILD
+++ b/lfs/iana-etc-20240806.PKGBUILD
@ -7,10 +7,10 @@ urls=('https://github.com/Mic92/iana-etc/releases/download/20240806/iana-etc-202
 md5sums=("ea3c37c00d22f1159fc3b7d988de8476")
 license=('custom:none')

-distdir=${DIST_DIR}/${pkgname}-${pkgver}
+distdir=${distdir}

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/inetutils-2.5.PKGBUILD
+++ b/lfs/inetutils-2.5.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("9e5a6dfd2d794dc056a770e8ad4a9263")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -i 's/def HAVE_TERMCAP_TGETENT/ 1/' telnet/telnet.c
 }

--- a/lfs/intltool-0.51.0.PKGBUILD
+++ b/lfs/intltool-0.51.0.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://launchpad.net/intltool/trunk/0.51.0/+download/${sources[0]}")
 md5sums=("12e517cac2b57a0121cda351570f1e63")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -i 's:\\\${:\\\$\\{:' intltool-update.in
 }

--- a/lfs/kmod-33.PKGBUILD
+++ b/lfs/kmod-33.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://www.kernel.org/pub/linux/utils/kernel/${pkgname}/${sources[0]}")
 md5sums=("c451c4aa61521adbe8af147f498046f8")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/less-661.PKGBUILD
+++ b/lfs/less-661.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://www.greenwoodsoftware.com/${pkgname}/${sources[0]}")
 md5sums=("44f54b6313c5d71fa1ac224d8d84766a")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/libcap-2.70.PKGBUILD
+++ b/lfs/libcap-2.70.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("df0e20c6eeca849347b87d5d6a8870c0")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -i '/install -m.*STA/d' libcap/Makefile
 }

--- a/lfs/libelf-0.191.PKGBUILD
+++ b/lfs/libelf-0.191.PKGBUILD
@ -9,7 +9,7 @@ urls=("https://sourceware.org/ftp/${_pkgbase}/${pkgver}/${sources[0]}")
 md5sums="636547248fb3fae58ec48030298d3ef7"

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/libffi-3.4.6.PKGBUILD
+++ b/lfs/libffi-3.4.6.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://github.com/libffi/libffi/releases/download/v${pkgver}/${sources[0
 md5sums=("b9cac6c5997dca2b3787a59ede34e0eb")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/libtool-2.4.7.PKGBUILD
+++ b/lfs/libtool-2.4.7.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("2fc0b6ddcd66a89ed6e45db28fa44232")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/libxcrypt-4.4.36.PKGBUILD
+++ b/lfs/libxcrypt-4.4.36.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("b84cd4104e08c975063ec6c4d0372446")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/libxcrypt-compat-4.4.36.PKGBUILD
+++ b/lfs/libxcrypt-compat-4.4.36.PKGBUILD
@ -10,7 +10,7 @@ md5sums=("b84cd4104e08c975063ec6c4d0372446")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/lz4-4.10.0.PKGBUILD
+++ b/lfs/lz4-4.10.0.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz")
 md5sums=("dead9f5f1966d9ae56e1e32761e4e675")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/m4-1.4.19.PKGBUILD
+++ b/lfs/m4-1.4.19.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("0d90823e1426f1da2fd872df0311298d")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/man-pages-6.9.1.PKGBUILD
+++ b/lfs/man-pages-6.9.1.PKGBUILD
@ -6,10 +6,10 @@ sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.9.1.tar.xz")
 md5sums=("4d56775b6cce4edf1e496249e7c01c1a")

-distdir=${DIST_DIR}/${pkgname}-${pkgver}
+distdir=${distdir}

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_check(){
--- a/lfs/mpc-1.3.1.PKGBUILD
+++ b/lfs/mpc-1.3.1.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("5c9bc658c9fd0f940e8e3e0f09530c62")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/mpfr-4.2.1.PKGBUILD
+++ b/lfs/mpfr-4.2.1.PKGBUILD
@ -16,7 +16,7 @@ md5sums=("523c50c6318dde6f9dc523bc0244690a")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/ncurses-6.5.PKGBUILD
+++ b/lfs/ncurses-6.5.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://invisible-mirror.net/archives/ncurses/${sources[0]}")
 md5sums=("ac2d2629296f04c8537ca706b6977687")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/openssl-3.3.1.PKGBUILD
+++ b/lfs/openssl-3.3.1.PKGBUILD
@ -9,7 +9,7 @@ urls=("https://www.openssl.org/source/${sources[0]}")
 md5sums=("8a4342b399c18f870ca6186299195984")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/perl-5.40.0.PKGBUILD
+++ b/lfs/perl-5.40.0.PKGBUILD
@ -9,7 +9,7 @@ urls=("https://www.cpan.org/src/5.0/${sources[0]}")
 md5sums=("cfe14ef0709b9687f9c514042e8e1e82")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/perl-xml-parser-2.47.PKGBUILD
+++ b/lfs/perl-xml-parser-2.47.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://cpan.metacpan.org/authors/id/T/TO/TODDR/${sources[0]}")
 md5sums=("89a8e82cfd2ad948b349c0a69c494463")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/pkgconf-2.3.0.PKGBUILD
+++ b/lfs/pkgconf-2.3.0.PKGBUILD
@ -9,7 +9,7 @@ md5sums=("833363e77b5bed0131c7bc4cc6f7747b")


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/psmisc-23.7.PKGBUILD
+++ b/lfs/psmisc-23.7.PKGBUILD
@ -7,7 +7,7 @@ urls="https://sourceforge.net/projects/psmisc/files/${pkgname}/${sources[0]}"
 md5sums="53eae841735189a896d614cba440eb10"

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/python-3.12.5.PKGBUILD
+++ b/lfs/python-3.12.5.PKGBUILD
@ -14,8 +14,8 @@ md5sums=("02c7d269e077f4034963bba6befdc715"
 )

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  tar --no-same-owner -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  tar --no-same-owner -xf ${distdir}/${sources[1]}
 }

 src_build() {
--- a/lfs/python-flit-core-3.9.0.PKGBUILD
+++ b/lfs/python-flit-core-3.9.0.PKGBUILD
@ -9,6 +9,6 @@ urls=("https://pypi.org/packages/source/f/${_name}/${sources[0]}")
 md5sums=("3bc52f1952b9a78361114147da63c35b")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

--- a/lfs/python-setuptools-72.2.0.PKGBUILD
+++ b/lfs/python-setuptools-72.2.0.PKGBUILD
@ -9,7 +9,7 @@ urls=("https://pypi.org/packages/source/s/${_name}/${sources[0]}")
 md5sums=("2e0ffd0f6fc632a11442b79d9b1c68bd")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/readline-8.2.13.PKGBUILD
+++ b/lfs/readline-8.2.13.PKGBUILD
@ -10,7 +10,7 @@ urls=("https://ftp.gnu.org/gnu/readline/readline-${pkgver}.tar.gz")
 md5sums=("05080bf3801e6874bb115cd6700b708f")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
  sed -i '/MV.*old/d' Makefile.in
  sed -i '/{OLDSUFF}/c:' support/shlib-install
  sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf
--- a/lfs/sed-4.9.PKGBUILD
+++ b/lfs/sed-4.9.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("6aac9b2dbafcd5b7a67a8a9bcb8036c3")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/shadow-4.16.0.PKGBUILD
+++ b/lfs/shadow-4.16.0.PKGBUILD
@ -15,7 +15,7 @@ md5sums=("eb70bad3316d08f0d3bb3d4bbeccb3b4"


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1

  sed -i 's/groups$(EXEEXT) //' src/Makefile.in
  find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
@ -41,5 +41,5 @@ src_install() {
  make exec_prefix=/usr DESTDIR="${pkgdir}" install
  make DESTDIR="${pkgdir}" -C man install-man
  install -vDm 644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -vDm 600 "${DIST_DIR}/${pkgname}-${pkgver}/useradd" -t "${pkgdir}/etc/default/"
+  install -vDm 600 "${distdir}/useradd" -t "${pkgdir}/etc/default/"
 }
--- a/lfs/tcl-8.6.14.PKGBUILD
+++ b/lfs/tcl-8.6.14.PKGBUILD
@ -16,7 +16,7 @@ md5sums=("c30b57c6051be28fa928d09aca82841e"


 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
@ -58,7 +58,7 @@ src_install() {
  mv "${pkgdir}"/usr/share/man/man3/{Thread,Tcl_Thread}.3
  
  cd ..
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]} --strip-components=1
+  tar -xf ${distdir}/${sources[1]} --strip-components=1
  mkdir -v -p "${pkgdir}/usr/share/doc/tcl-8.6.14"
  cp -v -r  ./html/* "${pkgdir}/usr/share/doc/tcl-8.6.14"
 }
--- a/lfs/xz-5.6.2.PKGBUILD
+++ b/lfs/xz-5.6.2.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://github.com//tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.
 md5sums=("bbf73fb28425cebb854328599f85c4cf")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/zlib-1.3.1.PKGBUILD
+++ b/lfs/zlib-1.3.1.PKGBUILD
@ -8,7 +8,7 @@ urls=("https://zlib.net/fossils/zlib-1.3.1.tar.gz")
 md5sums=("9855b6d802d7fe5b7bd5b196a2271655")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/lfs/zstd-1.5.6.PKGBUILD
+++ b/lfs/zstd-1.5.6.PKGBUILD
@ -11,7 +11,7 @@ urls=("https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.
 md5sums=("5a473726b3445d0e5d6296afd1ab6854")

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {
--- a/net-misc/wget-1.25.0.PKGBUILD
+++ b/net-misc/wget-1.25.0.PKGBUILD
@ -8,7 +8,7 @@ urls=(https://ftp.gnu.org/gnu/${pkgname}/${sources[0]})
 md5sums=('c70ba58b36f944e8ba1d655ace552881')

 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }

 src_build() {