upgpkg: terra-git 1.0.0beta2.r22.g55a73e0-1

2 files changed, 22 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f7598ff0d16..282fd07f16b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = terra-git
 	pkgdesc = Low-level system programming language designed to interoperate seamlessly with Lua
-	pkgver = 0.0.0.r1213.gf6c76fc
+	pkgver = 1.0.0beta2.r22.g55a73e0
 	pkgrel = 1
 	url = http://terralang.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
+	makedepends = clang
 	makedepends = git
-	makedepends = wget
-	makedepends = clang35
-	makedepends = llvm35
+	makedepends = llvm
 	source = git://github.com/zdevito/terra.git
+	source = LuaJIT-9143e86498436892cb4316550be4d45b68a61224.tar.gz::https://github.com/LuaJIT/LuaJIT/archive/9143e86498436892cb4316550be4d45b68a61224.tar.gz
 	sha256sums = SKIP
+	sha256sums = befe68612bcc9b812bafd1e596154214848941ed9193c65b5a844540a6af5a4d
 
 pkgname = terra-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 72e6e7834af2..aa366aa22077 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,41 @@
 
 _pkgname=terra
 pkgname=$_pkgname-git
-pkgver=0.0.0.r1213.gf6c76fc
+pkgver=1.0.0beta2.r22.g55a73e0
 pkgrel=1
 pkgdesc="Low-level system programming language designed to interoperate seamlessly with Lua"
 url="http://terralang.org/"
 arch=('i686' 'x86_64')
 license=('MIT')
-makedepends=('git' 'wget' 'clang35' 'llvm35')
-source=("git://github.com/zdevito/terra.git")
-sha256sums=('SKIP')
+makedepends=('clang' 'git' 'llvm')
+_ljc=9143e86498436892cb4316550be4d45b68a61224
+source=("git://github.com/zdevito/terra.git"
+		"LuaJIT-$_ljc.tar.gz::https://github.com/LuaJIT/LuaJIT/archive/$_ljc.tar.gz")
+sha256sums=('SKIP'
+            'befe68612bcc9b812bafd1e596154214848941ed9193c65b5a844540a6af5a4d')
 
-# 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)
+	cat <<- EOF > Makefile.inc
+		LLVM_CONFIG := /opt/llvm90/bin/llvm-config
+		CLANG := /opt/llvm90/bin/clang
+	EOF
+	cp ../LuaJIT-$_ljc.tar.gz build/
+	sed -e '/curl/d;/wget/d' -i Makefile
 }
 
 pkgver() {
 	cd "$_pkgname"
-	git describe --tags --abbrev=7 --match="[0-9\.]*" HEAD | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	git describe --tags --abbrev=7 --match="release-[0-9\.]*" HEAD |
+		sed 's/release-//;s/-beta/beta/;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "$srcdir/$_pkgname"
+	cd "$_pkgname"
 	make
 }
 
 package() {
-	cd "$srcdir/$_pkgname"
+	cd "$_pkgname"
 	cp -r release "$pkgdir/usr"
 }