View | Details | Raw Unified | Return to bug 175063 | Differences between
and this patch

Collapse All | Expand All

(-)/home/bacon/Prog/Ports/ports/sysutils/torque/Makefile (-5 / +16 lines)
Lines 6-27 Link Here
6
#
6
#
7
7
8
PORTNAME=	torque
8
PORTNAME=	torque
9
PORTVERSION=	3.0.2
9
PORTVERSION=	3.0.6
10
CATEGORIES=	sysutils parallel
10
CATEGORIES=	sysutils parallel
11
MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
11
MASTER_SITES=	http://www.adaptivecomputing.com/resources/downloads/torque/
12
12
13
MAINTAINER=	jwbacon@tds.net
13
MAINTAINER=	jwbacon@tds.net
14
COMMENT=	Open source distributed computing resource manager based on PBS
14
COMMENT=	Open source distributed computing resource manager based on PBS
15
15
16
USE_AUTOTOOLS=	libtool
16
USE_AUTOTOOLS=	libtool
17
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
18
CONFIGURE_ARGS=	--with-rcp=scp
18
CONFIGURE_ARGS=	--enable-syslog \
19
		--disable-spool
19
USE_GMAKE=	yes
20
USE_GMAKE=	yes
20
USE_RC_SUBR=	pbs_server.sh pbs_sched.sh pbs_mom.sh
21
USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
21
SUB_FILES=	pkg-message
22
SUB_FILES=	pkg-message torque-config
22
USE_PERL5=	yes
23
USE_PERL5=	yes
23
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
24
25
26
CONFLICTS=	qstat-[0-9]* zh-qterm-[0-9]* torque-2* torque-4*
27
25
MAN1=		qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \
28
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 \
29
		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 \
30
		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 \
59
MLINKS=		pbs_sched_cc.8 pbs_sched.8 \
57
		pbs_resources_freebsd.7 pbs_resources.7
60
		pbs_resources_freebsd.7 pbs_resources.7
58
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 defined(NOPORTEXAMPLES)
68
	${RM} -rf ${EXAMPLESDIR}
69
.else
60
	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
70
	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
71
.endif
61
	@${CAT} ${PKGMESSAGE}
72
	@${CAT} ${PKGMESSAGE}
62
73
63
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1
1
SHA256 (torque-3.0.6.tar.gz) = f76736d780fc0f8ac73c54d586b4d15704e37cf191649b748b07f660186642b3
2
SIZE (torque-3.0.2.tar.gz) = 5864771
2
SIZE (torque-3.0.6.tar.gz) = 5888678
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-configure (-22 lines)
Lines 1-22 Link Here
1
--- configure.orig	2008-03-10 17:19:28.000000000 +0100
2
+++ configure	2008-03-18 08:11:50.000000000 +0100
3
@@ -20765,8 +20765,8 @@
4
     else
5
       echo "$as_me:$LINENO: result: yes" >&5
6
 echo "${ECHO_T}yes" >&6
7
-      echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror" >&5
8
-echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror... $ECHO_C" >&6
9
+      echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic" >&5
10
+echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic... $ECHO_C" >&6
11
 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
13
 else
14
@@ -20780,7 +20780,7 @@
15
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
16
 
17
  ac_save_CFLAGS="$CFLAGS"
18
-for ac_arg in "-pedantic -Werror % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror"     "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror %% no, obsolete"     #
19
+for ac_arg in "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic"     "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic %% no, obsolete"     #
20
 do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
21
    cat >conftest.$ac_ext <<_ACEOF
22
 /* confdefs.h.  */
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/patch-src-server-req_getcred.c (+10 lines)
Line 0 Link Here
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"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_mom.in (+29 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# PROVIDE: pbs_mom
4
# REQUIRE: DAEMON
5
# BEFORE: LOGIN
6
# KEYWORD: shutdown
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_mom_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_mom.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_mom"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/mom_priv/mom.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_mom_enable="NO"}
26
27
command_args=""
28
29
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_mom.sh.in (-27 lines)
Lines 1-27 Link Here
1
#!/bin/sh
2
3
# $FreeBSD: ports/sysutils/torque/files/pbs_mom.sh.in,v 1.3 2011/05/15 02:49:15 dougb Exp $
4
#
5
# PROVIDE: pbs_mom
6
# REQUIRE: 
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_mom_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_mom.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_mom"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/mom_priv/mom.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_mom_enable="NO"}
26
27
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_sched.in (+29 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# PROVIDE: pbs_sched
4
# REQUIRE: pbs_server
5
# BEFORE: LOGIN
6
# KEYWORD: shutdown
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_sched_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_sched.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_sched"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/sched_priv/sched.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_sched_enable="NO"}
26
27
command_args=""
28
29
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_sched.sh.in (-27 lines)
Lines 1-27 Link Here
1
#!/bin/sh
2
3
# $FreeBSD: ports/sysutils/torque/files/pbs_sched.sh.in,v 1.3 2011/05/15 02:49:15 dougb Exp $
4
#
5
# PROVIDE: pbs_sched
6
# REQUIRE: pbs_server
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_sched_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_sched.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_sched"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/sched_priv/sched.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_sched_enable="NO"}
26
27
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_server.in (+29 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# PROVIDE: pbs_server
4
# REQUIRE: DAEMON
5
# BEFORE: LOGIN
6
# KEYWORD: shutdown
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_server_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_server.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_server"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/server_priv/server.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_server_enable="NO"}
26
27
command_args=""
28
29
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pbs_server.sh.in (-27 lines)
Lines 1-27 Link Here
1
#!/bin/sh
2
3
# $FreeBSD: ports/sysutils/torque/files/pbs_server.sh.in,v 1.3 2011/05/15 02:49:15 dougb Exp $
4
#
5
# PROVIDE: pbs_server
6
# REQUIRE: 
7
#
8
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# to enable this service:
10
#
11
# pbs_server_enable (bool):   Set to NO by default.
12
#               Set it to YES to enable pbs_server.
13
#
14
15
. /etc/rc.subr
16
17
name="pbs_server"
18
rcvar=${name}_enable
19
20
pidfile=/var/spool/torque/server_priv/server.lock
21
command=%%PREFIX%%/sbin/${name}
22
23
load_rc_config $name
24
25
: ${pbs_server_enable="NO"}
26
27
run_rc_command "$1"
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/pkg-message.in (-58 / +5 lines)
Lines 1-69 Link Here
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
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
******************************************************************************
18
On compute nodes:
19
20
	1. Put '$pbsserver ip.address.of.server' into
21
	
22
		/var/spool/torque/mom_priv/config
23
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
******************************************************************************
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
5
52
******************************************************************************
6
******************************************************************************
53
After installation is complete on the server and compute nodes:
7
On compute nodes, run:
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
8
61
		%%PREFIX%%/etc/rc.d/pbs_server restart
9
	torque-config compute
62
		%%PREFIX%%/etc/rc.d/pbs_sched restart
63
10
64
******************************************************************************
11
******************************************************************************
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
******************************************************************************
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/files/torque-config.in (+63 lines)
Line 0 Link Here
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
(-)/home/bacon/Prog/Ports/ports/sysutils/torque/pkg-plist (+1 lines)
Lines 31-36 Link Here
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