diff options
| author | joerg <joerg@pkgsrc.org> | 2011-09-25 19:53:07 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-09-25 19:53:07 +0000 |
| commit | 10ea86154bd8e2270820ea4e6fab5c701040d248 (patch) | |
| tree | d527be2a46040245e4b72eb17c677c94656d2aaf /net/dgd | |
| parent | 68b5dd7e8f7fb709177d39daa14267920e1b2df1 (diff) | |
| download | pkgsrc-10ea86154bd8e2270820ea4e6fab5c701040d248.tar.gz | |
Fix getline conflict.
Diffstat (limited to 'net/dgd')
| -rw-r--r-- | net/dgd/distinfo | 3 | ||||
| -rw-r--r-- | net/dgd/patches/patch-src-ed-fileio.c | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/net/dgd/distinfo b/net/dgd/distinfo index 9eca943d47d..8eee2272ce4 100644 --- a/net/dgd/distinfo +++ b/net/dgd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/11/03 22:37:28 rillig Exp $ +$NetBSD: distinfo,v 1.7 2011/09/25 19:53:07 joerg Exp $ SHA1 (dgd-1.2p4.tar.gz) = 7a42cf6534ad114ab2eca6638414d5dd5595342a RMD160 (dgd-1.2p4.tar.gz) = 1c6f5e8e6783ba29d8933bef2c365031e32be77f Size (dgd-1.2p4.tar.gz) = 472205 bytes SHA1 (patch-aa) = 9253e211eb82fb06ea7771e2dbd37d9c53ea1435 +SHA1 (patch-src-ed-fileio.c) = 0da31dfd142e4ad98f942029e2f1b8c4ff95dd96 diff --git a/net/dgd/patches/patch-src-ed-fileio.c b/net/dgd/patches/patch-src-ed-fileio.c new file mode 100644 index 00000000000..3050aa73e4f --- /dev/null +++ b/net/dgd/patches/patch-src-ed-fileio.c @@ -0,0 +1,27 @@ +$NetBSD: patch-src-ed-fileio.c,v 1.1 2011/09/25 19:53:07 joerg Exp $ + +--- src/ed/fileio.c.orig 2011-09-25 09:18:25.000000000 +0000 ++++ src/ed/fileio.c +@@ -20,11 +20,11 @@ typedef struct { + } fiocontext; + + /* +- * NAME: getline() ++ * NAME: my_getline() + * DESCRIPTION: read a line from the input, return as '\0'-terminated string + * without '\n' + */ +-static char *getline(ptr) ++static char *my_getline(ptr) + char *ptr; + { + register fiocontext *x; +@@ -126,7 +126,7 @@ io *iobuf; + P_close(x.fd); + error((char *) NULL); /* pass on error */ + } +- eb_add(eb, l, getline, (char *) &x); ++ eb_add(eb, l, my_getline, (char *) &x); + ec_pop(); + P_close(x.fd); + |