Attachment 131040 Details for Bug 175063 – torque-diff.txt

torque-diff.txt

torque-diff.txt (text/plain), 19.55 KB, created by Jason W. Bacon on 2013-03-26 15:37:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2013-03-26 15:37:18 UTC

Size: 19.55 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/Makefile /usr/home/bacon/Prog/Ports/ports/sysutils/torque/Makefile
>--- /usr/ports/sysutils/torque/Makefile	2012-11-17 00:01:48.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/Makefile	2013-03-26 10:23:38.000000000 -0500
>@@ -1,27 +1,27 @@
>-# New ports collection makefile for:	torque
>-# Date created:			20 Jul 2006
>-# Whom:				trasz
>-#
>-# $FreeBSD: ports/sysutils/torque/Makefile,v 1.27 2012/11/17 06:01:48 svnexp Exp $
>-#
>+# Created by: trasz
>+# $FreeBSD$
> 
> PORTNAME=	torque
>-PORTVERSION=	3.0.2
>+PORTVERSION=	2.5.12
> CATEGORIES=	sysutils parallel
>-MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
>+MASTER_SITES=	http://www.adaptivecomputing.com/index.php?wpfb_dl=77/ \
>+		http://acadix.biz/Ports/distfiles/
> 
> MAINTAINER=	jwbacon@tds.net
> COMMENT=	Open source distributed computing resource manager based on PBS
> 
> USE_AUTOTOOLS=	libtool
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-rcp=scp
>+CONFIGURE_ARGS=	--enable-syslog \
>+		--disable-spool
> USE_GMAKE=	yes
> USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-message torque-config
> USE_PERL5=	yes
> USE_LDCONFIG=	yes
> 
>+CONFLICTS_INSTALL=	qstat-[0-9]* zh-qterm-[0-9]*
>+
> 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 qchkpt.1 \
>@@ -56,8 +56,16 @@
> MLINKS=		pbs_sched_cc.8 pbs_sched.8 \
> 		pbs_resources_freebsd.7 pbs_resources.7
> 
>+post-patch:
>+	${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup
>+
> post-install:
>+	${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${PREFIX}/bin
>+.if defined(NOPORTEXAMPLES)
>+	${RM} -rf ${EXAMPLESDIR}
>+.else
> 	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
>+.endif
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/distinfo /usr/home/bacon/Prog/Ports/ports/sysutils/torque/distinfo
>--- /usr/ports/sysutils/torque/distinfo	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/distinfo	2013-03-26 10:09:40.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1
>-SIZE (torque-3.0.2.tar.gz) = 5864771
>+SHA256 (torque-2.5.12.tar.gz) = 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b
>+SIZE (torque-2.5.12.tar.gz) = 5862988
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in
>--- /usr/ports/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in	2011-10-19 14:58:11.000000000 -0500
>@@ -0,0 +1,19 @@
>+--- buildutils/dpbs_mkdirs.in.orig	Tue Jun 20 02:22:46 2006
>++++ buildutils/pbs_mkdirs.in	Thu Sep 14 15:06:48 2006
>+@@ -105,6 +105,7 @@
>+ #
>+ prefix=@prefix@
>+ exec_prefix=@exec_prefix@
>++DESTDIR=@prefix@
>+ CHK_TREE=${DESTDIR}@bindir@/chk_tree
>+ 
>+ PBS_DEFAULT_SERVER=@PBS_DEFAULT_SERVER@
>+@@ -112,7 +113,7 @@
>+ # PBS_SERVER_HOME is defined without DESTDIR so that DEFAULT_FILE and EVIRON
>+ # can be based on SERVER_HOME.  SERVER_HOME is defined a second time to pick
>+ # up DESTDIR
>+-test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=@PBS_SERVER_HOME@
>++test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=/share/examples/torque/var/spool/torque/
>+ test -n "$PBS_DEFAULT_FILE" || PBS_DEFAULT_FILE=${DESTDIR}@PBS_DEFAULT_FILE@
>+ test -n "$PBS_ENVIRON" || PBS_ENVIRON=${DESTDIR}@PBS_ENVIRON@
>+ 
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-configure /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-configure
>--- /usr/ports/sysutils/torque/files/patch-configure	2008-03-26 02:30:07.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-configure	2012-07-15 11:48:41.000000000 -0500
>@@ -1,6 +1,19 @@
>---- configure.orig	2008-03-10 17:19:28.000000000 +0100
>-+++ configure	2008-03-18 08:11:50.000000000 +0100
>-@@ -20765,8 +20765,8 @@
>+--- configure.orig	2012-04-13 16:06:17.000000000 -0500
>++++ configure	2012-07-15 11:40:43.000000000 -0500
>+@@ -19730,10 +19730,10 @@
>+ 
>+ 
>+ # This can be used to rebuild libtool when needed
>+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++LIBTOOL_DEPS=" /usr/local/share/libtool/config/ltmain.sh"
>+ 
>+ # Always use our own libtool.
>+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
>+ 
>+ # Prevent multiple expansion
>+ 
>+@@ -20294,8 +20294,8 @@
>      else
>        echo "$as_me:$LINENO: result: yes" >&5
>  echo "${ECHO_T}yes" >&6
>@@ -11,7 +24,7 @@
>  if test "${ac_cv_cflags_gcc_option__W__Wall__Wno_unused_parameter__Wno_long_long__pedantic__Werror+set}" = set; then
>    echo $ECHO_N "(cached) $ECHO_C" >&6
>  else
>-@@ -20780,7 +20780,7 @@
>+@@ -20309,7 +20309,7 @@
>  ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
>   ac_save_CFLAGS="$CFLAGS"
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-fifo-Makefile.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-fifo-Makefile.in
>--- /usr/ports/sysutils/torque/files/patch-fifo-Makefile.in	2006-10-05 21:32:32.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-fifo-Makefile.in	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- src.orig/scheduler.cc/samples/fifo/Makefile.in	Wed Jul 19 22:47:42 2006
>-+++ src/scheduler.cc/samples/fifo/Makefile.in	Wed Jul 19 22:59:44 2006
>-@@ -132,7 +132,7 @@
>- XPBSMON_DIR = $(libdir)/xpbsmon
>- 
>- # Support files used by the scheduler
>--schedprivdir = $(PBS_SERVER_HOME)/sched_priv
>-+schedprivdir = ${prefix}/share/examples/torque/var/spool/torque/sched_priv
>- schedpriv_DATA = sched_config resource_group holidays dedicated_time
>- 
>- EXTRA_DIST = $(schedpriv_DATA)
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-pbs_mkdirs.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-pbs_mkdirs.in
>--- /usr/ports/sysutils/torque/files/patch-pbs_mkdirs.in	2006-10-05 21:32:32.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-pbs_mkdirs.in	1969-12-31 18:00:00.000000000 -0600
>@@ -1,19 +0,0 @@
>---- buildutils/dpbs_mkdirs.in.orig	Tue Jun 20 02:22:46 2006
>-+++ buildutils/pbs_mkdirs.in	Thu Sep 14 15:06:48 2006
>-@@ -105,6 +105,7 @@
>- #
>- prefix=@prefix@
>- exec_prefix=@exec_prefix@
>-+DESTDIR=@prefix@
>- CHK_TREE=${DESTDIR}@bindir@/chk_tree
>- 
>- PBS_DEFAULT_SERVER=@PBS_DEFAULT_SERVER@
>-@@ -112,7 +113,7 @@
>- # PBS_SERVER_HOME is defined without DESTDIR so that DEFAULT_FILE and EVIRON
>- # can be based on SERVER_HOME.  SERVER_HOME is defined a second time to pick
>- # up DESTDIR
>--test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=@PBS_SERVER_HOME@
>-+test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=/share/examples/torque/var/spool/torque/
>- test -n "$PBS_DEFAULT_FILE" || PBS_DEFAULT_FILE=${DESTDIR}@PBS_DEFAULT_FILE@
>- test -n "$PBS_ENVIRON" || PBS_ENVIRON=${DESTDIR}@PBS_ENVIRON@
>- 
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c
>--- /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- 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 -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c
>--- /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,10 +0,0 @@
>---- 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 -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in
>--- /usr/ports/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in	2011-10-19 14:58:11.000000000 -0500
>@@ -0,0 +1,11 @@
>+--- src.orig/scheduler.cc/samples/fifo/Makefile.in	Wed Jul 19 22:47:42 2006
>++++ src/scheduler.cc/samples/fifo/Makefile.in	Wed Jul 19 22:59:44 2006
>+@@ -132,7 +132,7 @@
>+ XPBSMON_DIR = $(libdir)/xpbsmon
>+ 
>+ # Support files used by the scheduler
>+-schedprivdir = $(PBS_SERVER_HOME)/sched_priv
>++schedprivdir = ${prefix}/share/examples/torque/var/spool/torque/sched_priv
>+ schedpriv_DATA = sched_config resource_group holidays dedicated_time
>+ 
>+ EXTRA_DIST = $(schedpriv_DATA)
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-server-node_manager.c /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-node_manager.c
>--- /usr/ports/sysutils/torque/files/patch-src-server-node_manager.c	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-node_manager.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,10 +0,0 @@
>---- 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 -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-server-pbsd_main.c /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-pbsd_main.c
>--- /usr/ports/sysutils/torque/files/patch-src-server-pbsd_main.c	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-pbsd_main.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,10 +0,0 @@
>---- 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 -ruN --exclude=CVS /usr/ports/sysutils/torque/files/patch-src-server-req_getcred.c /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-req_getcred.c
>--- /usr/ports/sysutils/torque/files/patch-src-server-req_getcred.c	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-req_getcred.c	2012-07-15 11:48:41.000000000 -0500
>@@ -0,0 +1,10 @@
>+--- src/server/req_getcred.c.orig	2012-07-15 11:42:07.000000000 -0500
>++++ src/server/req_getcred.c	2012-07-15 11:48:39.000000000 -0500
>+@@ -97,6 +97,7 @@
>+ #include <ctype.h>
>+ #include <netdb.h>
>+ #include <signal.h>
>++#include <netinet/in.h>
>+ #include "libpbs.h"
>+ #include "log.h"
>+ #include "server_limits.h"
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/pbs_mom.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_mom.in
>--- /usr/ports/sysutils/torque/files/pbs_mom.in	2012-11-17 00:01:48.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_mom.in	2011-11-16 13:23:51.000000000 -0600
>@@ -1,9 +1,9 @@
> #!/bin/sh
> 
>-# $FreeBSD: ports/sysutils/torque/files/pbs_mom.in,v 1.2 2012/11/17 06:01:48 svnexp Exp $
>-#
> # PROVIDE: pbs_mom
>-# REQUIRE: 
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -15,7 +15,7 @@
> . /etc/rc.subr
> 
> name="pbs_mom"
>-rcvar=pbs_mom_enable
>+rcvar=${name}_enable
> 
> pidfile=/var/spool/torque/mom_priv/mom.lock
> command=%%PREFIX%%/sbin/${name}
>@@ -24,4 +24,6 @@
> 
> : ${pbs_mom_enable="NO"}
> 
>+command_args=""
>+
> run_rc_command "$1"
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/pbs_sched.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_sched.in
>--- /usr/ports/sysutils/torque/files/pbs_sched.in	2012-11-17 00:01:48.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_sched.in	2012-07-15 11:32:06.000000000 -0500
>@@ -1,9 +1,9 @@
> #!/bin/sh
> 
>-# $FreeBSD: ports/sysutils/torque/files/pbs_sched.in,v 1.2 2012/11/17 06:01:48 svnexp Exp $
>-#
> # PROVIDE: pbs_sched
> # REQUIRE: pbs_server
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -15,7 +15,7 @@
> . /etc/rc.subr
> 
> name="pbs_sched"
>-rcvar=pbs_sched_enable
>+rcvar=${name}_enable
> 
> pidfile=/var/spool/torque/sched_priv/sched.lock
> command=%%PREFIX%%/sbin/${name}
>@@ -24,4 +24,6 @@
> 
> : ${pbs_sched_enable="NO"}
> 
>+command_args=""
>+
> run_rc_command "$1"
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/pbs_server.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_server.in
>--- /usr/ports/sysutils/torque/files/pbs_server.in	2012-11-17 00:01:48.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_server.in	2012-07-15 11:32:12.000000000 -0500
>@@ -1,9 +1,9 @@
> #!/bin/sh
> 
>-# $FreeBSD: ports/sysutils/torque/files/pbs_server.in,v 1.2 2012/11/17 06:01:48 svnexp Exp $
>-#
> # PROVIDE: pbs_server
>-# REQUIRE: 
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -15,7 +15,7 @@
> . /etc/rc.subr
> 
> name="pbs_server"
>-rcvar=pbs_server_enable
>+rcvar=${name}_enable
> 
> pidfile=/var/spool/torque/server_priv/server.lock
> command=%%PREFIX%%/sbin/${name}
>@@ -24,4 +24,6 @@
> 
> : ${pbs_server_enable="NO"}
> 
>+command_args=""
>+
> run_rc_command "$1"
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/pkg-message.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pkg-message.in
>--- /usr/ports/sysutils/torque/files/pkg-message.in	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/pkg-message.in	2012-07-24 10:52:59.000000000 -0500
>@@ -1,69 +1,16 @@
> ******************************************************************************
>-You can find an example configuration in
>+On the server, run:
> 
>-	%%PREFIX%%/share/examples/torque/var/spool/torque
>-
>-On all machines, both server and compute nodes:
>-
>-	1. Run
>-
>-		cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque \
>-			/var/spool
>-
>-	2. Put the hostname of the server into
>-
>-		/var/spool/torque/server_name
>-
>-******************************************************************************
>-On compute nodes:
>-
>-	1. Put '$pbsserver ip.address.of.server' into
>-	
>-		/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 compute node as well.
>-
>-******************************************************************************
>-On the server:
>-
>-	1. Put hostnames of compute 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"
>-
>-	3. To configure queues, execute
>-
>-		%%PREFIX%%/share/examples/torque/torque.setup <admin>
>-
>-	The recommended <admin> user is root.
>+	torque-config head
> 
> ******************************************************************************
>-After installation is complete on the server and compute nodes:
>-
>-	1. Start node services on all compute nodes with:
>-
>-		%%PREFIX%%/etc/rc.d/pbs_mom restart
>-
>-	2. Start scheduler services on the server with:
>+On compute nodes, run:
> 
>-		%%PREFIX%%/etc/rc.d/pbs_server restart
>-		%%PREFIX%%/etc/rc.d/pbs_sched restart
>+	torque-config compute
> 
> ******************************************************************************
> For further information, see
> 
>-	http://www.clusterresources.com/torquedocs21/
>+	http://www.adaptivecomputing.com/products/open-source/torque/
> 
> ******************************************************************************
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/files/torque-config.in /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/torque-config.in
>--- /usr/ports/sysutils/torque/files/torque-config.in	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/files/torque-config.in	2012-07-24 11:02:57.000000000 -0500
>@@ -0,0 +1,63 @@
>+#!/bin/sh -e
>+
>+usage()
>+{
>+    printf "Usage: $0 head|compute\n"
>+    exit 1
>+}
>+
>+if [ $# != 1 ]; then
>+    usage
>+fi
>+node_type=$1
>+
>+if [ $node_type != 'head' ] && [ $node_type != 'compute' ]; then
>+    usage
>+fi
>+
>+spool_root=/var/spool
>+
>+if [ -e $spool_root/torque ]; then
>+    printf "$spool_root/torque already exists.  Aborting...\n"
>+    exit 1
>+fi
>+
>+cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque $spool_root
>+for dir in checkpoint spool undelivered; do
>+    chmod 1777 $spool_root/torque/$dir
>+done
>+
>+cat << EOM
>+===========================================================================
>+Enter the hostname of the torque server.  This should be resolved by
>+/etc/hosts on all nodes.  A short hostname is preferred.
>+===========================================================================
>+EOM
>+read server_hostname
>+echo $server_hostname > $spool_root/torque/server_name
>+
>+case $node_type in
>+'head')
>+    vi $spool_root/torque/server_priv/nodes
>+    if ! fgrep -q 'pbs_server_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_server_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    if ! fgrep -q 'pbs_sched_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_sched_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    %%PREFIX%%/share/examples/torque/torque.setup root
>+    %%PREFIX%%/etc/rc.d/pbs_server restart
>+    %%PREFIX%%/etc/rc.d/pbs_sched restart
>+    ;;
>+'compute')
>+    printf "Torque server IP address? "
>+    read server_ip
>+    printf '$pbsserver %s /var/spool/torque/mom_priv/config' $server_ip \
>+	> $spool_root/torque/mom_priv/config
>+    if ! fgrep -q 'pbs_mom_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_mom_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    %%PREFIX%%/etc/rc.d/pbs_mom restart
>+    ;;
>+esac
>+
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/pkg-descr /usr/home/bacon/Prog/Ports/ports/sysutils/torque/pkg-descr
>--- /usr/ports/sysutils/torque/pkg-descr	2006-10-05 21:32:32.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/pkg-descr	2013-03-26 10:21:29.000000000 -0500
>@@ -6,4 +6,4 @@
> USC , the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid,
> and many other leading edge HPC organizations.
> 
>-WWW: http://www.clusterresources.com/pages/products/torque-resource-manager.php
>+WWW: http://www.adaptivecomputing.com/products/open-source/torque/
>diff -ruN --exclude=CVS /usr/ports/sysutils/torque/pkg-plist /usr/home/bacon/Prog/Ports/ports/sysutils/torque/pkg-plist
>--- /usr/ports/sysutils/torque/pkg-plist	2011-07-12 14:49:24.000000000 -0500
>+++ /usr/home/bacon/Prog/Ports/ports/sysutils/torque/pkg-plist	2012-07-24 11:03:59.000000000 -0500
>@@ -31,6 +31,7 @@
> bin/qstop
> bin/qsub
> bin/qterm
>+bin/torque-config
> bin/tracejob
> include/pbs_error.h
> include/pbs_error_db.h

Actions: View

Attachments on bug 175063: 131038 | 131039 | 131040 | 131041 | 131042