separated patch, build, check and package stages

21 files changed, 111 insertions, 31 deletions

diff --git a/repo/util/bash.xibuild b/repo/util/bash.xibuild
index 5b5afd0..81fec13 100644
--- a/repo/util/bash.xibuild
+++ b/repo/util/bash.xibuild
@@ -8,10 +8,10 @@ DESC="The free Bourne Again Shell"
 build () {
     ./configure --without-bash-malloc --prefix=/usr
     make
-    make DESTDIR=$PKG_DEST install
 }
 
 package () {
+    make DESTDIR=$PKG_DEST install
     ln $PKG_DEST/usr/bin/bash $PKG_DEST/usr/bin/sh
 }
 
diff --git a/repo/util/curl.xibuild b/repo/util/curl.xibuild
index b5da8e4..a3ce1d8 100644
--- a/repo/util/curl.xibuild
+++ b/repo/util/curl.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(cacerts openssl zlib zstd libnghttp libpsl)
 
-SOURCE=https://curl.se/download/curl-7.80.0.tar.xz
+PKG_VER=7.80.0
+SOURCE=https://curl.se/download/curl-$PKG_VER.tar.xz
 DESC="A utility for transfering files with URL syntax"
 
 build () {
@@ -12,6 +13,8 @@ build () {
             --enable-threaded-resolver              \
             --with-ca-path=/etc/ssl/certs &&
     make
+}
 
+package () {
     make DESTDIR=$PKG_DEST install
 }
diff --git a/repo/util/diffutils.xibuild b/repo/util/diffutils.xibuild
index 2a14984..c55449a 100644
--- a/repo/util/diffutils.xibuild
+++ b/repo/util/diffutils.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(glibc bash)
 
-SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz
+PKG_VER=3.8
+SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-$PKG_VER.tar.xz
 DESC="Utility programs for creating patch files"
 
 build () {
     ./configure --prefix=/usr 
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/e2fsprogs.xibuild b/repo/util/e2fsprogs.xibuild
index c2de603..ee3b311 100644
--- a/repo/util/e2fsprogs.xibuild
+++ b/repo/util/e2fsprogs.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(sh util-linux)
 
-SOURCE=https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz
+PKG_VER=1.46.4
+SOURCE=https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$PKG_VER/e2fsprogs-$PKG_VER.tar.xz
 DESC="Ext2/3/4 filesystem utils"
 
 build () {
@@ -16,11 +17,10 @@ build () {
              --disable-uuidd         \
              --disable-fsck
     make
-    make DESTDIR=$PKG_DEST install 
 }
 
-
 package () {
+    make DESTDIR=$PKG_DEST install 
     rm -fv $PKG_DEST/usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
     gunzip -v $PKG_DEST/usr/share/info/libext2fs.info.gz
     install-info --dir-file=$PKG_DEST/usr/share/info/dir $PKG_DEST/usr/share/info/libext2fs.info
diff --git a/repo/util/elfutils.xibuild b/repo/util/elfutils.xibuild
index 4fef630..9162ffa 100644
--- a/repo/util/elfutils.xibuild
+++ b/repo/util/elfutils.xibuild
@@ -8,6 +8,12 @@ DESC="Handle ELF object files and DWARF debugging information"
 build () {
     ./configure --prefix=/usr --disable-debuginfod --enable-libdebuginfod=dummy
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/file.xibuild b/repo/util/file.xibuild
index 150810b..9e55dc6 100644
--- a/repo/util/file.xibuild
+++ b/repo/util/file.xibuild
@@ -2,13 +2,20 @@
 
 DEPS=(glibc zlib xz bzip2)
 
-SOURCE=http://ftp.astron.com/pub/file/file-5.40.tar.gz
+PKG_VER=5.40
+SOURCE=http://ftp.astron.com/pub/file/file-$PKG_VER.tar.gz
 DESC="A utility for determining the type of a given file or files"
 
 build () {
     ./configure --prefix=/usr 
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }
 
diff --git a/repo/util/gawk.xibuild b/repo/util/gawk.xibuild
index e06c4e3..7efbc0b 100644
--- a/repo/util/gawk.xibuild
+++ b/repo/util/gawk.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(sh glibc mpfr)
 
-SOURCE=https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz
+PKG_VER=5.1.0
+SOURCE=https://ftp.gnu.org/gnu/gawk/gawk-$PKG_VER.tar.xz
 DESC="GNU's awk"
 
 build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/grep.xibuild b/repo/util/grep.xibuild
index aab9964..ad7b9d4 100644
--- a/repo/util/grep.xibuild
+++ b/repo/util/grep.xibuild
@@ -2,12 +2,19 @@
 
 DEPS=(glibc pcre)
 
-SOURCE=https://ftp.gnu.org/gnu/grep/grep-3.7.tar.xz
+PKG_VER=3.7
+SOURCE=https://ftp.gnu.org/gnu/grep/grep-$PKG_VER.tar.xz
 DESC="A string search utility"
 
 build () {
     ./configure --prefix=/usr --bindir=/bin
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/groff.xibuild b/repo/util/groff.xibuild
index 83d970a..8dcbd33 100644
--- a/repo/util/groff.xibuild
+++ b/repo/util/groff.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(perl)
 
-SOURCE=https://ftp.gnu.org/gnu/groff/groff-1.22.4.tar.gz
+PKG_VER=1.22.4
+SOURCE=https://ftp.gnu.org/gnu/groff/groff-$PKG_VER.tar.gz
 DESC="GNU troff text-formatting system"
 
 build () {
     PAGE=A4 ./configure --prefix=/usr
     make -j1
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/inetutils.xibuild b/repo/util/inetutils.xibuild
index 89bf87c..a0c8ea8 100644
--- a/repo/util/inetutils.xibuild
+++ b/repo/util/inetutils.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(pam libcap readline ncurses libxcrypt)
 
-SOURCE=https://ftp.gnu.org/gnu/inetutils/inetutils-2.2.tar.xz
+PKG_VER=2.2
+SOURCE=https://ftp.gnu.org/gnu/inetutils/inetutils-$PKG_VER.tar.xz
 DESC="A collection of common programs for basic networking"
 
 build () {
     ./configure --prefix=/usr --bindir=/usr/bin  --localstatedir=/var --disable-logger --disable-whois  --disable-rcp  --disable-rexec --disable-rlogin --disable-rsh
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/iproute2.xibuild b/repo/util/iproute2.xibuild
index 94baef1..96ec60b 100644
--- a/repo/util/iproute2.xibuild
+++ b/repo/util/iproute2.xibuild
@@ -10,5 +10,8 @@ build () {
     rm -fv man/man8/arpd.8
 
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/keyutils.xibuild b/repo/util/keyutils.xibuild
index a2341dc..0b0992f 100644
--- a/repo/util/keyutils.xibuild
+++ b/repo/util/keyutils.xibuild
@@ -2,10 +2,14 @@
 
 DEPS=(glibc sh)
 
-SOURCE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.3.tar.gz
+PKG_VER=1.6.3
+SOURCE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$PKG_VER.tar.gz
 DESC="Linux Key Management Utils"
 
 build () {
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/less.xibuild b/repo/util/less.xibuild
index a2bb435..8903ef2 100644
--- a/repo/util/less.xibuild
+++ b/repo/util/less.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(glibc ncurses pcre2)
 
-SOURCE=https://www.greenwoodsoftware.com/less/less-590.tar.gz
+PKG_VER=590
+SOURCE=https://www.greenwoodsoftware.com/less/less-$PKG_VER.tar.gz
 DESC="A terminal based program for viewing text files"
 
 build () {
     ./configure --prefix=/usr --sysconfdir=/etc
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/make-ca.xibuild b/repo/util/make-ca.xibuild
index ff1ed76..22d495f 100644
--- a/repo/util/make-ca.xibuild
+++ b/repo/util/make-ca.xibuild
@@ -2,11 +2,14 @@
 
 DEPS=(p11-kit nss)
 
-SOURCE=https://github.com/djlucas/make-ca/releases/download/v1.7/make-ca-1.7.tar.xz
+PKG_VER=1.7
+SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz
 DESC="A utility to deliver and manage a complete PKI configuration"
 
 build () {
-
     make DESTDIR=$PKG_DEST install &&
+}
+
+package () {
     install -vdm755 $PKG_DEST/etc/ssl/local
 }
diff --git a/repo/util/man-db.xibuild b/repo/util/man-db.xibuild
index 92ce361..7f5d02c 100644
--- a/repo/util/man-db.xibuild
+++ b/repo/util/man-db.xibuild
@@ -2,13 +2,13 @@
 
 DEPS=(bash gdbm zlib groff libpipeline less)
 
-SOURCE=http://download.savannah.nongnu.org/releases/man-db/man-db-2.9.4.tar.xz
+PKG_VER=2.9.4
+SOURCE=http://download.savannah.nongnu.org/releases/man-db/man-db-$PKG_VER.tar.xz
 DESC="A utility for reading man pages"
 
 build () {
-    ./configure --prefix=/usr
     ./configure --prefix=/usr                        \
-            --docdir=/usr/share/doc/man-db-2.9.4 \
+            --docdir=/usr/share/doc/man-db-$PKG_VER \
             --sysconfdir=/etc                    \
             --disable-setuid                     \
             --enable-cache-owner=bin             \
@@ -18,5 +18,8 @@ build () {
             --with-systemdtmpfilesdir=           \
             --with-systemdsystemunitdir=
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/openssh.xibuild b/repo/util/openssh.xibuild
index 3ed91ef..a7e4b75 100644
--- a/repo/util/openssh.xibuild
+++ b/repo/util/openssh.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(glibc krb5 openssl libedit ldns libxcrypt zlib pam)
 
-SOURCE=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.8p1.tar.gz
+PKG_VER=8.8p1
+SOURCE=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$PKG_VER.tar.gz
 DESC="Premier connectivity tool for remote login with the SSH protocol"
 
 build () {
@@ -14,17 +15,17 @@ build () {
             --with-superuser-path=/usr/sbin:/usr/bin \
             --with-pid-dir=/run
     make
-    make DESTDIR=$PKG_DEST install
 }
 
 
 package () {
+    make DESTDIR=$PKG_DEST install
     install -v -m755    contrib/ssh-copy-id $PKG_DEST/usr/bin     
 
     install -v -m644    contrib/ssh-copy-id.1 \
                         $PKG_DEST/usr/share/man/man1              
-    install -v -m755 -d $PKG_DEST/usr/share/doc/openssh-8.8p1     
+    install -v -m755 -d $PKG_DEST/usr/share/doc/openssh-$PKG_VER
     install -v -m644    INSTALL LICENCE OVERVIEW README* \
-                        $PKG_DEST/usr/share/doc/openssh-8.8p1
+                        $PKG_DEST/usr/share/doc/openssh-$PKG_VER
 
 }
diff --git a/repo/util/procps-ng.xibuild b/repo/util/procps-ng.xibuild
index a5748ec..2c8731c 100644
--- a/repo/util/procps-ng.xibuild
+++ b/repo/util/procps-ng.xibuild
@@ -2,15 +2,22 @@
 
 DEPS=(glibc ncurses)
 
-SOURCE=https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-3.3.17.tar.xz
+PKG_VER=3.3.17
+SOURCE=https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$PKG_VER.tar.xz
 DESC="Utilities for monitoring your system and its processes"
 
 build () {
     ./configure --prefix=/usr                        \
-            --docdir=/usr/share/doc/procps-ng-3.3.17 \
+            --docdir=/usr/share/doc/procps-ng-$PKG_VER \
             --disable-static                         \
             --disable-kill
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/rsync.xibuild b/repo/util/rsync.xibuild
index f2547fd..e6ba587 100644
--- a/repo/util/rsync.xibuild
+++ b/repo/util/rsync.xibuild
@@ -2,13 +2,16 @@
 
 DEPS=(sh)
 
-SOURCE=https://www.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz
+PKG_VER=3.2.3
+SOURCE=https://www.samba.org/ftp/rsync/src/rsync-$PKG_VER.tar.gz
 DESC="A utility that provides fast incremental file transfer"
 
-
 build () {
     ./configure --prefix=/usr --disable-md2man --disable-lz4 --disable-xxhash --without-included-zlib &&
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }
 
diff --git a/repo/util/util-linux.xibuild b/repo/util/util-linux.xibuild
index aeb7edf..46228c1 100644
--- a/repo/util/util-linux.xibuild
+++ b/repo/util/util-linux.xibuild
@@ -2,15 +2,19 @@
 
 DEPS=(shadow coreutils libcap libxcrypt readline)
 
-SOURCE=https://cdn.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
+PKG_VER=2.37
+SOURCE=https://cdn.kernel.org/pub/linux/utils/util-linux/v$PKG_VER/util-linux-$PKG_VER.tar.xz
 DESC="System Utilities for Linux"
 
 build () {
     ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
             --libdir=/usr/lib    \
-            --docdir=/usr/share/doc/util-linux-2.20 \
+            --docdir=/usr/share/doc/util-linux-$PKG_VER\
             --disable-static     \
             runstatedir=/run
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/vim.xibuild b/repo/util/vim.xibuild
index 27e04ad..06c05a1 100644
--- a/repo/util/vim.xibuild
+++ b/repo/util/vim.xibuild
@@ -5,15 +5,19 @@ DEPS=(gpm acl glibc libgcrypt pcre zlib)
 SOURCE=https://github.com/vim/vim.git
 DESC="Vi Improved"
 
-build () {
+patch () {
     echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
+}
+
+build () {
     ./configure --prefix=/usr --disable-gtk-check --disable-motif-check --disable-athena-check --disable-gui --disable-xsmp --without-x -disable-canberra --disable-libsodium --disable-gpm --disable-libsodium
     make
-    make DESTDIR=$PKG_DEST install 
 }
 
 
 package () {
+make DESTDIR=$PKG_DEST install 
+
     cat > vimrc << "EOF"
 " Begin /etc/vimrc
 " Ensure defaults are set before customizing settings, not after
diff --git a/repo/util/which.xibuild b/repo/util/which.xibuild
index 5f682dc..8a70016 100644
--- a/repo/util/which.xibuild
+++ b/repo/util/which.xibuild
@@ -2,12 +2,17 @@
 
 DEPS=(glibc bash)
 
-SOURCE=http://ftp.gnu.org/gnu/which/which-2.21.tar.gz
+PKG_VER=2.21
+
+SOURCE=http://ftp.gnu.org/gnu/which/which-$PKG_VER.tar.gz
 DESC="A utility to show the full path of commands"
 
 build () {
     CC=gcc ./configure --prefix=/usr 
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }