diff --git a/findutils/PKGBUILD b/findutils/PKGBUILD
index 48769c5..d883c9d 100644
--- a/findutils/PKGBUILD
+++ b/findutils/PKGBUILD
@@ -7,10 +7,9 @@
 
 pkgname=findutils
 pkgver=4.9.0
-pkgrel=02
+pkgrel=03
 pkgdesc="GNU utilities to locate files"
-arch=('x86_64')
-groups=('base-devel')
+#groups=('base-devel') # base-devel was replaced by a metapackage in arch - equivalent is jobbot in joborun
 depends=('glibc' 'sh')
 url='https://www.gnu.org/software/findutils/'
 source=("https://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.xz"{,.sig})
@@ -47,7 +46,9 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
 
 license=('GPL3')
 
@@ -56,6 +57,6 @@ validpgpkeys=('A5189DB69C1164D33002936646502EF796917195') # Bernhard Voelker <ma
 sha256sums=(a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe # findutils-4.9.0.tar.xz
 	924c3719d066eda1b3e47175f8b83e90e9a23f0a639ebe7445621917b283c385) # findutils-4.9.0.tar.xz.sig
 
-# 36330b159b0a451d76aff42bc26e6b77d6e693468e8cffb3932ab5b0f589f2e0  findutils-4.9.0-02-x86_64.pkg.tar.xz
+##  7cf4ade596cf6e4a8843b5f7d581a0bfffa6f30e4de53105e94d287c2889381c  findutils-4.9.0-03-x86_64.pkg.tar.lz
 
 
diff --git a/findutils/PKGBUILD-arch b/findutils/PKGBUILD-arch
index 6fca9b9..e5e88f1 100644
--- a/findutils/PKGBUILD-arch
+++ b/findutils/PKGBUILD-arch
@@ -2,11 +2,10 @@
 
 pkgname=findutils
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU utilities to locate files"
 arch=('x86_64')
 license=('GPL3')
-groups=('base-devel')
 depends=('glibc' 'sh')
 url='https://www.gnu.org/software/findutils/'
 source=("https://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.xz"{,.sig})
diff --git a/gawk/PKGBUILD b/gawk/PKGBUILD
index 566932d..581f544 100644
--- a/gawk/PKGBUILD
+++ b/gawk/PKGBUILD
@@ -7,11 +7,10 @@
 
 pkgname=gawk
 pkgver=5.2.1
-pkgrel=01
+pkgrel=02
 pkgdesc="GNU version of awk"
-arch=('x86_64')
 url="https://www.gnu.org/software/gawk/"
-groups=('base-devel')
+# groups=('base-devel')
 depends=('sh' 'glibc' 'mpfr')
 provides=('awk')
 ##  options=('debug')  ## uncomment this to have the debug pkg produced
@@ -40,7 +39,9 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
 
 license=('GPL')
 
@@ -49,4 +50,5 @@ validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins
 sha256sums=(529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c  # gawk-5.2.1.tar.gz
 	27e39518586c9e40749cd3e0deff8af345a1f66f5f7653d25c04f09f53c4147d) # gawk-5.2.1.tar.gz.sig
 
+##  2971dfea3bba111d83838adb62ba2b021ebd23bc69d64e70da231540b4af002d  gawk-5.2.1-02-x86_64.pkg.tar.lz
 
diff --git a/gawk/PKGBUILD-arch b/gawk/PKGBUILD-arch
index dea8af1..3e38f60 100644
--- a/gawk/PKGBUILD-arch
+++ b/gawk/PKGBUILD-arch
@@ -3,15 +3,13 @@
 
 pkgname=gawk
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU version of awk"
 arch=('x86_64')
 url="https://www.gnu.org/software/gawk/"
 license=('GPL')
-groups=('base-devel')
 depends=('sh' 'glibc' 'mpfr')
 provides=('awk')
