add architectures, update to version 1.3.1

2 files changed, 29 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04dfdc057af2..d0aca9f123cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
 pkgbase = cbonsai-git
-	pkgdesc = A bonsai tree generator, written in C using ncurses
-	pkgver = r40.afb6878
+	pkgdesc = A bonsai tree generator, written in C using ncurses (git version)
+	pkgver = 1.3.1.2.gb3ee97a
 	pkgrel = 1
 	url = https://gitlab.com/jallbrit/cbonsai
-	arch = any
+	arch = aarch64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = i686
+	arch = pentium4
+	arch = x86_64
 	license = GPL3
-	makedepends = git
-	depends = gcc
+	makedepends = scdoc
+	depends = ncurses
 	provides = cbonsai
-	source = cbonsai::git+https://gitlab.com/jallbrit/cbonsai.git
+	conflicts = cbonsai
+	source = git+https://gitlab.com/jallbrit/cbonsai.git
 	md5sums = SKIP
 
 pkgname = cbonsai-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5aa8e758b302..d4305873ce66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
-# Maintainer: Nicholas Boyd Isacsson <nicholas@isacsson.se>
+# maintainer: libele <libele@disroot.org>
+# contributor: Nicholas Boyd Isacsson <nicholas@isacsson.se>
 
-_pkgname='cbonsai'
-pkgname="${_pkgname}-git"
-pkgver=r40.afb6878
+pkgname=cbonsai-git
+_gitpkg=cbonsai
+pkgver=1.3.1.2.gb3ee97a
 pkgrel=1
-pkgdesc='A bonsai tree generator, written in C using ncurses'
-arch=('any')
-url="https://gitlab.com/jallbrit/${_pkgname}"
+pkgdesc='A bonsai tree generator, written in C using ncurses (git version)'
+arch=('aarch64' 'arm' 'armv6h' 'armv7h' 'i686' 'pentium4' 'x86_64')
+url="https://gitlab.com/jallbrit/cbonsai"
 license=('GPL3')
-depends=('gcc')
-makedepends=('git')
+depends=('ncurses')
+makedepends=('scdoc')
 provides=('cbonsai')
-source=("${_pkgname}::git+${url}.git")
+conflicts=('cbonsai')
+source=('git+https://gitlab.com/jallbrit/cbonsai.git')
 md5sums=(SKIP)
 
 pkgver() {
-    cd "${_pkgname}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${_gitpkg}"
+  printf "%s" "$(git describe --long --tags | sed 's/v//; s/-/./g')"
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}"
-    gcc cbonsai.c -Wall -Wpedantic -l panel -l ncurses -o cbonsai
-    install -vDm 755 cbonsai -t "${pkgdir}/usr/bin/"
+  cd "${srcdir}"/"${_gitpkg}"
+  make DESTDIR="${pkgdir}" PREFIX="/usr" install
 }