Updated to the master branch

2 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8ce83d39bb0..f946e8a465f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = combblas
 	pkgdesc = Combinatorial BLAS Library
-	pkgver = 1.6.2
-	pkgrel = 2
-	url = http://gauss.cs.ucsb.edu/~aydin/CombBLAS/html/
+	pkgver = 1.6.2+r4666
+	pkgrel = 1
+	url = https://github.com/PASSIONLab/CombBLAS
 	arch = x86_64
-	license = MIT
+	license = BSD
 	makedepends = cmake
+	makedepends = git
 	depends = openmpi
-	source = http://gauss.cs.ucsb.edu/~aydin/CombBLAS_FILES/CombBLAS_beta_16_2.tgz
-	sha512sums = de63b6da77563cd1e074f44d6892c8d1dcb7aa9475f617b2de60239485e6dbd5965a305471f933fe175778a12fc6bb987a75f3631487b6461a382c5419b267aa
+	source = git+https://github.com/PASSIONLab/CombBLAS.git
+	sha256sums = SKIP
 
 pkgname = combblas
 
diff --git a/PKGBUILD b/PKGBUILD
index a975b1fcd9e1..60b80b0a371b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,25 @@
-# Maintainer: Christian Pfeiffer <cpfeiffer at live de>
+# Maintainer:  Anton Kudelin <kudelin at protonmail dot com>
+# Contributor: Christian Pfeiffer <cpfeiffer at live de>
 # Contributor: Michael Straube <straubem gmx de>
 # Contributor: xantares <xantares09 at hotmail dot com>
 
 pkgname=combblas
-pkgver=1.6.2
-pkgrel=2
+_PkgName=CombBLAS
+pkgver=1.6.2+r4666
+pkgrel=1
 pkgdesc="Combinatorial BLAS Library"
 arch=('x86_64')
-url="http://gauss.cs.ucsb.edu/~aydin/CombBLAS/html/"
-license=("MIT")
+url="https://github.com/PASSIONLab/CombBLAS"
+license=("BSD")
 depends=('openmpi')
-makedepends=('cmake')
-_filename="CombBLAS_beta_16_2"
-source=("http://gauss.cs.ucsb.edu/~aydin/CombBLAS_FILES/${_filename}.tgz")
+makedepends=('cmake' 'git')
+source=("git+$url.git")
+sha256sums=('SKIP')
 
-sha512sums=('de63b6da77563cd1e074f44d6892c8d1dcb7aa9475f617b2de60239485e6dbd5965a305471f933fe175778a12fc6bb987a75f3631487b6461a382c5419b267aa')
+pkgver() {
+  cd "$srcdir/$_PkgName"
+  printf "1.6.2+r%s" "$(git rev-list --count HEAD)"
+}
 
 prepare() {
   mkdir build
@@ -24,28 +29,25 @@ build() {
   cd build
 
   # Some tests are computationally heavy MPI stuff, so avoid them
-  cmake "${srcdir}/${_filename}" \
+  cmake ../$_PkgName \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_INSTALL_RPATH=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_TESTING=OFF
-
   make
 }
 
 package() {
   cd build
-
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   # Remove OS X leftover files
-  find "${pkgdir}" -name "*.DS_Store" -delete
-  find "${pkgdir}" -name "._*" -delete
+  find "$pkgdir" -name "*.DS_Store" -delete
+  find "$pkgdir" -name "._*" -delete
 
-  install -Dm644 "${srcdir}/${_filename}/LICENSE" -t "${pkgdir}"/usr/share/licenses/$pkgname/
+  install -Dm644 "$srcdir/$_PkgName/LICENSE" \
+    -t "$pkgdir/usr/share/licenses/$pkgname"
 
   # Add extra headers
-  install -Dm644 "${srcdir}/${_filename}"/Applications/*.h -t "${pkgdir}"/usr/include/CombBLAS/Applications/
-  install -Dm644 "${srcdir}/${_filename}"/BipartiteMatchings/*.h -t "${pkgdir}"/usr/include/CombBLAS/BipartiteMatchings/
+  install -Dm644 "$srcdir/$_PkgName"/Applications/*.h \
+    -t "$pkgdir/usr/include/CombBLAS/Applications"
 }