[107625] trunk/dports/science/miriad

[ryandesign at macports.org]

Revision: 107625
          https://trac.macports.org/changeset/107625
Author:   ryandesign at macports.org
Date:     2013-07-03 00:44:38 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
miriad: maintainer update to 4.3.4.20130702, and add patch to print additional debugging information in the event of a problem (#39618)

Modified Paths:
--------------
    trunk/dports/science/miriad/Portfile

Added Paths:
-----------
    trunk/dports/science/miriad/files/
    trunk/dports/science/miriad/files/patch-src-subs-mm.f2c.diff

Modified: trunk/dports/science/miriad/Portfile
===================================================================
--- trunk/dports/science/miriad/Portfile	2013-07-03 06:11:58 UTC (rev 107624)
+++ trunk/dports/science/miriad/Portfile	2013-07-03 07:44:38 UTC (rev 107625)
@@ -11,7 +11,7 @@
 name             miriad
 conflicts        pgplot
 set relver       4.3.4
-set tardate      20130606
+set tardate      20130702
 version          ${relver}.${tardate}
 platforms        darwin
 categories       science
@@ -32,8 +32,8 @@
 # Files
 
 master_sites     ${homepage}
-checksums        rmd160  05a7f6ce2e8e1a5e749bc49025f1b611e815ee80 \
-                 sha256  0013d8f98e1250d471420e3dde47ed14489765643a31c6e4069afc3439c833e3
+checksums        rmd160  bcc3a8626a369fd95b5aaaa14fd11027ebaf7338 \
+                 sha256  c678876260f1a2d67af3d30d0ee574393f3963b248d99b51353dbb076cafc878
 
 # Telescope/buffer size selection.
 
@@ -105,6 +105,10 @@
 
 worksrcdir      ${name}-${relver}
 
+# Patch to print out debugging information in case the mmAlloc bug persists
+
+patchfiles      patch-src-subs-mm.f2c.diff
+
 # Configure settings. Keep the binaries out of ${prefix}/bin to avoid
 # possible conflicts. The automiriad scripts will deal with this correctly.
 

Added: trunk/dports/science/miriad/files/patch-src-subs-mm.f2c.diff
===================================================================
--- trunk/dports/science/miriad/files/patch-src-subs-mm.f2c.diff	                        (rev 0)
+++ trunk/dports/science/miriad/files/patch-src-subs-mm.f2c.diff	2013-07-03 07:44:38 UTC (rev 107625)
@@ -0,0 +1,29 @@
+--- src/subs/mm.f2c.orig	2013-07-03 00:13:28.050984953 -0400
++++ src/subs/mm.f2c	2013-07-03 00:15:56.695917500 -0400
+@@ -122,15 +122,17 @@
+   if(s == (fort_integer *)NULL) return;
+   offset = s - data.addr;
+   t = (fort_ptrdiff)offset;
+-#ifdef DEBUG
+-  printf("MM_DEBUG: s=0x%lx  data=0x%lx count=%d\n",s,data.addr,counter++);
+-  printf("MM_DEBUG: t=0x%lx  offset=0x%lx size=%d\n",t,offset,size.val);
+-  printf("          s=%ld data=%ld offset=%ld\n",s,data.addr,offset);
+-  printf("          s=%d data=%d offset=%d\n",s,data.addr,offset);
+-  printf("          sizeof(fort_ptrdiff)=%ld sizeof(ptrdiff_t)=%ld sizeof(fort_integer)=%ld\n",
+-                    sizeof(fort_ptrdiff),    sizeof(ptrdiff_t),    sizeof(fort_integer));
+-#endif
+-  if(t != offset) bug_c('f',"Some odd form of rounding problem, in mmAlloc");
++  if(t != offset) {
++      /* MacPorts patch: print debugging info if and only if the assertion fails */
++      printf("MM_DEBUG: s=0x%lx  data=0x%lx count=%d\n",s,data.addr,counter++);
++      printf("MM_DEBUG: t=0x%lx  offset=0x%lx size=%d\n",t,offset,size.val);
++      printf("          s=%ld data=%ld offset=%ld\n",s,data.addr,offset);
++      printf("          s=%d data=%d offset=%d\n",s,data.addr,offset);
++      printf("          sizeof(fort_ptrdiff)=%ld sizeof(ptrdiff_t)=%ld sizeof(fort_integer)=%ld\n",
++	     sizeof(fort_ptrdiff), sizeof(ptrdiff_t), sizeof(fort_integer));
++      bug_c('f',"Some odd form of rounding problem, in mmAlloc");
++  }
++
+   *(ptr.addr) = t+1;
+ }
+ /************************************************************************/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/5b0421fd/attachment.html>