Update and fix package

2 files changed, 31 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e662829d1009..51a4edb7afa3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr 16 05:49:50 UTC 2016
+# Sat Apr 16 06:17:55 UTC 2016
 pkgbase = why3-git
 	pkgdesc = The next generation of the former software verification platform Why
-	pkgver = 20120419
-	pkgrel = 1
+	pkgver = 0.72.r3740.g406e7f0
+	pkgrel = 2
 	url = http://why3.gforge.inria.fr/
 	arch = x86_64
 	arch = i686
@@ -11,9 +11,14 @@ pkgbase = why3-git
 	makedepends = ocaml
 	makedepends = ocaml-sqlite3
 	makedepends = lablgtk2
+	makedepends = ocaml-menhir
 	makedepends = git
+	makedepends = autoconf
 	depends = gtksourceview2
+	depends = sqlite
 	conflicts = why3
+	source = why3::git+https://scm.gforge.inria.fr/anonscm/git/why3/why3.git
+	md5sums = SKIP
 
 pkgname = why3-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9905c900b8f0..37a3ebddd8fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,37 @@
-
 # Contributor: Paolo Herms
+# Contributor: kaptoxic
+
 pkgname=why3-git
-pkgver=20120419
-pkgrel=1
+pkgver=0.72.r3740.g406e7f0
+pkgrel=2
 pkgdesc="The next generation of the former software verification platform Why"
 arch=(x86_64 i686)
 url="http://why3.gforge.inria.fr/"
 license=('GPL')
-depends=('gtksourceview2')
-makedepends=('ocaml' 'ocaml-sqlite3' 'lablgtk2' 'git')
+depends=('gtksourceview2' 'sqlite')
+makedepends=('ocaml' 'ocaml-sqlite3' 'lablgtk2' 'ocaml-menhir' 'git' 'autoconf')
 conflicts=('why3')
+source=('why3::git+https://scm.gforge.inria.fr/anonscm/git/why3/why3.git')
+md5sums=('SKIP')
 
-_gitroot="git://scm.gforge.inria.fr/why3/why3.git"
+_gitroot="https://scm.gforge.inria.fr/anonscm/git/why3/why3.git"
 _gitname="why3"
 
-build() {
-  cd "$srcdir"
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-  else
-    git clone $_gitroot $_gitname && 
-    cd $_gitname
-  fi
+pkgver() {
+  cd "${srcdir}/${_gitname}"
+  git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g' | sed 's#debian/##'
+}
 
-  [[ -e "$srcdir"/NOCONFIGURE ]] && msg "Skipping configure - remove src/NOCONFIGURE to force it" || { 
-      autoconf &&
-      ./configure --prefix=/usr &&
-      echo "Remove this file to force ./configure" > "$srcdir"/NOCONFIGURE ||
-      return 1
-  }
+build() {
+  cd "${srcdir}/${_gitname}"
+  autoconf
+  ./configure --prefix=/usr --disable-pvs-libs
+  make clean
+  make all # src/why3.cma
+}
 
-  make || return 1
+package() {
+  cd "${srcdir}/${_gitname}"
   make DESTDIR="$pkgdir" OCAMLLIB="$pkgdir"/usr/lib/ocaml install install-lib
 }
+md5sums=('SKIP')