new pkgver function

2 files changed, 8 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2648d7c66c4..c9ca5449ddb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Apr  1 13:34:21 UTC 2017
 pkgbase = tikzit-git
 	pkgdesc = Creation and modification of TeX diagrams written using the pgf/TikZ macro library
-	pkgver = 297.
+	pkgver = r297
 	pkgrel = 1
 	url = http://sourceforge.net/projects/tikzit/
 	arch = i686
@@ -17,6 +15,7 @@ pkgbase = tikzit-git
 	depends = desktop-file-utils
 	provides = tikzit
 	conflicts = tikzit
+	conflicts = ploticus
 	options = !makeflags
 	source = git+https://github.com/tikzit/tikzit.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 379d48e1e92d..0ba6b9871f32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Based on original tikzit-aur-package made by pippin
 
 pkgname=tikzit-git
-pkgver=297.
+pkgver=r297
 pkgrel=1
 pkgdesc="Creation and modification of TeX diagrams written using the pgf/TikZ macro library"
 arch=('i686' 'x86_64')
@@ -13,25 +13,24 @@ license=('GPL')
 depends=('gtk2>=2.18.0' 'poppler-glib' 'hicolor-icon-theme' 'gnustep-base' 'desktop-file-utils')
 makedepends=('git' 'gcc-objc')
 provides=('tikzit')
-conflicts=('tikzit')
+conflicts=('tikzit' 'ploticus')
 source=('git+https://github.com/tikzit/tikzit.git')
 md5sums=('SKIP')
-_gitname="tikzit"
 options=('!makeflags')
 
 pkgver() {
-  cd "$srcdir"/$_gitname
-    printf "%s.%s" $(git describe --tags | tr -d 'v'|sed s#-#.#g) "$(git rev-list --count HEAD)"
+  cd ${pkgname%-git}
+  printf "r%s" "$(git rev-list --count HEAD)"
 }
  
 build() {
-  cd "$srcdir"/$_gitname/$_gitname
+  cd "$srcdir"/${pkgname%-git}/${pkgname%-git}
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd "$srcdir"/$_gitname/$_gitname
+  cd "$srcdir"/${pkgname%-git}/${pkgname%-git}
   make DESTDIR="$pkgdir" install
 }