Version 5.1

3 files changed, 30 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 323e8ffe21e2..bb9642de6313 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = geosteiner
 	pkgdesc = Compute Euclidean and Rectilinear Steiner Trees
-	pkgver = 5.0.1
+	pkgver = 5.1
 	pkgrel = 1
 	url = http://www.geosteiner.com/
 	arch = i686
 	arch = x86_64
 	license = custom
-	source = http://www.geosteiner.com/geosteiner-5.0.1.tar.gz
-	md5sums = 12dfdd602a1944ae70ddff48c992e2bb
+	source = http://www.geosteiner.com/geosteiner-5.1.tar.gz
+	source = 0001-Makefile-noerror.patch
+	sha256sums = e8dc390d7a2bb1cfbae050fb5c712a8fcf128a2ea0ec5cc7377e6f904878d9ee
+	sha256sums = ee4ec6ca5fc77c7fce1303a6d0fe8b9382118e11bbd8992bd10932a2f790300c
 
 pkgname = geosteiner
 
diff --git a/0001-Makefile-noerror.patch b/0001-Makefile-noerror.patch
new file mode 100644
index 000000000000..8fa9aa9897c2
--- /dev/null
+++ b/0001-Makefile-noerror.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2017-06-03 16:15:45.242782528 +0200
++++ b/Makefile	2017-06-03 16:16:02.362922046 +0200
+@@ -148,7 +148,7 @@
+ 
+ dash_I_args = $(LP_CFLAGS) $(GMP_CFLAGS)
+ 
+-CFLAGS = $(OPTFLAGS) $(DEBUG_FLAGS) $(dash_I_args) -Wall -Werror
++CFLAGS = $(OPTFLAGS) $(DEBUG_FLAGS) $(dash_I_args) -Wall -Wno-unused-but-set-variable
+ 
+ PROGRAMS = \
+ 	analyze_ckpt \
diff --git a/PKGBUILD b/PKGBUILD
index bf78b3694eed..3a7cfdfecfa7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,29 @@
 # Contributor: Robert Schwarz <mail@rschwarz.net>
 
 pkgname=geosteiner
-pkgver=5.0.1
+pkgver=5.1
 pkgrel=1
 pkgdesc="Compute Euclidean and Rectilinear Steiner Trees"
 arch=(i686 x86_64)
 url="http://www.geosteiner.com/"
 license=(custom)
-source=("http://www.geosteiner.com/geosteiner-$pkgver.tar.gz")
-md5sums=('12dfdd602a1944ae70ddff48c992e2bb')
+source=("http://www.geosteiner.com/geosteiner-${pkgver}.tar.gz"
+        '0001-Makefile-noerror.patch')
+sha256sums=('e8dc390d7a2bb1cfbae050fb5c712a8fcf128a2ea0ec5cc7377e6f904878d9ee'
+            'ee4ec6ca5fc77c7fce1303a6d0fe8b9382118e11bbd8992bd10932a2f790300c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix="${pkgdir}/usr"
+  patch -p1 < ../0001-Makefile-noerror.patch
   make
+
+  sed -i '' "${srcdir}/${pkgname}-${pkgver}/${pkgname}_config"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p $pkgdir/usr/bin
-  TARGETS=(bb dumpfst efst fst2graph lib_points plotfst prunefst rand_points rfst smt ufst analyze_ckpt demo1 demo2 demo3 demo4 hgmst merge_ckpt)
-  for i in ${TARGETS[@]}; do
-      install -c -m 755 $i $pkgdir/usr/bin
-  done
-
-  mkdir -p $pkgdir/usr/share/$pkgname
-  DOCS=(README INSTALL prelude.ps)
-  for i in ${DOCS[@]}; do
-      install -c -m 644 $i $pkgdir/usr/share/$pkgname
-  done
-
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
-  install -c -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install
+  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -c -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"
 }