Sun Sep 25 19:44:09 2011 UTC ()
Fix getline conflict.
(joerg)
diff -r1.5 -r1.6 pkgsrc/devel/fortran-utils/distinfo
diff -r0 -r1.1 pkgsrc/devel/fortran-utils/patches/patch-fsplit-fsplit.c
--- pkgsrc/devel/fortran-utils/distinfo 2007/12/31 08:05:41 1.5
+++ pkgsrc/devel/fortran-utils/distinfo 2011/09/25 19:44:08 1.6
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2007/12/31 08:05:41 obache Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2011/09/25 19:44:08 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (fortran-utils-1.1.tar.gz) = 587f55857876b9447326faa1074d6d8b6b1a058e | | 3 | SHA1 (fortran-utils-1.1.tar.gz) = 587f55857876b9447326faa1074d6d8b6b1a058e |
| 4 | RMD160 (fortran-utils-1.1.tar.gz) = e286108ce7eb0a8062b6f624bea28c71be759109 | | 4 | RMD160 (fortran-utils-1.1.tar.gz) = e286108ce7eb0a8062b6f624bea28c71be759109 |
| 5 | Size (fortran-utils-1.1.tar.gz) = 7566 bytes | | 5 | Size (fortran-utils-1.1.tar.gz) = 7566 bytes |
| 6 | SHA1 (patch-ac) = 43f7683cb7d4a2b06db447a3f28c34c57c2252a7 | | 6 | SHA1 (patch-ac) = 43f7683cb7d4a2b06db447a3f28c34c57c2252a7 |
| | | 7 | SHA1 (patch-fsplit-fsplit.c) = 78dddf494e55cdf493677215a33c063973df0b85 |
$NetBSD: patch-fsplit-fsplit.c,v 1.1 2011/09/25 19:44:08 joerg Exp $
--- fsplit/fsplit.c.orig 2011-09-25 09:50:22.000000000 +0000
+++ fsplit/fsplit.c
@@ -97,7 +97,7 @@ struct stat sbuf;
#define trim(p) while (*p == ' ' || *p == '\t') p++
-int getline __P((void));
+int my_getline __P((void));
void get_name __P((char *, int));
char *functs __P((char *));
int lend __P((void));
@@ -171,7 +171,7 @@ char **argv;
errx(1, "can not open %s", x);
nflag = 0;
rv = 0;
- while (getline() > 0) {
+ while (my_getline() > 0) {
rv = 1;
fprintf(ofp, "%s", buf);
if (lend()) /* look for an 'end' statement */
@@ -263,7 +263,7 @@ int letters;
}
int
-getline()
+my_getline()
{
register char *ptr;