sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 10:56:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- "Update" to 2.5.12. This is the supported stable branch upstream

Browse source 
- Bump PORTEPOCH
- Trim Makefile header
- Add CONFLICTS_INSTALL [1]
- Make rc scripts more rclint compliant
- Update WWW line in pkg-descr

PR:		ports/175063
Submitted by:	Jason Bacon <jwbacon@tds.net> (maintainer)
Approved by:	danfe (maintainer of games/qstat, via email) [1]
Approved by:	Kai Wang <kaiwang27@gmail.com> (maintainer of chinese/qterm) [1]
Feature safe:	yes
This commit is contained in:
Guido Falsi 2013-04-16 18:23:45 +00:00
parent ad8c40120e
commit ac8c103656
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=315876
19 changed files with 138 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chinese/qterm/Makefile
View file

@ -19,6 +19,8 @@ USE_XORG= x11 ice
MAKE_JOBS_SAFE= yes
INSTALLS_ICONS= yes
CONFLICTS_INSTALL= torque-[0-9]*
OPTIONS_DEFINE= DBUS OPENSSL PHONON QTSCRIPT KDE
OPTIONS_DEFAULT= DBUS OPENSSL PHONON QTSCRIPT

2
games/qstat/Makefile
View file

@ -11,6 +11,8 @@ COMMENT= Command-line program to query game servers on the net
GNU_CONFIGURE= yes
CONFLICTS_INSTALL= torque-[0-9]*
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>

30
sysutils/torque/Makefile
View file

@ -1,27 +1,28 @@
# New ports collection makefile for: torque
# Date created: 20 Jul 2006
# Whom: trasz
#
# Created by: trasz
# $FreeBSD$
#
PORTNAME= torque
PORTVERSION= 3.0.2
PORTVERSION= 2.5.12
PORTEPOCH= 1
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 +57,19 @@ MAN8= pbs_mom.8 pbsnodes.8 pbs_sched_basl.8 pbs_sched_cc.8 \
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
@${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
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>

4
sysutils/torque/distinfo
View file

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

0
sysutils/torque/files/patch-pbs_mkdirs.in → sysutils/torque/files/patch-buildutils-pbs_mkdirs.in
View file

21
sysutils/torque/files/patch-configure
View file

@ -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 23:06:17.000000000 +0200
+++ configure 2013-04-12 13:23:42.785303064 +0200
@@ -19730,10 +19730,10 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS=" %%LOCALBASE%%/share/libtool/config/ltmain.sh"
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) %%LOCALBASE%%/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"

11
sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c
View file

@ -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);
/*

10
sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c
View file

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

0
sysutils/torque/files/patch-fifo-Makefile.in → sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in
View file

10
sysutils/torque/files/patch-src-server-node_manager.c
View file

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

10
sysutils/torque/files/patch-src-server-pbsd_main.c
View file

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

10
sysutils/torque/files/patch-src-server-req_getcred.c Normal file
View file

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

8
sysutils/torque/files/pbs_mom.in
View file

@ -3,7 +3,9 @@
# $FreeBSD$
#
# 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:
@ -14,7 +16,7 @@
. /etc/rc.subr
name="pbs_mom"
name=pbs_mom
rcvar=pbs_mom_enable
pidfile=/var/spool/torque/mom_priv/mom.lock
@ -22,6 +24,6 @@ command=%%PREFIX%%/sbin/${name}
load_rc_config $name
: ${pbs_mom_enable="NO"}
: ${pbs_mom_enable:="NO"}
run_rc_command "$1"

6
sysutils/torque/files/pbs_sched.in
View file

@ -4,6 +4,8 @@
#
# 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:
@ -14,7 +16,7 @@
. /etc/rc.subr
name="pbs_sched"
name=pbs_sched
rcvar=pbs_sched_enable
pidfile=/var/spool/torque/sched_priv/sched.lock
@ -22,6 +24,6 @@ command=%%PREFIX%%/sbin/${name}
load_rc_config $name
: ${pbs_sched_enable="NO"}
: ${pbs_sched_enable:="NO"}
run_rc_command "$1"

8
sysutils/torque/files/pbs_server.in
View file

@ -3,7 +3,9 @@
# $FreeBSD$
#
# 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:
@ -14,7 +16,7 @@
. /etc/rc.subr
name="pbs_server"
name=pbs_server
rcvar=pbs_server_enable
pidfile=/var/spool/torque/server_priv/server.lock
@ -22,6 +24,6 @@ command=%%PREFIX%%/sbin/${name}
load_rc_config $name
: ${pbs_server_enable="NO"}
: ${pbs_server_enable:="NO"}
run_rc_command "$1"

63
sysutils/torque/files/pkg-message.in
View file

@ -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
torque-config head
******************************************************************************
On compute nodes:
On compute nodes, run:
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.
******************************************************************************
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
torque-config compute
******************************************************************************
For further information, see
http://www.clusterresources.com/torquedocs21/
http://www.adaptivecomputing.com/products/open-source/torque/
******************************************************************************

63
sysutils/torque/files/torque-config.in Normal file
View file

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

2
sysutils/torque/pkg-descr
View file

@ -6,4 +6,4 @@ fault tolerance, and feature extensions contributed by NCSA, OSC,
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/

1
sysutils/torque/pkg-plist
View file

@ -31,6 +31,7 @@ bin/qstat
bin/qstop
bin/qsub
bin/qterm
bin/torque-config
bin/tracejob
include/pbs_error.h
include/pbs_error_db.h