Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2449/common/main/finkinfo/devel

Modified Files:
        distcc.info distcc.patch scons.info 
Log Message:
various tweakage, still in progress

Index: scons.info
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/devel/scons.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scons.info  15 Apr 2004 23:28:34 -0000      1.2
+++ scons.info  14 Sep 2004 21:46:56 -0000      1.3
@@ -1,17 +1,17 @@
 Package: scons
-Version: 0.95
+Version: 0.96.1
 Revision: 1
 Depends: python23 | python23-nox
 BuildDepends: python23 | python23-nox
 BuildDependsOnly: true
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 2d08d41b9de7553729eab45adbd943c0
+Source-MD5: 45b1c346edd8a0970210aeb1e82557c9
 CompileScript: <<
   python2.3 setup.py build
 <<
 InstallScript: <<
-  python2.3 setup.py install --prefix %i
+  python2.3 setup.py install --verbose --root "%d"
 <<
 RuntimeVars: <<
   SCONS_LIB_DIR: %p/lib/scons

Index: distcc.patch
===================================================================
RCS file: 
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/devel/distcc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- distcc.patch        8 Jul 2004 02:18:57 -0000       1.3
+++ distcc.patch        14 Sep 2004 21:46:56 -0000      1.4
@@ -1,18 +1,40 @@
-diff -uNr distcc-2.15/src/dparent.c distcc-2.15-new/src/dparent.c
---- distcc-2.15/src/dparent.c  Tue Jul  6 08:39:38 2004
-+++ distcc-2.15-new/src/dparent.c      Wed Jul  7 13:02:23 2004
-@@ -154,13 +154,8 @@
-         int sig = WTERMSIG(status);
-         int severity = sig == SIGTERM ? RS_LOG_INFO : RS_LOG_ERR;
+diff -uNr distcc-2.17/src/mon-text.c distcc-2.17-new/src/mon-text.c
+--- distcc-2.17/src/mon-text.c Thu Jul 29 21:12:13 2004
++++ distcc-2.17-new/src/mon-text.c     Mon Sep 13 16:48:34 2004
+@@ -87,25 +87,34 @@
+      * other program, so make sure we're always line buffered. */
+     setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
+ 
++    char currentTime[9];
++
+     do {
+         struct dcc_task_state *i;
          
--#ifdef HAVE_STRSIGNAL
--        /* take off every sig! for great justice. */
--        rs_log(severity, "child %d: %s", (int) kid, strsignal(sig));
--#else
-         rs_log(severity, "child %d: signal %d (%s)", (int) kid, sig,
--               WCOREDUMP(status) ? : "core dumped" : "no core");
--#endif
-+               WCOREDUMP(status) ? "core dumped" : "no core");
-     } else if (WIFEXITED(status)) {
-         rs_log_info("child %d exited: exit status %d",
-                     (int) kid, WEXITSTATUS(status));
+         if ((ret = dcc_mon_poll(&list)))
+             return ret;
+ 
++        unsigned dirty=0;
+         for (i = list; i; i = i->next) {
++            dirty = 1;
+ #if 1
+             if (i->curr_phase == DCC_PHASE_DONE)
+                 continue;
+ #endif
++            time_t cTime;
++            time(&cTime);
++            strftime(currentTime, 9, "%H:%M:%S", localtime(&cTime));
+             /* Assume 80 cols = */
+-            printf("%6ld  %-10.10s  %-30.30s %24.24s[%d]\n",
++            printf("[%8s] %6ld  %-10.10s  %-30.30s %24.24s[%d]\n",
++                   currentTime,
+                    (long) i->cpid,
+                    dcc_get_phase_name(i->curr_phase),
+                    i->file, i->host, i->slot);
+         }
+ 
+-        printf("\n");
++        if (dirty)
++            printf("\n");
+ 
+         /* XXX: usleep() is probably not very portable */
+         usleep(delay * 1000000);

Index: distcc.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/devel/distcc.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- distcc.info 28 Aug 2004 16:10:49 -0000      1.13
+++ distcc.info 14 Sep 2004 21:46:56 -0000      1.14
@@ -8,7 +8,7 @@
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 Source: http://%n.samba.org/ftp/%n/%n-%v.tar.bz2
 Source-MD5: 8ac5c032cde68c525afe9f53eae5cbf7
-#Patch: %n.patch
+Patch: %n.patch
 ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -no-cpp-precomp -I./src -I./lzo -I%p/include



-------------------------------------------------------
This SF.Net email is sponsored by: thawte's Crypto Challenge Vl
Crack the code and win a Sony DCRHC40 MiniDV Digital Handycam
Camcorder. More prizes in the weekly Lunch Hour Challenge.
Sign up NOW http://ad.doubleclick.net/clk;10740251;10262165;m
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to