Date: Tue, 16 Apr 2013 18:23:45 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315876 - in head: chinese/qterm games/qstat sysutils/torque sysutils/torque/files Message-ID: <201304161823.r3GINjP2055689@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Apr 16 18:23:45 2013 New Revision: 315876 URL: http://svnweb.freebsd.org/changeset/ports/315876 Log: - "Update" to 2.5.12. This is the supported stable branch upstream - 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 Added: head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in (contents, props changed) head/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in (contents, props changed) head/sysutils/torque/files/patch-src-server-req_getcred.c (contents, props changed) head/sysutils/torque/files/torque-config.in (contents, props changed) Deleted: head/sysutils/torque/files/patch-fifo-Makefile.in head/sysutils/torque/files/patch-pbs_mkdirs.in head/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c head/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c head/sysutils/torque/files/patch-src-server-node_manager.c head/sysutils/torque/files/patch-src-server-pbsd_main.c Modified: head/chinese/qterm/Makefile head/games/qstat/Makefile (contents, props changed) head/sysutils/torque/Makefile (contents, props changed) head/sysutils/torque/distinfo (contents, props changed) head/sysutils/torque/files/patch-configure (contents, props changed) head/sysutils/torque/files/pbs_mom.in (contents, props changed) head/sysutils/torque/files/pbs_sched.in (contents, props changed) head/sysutils/torque/files/pbs_server.in (contents, props changed) head/sysutils/torque/files/pkg-message.in (contents, props changed) head/sysutils/torque/pkg-descr (contents, props changed) head/sysutils/torque/pkg-plist (contents, props changed) Modified: head/chinese/qterm/Makefile ============================================================================== --- head/chinese/qterm/Makefile Tue Apr 16 18:12:45 2013 (r315875) +++ head/chinese/qterm/Makefile Tue Apr 16 18:23:45 2013 (r315876) @@ -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 Modified: head/games/qstat/Makefile ============================================================================== --- head/games/qstat/Makefile Tue Apr 16 18:12:45 2013 (r315875) +++ head/games/qstat/Makefile Tue Apr 16 18:23:45 2013 (r315876) @@ -11,6 +11,8 @@ COMMENT= Command-line program to query g GNU_CONFIGURE= yes +CONFLICTS_INSTALL= torque-[0-9]* + OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> Modified: head/sysutils/torque/Makefile ============================================================================== --- head/sysutils/torque/Makefile Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/Makefile Tue Apr 16 18:23:45 2013 (r315876) @@ -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_ba 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> Modified: head/sysutils/torque/distinfo ============================================================================== --- head/sysutils/torque/distinfo Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/distinfo Tue Apr 16 18:23:45 2013 (r315876) @@ -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 Added: head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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@ + Modified: head/sysutils/torque/files/patch-configure ============================================================================== --- head/sysutils/torque/files/patch-configure Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/files/patch-configure Tue Apr 16 18:23:45 2013 (r315876) @@ -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" Added: head/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/torque/files/patch-src-scheduler.cc-samples-fifo-Makefile.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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) Added: head/sysutils/torque/files/patch-src-server-req_getcred.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/torque/files/patch-src-server-req_getcred.c Tue Apr 16 18:23:45 2013 (r315876) @@ -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" Modified: head/sysutils/torque/files/pbs_mom.in ============================================================================== --- head/sysutils/torque/files/pbs_mom.in Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/files/pbs_mom.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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" Modified: head/sysutils/torque/files/pbs_sched.in ============================================================================== --- head/sysutils/torque/files/pbs_sched.in Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/files/pbs_sched.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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" Modified: head/sysutils/torque/files/pbs_server.in ============================================================================== --- head/sysutils/torque/files/pbs_server.in Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/files/pbs_server.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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" Modified: head/sysutils/torque/files/pkg-message.in ============================================================================== --- head/sysutils/torque/files/pkg-message.in Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/files/pkg-message.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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/ ****************************************************************************** Added: head/sysutils/torque/files/torque-config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/torque/files/torque-config.in Tue Apr 16 18:23:45 2013 (r315876) @@ -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 + Modified: head/sysutils/torque/pkg-descr ============================================================================== --- head/sysutils/torque/pkg-descr Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/pkg-descr Tue Apr 16 18:23:45 2013 (r315876) @@ -6,4 +6,4 @@ fault tolerance, and feature extensions 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/ Modified: head/sysutils/torque/pkg-plist ============================================================================== --- head/sysutils/torque/pkg-plist Tue Apr 16 18:12:45 2013 (r315875) +++ head/sysutils/torque/pkg-plist Tue Apr 16 18:23:45 2013 (r315876) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304161823.r3GINjP2055689>