Attachment #131041 for bug #175063

Lines 19-24 Link Here

(-)chinese/qterm/Makefile (+2 lines)
19	MAKE_JOBS_SAFE= yes	19	MAKE_JOBS_SAFE= yes
20	INSTALLS_ICONS= yes	20	INSTALLS_ICONS= yes
21		21
		22	CONFLICTS_INSTALL= torque-[0-9]*
		23
22	OPTIONS_DEFINE= DBUS OPENSSL PHONON QTSCRIPT KDE	24	OPTIONS_DEFINE= DBUS OPENSSL PHONON QTSCRIPT KDE
23	OPTIONS_DEFAULT= DBUS OPENSSL PHONON QTSCRIPT	25	OPTIONS_DEFAULT= DBUS OPENSSL PHONON QTSCRIPT
24		26

Lines 11-16 Link Here

(-)games/qstat/Makefile (+2 lines)
11		11
12	GNU_CONFIGURE= yes	12	GNU_CONFIGURE= yes
13		13
		14	CONFLICTS_INSTALL= torque-[0-9]*
		15
14	OPTIONS_DEFINE= DOCS	16	OPTIONS_DEFINE= DOCS
15		17
16	.include <bsd.port.options.mk>	18	.include <bsd.port.options.mk>




# Created by: trasz
# Date created:			20 Jul 2006
# Whom:				trasz
#
# $FreeBSD$
#

PORTNAME=	torque
PORTVERSION=	2.5.12
PORTEPOCH=	1
CATEGORIES=	sysutils parallel
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=	--enable-syslog \
		--disable-spool
USE_GMAKE=	yes
USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
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 \

MLINKS=		pbs_sched_cc.8 pbs_sched.8 \
		pbs_resources_freebsd.7 pbs_resources.7

.include <bsd.port.options.mk>

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 ${PORT_OPTIONS:MEXAMPLES}
	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
.else
	${RM} -rf ${EXAMPLESDIR}
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)sysutils/torque/distinfo (-2 / +2 lines)
1	SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1	1	SHA256 (torque-2.5.12.tar.gz) = 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b
2	SIZE (torque-3.0.2.tar.gz) = 5864771	2	SIZE (torque-2.5.12.tar.gz) = 5862988




--- 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@
 




--- 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

 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
@@ -20309,7 +20309,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
  ac_save_CFLAGS="$CFLAGS"

Lines 1-11 Link Here

(-)sysutils/torque/files/patch-fifo-Makefile.in (-11 lines)
1	--- src.orig/scheduler.cc/samples/fifo/Makefile.in Wed Jul 19 22:47:42 2006
2	+++ src/scheduler.cc/samples/fifo/Makefile.in Wed Jul 19 22:59:44 2006
3	@@ -132,7 +132,7 @@
4	XPBSMON_DIR = $(libdir)/xpbsmon
5
6	# Support files used by the scheduler
7	-schedprivdir = $(PBS_SERVER_HOME)/sched_priv
8	+schedprivdir = ${prefix}/share/examples/torque/var/spool/torque/sched_priv
9	schedpriv_DATA = sched_config resource_group holidays dedicated_time
10
11	EXTRA_DIST = $(schedpriv_DATA)




--- 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@
 

Lines 1-11 Link Here

(-)sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c (-11 lines)
1	--- src/resmom/freebsd5/mom_mach.c.orig 2011-06-24 13:50:59.000000000 -0500
2	+++ src/resmom/freebsd5/mom_mach.c 2011-06-24 13:51:19.000000000 -0500
3	@@ -166,7 +166,7 @@
4	extern int ignmem;
5
6	extern int LOGLEVEL;
7	-extern void checkret(char **, int);
8	+// extern void checkret(char **, int);
9
10
11	/*

Lines 1-10 Link Here

(-)sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c (-10 lines)
1	--- src/resmom/freebsd5/mom_start.c.orig 2011-06-24 13:40:31.000000000 -0500
2	+++ src/resmom/freebsd5/mom_start.c 2011-06-24 13:41:15.000000000 -0500
3	@@ -214,6 +214,7 @@
4	task *ptask = 0;
5	int statloc;
6	unsigned int momport = 0;
7	+ extern unsigned int pbs_rm_port;
8
9	if (LOGLEVEL >= 7)
10	{

Line 0 Link Here

(-)sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in (+11 lines)
	1	--- src.orig/scheduler.cc/samples/fifo/Makefile.in Wed Jul 19 22:47:42 2006
	2	+++ src/scheduler.cc/samples/fifo/Makefile.in Wed Jul 19 22:59:44 2006
	3	@@ -132,7 +132,7 @@
	4	XPBSMON_DIR = $(libdir)/xpbsmon
	5
	6	# Support files used by the scheduler
	7	-schedprivdir = $(PBS_SERVER_HOME)/sched_priv
	8	+schedprivdir = ${prefix}/share/examples/torque/var/spool/torque/sched_priv
	9	schedpriv_DATA = sched_config resource_group holidays dedicated_time
	10
	11	EXTRA_DIST = $(schedpriv_DATA)

Lines 1-10 Link Here

(-)sysutils/torque/files/patch-src-server-node_manager.c (-10 lines)
1	--- src/server/node_manager.c.orig 2011-06-24 13:21:21.000000000 -0500
2	+++ src/server/node_manager.c 2011-06-24 13:21:47.000000000 -0500
3	@@ -88,6 +88,7 @@
4	#include <fcntl.h>
5	#include <netdb.h>
6	#include <sys/types.h>
7	+#include <sys/socket.h>
8	#include <netinet/in.h>
9	#include <stdarg.h>
10	#include <assert.h>

Lines 1-10 Link Here

(-)sysutils/torque/files/patch-src-server-pbsd_main.c (-10 lines)
1	--- src/server/pbsd_main.c.orig 2011-06-24 13:24:45.000000000 -0500
2	+++ src/server/pbsd_main.c 2011-06-24 13:25:15.000000000 -0500
3	@@ -94,6 +94,7 @@
4	#include <sys/lock.h>
5	#endif /* PLOCK_DAEMONS */
6	#include <netinet/in.h>
7	+#include <sys/socket.h>
8	#include "pbs_ifl.h"
9	#include <assert.h>
10	#include <ctype.h>

Line 0 Link Here

(-)sysutils/torque/files/patch-src-server-req_getcred.c (+10 lines)
	1	--- src/server/req_getcred.c.orig 2012-07-15 11:42:07.000000000 -0500
	2	+++ src/server/req_getcred.c 2012-07-15 11:48:39.000000000 -0500
	3	@@ -97,6 +97,7 @@
	4	#include <ctype.h>
	5	#include <netdb.h>
	6	#include <signal.h>
	7	+#include <netinet/in.h>
	8	#include "libpbs.h"
	9	#include "log.h"
	10	#include "server_limits.h"

Lines 3-9 Link Here

(-)sysutils/torque/files/pbs_mom.in (-3 / +5 lines)
3	# $FreeBSD$	3	# $FreeBSD$
4	#	4	#
5	# PROVIDE: pbs_mom	5	# PROVIDE: pbs_mom
6	# REQUIRE:	6	# REQUIRE: DAEMON
		7	# BEFORE: LOGIN
		8	# KEYWORD: shutdown
7	#	9	#
8	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf	10	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9	# to enable this service:	11	# to enable this service:
Lines 14-20 Link Here
14		16
15	. /etc/rc.subr	17	. /etc/rc.subr
16		18
17	name="pbs_mom"	19	name=pbs_mom
18	rcvar=pbs_mom_enable	20	rcvar=pbs_mom_enable
19		21
20	pidfile=/var/spool/torque/mom_priv/mom.lock	22	pidfile=/var/spool/torque/mom_priv/mom.lock
Lines 22-27 Link Here
22		24
23	load_rc_config $name	25	load_rc_config $name
24		26
25	: ${pbs_mom_enable="NO"}	27	: ${pbs_mom_enable:="NO"}
26		28
27	run_rc_command "$1"	29	run_rc_command "$1"

