summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshtrom2010-04-08 09:21:37 +0000
committershtrom2010-04-08 09:21:37 +0000
commit101fd6c5ad572faacc9f0beaa62f11da279f7250 (patch)
tree9d6d93485642405e0fcae885a1834e019115ed6a
parenta75d94c498b20bc8a64a3ca74cb75b37b67de0da (diff)
downloadaur-101fd6c5ad572faacc9f0beaa62f11da279f7250.tar.gz
[ndt] Bump to 3.6.1.
git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@235 df209809-8e4a-0410-9a64-c169741eb0fc
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--fix_I2util_configure_mandir.patch15
3 files changed, 29 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d01be47154c..16dff3ed57e3 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.0
+ pkgver = 3.6.1
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.0.tar.gz
+ source = http://software.internet2.edu/sources/ndt/ndt-3.6.1.tar.gz
source = fix_configure_include_paths.patch
source = fix_JAnalyze_Makefile_target.patch
- md5sums = 93230f7e6ef94a19b6f1fbd8219794ad
+ source = fix_I2util_configure_mandir.patch
+ md5sums = 94258e22353f59c75a32e2c715f1b4b1
md5sums = ec3e388b9a54094216af62cab7bb07d7
md5sums = 90838b71a45f9e7e8432c4077b0259ca
+ md5sums = 6d36f6e8f81f9f79b6a24bb4958529c9
pkgname = ndt
diff --git a/PKGBUILD b/PKGBUILD
index 84641b383f13..6792aaf86f6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Olivier Mehani <shtrom-aur@ssji.net>
# $Id$
pkgname=ndt
-pkgver=3.6.0
+pkgver=3.6.1
pkgrel=1
pkgdesc="The Network Diagnostic Tool (NDT) is a client/server program that provides network configuration and performance testing"
arch=('x86_64')
@@ -10,13 +10,15 @@ license=('BSD')
depends=('web100-utils' 'jopenchart')
source=(http://software.internet2.edu/sources/ndt/$pkgname-$pkgver.tar.gz
fix_configure_include_paths.patch
- fix_JAnalyze_Makefile_target.patch)
+ fix_JAnalyze_Makefile_target.patch
+ fix_I2util_configure_mandir.patch)
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < $srcdir/fix_configure_include_paths.patch
patch -p1 < $srcdir/fix_JAnalyze_Makefile_target.patch
+ patch -p1 < $srcdir/fix_I2util_configure_mandir.patch
./configure --prefix=/usr
# XXX: The CLASSPATH specification looks bodgey...
@@ -25,11 +27,12 @@ build() {
# Avoid collision with hunspell
mv $pkgdir/usr/bin/analyze $pkgdir/usr/bin/ndt-analyze
- mv $pkgdir/usr/man/man1/analyze.1 $pkgdir/usr/man/man1/ndt-analyze.1
- sed -i "s/analyze[^r]/ndt-&/" $pkgdir/usr/man/man1/ndt-analyze.1
+ 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
}
# vim:set ts=2 sw=2 et:
-md5sums=('93230f7e6ef94a19b6f1fbd8219794ad'
+md5sums=('94258e22353f59c75a32e2c715f1b4b1'
'ec3e388b9a54094216af62cab7bb07d7'
- '90838b71a45f9e7e8432c4077b0259ca')
+ '90838b71a45f9e7e8432c4077b0259ca'
+ '6d36f6e8f81f9f79b6a24bb4958529c9')
diff --git a/fix_I2util_configure_mandir.patch b/fix_I2util_configure_mandir.patch
new file mode 100644
index 000000000000..0d265d178ba7
--- /dev/null
+++ b/fix_I2util_configure_mandir.patch
@@ -0,0 +1,15 @@
+Index: ndt-3.6.1/I2util/configure
+===================================================================
+--- ndt-3.6.1.orig/I2util/configure
++++ ndt-3.6.1/I2util/configure
+@@ -349,8 +349,8 @@ localstatedir='${prefix}/var'
+ 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