23 files changed, 130 insertions, 43 deletions
diff --git a/repo/devel/asciidoc.xibuild b/repo/devel/asciidoc.xibuild
index 47b51a0..135dcb7 100644
--- a/repo/devel/asciidoc.xibuild
+++ b/repo/devel/asciidoc.xibuild
@@ -2,11 +2,10 @@
 
 DEPS=(python libxslt docbook-xsl)
 
-SOURCE=https://github.com/asciidoc-py/asciidoc-py/releases/download/10.1.1/asciidoc-10.1.1.tar.gz
+PKG_VER=10.1.1
+SOURCE=https://github.com/asciidoc-py/asciidoc-py/releases/download/$PKG_VER/asciidoc-$PKG_VER.tar.gz
 DESC="Text document format for short documents, articles, books and UNIX man pages"
 
-
-
 package () {
     pip install -t $PKG_DEST/usr/lib/python3.10/site-packages/ asciidoc
     mkdir -pv $PKG_DEST/usr/bin
diff --git a/repo/devel/autoconf.xibuild b/repo/devel/autoconf.xibuild
index b61179f..8d355b5 100644
--- a/repo/devel/autoconf.xibuild
+++ b/repo/devel/autoconf.xibuild
@@ -2,12 +2,19 @@
 
 DEPS=(awk m4 diffutils perl sh)
 
-SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.xz
+PKG_VER=2.71
+SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-$PKG_VER.tar.xz
 DESC="GNU programs for producing shell scripts that can automatically configure source code"
 
 build () {
     ./configure --prefix=/usr --sysconfdir=/etc
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/automake.xibuild b/repo/devel/automake.xibuild
index f83fc62..2d65042 100644
--- a/repo/devel/automake.xibuild
+++ b/repo/devel/automake.xibuild
@@ -2,17 +2,22 @@
 
 DEPS=(perl bash)
 
-SOURCE=https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.xz
+PKG_VER=1.16.5
+SOURCE=https://ftp.gnu.org/gnu/automake/automake-$PKG_VER.tar.xz
 DESC="A GNU tool for automatically creating Makefiles"
 
 build () {
-    ./configure --prefix=/usr -docdir=/usr/share/doc/automake-1.16.5
+    ./configure --prefix=/usr -docdir=/usr/share/doc/automake-$PKG_VER
     make
+}
+
+check () {
     make -j4 check
-    make DESTDIR=$PKG_DEST install 
 }
 
 package () {
+    make DESTDIR=$PKG_DEST install
+
     # backwards compatibility?
     ln -s /usr/bin/aclocal $PKG_DEST/usr/bin/aclocal-1.15
 }
diff --git a/repo/devel/bc.xibuild b/repo/devel/bc.xibuild
index 160b6f5..76231c6 100644
--- a/repo/devel/bc.xibuild
+++ b/repo/devel/bc.xibuild
@@ -2,14 +2,19 @@
 
 DEPS=(readline)
 
-SOURCE=https://github.com/gavinhoward/bc/releases/download/5.2.1/bc-5.2.1.tar.xz
+PKG_VER=5.2.1
+SOURCE=https://github.com/gavinhoward/bc/releases/download/$PKG_VER/bc-$PKG_VER.tar.xz
 DESC="An arbitrary precision numeric processing language"
 
 build () {
     CC=gcc ./configure --prefix=/usr -G -O3
     make
-    make test
-    make DESTDIR=$PKG_DEST install
 }
 
+check () {
+    make test
+}
 
+package () {
+    make DESTDIR=$PKG_DEST install
+}
diff --git a/repo/devel/bison.xibuild b/repo/devel/bison.xibuild
index 60c231a..59c56f5 100644
--- a/repo/devel/bison.xibuild
+++ b/repo/devel/bison.xibuild
@@ -9,6 +9,12 @@ DESC="The GNU general-purpose parser generator"
 build () {
     ./configure --prefix=/usr --docdir=/usr/share/doc/bison-$PKG_VER
     make
+}
+
+check () {
     make check 
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/check.xibuild b/repo/devel/check.xibuild
index a472872..c03e775 100644
--- a/repo/devel/check.xibuild
+++ b/repo/devel/check.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(awk)
 
-SOURCE=https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz
+PKG_VER=0.15.2
+SOURCE=https://github.com/libcheck/check/releases/download/$PKG_VER/check-$PKG_VER.tar.gz
 DESC="A unit testing framework for C"
 
 build () {
     ./configure --prefix=/usr --disable-static
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/cmake.xibuild b/repo/devel/cmake.xibuild
index 1b9959e..10e4485 100644
--- a/repo/devel/cmake.xibuild
+++ b/repo/devel/cmake.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(curl libarchive jsoncpp libuv rhash)
 
-SOURCE=https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz
+PKG_VER=3.22.1
+SOURCE=https://github.com/Kitware/CMake/releases/download/v$PKG_VER/cmake-$PKG_VER.tar.gz
 DESC="A cross-platform open-source make system"
 
 build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/dejagnu.xibuild b/repo/devel/dejagnu.xibuild
index 21a35a4..43c2002 100644
--- a/repo/devel/dejagnu.xibuild
+++ b/repo/devel/dejagnu.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(sh expect)
 
-SOURCE=https://ftp.gnu.org/gnu/dejagnu/dejagnu-1.6.3.tar.gz
+PKG_VER=1.6.3
+SOURCE=https://ftp.gnu.org/gnu/dejagnu/dejagnu-$PKG_VER.tar.gz
 DESC="a framework for running test suites on GNU tools"
 
 build () {
@@ -13,11 +14,13 @@ build () {
 
     makeinfo --html --no-split -o doc/dejagnu.html ../doc/dejagnu.texi
     makeinfo --plaintext -o doc/dejagnu.txt ../doc/dejagnu.texi
+}
 
+package () {
     make DESTDIR=$PKG_DEST install
 
-    install -v -dm755 $PKG_DEST/usr/share/doc/dejagnu-1.6.3
-    install -v -m644 doc/dejagnu.{html,txt} $PKG_DEST/usr/share/doc/dejagnu-1.6.3
+    install -v -dm755 $PKG_DEST/usr/share/doc/dejagnu-$PKG_VER
+    install -v -m644 doc/dejagnu.{html,txt} $PKG_DEST/usr/share/doc/dejagnu-$PKG_VER
 }
 
 
diff --git a/repo/devel/distcc.xibuild b/repo/devel/distcc.xibuild
index 8d4039b..2011608 100644
--- a/repo/devel/distcc.xibuild
+++ b/repo/devel/distcc.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(gcc python)
 
-SOURCE=https://github.com/distcc/distcc/releases/download/v3.4/distcc-3.4.tar.gz
+PKG_VER=3.4
+SOURCE=https://github.com/distcc/distcc/releases/download/v$PKG_VER/distcc-$PKG_VER.tar.gz
 
 DESC="Distributed compiler for C, C++ and Objective-C"
 
diff --git a/repo/devel/expect.xibuild b/repo/devel/expect.xibuild
index cb5b6f6..084185c 100644
--- a/repo/devel/expect.xibuild
+++ b/repo/devel/expect.xibuild
@@ -2,18 +2,22 @@
 
 DEPS=(tcl)
 
-SOURCE=https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz/download
+PKG_VER=5.45.4
+SOURCE=https://sourceforge.net/projects/expect/files/Expect/$PKG_VER/expect$PKG_VER.tar.gz/download
 DESC="tools for automating interactive applications"
 
 build () {
     # note: --with-tcl, we might want to make a way to use the tcl that we've compiled in another package
     ./configure --prefix=/usr --with-tcl=/usr/lib --enable-shared --mandir=/usr/share/man --with-tclinclude=/usr/include
     make
+}
+
+check () {
     make test
-    make DESTDIR=$PKG_DEST install
 }
 
 package () {
+    make DESTDIR=$PKG_DEST install
     cp libexpect*.so $PKG_DEST/usr/lib
 }
 
diff --git a/repo/devel/flex.xibuild b/repo/devel/flex.xibuild
index f5291cc..bd7a96f 100644
--- a/repo/devel/flex.xibuild
+++ b/repo/devel/flex.xibuild
@@ -2,17 +2,21 @@
 
 DEPS=(glibc m4 sh)
 
-SOURCE=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+PKG_VER=2.6.4
+SOURCE=https://github.com/westes/flex/releases/download/v$PKG_VER/flex-$PKG_VER.tar.gz
 DESC="a utility for generating programs that recognize patterns in text"
 
 build () {
     ./configure --prefix=/usr --docdir=/usr/share/doc/flex --disable-static
     make
+}
+
+check () {
     make check
-    make DESTDIR=$PKG_DEST install
 }
 
 package () {
+    make DESTDIR=$PKG_DEST install
     ln -v /usr/bin/flex $PKG_DEST/usr/bin/lex
 }
 
diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild
index ab9830d..30a0698 100644
--- a/repo/devel/gcc.xibuild
+++ b/repo/devel/gcc.xibuild
@@ -2,12 +2,12 @@
 
 DEPS=(glibc)
 
-SOURCE=https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-11.2.0/gcc-11.2.0.tar.xz
+PKG_VER=11.2.0
+SOURCE=https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$PKG_VER/gcc-$PKG_VER.tar.xz
 
 DESC="The GNU Compiler Collection - C and C++ frontends"
 
-
-build () {
+patch () {
     #fix an issue breaking libasan.a
 
     sed -e '/static.*SIGSTKSZ/d' \
@@ -20,8 +20,9 @@ build () {
             -i.orig gcc/config/i386/t-linux64
       ;;
     esac
+}
 
-
+build () {
     mkdir -v build
     cd build
 
@@ -33,7 +34,9 @@ build () {
              --with-system-zlib
 
     make
+}
 
+check () {
     ulimit -s 32768
 
     if id -u tester; then
@@ -41,7 +44,6 @@ build () {
         su tester -c "PATH=$PATH make $MAKEFLAGS -k check"
         ../contrib/test_summary | grep -A7 Summ
     fi
-
 }
 
 
diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild
index 7f8d277..b9c7665 100644
--- a/repo/devel/git.xibuild
+++ b/repo/devel/git.xibuild
@@ -2,7 +2,8 @@
 
 DEPS=(curl perl openssl pcre2 grep shadow zlib)
 
-SOURCE=https://www.kernel.org/pub/software/scm/git/git-2.34.1.tar.xz
+PKG_VER=2.34.1
+SOURCE=https://www.kernel.org/pub/software/scm/git/git-$PKG_VER.tar.xz
 DESC="The free and open source, distributed version control system"
 
 build () {
@@ -10,8 +11,7 @@ build () {
             --with-gitconfig=/etc/gitconfig \
             --with-python=python3 &&
     make
-    #make man
+    make man
     make perllibdir=/usr/lib/perl5/5.34/site_perl DESTDIR=$PKG_DEST install
-    #make DESTDIR=$PKG_DEST install-man
-
+    make DESTDIR=$PKG_DEST install-man
 }
diff --git a/repo/devel/help2man.xibuild b/repo/devel/help2man.xibuild
index a8d4e47..ddaa5c4 100644
--- a/repo/devel/help2man.xibuild
+++ b/repo/devel/help2man.xibuild
@@ -2,13 +2,16 @@
 
 DEPS=(sh)
 
-SOURCE=http://mirror.koddos.net/gnu/help2man/help2man-1.48.5.tar.xz
+PKG_VER=1.48.5
+SOURCE=http://mirror.koddos.net/gnu/help2man/help2man-$PKG_VER.tar.xz
 DESC="A tool for automatically generating simple manual pages from program output"
 
-
 build () {
     ./configure --prefix=/usr 
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }
 
diff --git a/repo/devel/m4.xibuild b/repo/devel/m4.xibuild
index 409c9a3..bdab7c6 100644
--- a/repo/devel/m4.xibuild
+++ b/repo/devel/m4.xibuild
@@ -2,13 +2,20 @@
 
 DEPS=(glibc bash)
 
-SOURCE=https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
+PKG_VER=1.4.19
+SOURCE=https://ftp.gnu.org/gnu/m4/m4-$PKG_VER.tar.xz
 DESC="The gnu m4 macro processor"
 
 
 build () {
     ./configure --prefix=/usr 
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }
diff --git a/repo/devel/make.xibuild b/repo/devel/make.xibuild
index bb057ee..b361786 100644
--- a/repo/devel/make.xibuild
+++ b/repo/devel/make.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(glibc)
 
-SOURCE=https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
+PKG_VER=4.3
+SOURCE=https://ftp.gnu.org/gnu/make/make-$PKG_VER.tar.gz
 DESC="GNU make utility"
 
 build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/meson.xibuild b/repo/devel/meson.xibuild
index c8f7dde..55c38ce 100644
--- a/repo/devel/meson.xibuild
+++ b/repo/devel/meson.xibuild
@@ -2,17 +2,19 @@
 
 DEPS=(python ninja)
 
+PKG_VER=0.59
 SOURCE=https://github.com/mesonbuild/meson
-BRANCH=0.59
+BRANCH=$PKG_VER
 
 DESC="High productivity build system"
 
 build () {
     python setup.py build
-    python setup.py install --root=$PKG_DEST
 }
 
 package () {
+    python setup.py install --root=$PKG_DEST
+
     install -vDm644 data/shell-completions/bash/meson $PKG_DEST/usr/share/bash-completion/completions/meson
     install -vDm644 data/shell-completions/zsh/_meson $PKG_DEST/usr/share/zsh/site-functions/_meson
 }
diff --git a/repo/devel/mpc.xibuild b/repo/devel/mpc.xibuild
index 5fd5898..dde3750 100644
--- a/repo/devel/mpc.xibuild
+++ b/repo/devel/mpc.xibuild
@@ -2,15 +2,18 @@
 
 DEPS=(mpfr)
 
-SOURCE=http://www.multiprecision.org/downloads/mpc-1.2.0.tar.gz
+PKG_VER=1.2.0
+SOURCE=http://www.multiprecision.org/downloads/mpc-$PKG_VER.tar.gz
 DESC="Library for the arithmetic of complex numbers with arbitrarily high precision"
 
 build () {
-    ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/mpc-1.2.0
+    ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/mpc-$PKG_VER
 
     make
     make html
+}
 
+check () {
     make check
 }
 
diff --git a/repo/devel/ninja.xibuild b/repo/devel/ninja.xibuild
index cfd705f..5c23a1a 100644
--- a/repo/devel/ninja.xibuild
+++ b/repo/devel/ninja.xibuild
@@ -8,6 +8,9 @@ DESC="Small build system with a focus on speed"
 
 build () {
     python configure.py --bootstrap
+}
+
+check () {
     ./ninja ninja_test
 }
 
diff --git a/repo/devel/patch.xibuild b/repo/devel/patch.xibuild
index 728fc1d..7d1dfd0 100644
--- a/repo/devel/patch.xibuild
+++ b/repo/devel/patch.xibuild
@@ -2,11 +2,15 @@
 
 DEPS=(glibc attr)
 
-SOURCE=https://ftp.gnu.org/gnu/patch/patch-2.7.tar.xz
+PKG_VER=2.7
+SOURCE=https://ftp.gnu.org/gnu/patch/patch-$PKG_VER.tar.xz
 DESC="A utility to apply patch files to a file"
 
 build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/pkg-config.xibuild b/repo/devel/pkg-config.xibuild
index 9f1e3f4..68ca22e 100644
--- a/repo/devel/pkg-config.xibuild
+++ b/repo/devel/pkg-config.xibuild
@@ -2,15 +2,22 @@
 
 DEPS=(glibc sh)
 
-SOURCE=https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
+PKG_VER=0.29.2
+SOURCE=https://pkg-config.freedesktop.org/releases/pkg-config-$PKG_VER.tar.gz
 DESC="Package compiler and linker metadata toolkit"
 
 build () {
     ./configure --prefix=/usr              \
             --with-internal-glib       \
             --disable-host-tool        \
-            --docdir=/usr/share/doc/pkg-config-0.29.2
+            --docdir=/usr/share/doc/pkg-config-$PKG_VER
     make
+}
+
+check () {
     make check
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/devel/texinfo.xibuild b/repo/devel/texinfo.xibuild
index 0bcbb29..cfc6653 100644
--- a/repo/devel/texinfo.xibuild
+++ b/repo/devel/texinfo.xibuild
@@ -2,16 +2,22 @@
 
 DEPS=(ncurses gzip perl sh)
 
-SOURCE=https://ftp.gnu.org/gnu/texinfo/texinfo-6.8.tar.xz
+PKG_VER=6.8
+SOURCE=https://ftp.gnu.org/gnu/texinfo/texinfo-$PKG_VER.tar.xz
 DESC="GNU documentation system for reading, writing and converting info pages"
 
-build () {
+patch () {
     # fix an issue when building with glibc-2.34 or later
     sed -e 's/__attribute_nonnull__/__nonnull/' \
     -i gnulib/lib/malloc/dynarray-skeleton.c
+}
 
+build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install 
     make TEXMF=$PKG_DEST/usr/share/texmf install-tex
 }
diff --git a/repo/devel/xmlto.xibuild b/repo/devel/xmlto.xibuild
index a162415..578c07e 100644
--- a/repo/devel/xmlto.xibuild
+++ b/repo/devel/xmlto.xibuild
@@ -2,12 +2,16 @@
 
 DEPS=(libxslt)
 
-SOURCE=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
+PKG_VER=0.0.28
+SOURCE=https://releases.pagure.org/xmlto/xmlto-$PKG_VER.tar.bz2
 DESC="Convert xml to many other formats"
 
 
 build () {
     ./configure --prefix=/usr
     make
+}
+
+package () {
     make DESTDIR=$PKG_DEST install
 }