- Update to 2.2.0. Mark broken on RELENG_7; previous versions don't build

  on it either.  I'll fix that later.

4 files changed, 33 insertions, 6 deletions

diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 3657dc0b477e..980513d7aee8 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	torque
-PORTVERSION=	2.1.9
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
 
@@ -57,4 +57,10 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
 	@${CAT} ${PKGMESSAGE}
 
-.include	<bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700000
+BROKEN=		Does not build on 7.x
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/torque/distinfo b/sysutils/torque/distinfo
index 98f683a3b79a..0d5fb6e9944a 100644
--- a/sysutils/torque/distinfo
+++ b/sysutils/torque/distinfo
@@ -1,3 +1,3 @@
-MD5 (torque-2.1.9.tar.gz) = 88b7998865cf236b7eb42148fa937172
-SHA256 (torque-2.1.9.tar.gz) = 2bd75c52372d7dbae42890dcd01821dc8752209533e75b3df424c03739c387d1
-SIZE (torque-2.1.9.tar.gz) = 2905873
+MD5 (torque-2.2.0.tar.gz) = e1dc88bd5da29e5e2afe19c0d7420ab3
+SHA256 (torque-2.2.0.tar.gz) = 0b35ae88484a66510bea20adc9530bf2034cff38383cc4936549694b04af83ae
+SIZE (torque-2.2.0.tar.gz) = 5366011
diff --git a/sysutils/torque/files/patch-configure b/sysutils/torque/files/patch-configure
new file mode 100644
index 000000000000..10779630a486
--- /dev/null
+++ b/sysutils/torque/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2007-10-28 11:47:59.000000000 +0100
++++ configure	2007-10-28 11:48:08.000000000 +0100
+@@ -19076,7 +19076,7 @@
+ 
+ 
+ 
+-gcc_warning_flags="-W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror"
++gcc_warning_flags="-W -Wall -Wno-unused-parameter -Wno-long-long -pedantic"
+ # Check whether --enable-gcc_warnings or --disable-gcc_warnings was given.
+ if test "${enable_gcc_warnings+set}" = set; then
+   enableval="$enable_gcc_warnings"
diff --git a/sysutils/torque/pkg-plist b/sysutils/torque/pkg-plist
index 44560c745e7c..80b1376812d4 100644
--- a/sysutils/torque/pkg-plist
+++ b/sysutils/torque/pkg-plist
@@ -4,7 +4,7 @@ include/tm.h
 include/tm_.h
 include/rpp.h
 include/rm.h
-lib/libtorque.so.0
+lib/libtorque.so.2
 lib/libtorque.so
 lib/libtorque.la
 lib/libtorque.a
@@ -42,6 +42,10 @@ bin/printjob
 bin/printtracking
 bin/tracejob
 bin/pbs-config
+bin/qnodes
+sbin/qserverd
+sbin/qschedd
+sbin/qnoded
 %%EXAMPLESDIR%%/torque.setup
 %%EXAMPLESDIR%%/var/spool/torque/pbs_environment
 %%EXAMPLESDIR%%/var/spool/torque/server_name
@@ -49,6 +53,8 @@ bin/pbs-config
 %%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group
 %%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays
 %%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time
+@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
 @exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/aux
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/aux
 @exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/checkpoint
@@ -80,6 +86,10 @@ bin/pbs-config
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
 @exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv
 @exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/undelivered
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered