OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   14-Jun-2003 12:21:03
  Branch: HEAD                             Handle: 2003061411210201

  Added files:
    openpkg-src/njmc        njmc.patch
  Modified files:
    openpkg-src/njmc        njmc.spec
    openpkg-web             news.txt

  Log:
    quick and dirty patch to avoid treating stdout as a constant

  Summary:
    Revision    Changes     Path
    1.1         +28 -0      openpkg-src/njmc/njmc.patch
    1.8         +3  -1      openpkg-src/njmc/njmc.spec
    1.4870      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/njmc/njmc.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 njmc.patch
  --- /dev/null 2003-06-14 12:21:03.000000000 +0200
  +++ njmc.patch        2003-06-14 12:21:03.000000000 +0200
  @@ -0,0 +1,28 @@
  +--- base/mclib.c.dist        2003-06-14 12:18:31.000000000 +0200
  ++++ base/mclib.c     2003-06-14 12:18:21.000000000 +0200
  +@@ -473,13 +473,12 @@
  + }
  + #line 1016 "mclib.nw"
  + static void label_print(struct label *label) {
  +-  asmprintf(asmprintfd, "%s", label->name ? label->name : "???");
  ++  asmprintf(stdout, "%s", label->name ? label->name : "???");
  + }
  + #line 1022 "mclib.nw"
  + typedef void (*asmprinter)(void *closure, const char *fmt, ...);
  + extern int fprintf(FILE *stream, const char *fmt, ...); /* needed at Purdue -- ugh 
*/
  + void (*asmprintf)(void *closure, const char *fmt, ...) = (asmprinter) fprintf;
  +-void *asmprintfd = (void *)stdout;
  + void (*asmprintreloc)(RAddr reloc) = reloc_print; /* calls asmprintf */
  + #line 79 "reloc.nw"
  + RAddr addr_new(label, offset) RLabel label; int offset; {
  +@@ -493,8 +492,8 @@
  + #line 100 "reloc.nw"
  + static void reloc_print(RAddr addr) {
  +   label_print(addr->label);
  +-  if (addr->offset > 0) asmprintf(asmprintfd, "+%d", addr->offset);
  +-  if (addr->offset < 0) asmprintf(asmprintfd,  "%d", addr->offset);
  ++  if (addr->offset > 0) asmprintf(stdout, "+%d", addr->offset);
  ++  if (addr->offset < 0) asmprintf(stdout,  "%d", addr->offset);
  + }
  + #line 113 "reloc.nw"
  + RAddr unsigned_to_raddr(unsigned lc) {
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/njmc/njmc.spec
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 njmc.spec
  --- openpkg-src/njmc/njmc.spec        31 Jan 2003 12:26:08 -0000      1.7
  +++ openpkg-src/njmc/njmc.spec        14 Jun 2003 10:21:03 -0000      1.8
  @@ -33,11 +33,12 @@
   Group:        Compiler
   License:      GPL
   Version:      0.5
  -Release:      20020717
  +Release:      20030614
   
   #   list of sources
   Source0:      http://www.eecs.harvard.edu/~nr/toolkit/base.tar.gz
   Source1:      http://www.eecs.harvard.edu/~nr/toolkit/base-specs.tar.gz
  +Patch0:       njmc.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -58,6 +59,7 @@
   %prep
       %setup0 -q -c
       %setup1 -q -T -D -a 1
  +    %patch0 -p0
   
   %build
       cd base
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.4869 -r1.4870 news.txt
  --- openpkg-web/news.txt      14 Jun 2003 09:10:56 -0000      1.4869
  +++ openpkg-web/news.txt      14 Jun 2003 10:21:02 -0000      1.4870
  @@ -1,3 +1,4 @@
  +14-Jun-2003: Upgraded package: P<njmc-0.5-20030614>
   14-Jun-2003: Upgraded package: P<glib2-2.2.2-20030614>
   14-Jun-2003: Upgraded package: P<sgml-20030614-20030614>
   14-Jun-2003: Upgraded package: P<mysql3-3.23.56-20030614>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to