Adopt, fix version number scheme

2 files changed, 20 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 817d177761e4..598a1c37ffc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = terra-git
 	pkgdesc = Low-level system programming language that is designed to interoperate seamlessly with the Lua programming language.
-	pkgver = ac615b0
+	pkgver = 0.0.0.r1213.gf6c76fc
 	pkgrel = 1
 	url = http://terralang.org/
 	arch = i686
@@ -8,10 +8,10 @@ pkgbase = terra-git
 	license = MIT
 	makedepends = git
 	makedepends = wget
-	depends = clang35
-	depends = llvm35
-	source = git://github.com/zdevito/terra
-	md5sums = SKIP
+	makedepends = clang35
+	makedepends = llvm35
+	source = git://github.com/zdevito/terra.git
+	sha256sums = SKIP
 
 pkgname = terra-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1db743f8ed9f..304789309c08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,29 @@
-# Maintainer: Adrian Sinclair <adrian at adrusi dot com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Adrian Sinclair <adrian at adrusi dot com>
 
 _pkgname=terra
 pkgname=$_pkgname-git
-pkgver=ac615b0
+pkgver=0.0.0.r1213.gf6c76fc
 pkgrel=1
 pkgdesc="Low-level system programming language that is designed to interoperate seamlessly with the Lua programming language."
 url="http://terralang.org/"
 arch=('i686' 'x86_64')
 license=('MIT')
-depends=('clang35' 'llvm35')
-makedepends=('git' 'wget')
-source=(git://github.com/zdevito/terra)
-md5sums=('SKIP')
+makedepends=('git' 'wget' 'clang35' 'llvm35')
+source=("git://github.com/zdevito/terra.git")
+sha256sums=('SKIP')
+
+# Upstream doesn't have sane release tags yet but is moving
+# towards semver. This will let us migrate to that when they
+# do release (currently there is a 1.0.0-beta tag)
+prepare() {
+	cd "$_pkgname"
+	git tag -f 0.0.0 $(git rev-list --max-parents=0 HEAD)
+}
 
 pkgver() {
 	cd "$_pkgname"
-	git log | head -n 1 | cut -c8-14
+	git describe --tags --abbrev=7 --match="[0-9\.]*" HEAD | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {