4 files changed, 130 insertions, 100 deletions

diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 03acd28af860..99ffbb07424f 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	torque
-PORTVERSION=	2.3.7
+PORTVERSION=	2.4.6
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
 
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 
 MAN1=		qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \
 		qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \
-		nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1
+		nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1
 
 MAN3=		rpp.3 tm.3 pbs_alterjob.3 pbs_connect.3 pbs_default.3 \
 		pbs_deljob.3 pbs_disconnect.3 pbs_geterrmsg.3 pbs_holdjob.3 \
diff --git a/sysutils/torque/distinfo b/sysutils/torque/distinfo
index a0048dcdce50..3bd74a27b331 100644
--- a/sysutils/torque/distinfo
+++ b/sysutils/torque/distinfo
@@ -1,3 +1,3 @@
-MD5 (torque-2.3.7.tar.gz) = f12383cbae3f6dfd85943a13bfa5cc79
-SHA256 (torque-2.3.7.tar.gz) = 802e2f3b5489e32c44d27a76861df94eb791f42f4e13283cf90431194a48d4d0
-SIZE (torque-2.3.7.tar.gz) = 5456607
+MD5 (torque-2.4.6.tar.gz) = 970b5d9687dc1c1d74d20a8766c6b1e5
+SHA256 (torque-2.4.6.tar.gz) = 84c6f96bd034dc8766fc28a1e0f641c6c01d3c00712f05adb81c37b2be988975
+SIZE (torque-2.4.6.tar.gz) = 5537109
diff --git a/sysutils/torque/files/pkg-message.in b/sysutils/torque/files/pkg-message.in
index 7945b7fd9fff..fb5dd4c16b30 100644
--- a/sysutils/torque/files/pkg-message.in
+++ b/sysutils/torque/files/pkg-message.in
@@ -1,40 +1,69 @@
-***************************************************************
-You can find example configuration in
+******************************************************************************
+You can find an example configuration in
 
 	%%PREFIX%%/share/examples/torque/var/spool/torque
 
-On all machines, both server and computing nodes, copy its
-contents into
+On all machines, both server and computing nodes:
 
-	/var/spool/torque/
+	1. Run
 
-and put hostname of the server into
+		cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque \
+			/var/spool
 
-	/var/spool/torque/server_name
+	2. Put the hostname of the server into
 
-On computing nodes, put '$pbsserver ip.address.of.server' into
+		/var/spool/torque/server_name
+
+******************************************************************************
+On computing nodes:
+
+	1. Put '$pbsserver ip.address.of.server' into
 	
-	/var/spool/torque/mom_priv/config
+		/var/spool/torque/mom_priv/config
+
+	2. Add the following line to /etc/rc.conf:
+
+		pbs_mom_enable="YES"
+
+	This may include the server if you allow it to be used
+	as a computing node as well.
+
+******************************************************************************
+On the server:
+
+	1. Put hostnames of computing nodes, one per line, into
+
+		/var/spool/torque/server_priv/nodes
+
+	Additional options can be specified for each entry.  Consult
+	the torque documentation for details.
+
+	2. Add the following lines to /etc/rc.conf:
+
+		pbs_server_enable="YES"
+		pbs_sched_enable="YES"
 
-On server, put hostnames of computing nodes, one per line, into
+	3. To configure queues, execute
 
-	/var/spool/torque/server_priv/nodes
+		%%PREFIX%%/share/examples/torque/torque.setup <admin>
 
-On computing nodes, add the following line to /etc/rc.conf:
+	The recommended <admin> user is root.
 
-	pbs_mom_enable="YES"
+******************************************************************************
+After installation is complete on the server and computing nodes:
 
-On TORQUE server, add the following lines to /etc/rc.conf:
+	1. Start node services on all computing nodes with:
 
-	pbs_server_enable="YES"
-	pbs_sched_enable="YES"
+		%%PREFIX%%/etc/rc.d/pbs_mom restart
 
-To configure queues on server, execute
+	2. Start scheduler services on the server with:
 
-	%%PREFIX%%/share/examples/torque/torque.setup <admin>
+		%%PREFIX%%/etc/rc.d/pbs_server restart
+		%%PREFIX%%/etc/rc.d/pbs_sched restart
 
+******************************************************************************
 For further information, see
 
 	http://www.clusterresources.com/torquedocs21/
 
-***************************************************************
+******************************************************************************
diff --git a/sysutils/torque/pkg-plist b/sysutils/torque/pkg-plist
index fc11529a4291..9c412ff0369f 100644
--- a/sysutils/torque/pkg-plist
+++ b/sysutils/torque/pkg-plist
@@ -1,103 +1,104 @@
-include/pbs_error.h
-include/pbs_ifl.h
-include/tm.h
-include/tm_.h
-include/rpp.h
-include/rm.h
-lib/libtorque.so.2
-lib/libtorque.so
-lib/libtorque.la
-lib/libtorque.a
-sbin/pbs_server
-sbin/pbs_sched
-sbin/pbs_mom
-sbin/pbs_iff
+bin/chk_tree
+bin/hostn
+bin/nqs2pbs
+bin/pbs-config
+bin/pbs_track
+bin/pbsdsh
+bin/pbsnodes
+bin/printjob
+bin/printserverdb
+bin/printtracking
 bin/qalter
+bin/qchkpt
 bin/qdel
+bin/qdisable
+bin/qenable
 bin/qhold
+bin/qmgr
 bin/qmove
-bin/qorder
 bin/qmsg
+bin/qnodes
+bin/qorder
 bin/qrerun
 bin/qrls
+bin/qrun
 bin/qselect
 bin/qsig
-bin/qstat
-bin/qsub
-bin/pbsdsh
-bin/qdisable
-bin/qenable
-bin/qrun
 bin/qstart
+bin/qstat
 bin/qstop
+bin/qsub
 bin/qterm
-bin/pbsnodes
-bin/pbs_track
-bin/qmgr
-bin/nqs2pbs
-sbin/pbs_demux
-sbin/momctl
-bin/chk_tree
-bin/hostn
-bin/printjob
-bin/printtracking
 bin/tracejob
-bin/pbs-config
-bin/qnodes
-sbin/qserverd
-sbin/qschedd
+include/pbs_error.h
+include/pbs_error_db.h
+include/pbs_ifl.h
+include/rm.h
+include/rpp.h
+include/tm.h
+include/tm_.h
+lib/libtorque.a
+lib/libtorque.la
+lib/libtorque.so
+lib/libtorque.so.2
+sbin/momctl
+sbin/pbs_demux
+sbin/pbs_iff
+sbin/pbs_mom
+sbin/pbs_sched
+sbin/pbs_server
 sbin/qnoded
-bin/printserverdb
+sbin/qschedd
+sbin/qserverd
 %%EXAMPLESDIR%%/torque.setup
 %%EXAMPLESDIR%%/var/spool/torque/pbs_environment
-%%EXAMPLESDIR%%/var/spool/torque/server_name
-%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_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
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/mom_logs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/mom_priv
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/sched_logs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_logs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
+%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays
+%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group
+%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config
+%%EXAMPLESDIR%%/var/spool/torque/server_name
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
 @dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
 @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
-@exec mkdir -p %D%/%%EXAMPLESDIR%%/var/spool/torque/spool
-@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint
+@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux
 @dirrm %%EXAMPLESDIR%%/var/spool/torque
 @dirrm %%EXAMPLESDIR%%/var/spool
 @dirrm %%EXAMPLESDIR%%/var
 @dirrm %%EXAMPLESDIR%%
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint
+@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux