[97057] trunk/dports/math/dap

[ryandesign at macports.org]

Revision: 97057
          https://trac.macports.org/changeset/97057
Author:   ryandesign at macports.org
Date:     2012-08-25 14:41:25 -0700 (Sat, 25 Aug 2012)
Log Message:
-----------
dap: fix build on Lion and later by renaming internal getline function (#35822)

Modified Paths:
--------------
    trunk/dports/math/dap/Portfile

Added Paths:
-----------
    trunk/dports/math/dap/files/
    trunk/dports/math/dap/files/patch-dap0.c.diff

Modified: trunk/dports/math/dap/Portfile
===================================================================
--- trunk/dports/math/dap/Portfile	2012-08-25 19:11:27 UTC (rev 97056)
+++ trunk/dports/math/dap/Portfile	2012-08-25 21:41:25 UTC (rev 97057)
@@ -29,6 +29,8 @@
                  sha1    9ffb69a6a68c104005ef670c2dd11f524d0bd74c \
                  rmd160  4cf264dd146c774773eb64007441ea7fdae21145
 
+patchfiles       patch-dap0.c.diff
+
 configure.args   --infodir=${prefix}/share/info
 
 post-destroot {

Added: trunk/dports/math/dap/files/patch-dap0.c.diff
===================================================================
--- trunk/dports/math/dap/files/patch-dap0.c.diff	                        (rev 0)
+++ trunk/dports/math/dap/files/patch-dap0.c.diff	2012-08-25 21:41:25 UTC (rev 97057)
@@ -0,0 +1,65 @@
+--- src/dap0.c.orig	2008-02-11 17:50:39.000000000 -0600
++++ src/dap0.c	2012-08-25 16:39:52.000000000 -0500
+@@ -543,7 +543,7 @@
+   return -1;
+ }
+ 
+-static int getline(DFILE *fp, char *line)
++static int dap_getline(DFILE *fp, char *line)
+ {
+   int l;
+   int c;
+@@ -569,7 +569,7 @@
+ 	  else
+ 	    {
+ 	      line[l] = '\0';
+-	      fprintf(dap_err, "(getline) line too long:\n%s\n", line);
++	      fprintf(dap_err, "(dap_getline) line too long:\n%s\n", line);
+ 	      exit(1);
+ 	    }
+ 	}
+@@ -589,7 +589,7 @@
+       line[l] = '\0';
+       break;
+     default:
+-      fprintf(dap_err, "(getline) bad infile type: %d\n", intype);
++      fprintf(dap_err, "(dap_getline) bad infile type: %d\n", intype);
+       exit(1);
+     }
+   if (!l && c == EOF)
+@@ -773,7 +773,7 @@
+ 		  dap_ono);
+ 	  exit(1);
+ 	}
+-      if (getline(dap_in[dap_ono], line) < 0)
++      if (dap_getline(dap_in[dap_ono], line) < 0)
+ 	eof[dap_ono] = 1;
+       lineno[dap_ono]++;
+     }
+@@ -789,7 +789,7 @@
+   int l;
+   int i;
+   int iv;
+-  int nread;	/* number of chars read by getline */
++  int nread;	/* number of chars read by dap_getline */
+ 
+   if (!stepinit)
+     {
+@@ -823,7 +823,7 @@
+ 	}
+     }
+   dap_prev[dap_ono].do_valid = dap_obs[dap_ono].do_valid;
+-  if ((nread = getline(dap_in[dap_ono], line)) <= 0)
++  if ((nread = dap_getline(dap_in[dap_ono], line)) <= 0)
+     {
+       eof[dap_ono] = 1;
+       dap_obs[dap_ono].do_valid = 0;
+@@ -2069,7 +2069,7 @@
+     }
+   intype = DSET;
+   dap_delim = '\0';
+-  if (getline(dap_in[dap_ono], varspec) < 0)
++  if (dap_getline(dap_in[dap_ono], varspec) < 0)
+     {
+       fprintf(dap_err, "(inset) data set empty: %s\n", fname);
+       exit(1);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120825/33f8fbc4/attachment.html>