Update

6 files changed, 42 insertions, 25 deletions

diff --git a/dmenu/PKGBUILD b/dmenu/PKGBUILD
index 24e1167..a4d0f96 100644
--- a/dmenu/PKGBUILD
+++ b/dmenu/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dmenu
 pkgname=$_pkgname-jxir
-pkgver=4.9.r7.ga4173dd
+pkgver=5.2.r9.g5facc63
 pkgrel=1
 pkgdesc='Generic menu for X'
 arch=('x86_64')
@@ -12,7 +12,7 @@ depends=('bash' 'libxft' 'libxinerama')
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+https://git.jxir.de/$_pkgname")
+source=("git+https://git.jxir.de/$_pkgname#branch=config")
 sha256sums=('SKIP')
 
 pkgver(){
@@ -20,13 +20,6 @@ pkgver(){
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$_pkgname"
-  for branch in config; do
-    git merge --no-edit origin/$branch
-  done
-}
-
 build() {
   cd "$_pkgname"
   make
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index 6dff4e7..6615d5c 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dwm
 pkgname=$_pkgname-jxir
-pkgver=6.2.r28.g9900688
+pkgver=6.4.r15.g9761028
 pkgrel=1
 pkgdesc='A dynamic window manager for X'
 arch=('x86_64')
@@ -22,7 +22,7 @@ pkgver(){
 
 prepare() {
   cd "$_pkgname"
-  for branch in noborder pertag fancybar config; do
+  for branch in center noborder pertag fancybar config; do
     git merge --no-edit origin/$branch
   done
 }
diff --git a/msmtp/PKGBUILD b/msmtp/PKGBUILD
index 3c7c3b6..c5f4060 100644
--- a/msmtp/PKGBUILD
+++ b/msmtp/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=msmtp
 pkgname=$_pkgname-jxir
-pkgver=1.8.6.r0.g2131126
+pkgver=1.8.24.r9.gb3500e2
 pkgrel=1
 pkgdesc='A small, fast SMTP client'
 arch=('x86_64')
 url="https://marlam.de/$_pkgname/"
 license=('GPL3')
-depends=('gnutls' 'gsasl')
-makedepends=('git' 'texlive-plainextra')
+depends=('gnutls')
+makedepends=('git' 'texlive-plaingeneric')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=("git+https://git.marlam.de/git/$_pkgname.git")
@@ -27,7 +27,7 @@ build() {
     --prefix=/usr \
     --disable-nls \
     --with-tls=gnutls \
-    --with-libgsasl \
+    --without-libgsasl \
     --without-libsecret \
     --without-msmtpd
   make
diff --git a/nsxiv/PKGBUILD b/nsxiv/PKGBUILD
new file mode 100644
index 0000000..3d7c5a4
--- /dev/null
+++ b/nsxiv/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Justin Gassner <justin.gassner@mailbox.org>
+
+_pkgname=nsxiv
+pkgname=$_pkgname-jxir
+pkgver=32.r2.gc08c267
+pkgrel=1
+pkgdesc='Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer'
+arch=('x86_64')
+url='https://codeberg.org/nsxiv/nsxiv'
+license=('GPL2')
+depends=('imlib2' 'libexif' 'libxft' 'giflib' 'libwebp')
+makedepends=('git')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("git+https://git.jxir.de/$_pkgname#branch=config")
+sha256sums=('SKIP')
+
+pkgver(){
+  cd "$_pkgname"
+  git describe --long --tags | sed 's/v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  cd "$_pkgname"
+  make
+}
+
+package() {
+  cd "$_pkgname"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+}
diff --git a/pass/PKGBUILD b/pass/PKGBUILD
index 3ecdff3..8626a84 100644
--- a/pass/PKGBUILD
+++ b/pass/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=pass
 pkgname=$_pkgname-jxir
-pkgver=1.7.3.r5.gb2e24c8
+pkgver=1.7.4.r13.g0725291
 pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 arch=('any')
@@ -14,7 +14,7 @@ optdepends=('git: for Git support'
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+https://git.jxir.de/$_pkgname")
+source=("git+https://git.jxir.de/$_pkgname#branch=no-tree")
 sha256sums=('SKIP')
 
 pkgver(){
@@ -22,13 +22,6 @@ pkgver(){
   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$_pkgname"
-  for branch in no-tree; do
-    git merge --no-edit origin/$branch
-  done
-}
-
 package() {
   cd "$_pkgname"
   make DESTDIR="$pkgdir" FORCE_ALL=1 install
diff --git a/st/PKGBUILD b/st/PKGBUILD
index b51766b..c9bbd51 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=st
 pkgname=$_pkgname-jxir
-pkgver=0.8.4.r10.ge290ec4
+pkgver=0.9.r18.gea2ee01
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X'
 arch=('x86_64')