Bump to 3.7.0.2, disable java and flash

2 files changed, 15 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c8cb71f3ab1..7608f187bf17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,16 @@
 pkgbase = ndt
 	pkgdesc = The Network Diagnostic Tool (NDT) is a client/server program that provides network configuration and performance testing
-	pkgver = 3.6.4
+	pkgver = 3.7.0.2
 	pkgrel = 1
 	url = http://www.internet2.edu/performance/ndt/index.html
 	arch = x86_64
 	license = BSD
-	depends = web100-utils
 	depends = jopenchart
-	source = http://software.internet2.edu/sources/ndt/ndt-3.6.4.tar.gz
-	source = fix_configure_include_paths.patch
-	source = fix_configure_mandir.patch
-	source = fix_JAnalyze_Makefile_target.patch
-	source = fix_I2util_configure_mandir.patch
-	md5sums = 098d9d55536b8a0ab07ef13eb15b7fd4
-	md5sums = ec3e388b9a54094216af62cab7bb07d7
-	md5sums = 69851a12c0927ec28e13b55f80f6d7cc
-	md5sums = 90838b71a45f9e7e8432c4077b0259ca
-	md5sums = 6d36f6e8f81f9f79b6a24bb4958529c9
+	depends = openssl
+	depends = jansson
+	depends = zlib
+	source = http://software.internet2.edu/sources/ndt/ndt-3.7.0.2.tar.gz
+	md5sums = 30cddd43f76a2be1b3764904d5a9e0c1
 
 pkgname = ndt
 
diff --git a/PKGBUILD b/PKGBUILD
index 117fa0e27fe9..1d27ce64dfec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,21 @@
 # Contributor: Olivier Mehani <shtrom-aur@ssji.net>
+# Contributor: Martin Sandsmark <sandsmark@iskrembilen.com>
 # vim:set ts=2 sw=2 et:
 pkgname=ndt
-pkgver=3.6.4
+pkgver=3.7.0.2
 pkgrel=1
 pkgdesc="The Network Diagnostic Tool (NDT) is a client/server program that provides network configuration and performance testing"
 arch=('x86_64')
 url="http://www.internet2.edu/performance/ndt/index.html"
 license=('BSD')
-depends=('web100-utils' 'jopenchart')
-source=(http://software.internet2.edu/sources/ndt/$pkgname-$pkgver.tar.gz
-        fix_configure_include_paths.patch
-        fix_configure_mandir.patch
-        fix_JAnalyze_Makefile_target.patch
-        fix_I2util_configure_mandir.patch)
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p1 < $srcdir/fix_configure_include_paths.patch
-  patch -p1 < $srcdir/fix_configure_mandir.patch
-  patch -p1 < $srcdir/fix_JAnalyze_Makefile_target.patch
-  patch -p1 < $srcdir/fix_I2util_configure_mandir.patch
-}
+depends=('jopenchart' 'openssl' 'jansson' 'zlib')
+source=(http://software.internet2.edu/sources/ndt/$pkgname-$pkgver.tar.gz)
+md5sums=('30cddd43f76a2be1b3764904d5a9e0c1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-java=no --enable-flash=no --with-flash=no
   # XXX: The CLASSPATH specification looks bodgey...
   make ndtdir="/usr/share/java/ndt" CLASSPATH_ENV="CLASSPATH=/usr/share/java/jopenchart/charting-0.94.jar" || return 1
 }
@@ -36,16 +25,11 @@ package() {
 
   make ndtdir="$pkgdir/usr/share/java/ndt" prefix="$pkgdir/usr" install
 
-  mv $pkgdir/usr/bin/analyze $pkgdir/usr/bin/ndt-analyze
-  mv $pkgdir/usr/share/man/man1/analyze.1 $pkgdir/usr/share/man/man1/ndt-analyze.1
-  sed -i "s/analyze[^r]/ndt-&/" $pkgdir/usr/share/man/man1/ndt-analyze.1
+  # namcap complains about these
+  rmdir "$pkgdir/usr/sbin"
+  rmdir "$pkgdir/usr/share/java/ndt/serverdata"
 
   mkdir -p $pkgdir/usr/share/doc/$pkgname-$pkgver
   cp AUTHORS ChangeLog DISCUSSION-LIST NEWS README Readme-fakewww Readme-web100srv tcpbw100.template $pkgdir/usr/share/doc/$pkgname-$pkgver
 }
 
-md5sums=('098d9d55536b8a0ab07ef13eb15b7fd4'
-         'ec3e388b9a54094216af62cab7bb07d7'
-         '69851a12c0927ec28e13b55f80f6d7cc'
-         '90838b71a45f9e7e8432c4077b0259ca'
-         '6d36f6e8f81f9f79b6a24bb4958529c9')