Lines 4-9 Link Here

(-)sysutils/torque/files/pbs_sched.in (-2 / +4 lines)
4	#	4	#
5	# PROVIDE: pbs_sched	5	# PROVIDE: pbs_sched
6	# REQUIRE: pbs_server	6	# REQUIRE: pbs_server
		7	# BEFORE: LOGIN
		8	# KEYWORD: shutdown
7	#	9	#
8	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf	10	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9	# to enable this service:	11	# to enable this service:
Lines 14-20 Link Here
14		16
15	. /etc/rc.subr	17	. /etc/rc.subr
16		18
17	name="pbs_sched"	19	name=pbs_sched
18	rcvar=pbs_sched_enable	20	rcvar=pbs_sched_enable
19		21
20	pidfile=/var/spool/torque/sched_priv/sched.lock	22	pidfile=/var/spool/torque/sched_priv/sched.lock
Lines 22-27 Link Here
22		24
23	load_rc_config $name	25	load_rc_config $name
24		26
25	: ${pbs_sched_enable="NO"}	27	: ${pbs_sched_enable:="NO"}
26		28
27	run_rc_command "$1"	29	run_rc_command "$1"

Lines 3-9 Link Here

(-)sysutils/torque/files/pbs_server.in (-3 / +5 lines)
3	# $FreeBSD$	3	# $FreeBSD$
4	#	4	#
5	# PROVIDE: pbs_server	5	# PROVIDE: pbs_server
6	# REQUIRE:	6	# REQUIRE: DAEMON
		7	# BEFORE: LOGIN
		8	# KEYWORD: shutdown
7	#	9	#
8	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf	10	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9	# to enable this service:	11	# to enable this service:
Lines 14-20 Link Here
14		16
15	. /etc/rc.subr	17	. /etc/rc.subr
16		18
17	name="pbs_server"	19	name=pbs_server
18	rcvar=pbs_server_enable	20	rcvar=pbs_server_enable
19		21
20	pidfile=/var/spool/torque/server_priv/server.lock	22	pidfile=/var/spool/torque/server_priv/server.lock
Lines 22-27 Link Here
22		24
23	load_rc_config $name	25	load_rc_config $name
24		26
25	: ${pbs_server_enable="NO"}	27	: ${pbs_server_enable:="NO"}
26		28
27	run_rc_command "$1"	29	run_rc_command "$1"




******************************************************************************
On the server, run:

	torque-config head

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, run:

	torque-config compute
	
		/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.

******************************************************************************
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:

		%%PREFIX%%/etc/rc.d/pbs_server restart
		%%PREFIX%%/etc/rc.d/pbs_sched restart

******************************************************************************
For further information, see

	http://www.adaptivecomputing.com/products/open-source/torque/

******************************************************************************




#!/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


Lines 6-9 Link Here

(-)sysutils/torque/pkg-descr (-1 / +1 lines)
6	USC , the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid,	6	USC , the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid,
7	and many other leading edge HPC organizations.	7	and many other leading edge HPC organizations.
8		8
9	WWW: http://www.clusterresources.com/pages/products/torque-resource-manager.php	9	WWW: http://www.adaptivecomputing.com/products/open-source/torque/

Lines 31-36 Link Here

(-)sysutils/torque/pkg-plist (+1 lines)
31	bin/qstop	31	bin/qstop
32	bin/qsub	32	bin/qsub
33	bin/qterm	33	bin/qterm
		34	bin/torque-config
34	bin/tracejob	35	bin/tracejob
35	include/pbs_error.h	36	include/pbs_error.h
36	include/pbs_error_db.h	37	include/pbs_error_db.h

Return to bug 175063

Lines 1-27 Link Here

(-)sysutils/torque/Makefile (-9 / +20 lines)
1	# New ports collection makefile for: torque	1	# Created by: trasz
2	# Date created: 20 Jul 2006
3	# Whom: trasz
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= torque	4	PORTNAME= torque
9	PORTVERSION= 3.0.2	5	PORTVERSION= 2.5.12
		6	PORTEPOCH= 1
