upgraded to 6.1.3.h5

2 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab0b123243cb..4a57cde976a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = torque
 	pkgdesc = An open source resource manager providing control over batch jobs and distributed compute nodes
-	pkgver = 6.1.1.1
-	pkgrel = 2
+	pkgver = 6.1.3.h5
+	pkgrel = 1
 	url = http://www.adaptivecomputing.com/products/open-source/torque/
 	install = torque.install
 	arch = x86_64
@@ -21,8 +21,7 @@ pkgbase = torque
 	backup = var/spool/torque/mom_priv/config
 	backup = var/spool/torque/serv_priv/nodes
 	backup = var/spool/torque/serv_priv/serverdb
-	source = file://torque-6.1.1.1.tar.gz
-	md5sums = SKIP
+	source = https://github.com/adaptivecomputing/torque/archive/refs/heads/6.1.3.h5.tar.gz
+	md5sums = 121347809f32353f02385f982cb980a3
 
 pkgname = torque
-
diff --git a/PKGBUILD b/PKGBUILD
index e1b7560dcc8f..5f27c2218b11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Jingbei Li <i@jingbei.li>
 # Contributor:  Martin C. Doege <mdoege at compuserve dot com>
-pkgname="torque"
-pkgver=6.1.1.1
-pkgrel=2
+
+pkgname=torque
+pkgver=6.1.3.h5
+pkgrel=1
 pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes'
 arch=('x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="http://www.adaptivecomputing.com/products/open-source/torque/"
@@ -10,23 +11,36 @@ license=('custom')
 depends=('openssh' 'libxml2' 'tcl' 'boost-libs')
 makedepends=('make' 'boost' 'tk')
 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=("file://torque-"$pkgver".tar.gz")
-md5sums=('SKIP')
+source=("https://github.com/adaptivecomputing/torque/archive/refs/heads/${pkgver}.tar.gz")
+md5sums=('121347809f32353f02385f982cb980a3')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed '511s/job_mutex/job_mutex != NULL/' -i src/server/job_container.c
+  sed 's/\/sbin\/ldconfig/:/g' -i src/resmom/Makefile.am
+}
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed 's/\/sbin\/ldconfig/:/g' -i src/resmom/Makefile.{am,in}
-	CPPFLAGS="$CPPFLAGS -O3 -fpermissive"
-	./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gui
-	sed 's| -Werror | |g' -i `find . -name Makefile`
-	make
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -e '/^CC="$CXX"$/d' -i configure.ac
+  ./autogen.sh
+
+  CPPFLAGS="$CPPFLAGS -O2 -fpermissive --std=c++0x" \
+  ./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gcc-warnings
+
+  sed 's/gcc/g++/g' -i $(find . -name Makefile)
+  make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	# License
-	install -D -m644 "${srcdir}/$pkgname-$pkgver/"PBS_License.txt "${pkgdir}/usr/share/licenses/torque/PBS_License.txt"
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # License
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/torque/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et: