[Gsrc-commit] /srv/bzr/gsrc/trunk r1281: fix dap build

[Brandon Invergo]

------------------------------------------------------------
revno: 1281
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-24 20:22:47 +0100
message:
  fix dap build
added:
  gnu/dap/files/
  gnu/dap/files/dap-3.7-rename-getline.diff
modified:
  gnu/dap/Makefile
  gnu/dap/sha256sums

=== modified file 'gnu/dap/Makefile'
--- a/gnu/dap/Makefile  2012-10-28 08:41:52 +0000
+++ b/gnu/dap/Makefile  2012-11-24 19:22:47 +0000
@@ -1,7 +1,7 @@
 GARNAME = dap
 GARVERSION = 3.7
 HOME_URL = http://www.gnu.org/software/dap/
-DESCRIPTION = Dap statistics and graphics
+DESCRIPTION = A small statistics and graphics package
 
 ######################################################################
 
@@ -9,6 +9,7 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-rename-getline.diff
 
 BUILDDEPS = 
 LIBDEPS = 

=== added directory 'gnu/dap/files'
=== added file 'gnu/dap/files/dap-3.7-rename-getline.diff'
--- a/gnu/dap/files/dap-3.7-rename-getline.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/dap/files/dap-3.7-rename-getline.diff 2012-11-24 19:22:47 +0000
@@ -0,0 +1,65 @@
+--- work/dap-3.7/src/dap0.c    2008-02-11 17:50:39.000000000 -0600
++++ work/dap-3.7/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);

=== modified file 'gnu/dap/sha256sums'
--- a/gnu/dap/sha256sums        2010-06-11 09:39:08 +0000
+++ b/gnu/dap/sha256sums        2012-11-24 19:22:47 +0000
@@ -1,2 +1,3 @@
 c45a2d2883966d70b9043e02d9fe2d0177ea81c12548b98e90d2ef59e06c792f  
download/dap-3.7.tar.gz
+38247e14281e2cbaa22247fb2d81d3100f6e6742b473bc2aa1c99cd5304716d6  
download/dap-3.7-rename-getline.diff
 3b816f91fe592dbd129772c5c7f9a97836e2e0014b274d8acd146c5d58b57c0e  
download/dap-3.7.tar.gz.sig