10	CATEGORIES= sysutils parallel	7	CATEGORIES= sysutils parallel
11	MASTER_SITES= http://www.clusterresources.com/downloads/torque/	8	MASTER_SITES= http://www.adaptivecomputing.com/index.php?wpfb_dl=77/ \
		9	http://acadix.biz/Ports/distfiles/
12		10
13	MAINTAINER= jwbacon@tds.net	11	MAINTAINER= jwbacon@tds.net
14	COMMENT= Open source distributed computing resource manager based on PBS	12	COMMENT= Open source distributed computing resource manager based on PBS
15		13
16	USE_AUTOTOOLS= libtool	14	USE_AUTOTOOLS= libtool
17	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --with-rcp=scp	16	CONFIGURE_ARGS= --enable-syslog \
		17	--disable-spool
19	USE_GMAKE= yes	18	USE_GMAKE= yes
20	USE_RC_SUBR= pbs_server pbs_sched pbs_mom	19	USE_RC_SUBR= pbs_server pbs_sched pbs_mom
21	SUB_FILES= pkg-message	20	SUB_FILES= pkg-message torque-config
22	USE_PERL5= yes	21	USE_PERL5= yes
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24		23
		24	CONFLICTS_INSTALL= qstat-[0-9]* zh-qterm-[0-9]*
		25
25	MAN1= qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \	26	MAN1= qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \
26	qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \	27	qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \
27	nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 \	28	nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 \
Lines 56-63 Link Here
56	MLINKS= pbs_sched_cc.8 pbs_sched.8 \	57	MLINKS= pbs_sched_cc.8 pbs_sched.8 \
57	pbs_resources_freebsd.7 pbs_resources.7	58	pbs_resources_freebsd.7 pbs_resources.7
58		59
		60	.include <bsd.port.options.mk>
		61
		62	post-patch:
		63	${REINPLACE_CMD} -E 's\|ps[ \t]+-ef\|ps -ax\|g' ${WRKSRC}/torque.setup
		64
59	post-install:	65	post-install:
		66	${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${PREFIX}/bin
		67	.if ${PORT_OPTIONS:MEXAMPLES}
60	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}	68	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
		69	.else
		70	${RM} -rf ${EXAMPLESDIR}
		71	.endif
61	@${CAT} ${PKGMESSAGE}	72	@${CAT} ${PKGMESSAGE}
62		73
63	.include <bsd.port.mk>	74	.include <bsd.port.mk>

Line 0 Link Here

(-)sysutils/torque/files/patch-buildutils-pbs_mkdirs.in (+19 lines)
	1	--- buildutils/dpbs_mkdirs.in.orig Tue Jun 20 02:22:46 2006
	2	+++ buildutils/pbs_mkdirs.in Thu Sep 14 15:06:48 2006
	3	@@ -105,6 +105,7 @@
	4	#
	5	prefix=@prefix@
	6	exec_prefix=@exec_prefix@
	7	+DESTDIR=@prefix@
	8	CHK_TREE=${DESTDIR}@bindir@/chk_tree
	9
	10	PBS_DEFAULT_SERVER=@PBS_DEFAULT_SERVER@
	11	@@ -112,7 +113,7 @@
	12	# PBS_SERVER_HOME is defined without DESTDIR so that DEFAULT_FILE and EVIRON
	13	# can be based on SERVER_HOME. SERVER_HOME is defined a second time to pick
	14	# up DESTDIR
	15	-test -n "$PBS_SERVER_HOME" \|\| PBS_SERVER_HOME=@PBS_SERVER_HOME@
	16	+test -n "$PBS_SERVER_HOME" \|\| PBS_SERVER_HOME=/share/examples/torque/var/spool/torque/
	17	test -n "$PBS_DEFAULT_FILE" \|\| PBS_DEFAULT_FILE=${DESTDIR}@PBS_DEFAULT_FILE@
	18	test -n "$PBS_ENVIRON" \|\| PBS_ENVIRON=${DESTDIR}@PBS_ENVIRON@
	19

Lines 1-6 Link Here

