[ndt] Bump to 3.6.4

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@254 df209809-8e4a-0410-9a64-c169741eb0fc

3 files changed, 29 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16dff3ed57e3..1c8cb71f3ab1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = ndt
 	pkgdesc = The Network Diagnostic Tool (NDT) is a client/server program that provides network configuration and performance testing
-	pkgver = 3.6.1
+	pkgver = 3.6.4
 	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.1.tar.gz
+	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 = 94258e22353f59c75a32e2c715f1b4b1
+	md5sums = 098d9d55536b8a0ab07ef13eb15b7fd4
 	md5sums = ec3e388b9a54094216af62cab7bb07d7
+	md5sums = 69851a12c0927ec28e13b55f80f6d7cc
 	md5sums = 90838b71a45f9e7e8432c4077b0259ca
 	md5sums = 6d36f6e8f81f9f79b6a24bb4958529c9
 
diff --git a/PKGBUILD b/PKGBUILD
index a2b99f253ac9..3abee85228aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # $Id$
 # vim:set ts=2 sw=2 et:
 pkgname=ndt
-pkgver=3.6.1
+pkgver=3.6.4
 pkgrel=1
 pkgdesc="The Network Diagnostic Tool (NDT) is a client/server program that provides network configuration and performance testing"
 arch=('x86_64')
@@ -11,6 +11,7 @@ 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)
 
@@ -18,6 +19,7 @@ build() {
   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
 
@@ -25,14 +27,17 @@ build() {
   # 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
   make ndtdir="$pkgdir/usr/share/java/ndt" prefix="$pkgdir/usr" install
-  
-  # Avoid collision with hunspell
+
   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
+
+  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=('94258e22353f59c75a32e2c715f1b4b1'
+md5sums=('098d9d55536b8a0ab07ef13eb15b7fd4'
          'ec3e388b9a54094216af62cab7bb07d7'
+         '69851a12c0927ec28e13b55f80f6d7cc'
          '90838b71a45f9e7e8432c4077b0259ca'
          '6d36f6e8f81f9f79b6a24bb4958529c9')
diff --git a/fix_configure_mandir.patch b/fix_configure_mandir.patch
new file mode 100644
index 000000000000..60caed2dac7c
--- /dev/null
+++ b/fix_configure_mandir.patch
@@ -0,0 +1,15 @@
+Index: ndt-3.6.4/configure
+===================================================================
+--- ndt-3.6.4.orig/configure
++++ ndt-3.6.4/configure
+@@ -350,8 +350,8 @@
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datadir}/info'
++mandir='${datadir}/man'
+ 
+ ac_prev=
+ for ac_option