fix build

2 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3496250071ce..ec5bed5d6549 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
-# Generated by makepkg 4.2.0
-# Tue Jan 13 18:01:04 UTC 2015
 pkgbase = ori-git
 	pkgdesc = Peer-to-peer distributed file system with history
-	pkgver = r941.bcba89d
+	pkgver = release_0_8_0.r108.ge019aba
 	pkgrel = 1
 	url = http://ori.scs.stanford.edu/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	makedepends = scons
+	makedepends = scons2
 	makedepends = boost
 	depends = libevent
 	depends = fuse
+	depends = openssl-1.0
 	provides = ori
 	conflicts = ori
 	source = ori-git::git+http://bitbucket.org/orifs/ori.git
 	md5sums = SKIP
 
 pkgname = ori-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 89161c9cd3bc..656a7d827220 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=ori-git
 pkgrel=1
-pkgver=r941.bcba89d
+pkgver=release_0_8_0.r108.ge019aba
 pkgdesc="Peer-to-peer distributed file system with history"
 arch=(i686 x86_64)
 url="http://ori.scs.stanford.edu/"
 license=('MIT')
-depends=(libevent fuse)
-makedepends=(git scons boost)
+depends=(libevent fuse openssl-1.0)
+makedepends=(git scons2 boost)
 provides=(ori)
 conflicts=(ori)
 source=("$pkgname"::'git+http://bitbucket.org/orifs/ori.git')
@@ -14,15 +14,19 @@ md5sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/$pkgname"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git describe --long --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
 	cd "$srcdir/$pkgname"
-	scons
+	CPPFLAGS+=" -I/usr/include/openssl-1.0"
+	LDFLAGS+=" -L/usr/lib/openssl-1.0"
+	scons2
 }
 
 package() {
 	cd "$srcdir/$pkgname"
-	scons PREFIX="/usr" DESTDIR="$pkgdir" install
+	CPPFLAGS+=" -I/usr/include/openssl-1.0"
+	LDFLAGS+=" -L/usr/lib/openssl-1.0"
+	scons2 PREFIX="/usr" DESTDIR="$pkgdir" install
 }