(-)sysutils/torque/files/patch-configure (-4 / +17 lines)
1	--- configure.orig 2008-03-10 17:19:28.000000000 +0100	1	--- configure.orig 2012-04-13 16:06:17.000000000 -0500
2	+++ configure 2008-03-18 08:11:50.000000000 +0100	2	+++ configure 2012-07-15 11:40:43.000000000 -0500
3	@@ -20765,8 +20765,8 @@	3	@@ -19730,10 +19730,10 @@
		4
		5
		6	# This can be used to rebuild libtool when needed
		7	-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
		8	+LIBTOOL_DEPS=" /usr/local/share/libtool/config/ltmain.sh"
		9
		10	# Always use our own libtool.
		11	-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
		12	+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
		13
		14	# Prevent multiple expansion
		15
		16	@@ -20294,8 +20294,8 @@
4	else	17	else
5	echo "$as_me:$LINENO: result: yes" >&5	18	echo "$as_me:$LINENO: result: yes" >&5
6	echo "${ECHO_T}yes" >&6	19	echo "${ECHO_T}yes" >&6
Lines 11-17 Link Here
11	if test "${ac_cv_cflags_gcc_option__W__Wall__Wno_unused_parameter__Wno_long_long__pedantic__Werror+set}" = set; then	24	if test "${ac_cv_cflags_gcc_option__W__Wall__Wno_unused_parameter__Wno_long_long__pedantic__Werror+set}" = set; then
12	echo $ECHO_N "(cached) $ECHO_C" >&6	25	echo $ECHO_N "(cached) $ECHO_C" >&6
13	else	26	else
14	@@ -20780,7 +20780,7 @@	27	@@ -20309,7 +20309,7 @@
15	ac_compiler_gnu=$ac_cv_c_compiler_gnu	28	ac_compiler_gnu=$ac_cv_c_compiler_gnu
16		29
17	ac_save_CFLAGS="$CFLAGS"	30	ac_save_CFLAGS="$CFLAGS"

Lines 1-19 Link Here

(-)sysutils/torque/files/patch-pbs_mkdirs.in (-19 lines)
1	--- buildutils/dpbs_mkdirs.in.orig Tue Jun 20 02:22:46 2006
2	+++ buildutils/pbs_mkdirs.in Thu Sep 14 15:06:48 2006
3	@@ -105,6 +105,7 @@
4	#
5	prefix=@prefix@
6	exec_prefix=@exec_prefix@
7	+DESTDIR=@prefix@
8	CHK_TREE=${DESTDIR}@bindir@/chk_tree
9
10	PBS_DEFAULT_SERVER=@PBS_DEFAULT_SERVER@
11	@@ -112,7 +113,7 @@
12	# PBS_SERVER_HOME is defined without DESTDIR so that DEFAULT_FILE and EVIRON
13	# can be based on SERVER_HOME. SERVER_HOME is defined a second time to pick
14	# up DESTDIR
15	-test -n "$PBS_SERVER_HOME" \|\| PBS_SERVER_HOME=@PBS_SERVER_HOME@
16	+test -n "$PBS_SERVER_HOME" \|\| PBS_SERVER_HOME=/share/examples/torque/var/spool/torque/
17	test -n "$PBS_DEFAULT_FILE" \|\| PBS_DEFAULT_FILE=${DESTDIR}@PBS_DEFAULT_FILE@
18	test -n "$PBS_ENVIRON" \|\| PBS_ENVIRON=${DESTDIR}@PBS_ENVIRON@
19

Lines 1-69 Link Here

