From f9426e4c142385fd04fb6fdd293f861faf4e0633 Mon Sep 17 00:00:00 2001
From: Justin Gassner <justin.gassner@mailbox.org>
Date: Thu, 26 Sep 2019 11:37:03 +0200
Subject: Follow recommended version format for VCS packages

---
 dmenu/PKGBUILD | 4 ++--
 dwm/PKGBUILD   | 4 ++--
 mpop/PKGBUILD  | 4 ++--
 msmtp/PKGBUILD | 4 ++--
 pass/PKGBUILD  | 4 ++--
 slock/PKGBUILD | 4 ++--
 st/PKGBUILD    | 4 ++--
 vifm/PKGBUILD  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dmenu/PKGBUILD b/dmenu/PKGBUILD
index 73dddb0..bb69dfc 100644
--- a/dmenu/PKGBUILD
+++ b/dmenu/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dmenu
 pkgname=$_pkgname-jxir
-pkgver=4.8.12.gbbc464d
+pkgver=4.9.r5.gdb6093f
 pkgrel=1
 pkgdesc='Generic menu for X'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver(){
   cd "$_pkgname"
-  git describe --tags | sed 's/-/./g'
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index cb62616..048b740 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dwm
 pkgname=$_pkgname-jxir
-pkgver=6.1.51.g41bd44f
+pkgver=6.2.r18.g0d36e38
 pkgrel=1
 pkgdesc='A dynamic window manager for X'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver(){
   cd "$_pkgname"
-  git describe --tags | sed 's/-/./g'
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
diff --git a/mpop/PKGBUILD b/mpop/PKGBUILD
index 3c11c34..aebf34e 100644
--- a/mpop/PKGBUILD
+++ b/mpop/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=mpop
 pkgname=$_pkgname-jxir
-pkgver=1.4.2.1.g52c8e3c
+pkgver=1.4.5.r1.gbe53f83
 pkgrel=1
 pkgdesc='A small, fast POP3 client'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_pkgname"
-  git describe --long | sed "s/$_pkgname-//;s/-/./g"
+  git describe --long | sed "s/$_pkgname-//;s/\([^-]*-g\)/r\1/;s/-/./g"
 }
 
 build() {
diff --git a/msmtp/PKGBUILD b/msmtp/PKGBUILD
index bdb41c7..bfadb9c 100644
--- a/msmtp/PKGBUILD
+++ b/msmtp/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=msmtp
 pkgname=$_pkgname-jxir
-pkgver=1.8.2.1.g9f99487
+pkgver=1.8.5.r6.gcc22c93
 pkgrel=1
 pkgdesc='A small, fast POP3 client'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_pkgname"
-  git describe --long | sed "s/$_pkgname-//;s/-/./g"
+  git describe --long | sed "s/$_pkgname-//;s/\([^-]*-g\)/r\1/;s/-/./g"
 }
 
 build() {
diff --git a/pass/PKGBUILD b/pass/PKGBUILD
index 0bd042b..b3f2116 100644
--- a/pass/PKGBUILD
+++ b/pass/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=pass
 pkgname=$_pkgname-jxir
-pkgver=1.7.3.5.gb2e24c8
+pkgver=1.7.3.r5.gb2e24c8
 pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 arch=('any')
@@ -18,7 +18,7 @@ sha256sums=('SKIP')
 
 pkgver(){
   cd "$_pkgname"
-  git describe --tags | sed 's/-/./g'
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
diff --git a/slock/PKGBUILD b/slock/PKGBUILD
index 2311fc9..6c7be18 100644
--- a/slock/PKGBUILD
+++ b/slock/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=slock
 pkgname=$_pkgname-jxir
-pkgver=1.4.6.g2aa4369
+pkgver=1.4.r6.g2aa4369
 pkgrel=1
 pkgdesc='A simple screen locker for X'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver(){
   cd "$_pkgname"
-  git describe --tags | sed 's/-/./g'
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
diff --git a/st/PKGBUILD b/st/PKGBUILD
index c1a912b..021f66a 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=st
 pkgname=$_pkgname-jxir
-pkgver=0.8.1.28.g49a9d90
+pkgver=0.8.2.r21.g7cf337c
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver(){
   cd "$_pkgname"
-  git describe --tags | sed 's/-/./g'
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
diff --git a/vifm/PKGBUILD b/vifm/PKGBUILD
index 990fb1b..f4006a3 100644
--- a/vifm/PKGBUILD
+++ b/vifm/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=vifm
 pkgname=$_pkgname-jxir
-pkgver=0.10.r78.g91350c247
+pkgver=0.10.1.r10.gae71417b7
 pkgrel=1
 pkgdesc='A file manager with curses interface, which provides Vi[m]-like environment'
 arch=('x86_64')
@@ -17,7 +17,7 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;'
 }
 
 build() {
-- 
cgit v1.2.3-54-g00ecf