Ticket #39618: miriad-4.3.4.20130702.diff

File miriad-4.3.4.20130702.diff, 3.0 KB (added by pkgw (Peter Williams), 11 years ago)

Update to 4.3.4.20130702.

  • ports/science/miriad/Portfile 

    diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
index a85a19a..524bb1c 100644
    a b PortGroup xcodeversion 1.0 
    1111name             miriad
    1212conflicts        pgplot
    1313set relver       4.3.4
    14 set tardate      20130606
     14set tardate      20130702
    1515version          ${relver}.${tardate}
    1616platforms        darwin
    1717categories       science
    … … license unknown 
    3232# Files
    3333
    3434master_sites     ${homepage}
    35 checksums        rmd160  05a7f6ce2e8e1a5e749bc49025f1b611e815ee80 \
    36                  sha256  0013d8f98e1250d471420e3dde47ed14489765643a31c6e4069afc3439c833e3
     35checksums        rmd160  bcc3a8626a369fd95b5aaaa14fd11027ebaf7338 \
     36                 sha256  c678876260f1a2d67af3d30d0ee574393f3963b248d99b51353dbb076cafc878
    3737
    3838# Telescope/buffer size selection.
    3939
    … … minimum_xcodeversions {9 3.1} 
    105105
    106106worksrcdir      ${name}-${relver}
    107107
     108# Patch to print out debugging information in case the mmAlloc bug persists
     109
     110patchfiles      patch-src-subs-mm.f2c.diff
     111
    108112# Configure settings. Keep the binaries out of ${prefix}/bin to avoid
    109113# possible conflicts. The automiriad scripts will deal with this correctly.
    110114

  • new file ports/science/miriad/files/patch-src-subs-mm.f2c.diff 

    diff --git a/ports/science/miriad/files/patch-src-subs-mm.f2c.diff b/ports/science/miriad/files/patch-src-subs-mm.f2c.diff
new file mode 100644
index 0000000..09d1da2
    - +  
     1--- src/subs/mm.f2c.orig        2013-07-03 00:13:28.050984953 -0400
     2+++ src/subs/mm.f2c     2013-07-03 00:15:56.695917500 -0400
     3@@ -122,15 +122,17 @@
     4   if(s == (fort_integer *)NULL) return;
     5   offset = s - data.addr;
     6   t = (fort_ptrdiff)offset;
     7-#ifdef DEBUG
     8-  printf("MM_DEBUG: s=0x%lx  data=0x%lx count=%d\n",s,data.addr,counter++);
     9-  printf("MM_DEBUG: t=0x%lx  offset=0x%lx size=%d\n",t,offset,size.val);
     10-  printf("          s=%ld data=%ld offset=%ld\n",s,data.addr,offset);
     11-  printf("          s=%d data=%d offset=%d\n",s,data.addr,offset);
     12-  printf("          sizeof(fort_ptrdiff)=%ld sizeof(ptrdiff_t)=%ld sizeof(fort_integer)=%ld\n",
     13-                    sizeof(fort_ptrdiff),    sizeof(ptrdiff_t),    sizeof(fort_integer));
     14-#endif
     15-  if(t != offset) bug_c('f',"Some odd form of rounding problem, in mmAlloc");
     16+  if(t != offset) {
     17+      /* MacPorts patch: print debugging info if and only if the assertion fails */
     18+      printf("MM_DEBUG: s=0x%lx  data=0x%lx count=%d\n",s,data.addr,counter++);
     19+      printf("MM_DEBUG: t=0x%lx  offset=0x%lx size=%d\n",t,offset,size.val);
     20+      printf("          s=%ld data=%ld offset=%ld\n",s,data.addr,offset);
     21+      printf("          s=%d data=%d offset=%d\n",s,data.addr,offset);
     22+      printf("          sizeof(fort_ptrdiff)=%ld sizeof(ptrdiff_t)=%ld sizeof(fort_integer)=%ld\n",
     23+            sizeof(fort_ptrdiff), sizeof(ptrdiff_t), sizeof(fort_integer));
     24+      bug_c('f',"Some odd form of rounding problem, in mmAlloc");
     25+  }
     26+
     27   *(ptr.addr) = t+1;
     28 }
     29 /************************************************************************/