- Update to 3.0.2

PR:		ports/158699
Submitted by:	Jason Bacon <jwbacon@tds.net> (maintainer)

5 files changed, 47 insertions, 6 deletions

diff --git a/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c
new file mode 100644
index 000000000000..d43da3d3f30a
--- /dev/null
+++ b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c
@@ -0,0 +1,11 @@
+--- src/resmom/freebsd5/mom_mach.c.orig	2011-06-24 13:50:59.000000000 -0500
++++ src/resmom/freebsd5/mom_mach.c	2011-06-24 13:51:19.000000000 -0500
+@@ -166,7 +166,7 @@
+ extern  int     ignmem;
+ 
+ extern  int     LOGLEVEL;
+-extern void checkret(char **, int);
++// extern void checkret(char **, int);
+ 
+ 
+ /*
diff --git a/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c
new file mode 100644
index 000000000000..419d7a4040ed
--- /dev/null
+++ b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c
@@ -0,0 +1,10 @@
+--- src/resmom/freebsd5/mom_start.c.orig	2011-06-24 13:40:31.000000000 -0500
++++ src/resmom/freebsd5/mom_start.c	2011-06-24 13:41:15.000000000 -0500
+@@ -214,6 +214,7 @@
+   task  *ptask = 0;
+   int  statloc;
+   unsigned int momport = 0;
++  extern unsigned int pbs_rm_port;
+ 
+   if (LOGLEVEL >= 7)
+     {
diff --git a/sysutils/torque/files/patch-src-server-node_manager.c b/sysutils/torque/files/patch-src-server-node_manager.c
new file mode 100644
index 000000000000..faac6bdf4c24
--- /dev/null
+++ b/sysutils/torque/files/patch-src-server-node_manager.c
@@ -0,0 +1,10 @@
+--- src/server/node_manager.c.orig	2011-06-24 13:21:21.000000000 -0500
++++ src/server/node_manager.c	2011-06-24 13:21:47.000000000 -0500
+@@ -88,6 +88,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <assert.h>
diff --git a/sysutils/torque/files/patch-src-server-pbsd_main.c b/sysutils/torque/files/patch-src-server-pbsd_main.c
new file mode 100644
index 000000000000..f4d9aa898e27
--- /dev/null
+++ b/sysutils/torque/files/patch-src-server-pbsd_main.c
@@ -0,0 +1,10 @@
+--- src/server/pbsd_main.c.orig	2011-06-24 13:24:45.000000000 -0500
++++ src/server/pbsd_main.c	2011-06-24 13:25:15.000000000 -0500
+@@ -94,6 +94,7 @@
+ #include <sys/lock.h>
+ #endif /* PLOCK_DAEMONS */
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #include "pbs_ifl.h"
+ #include <assert.h>
+ #include <ctype.h>
diff --git a/sysutils/torque/files/pkg-message.in b/sysutils/torque/files/pkg-message.in
index fb5dd4c16b30..abefcbd82985 100644
--- a/sysutils/torque/files/pkg-message.in
+++ b/sysutils/torque/files/pkg-message.in
@@ -3,7 +3,7 @@ You can find an example configuration in
 
 	%%PREFIX%%/share/examples/torque/var/spool/torque
 
-On all machines, both server and computing nodes:
+On all machines, both server and compute nodes:
 
 	1. Run
 
@@ -15,7 +15,7 @@ On all machines, both server and computing nodes:
 		/var/spool/torque/server_name
 
 ******************************************************************************
-On computing nodes:
+On compute nodes:
 
 	1. Put '$pbsserver ip.address.of.server' into
 	
@@ -26,12 +26,12 @@ On computing nodes:
 		pbs_mom_enable="YES"
 
 	This may include the server if you allow it to be used
-	as a computing node as well.
+	as a compute node as well.
 
 ******************************************************************************
 On the server:
 
-	1. Put hostnames of computing nodes, one per line, into
+	1. Put hostnames of compute nodes, one per line, into
 
 		/var/spool/torque/server_priv/nodes
 
@@ -50,9 +50,9 @@ On the server:
 	The recommended <admin> user is root.
 
 ******************************************************************************
-After installation is complete on the server and computing nodes:
+After installation is complete on the server and compute nodes:
 
-	1. Start node services on all computing nodes with:
+	1. Start node services on all compute nodes with:
 
 		%%PREFIX%%/etc/rc.d/pbs_mom restart