Update to 6.1.0

2 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adc595a4b1d1..3e572f633ec3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Aug  6 16:55:40 UTC 2016
+# Wed Jan  4 08:16:03 UTC 2017
 pkgbase = torque
 	pkgdesc = An open source resource manager providing control over batch jobs and distributed compute nodes
-	pkgver = 6.0.2
+	pkgver = 6.1.0
 	pkgrel = 1
 	url = http://www.adaptivecomputing.com/products/open-source/torque/
 	install = torque.install
@@ -21,8 +21,8 @@ pkgbase = torque
 	backup = var/spool/torque/mom_priv/config
 	backup = var/spool/torque/serv_priv/nodes
 	backup = var/spool/torque/serv_priv/serverdb
-	source = torque-6.0.2-1469811694_d9a3483.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=3124
-	md5sums = df7f1ef5116e01c8290812bc9bd74fe9
+	source = torque-6.1.0.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=3170
+	md5sums = 346a5d7cafb9ad0baa8193897a0e7acc
 
 pkgname = torque
 
diff --git a/PKGBUILD b/PKGBUILD
index f9628d659d30..e941ead1760f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer:  Martin C. Doege <mdoege at compuserve dot com>
+# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor:  Martin C. Doege <mdoege at compuserve dot com>
 
 pkgname="torque"
-pkgver=6.0.2
+pkgver=6.1.0
 pkgrel=1
-buildnr="1469811694_d9a3483"
-linknum="3124"
+linknum="3170"
 pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes'
 arch=('i686' 'x86_64')
 url="http://www.adaptivecomputing.com/products/open-source/torque/"
@@ -14,19 +14,21 @@ makedepends=('make' 'gcc' 'boost')
 backup=(var/spool/torque/server_name var/spool/torque/mom_priv/config var/spool/torque/serv_priv/{nodes,serverdb})
 options=(!libtool)
 install=torque.install
-source=("torque-"$pkgver"-"$buildnr".tar.gz"::'http://www.adaptivecomputing.com/index.php?wpfb_dl='$linknum)
-md5sums=('df7f1ef5116e01c8290812bc9bd74fe9')
+source=("torque-"$pkgver".tar.gz"::'http://www.adaptivecomputing.com/index.php?wpfb_dl='$linknum)
+md5sums=('346a5d7cafb9ad0baa8193897a0e7acc')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver-$buildnr"
-	CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -Wno-misleading-indentation" ./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gui
+	cd "$srcdir/$pkgname-$pkgver"
+	sed 's/#include <sys\/tty.h>/#include <linux\/tty.h>/' -i src/resmom/mom_inter.c
+	sed 's/\/sbin\/ldconfig/:/g' -i src/resmom/Makefile.{am,in}
+	CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -Wno-misleading-indentation -Wno-deprecated-declarations" ./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gui
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver-$buildnr"
-	make DESTDIR="$pkgdir/" install
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 	# License
-	install -D -m644 "${srcdir}/$pkgname-$pkgver-$buildnr/"PBS_License.txt "${pkgdir}/usr/share/licenses/torque/PBS_License.txt"
+	install -D -m644 "${srcdir}/$pkgname-$pkgver/"PBS_License.txt "${pkgdir}/usr/share/licenses/torque/PBS_License.txt"
 }