Date: Tue, 2 Sep 2008 02:47:59 +0800 (CST) From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: demon@FreeBSD.org Subject: ports/127028: [PATCH] net/clusterit: update to 2.5 Message-ID: <200809011847.m81Ilxpw070440@bsd0.cs.nctu.edu.tw> Resent-Message-ID: <200809011850.m81Io2tS014562@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127028 >Category: ports >Synopsis: [PATCH] net/clusterit: update to 2.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 01 18:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yi-Jheng Lin >Release: FreeBSD 7.0-RELEASE-p1 amd64 >Organization: NCTU CS >Environment: System: FreeBSD stucgi 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Thu Apr 17 15:56:39 CST 2008 >Description: - Update to 2.5 Removed file(s): - files/patch-alignstring - files/patch-barrier::barrierd.c - files/patch-common::common.c - files/patch-dsh-dsh.c - files/patch-tools::dshbak.src Port maintainer (demon@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- clusterit-2.5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/clusterit/Makefile /amd/account/gcs/96/9655630/dev/ports/net/clusterit/Makefile --- /usr/ports/net/clusterit/Makefile 2008-04-20 03:18:28.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/Makefile 2008-09-02 02:37:01.000000000 +0800 @@ -6,17 +6,18 @@ # PORTNAME= clusterit -PORTVERSION= 2.0 -PORTREVISION= 4 +PORTVERSION= 2.5 CATEGORIES= net devel parallel -MASTER_SITES= http://www.garbled.net/download/ \ - ftp://ftp.chg.ru/pub/prog/parallel/clusterit/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= demon@FreeBSD.org COMMENT= A collection of clustering tools -MAN1= barrier.1 barrierd.1 dsh.1 jsh.1 jsd.1 \ - clustersed.1 run.1 seq.1 dshbak.1 pcp.1 pdf.1 prm.1 +GNU_CONFIGURE= yes + +MAN1= barrier.1 barrierd.1 clustersed.1 dsh.1 dshbak.1 \ + dtop.1 jsh.1 jsd.1 pcp.1 pdf.1 prm.1 rseq.1 run.1 .if defined (WITHOUT_X11) PLIST_SUB+= X11='@comment ' @@ -25,16 +26,10 @@ MAN1+= rvt.1 dvt.1 USE_XORG= x11 .endif -USE_PERL5_BUILD=yes post-patch: - @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ - ${PERL} -pi -e 's#/usr/X11R6#${LOCALBASE}#g' -.for file in command.c rvt.c screen.c - @${PERL} -pi -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/rvt/${file} -.endfor .if defined(WITHOUT_X11) - @${PERL} -pi -e 's#rvt dvt##g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -E 's,^(SUBDIRS) = .*,\1 = barrier dsh jsd pcp dtop tools,' ${WRKSRC}/Makefile.in .endif .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/net/clusterit/distinfo /amd/account/gcs/96/9655630/dev/ports/net/clusterit/distinfo --- /usr/ports/net/clusterit/distinfo 2006-01-23 05:22:58.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/distinfo 2008-09-01 16:33:19.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (clusterit-2.0.tar.gz) = 4868fdb108473c9ba3fef38450423469 -SHA256 (clusterit-2.0.tar.gz) = 5eec53f6834dcabfb78c24d00114fa18f0e216b3402b7e660fe9b78f223afd3d -SIZE (clusterit-2.0.tar.gz) = 124564 +MD5 (clusterit-2.5.tar.gz) = f0e772e07122e388de629fb57f7237ab +SHA256 (clusterit-2.5.tar.gz) = e50597fb361d9aefff0250108900a3837a4a14c46083d6eb5ed5d7fc42ce9f35 +SIZE (clusterit-2.5.tar.gz) = 295347 diff -ruN --exclude=CVS /usr/ports/net/clusterit/files/patch-alignstring /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-alignstring --- /usr/ports/net/clusterit/files/patch-alignstring 2003-04-07 15:29:21.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-alignstring 1970-01-01 08:00:00.000000000 +0800 @@ -1,121 +0,0 @@ -diff -ru clusterit-2.0/common/common.c clusterit-2.0-new/common/common.c ---- common/common.c Sat Apr 5 17:01:50 2003 -+++ common/common.c Sat Apr 5 16:56:15 2003 -@@ -316,24 +316,6 @@ - - #endif /* CLUSTERS */ - --/* return a string, followed by n - strlen spaces */ -- --char * --alignstring(string, n) -- char *string; -- size_t n; --{ -- size_t i; -- char *newstring; -- -- newstring = strdup(string); -- for (i=1; i <= n - strlen(string); i++) -- newstring = strcat(newstring, " "); -- -- return(newstring); --} -- -- - /* - * Simple error handling routine, needs severe work. - * Its almost totally useless. -diff -ru clusterit-2.0/common/common.h clusterit-2.0-new/common/common.h ---- common/common.h Tue Aug 14 04:21:39 2001 -+++ common/common.h Sat Apr 5 16:56:32 2003 -@@ -78,7 +78,6 @@ - typedef struct group_data group_t; - - void bailout __P((int)); --char *alignstring __P((char *, size_t)); - #ifndef __NetBSD__ - char * strsep(char **stringp, const char *delim); - #endif -diff -ru clusterit-2.0/dsh/dsh.c clusterit-2.0-new/dsh/dsh.c ---- dsh/dsh.c Tue Aug 14 04:21:38 2001 -+++ dsh/dsh.c Sat Apr 5 16:58:38 2003 -@@ -399,8 +399,8 @@ - bailout(__LINE__); - while ((cd = fgets(pipebuf, sizeof(pipebuf), fd))) { - if (cd != NULL) -- (void)printf("%s: %s", -- alignstring(nodeptr->name, maxnodelen), cd); -+ (void)printf("%*s: %s", -+ -maxnodelen, nodeptr->name, cd); - } - fclose(fd); - fd = fdopen(nodeptr->err.fds[0], "r"); /* stderr */ -@@ -408,8 +408,8 @@ - bailout(__LINE__); - while ((cd = fgets(pipebuf, sizeof(pipebuf), fd))) { - if (errorflag && cd != NULL) -- (void)printf("%s: %s", -- alignstring(nodeptr->name, maxnodelen), cd); -+ (void)printf("%*s: %s", -+ -maxnodelen, nodeptr->name, cd); - } - fclose(fd); - (void)wait(&status); -diff -ru clusterit-2.0/dsh/run.c clusterit-2.0-new/dsh/run.c ---- dsh/run.c Tue Aug 14 04:21:38 2001 -+++ dsh/run.c Sat Apr 5 16:59:35 2003 -@@ -326,13 +326,12 @@ - bailout(__LINE__); - fd = fdopen(nodeptr->out.fds[0], "r"); /* stdout */ - while ((p = fgets(buf, sizeof(buf), fd))) -- (void)printf("%s: %s", alignstring(nodeptr->name, maxnodelen), p); -+ (void)printf("%*s: %s", -maxnodelen, nodeptr->name, p); - fclose(fd); - fd = fdopen(nodeptr->err.fds[0], "r"); /* stderr */ - while ((p = fgets(buf, sizeof(buf), fd))) - if (errorflag) -- (void)printf("%s: %s", -- alignstring(nodeptr->name, maxnodelen), p); -+ (void)printf("%*s: %s", -maxnodelen, nodeptr->name, p); - fclose(fd); - (void)wait(&status); - if (piping) { -diff -ru clusterit-2.0/dvt/dvt.c clusterit-2.0-new/dvt/dvt.c ---- dvt/dvt.c Tue Aug 14 04:21:37 2001 -+++ dvt/dvt.c Sat Apr 5 17:00:07 2003 -@@ -610,8 +610,8 @@ - bailout(__LINE__); - while ((cd = fgets(pipebuf, sizeof(pipebuf), fd))) { - if (errorflag && cd != NULL) -- (void)printf("ERROR %s: %s", -- alignstring(nodeptr->name, maxnodelen), cd); -+ (void)printf("ERROR %*s: %s", -+ -maxnodelen, nodeptr->name, cd); - } - fclose(fd); - (void)waitpid(nodeptr->childpid, &status, 0); -diff -ru clusterit-2.0/pcp/pcp.c clusterit-2.0-new/pcp/pcp.c ---- pcp/pcp.c Tue Aug 14 04:21:34 2001 -+++ pcp/pcp.c Sat Apr 5 16:58:00 2003 -@@ -383,16 +383,16 @@ - bailout(__LINE__); - while ((cd = fgets(pipebuf, sizeof(pipebuf), fd))) - if (cd != NULL && !quiet) -- (void)printf("%s: %s", -- alignstring(nodeptr->name, maxnodelen), cd); -+ (void)printf("%*s: %s", -+ -maxnodelen, nodeptr->name, cd); - fclose(fd); - fd = fdopen(nodeptr->err.fds[0], "r"); /* stderr */ - if (fd == NULL) - bailout(__LINE__); - while ((cd = fgets(pipebuf, sizeof(pipebuf), fd))) - if (cd != NULL && !quiet) -- (void)printf("%s: %s", -- alignstring(nodeptr->name, maxnodelen), cd); -+ (void)printf("%*s: %s", -+ -maxnodelen, nodeptr->name, cd); - fclose(fd); - (void)wait(&status); - nodeptr = nodeptr->next; diff -ruN --exclude=CVS /usr/ports/net/clusterit/files/patch-barrier::barrierd.c /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-barrier::barrierd.c --- /usr/ports/net/clusterit/files/patch-barrier::barrierd.c 2003-10-18 18:08:08.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-barrier::barrierd.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,11 +0,0 @@ ---- barrier/barrierd.c.orig Sat Oct 18 14:05:14 2003 -+++ barrier/barrierd.c Sat Oct 18 14:05:29 2003 -@@ -38,7 +38,7 @@ - #include <string.h> - #include <strings.h> - #include <syslog.h> --#include <varargs.h> -+#include <stdarg.h> - #include "../common/sockcommon.h" - - #if !defined(lint) && defined(__NetBSD__) diff -ruN --exclude=CVS /usr/ports/net/clusterit/files/patch-common::common.c /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-common::common.c --- /usr/ports/net/clusterit/files/patch-common::common.c 2003-04-07 15:29:21.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-common::common.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,34 +0,0 @@ -Index: common/common.c -=================================================================== -RCS file: /cvsroot/src/common/common.c,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- common/common.c 2001/08/13 21:04:22 1.5 -+++ common/common.c 2001/08/16 19:08:17 1.6 -@@ -1,4 +1,4 @@ --/* $Id: common.c,v 1.5 2001/08/13 21:04:22 garbled Exp $ */ -+/* $Id: common.c,v 1.6 2001/08/16 19:08:17 garbled Exp $ */ - /* - * Copyright (c) 1998, 1999, 2000 - * Tim Rightnour. All rights reserved. -@@ -42,7 +42,7 @@ - __COPYRIGHT( - "@(#) Copyright (c) 1998, 1999, 2000\n\ - Tim Rightnour. All rights reserved\n"); --__RCSID("$Id: common.c,v 1.5 2001/08/13 21:04:22 garbled Exp $"); -+__RCSID("$Id: common.c,v 1.6 2001/08/16 19:08:17 garbled Exp $"); - #endif - - -@@ -91,8 +91,8 @@ - for (i=0; (i < fanout && nodeptr != NULL); i++) { - l++; - group = NULL; -- if (nodeptr->group >= 0) -- group = strdup(grouplist[nodeptr->group].name); -+ if (nodeptr->group >= 0 && grouplist[nodeptr->group].name) -+ group = strdup(grouplist[nodeptr->group].name); - if (group == NULL) - (void)printf("Node: %3d Fangroup: %3d Rungroup: None" - " Host: %-15s\n", l, n + 1, nodeptr->name); diff -ruN --exclude=CVS /usr/ports/net/clusterit/files/patch-dsh-dsh.c /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-dsh-dsh.c --- /usr/ports/net/clusterit/files/patch-dsh-dsh.c 2004-07-06 16:57:49.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-dsh-dsh.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,34 +0,0 @@ ---- dsh/dsh.c.orig Tue Jul 6 12:49:37 2004 -+++ dsh/dsh.c Tue Jul 6 12:53:51 2004 -@@ -35,6 +35,7 @@ - #include <sys/types.h> - #include <sys/resource.h> - #include <sys/wait.h> -+#include <sys/param.h> - - #include <errno.h> - #include <fcntl.h> -@@ -76,6 +77,11 @@ - { - extern char *optarg; - extern int optind; -+#if __FreeBSD_version < 500000 -+ extern char *malloc_options; -+#else -+ extern const char *_malloc_options; -+#endif - - int someflag, ch, i, fanout, showflag, fanflag; - char *p, *q, *group, *nodename, *username; -@@ -93,6 +99,11 @@ - nodeptr = NULL; - nodelink = NULL; - -+#if __FreeBSD_version < 500000 -+ malloc_options = "Z"; -+#else -+ _malloc_options = "Z"; -+#endif - rungroup = malloc(sizeof(char **) * GROUP_MALLOC); - if (rungroup == NULL) - bailout(__LINE__); diff -ruN --exclude=CVS /usr/ports/net/clusterit/files/patch-tools::dshbak.src /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-tools::dshbak.src --- /usr/ports/net/clusterit/files/patch-tools::dshbak.src 2003-04-07 15:29:21.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/files/patch-tools::dshbak.src 1970-01-01 08:00:00.000000000 +0800 @@ -1,24 +0,0 @@ ---- tools/dshbak.src Sat Apr 5 15:54:14 2003 -+++ tools/dshbak.src Sat Apr 5 15:52:53 2003 -@@ -1,7 +1,10 @@ - #!@@@AWK@@@ -f - # $Id: dshbak.src,v 1.2 1999/05/05 09:20:45 garbled Exp $ - # dshbak *must have nawk or compatible* --BEGIN { LASTNODE="null" } -+BEGIN { -+ LASTNODE="null" -+ FS=":" -+} - { - if ($1 != LASTNODE) { - LASTNODE = $1 -@@ -9,8 +12,7 @@ - gsub(/./,"-",FOO) - printf("-----%s\nNode %s\n-----%s\n", FOO, $1, FOO) - } -- sub(/:/,"!@#$!") -- sub(/^.*!@#$! /,"") -+ sub(/^[^:]*: /,"") - print $0 - } - diff -ruN --exclude=CVS /usr/ports/net/clusterit/pkg-plist /amd/account/gcs/96/9655630/dev/ports/net/clusterit/pkg-plist --- /usr/ports/net/clusterit/pkg-plist 2001-09-03 09:24:04.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/net/clusterit/pkg-plist 2008-09-01 19:18:20.000000000 +0800 @@ -3,12 +3,13 @@ bin/clustersed bin/dsh bin/dshbak +bin/dtop %%X11%%bin/dvt bin/jsd bin/jsh bin/pcp bin/pdf bin/prm +bin/rseq bin/run %%X11%%bin/rvt -bin/seq --- clusterit-2.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809011847.m81Ilxpw070440>