-options=('debug')
 source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
 validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins
 sha256sums=('529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c'
diff --git a/gawk/deps b/gawk/deps
index 139597f..b28b04f 100644
--- a/gawk/deps
+++ b/gawk/deps
@@ -1,2 +1,3 @@
 
 
+
diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD
index 1963d17..becaa1f 100644
--- a/gettext/PKGBUILD
+++ b/gettext/PKGBUILD
@@ -7,13 +7,12 @@
 
 pkgname=gettext
 pkgver=0.21.1
-pkgrel=03
+pkgrel=04
 pkgdesc="GNU internationalization library"
 url="https://www.gnu.org/software/gettext/"
-arch=(x86_64)
 #depends=(gcc-libs acl sh glib2 libunistring libcroco)
-depends=(gcc-libs acl sh libunistring libxml2)
-makedepends=(gettext emacs-git git)
+depends=(gcc-libs acl sh libunistring)
+makedepends=(gettext emacs-git git libxml2)
 optdepends=('git: for autopoint infrastructure updates')
 #options=(!docs)
 source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
@@ -56,7 +55,9 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
 
 license=(GPL)
 
@@ -69,3 +70,5 @@ sha256sums=(e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45  #
 	544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418) # gettext-0.21-disable-libtextstyle.patch
 
 
+##  ef80e4d8161ef00b8fb98f48857b40a44adce430a701e3ce85078b091ed139d8  gettext-0.21.1-04-x86_64.pkg.tar.lz
+
diff --git a/gettext/PKGBUILD-arch b/gettext/PKGBUILD-arch
index c4ab7e1..5ba3806 100644
--- a/gettext/PKGBUILD-arch
+++ b/gettext/PKGBUILD-arch
@@ -2,14 +2,13 @@
 
 pkgname=gettext
 pkgver=0.21.1
-pkgrel=1
+pkgrel=4
 pkgdesc="GNU internationalization library"
 url="https://www.gnu.org/software/gettext/"
 arch=(x86_64)
 license=(GPL)
-groups=(base-devel)
-depends=(gcc-libs acl sh libunistring libxml2)
-makedepends=(gettext emacs git)
+depends=(gcc-libs acl sh libunistring)
+makedepends=(gettext emacs git libxml2)
 optdepends=('git: for autopoint infrastructure updates')
 options=(!docs)
 source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
diff --git a/gettext/deps b/gettext/deps
index 9186b1c..c41af70 100644
--- a/gettext/deps
+++ b/gettext/deps
@@ -6,4 +6,3 @@ autoconf
 automake
 
 
-
diff --git a/groff/PKGBUILD b/groff/PKGBUILD
index 4049f93..e6076b4 100644
--- a/groff/PKGBUILD
+++ b/groff/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=groff
 pkgver=1.22.4
-pkgrel=09
+pkgrel=010
 pkgdesc='GNU troff text-formatting system'
 url='https://www.gnu.org/software/groff/groff.html'
 groups=( jobbot )
@@ -78,6 +78,6 @@ sha256sums=(e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293 # g
 	b1e0bcbe1e0737aed1301066ff92a1e7fa0bd8b80a36321f92f519366a1acdb3 # display-utc-times.patch
 	a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff) # site.tmac
 
-##  3335258cfd97f0382221e0e7f20329b3aedf025c08c4a80f2a5b81950138dda0  groff-1.22.4-09-x86_64.pkg.tar.lz
+##  dbadd2b2a0c233c39d17499d710cdb8bff24a18d020d8a4e40f5d1be8c900dae  groff-1.22.4-010-x86_64.pkg.tar.lz
 
 
diff --git a/groff/PKGBUILD-arch b/groff/PKGBUILD-arch
index d792917..578e489 100644
--- a/groff/PKGBUILD-arch
+++ b/groff/PKGBUILD-arch
@@ -2,12 +2,11 @@
 
 pkgname=groff
 pkgver=1.22.4
-pkgrel=9
+pkgrel=10
 pkgdesc='GNU troff text-formatting system'
 arch=('x86_64')
 url='https://www.gnu.org/software/groff/groff.html'
 license=('GPL')
-groups=('base-devel')
 depends=('perl' 'gcc-libs')
 makedepends=('netpbm' 'psutils'  'libxaw' 'perl-file-homedir')
 optdepends=('netpbm: for use together with man -H command interaction in browsers'