(-)sysutils/torque/files/pkg-message.in (-58 / +5 lines)
1	******************************************************************************	1	******************************************************************************
2	You can find an example configuration in	2	On the server, run:
3		3
4	%%PREFIX%%/share/examples/torque/var/spool/torque	4	torque-config head
5		5
6	On all machines, both server and compute nodes:
7
8	1. Run
9
10	cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque \
11	/var/spool
12
13	2. Put the hostname of the server into
14
15	/var/spool/torque/server_name
16
17	******************************************************************************	6	******************************************************************************
18	On compute nodes:	7	On compute nodes, run:
19		8
20	1. Put '$pbsserver ip.address.of.server' into	9	torque-config compute
21
22	/var/spool/torque/mom_priv/config
23		10
24	2. Add the following line to /etc/rc.conf:
25
26	pbs_mom_enable="YES"
27
28	This may include the server if you allow it to be used
29	as a compute node as well.
30
31	******************************************************************************	11	******************************************************************************
32	On the server:
33
34	1. Put hostnames of compute nodes, one per line, into
35
36	/var/spool/torque/server_priv/nodes
37
38	Additional options can be specified for each entry. Consult
39	the torque documentation for details.
40
41	2. Add the following lines to /etc/rc.conf:
42
43	pbs_server_enable="YES"
44	pbs_sched_enable="YES"
45
46	3. To configure queues, execute
47
48	%%PREFIX%%/share/examples/torque/torque.setup <admin>
49
50	The recommended <admin> user is root.
51
52	******************************************************************************
53	After installation is complete on the server and compute nodes:
54
55	1. Start node services on all compute nodes with:
56
57	%%PREFIX%%/etc/rc.d/pbs_mom restart
58
59	2. Start scheduler services on the server with:
60
61	%%PREFIX%%/etc/rc.d/pbs_server restart
62	%%PREFIX%%/etc/rc.d/pbs_sched restart
63
64	******************************************************************************
65	For further information, see	12	For further information, see
66		13
67	http://www.clusterresources.com/torquedocs21/	14	http://www.adaptivecomputing.com/products/open-source/torque/
68		15
69	******************************************************************************	16	******************************************************************************

Line 0 Link Here

(-)sysutils/torque/files/torque-config.in (+63 lines)
	1	#!/bin/sh -e
	2
	3	usage()
	4	{
	5	printf "Usage: $0 head\|compute\n"
	6	exit 1
	7	}
	8
	9	if [ $# != 1 ]; then
	10	usage
	11	fi
	12	node_type=$1
	13
	14	if [ $node_type != 'head' ] && [ $node_type != 'compute' ]; then
	15	usage
	16	fi
	17
	18	spool_root=/var/spool
	19
	20	if [ -e $spool_root/torque ]; then
	21	printf "$spool_root/torque already exists. Aborting...\n"
	22	exit 1
	23	fi
	24
	25	cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque $spool_root
	26	for dir in checkpoint spool undelivered; do
	27	chmod 1777 $spool_root/torque/$dir
	28	done
	29
	30	cat << EOM
	31	===========================================================================
	32	Enter the hostname of the torque server. This should be resolved by
	33	/etc/hosts on all nodes. A short hostname is preferred.
	34	===========================================================================
	35	EOM
	36	read server_hostname
	37	echo $server_hostname > $spool_root/torque/server_name
	38
	39	case $node_type in
	40	'head')
	41	vi $spool_root/torque/server_priv/nodes
	42	if ! fgrep -q 'pbs_server_enable="YES"' /etc/rc.conf; then
	43	printf 'pbs_server_enable="YES"\n' >> /etc/rc.conf
	44	fi
	45	if ! fgrep -q 'pbs_sched_enable="YES"' /etc/rc.conf; then
	46	printf 'pbs_sched_enable="YES"\n' >> /etc/rc.conf
	47	fi
	48	%%PREFIX%%/share/examples/torque/torque.setup root
	49	%%PREFIX%%/etc/rc.d/pbs_server restart
	50	%%PREFIX%%/etc/rc.d/pbs_sched restart
	51	;;
	52	'compute')
	53	printf "Torque server IP address? "
	54	read server_ip
	55	printf '$pbsserver %s /var/spool/torque/mom_priv/config' $server_ip \
	56	> $spool_root/torque/mom_priv/config
	57	if ! fgrep -q 'pbs_mom_enable="YES"' /etc/rc.conf; then
	58	printf 'pbs_mom_enable="YES"\n' >> /etc/rc.conf
	59	fi
	60	%%PREFIX%%/etc/rc.d/pbs_mom restart
	61	;;
	62	esac
	63