diff options
author | tnn <tnn> | 2009-09-23 13:31:31 +0000 |
---|---|---|
committer | tnn <tnn> | 2009-09-23 13:31:31 +0000 |
commit | ca22961565e8b708a7ad56449a1d5510755288dd (patch) | |
tree | 40c679d907d21f5e017bcb44c08b00e3875059e3 | |
parent | 560e06dc84ef87bc4f2afcc87d473a18bd6b1ebc (diff) | |
download | pkgsrc-ca22961565e8b708a7ad56449a1d5510755288dd.tar.gz |
- rename conflicting getline()
- honour PKGMANDIR
-rw-r--r-- | chat/zephyr/distinfo | 5 | ||||
-rw-r--r-- | chat/zephyr/patches/patch-ai | 11 | ||||
-rw-r--r-- | chat/zephyr/patches/patch-an | 67 |
3 files changed, 80 insertions, 3 deletions
diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo index e5fb599c975..720ebd9d2f8 100644 --- a/chat/zephyr/distinfo +++ b/chat/zephyr/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2007/03/17 14:37:47 rillig Exp $ +$NetBSD: distinfo,v 1.5 2009/09/23 13:31:31 tnn Exp $ SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0 @@ -10,8 +10,9 @@ SHA1 (patch-ae) = e0d0776b891db5b8542285899e22c886337cc6c7 SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147 SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207 -SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28 +SHA1 (patch-ai) = 2e6a35f15cca8912ddbda5c2aad73102be01be4a SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236 SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17 SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8 SHA1 (patch-am) = 40fc00c67f78485b0d45a86ab97aa8ae662dda40 +SHA1 (patch-an) = 94556f92c2d00b4a9d26a230259e28d72b70a1f4 diff --git a/chat/zephyr/patches/patch-ai b/chat/zephyr/patches/patch-ai index 6450b0f6cc3..79d1cc43457 100644 --- a/chat/zephyr/patches/patch-ai +++ b/chat/zephyr/patches/patch-ai @@ -1,7 +1,16 @@ -$NetBSD: patch-ai,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ +$NetBSD: patch-ai,v 1.2 2009/09/23 13:31:32 tnn Exp $ --- Makefile.in.orig 1998-06-11 21:10:02.000000000 +0200 +++ Makefile.in +@@ -7,7 +7,7 @@ sysconfdir=@sysconfdir@ + sbindir=@sbindir@ + + includedir=${prefix}/include +-mandir=${prefix}/man ++mandir=${prefix}/${PKGMANDIR} + bindir=${exec_prefix}/bin + libdir=${exec_prefix}/lib + @@ -31,8 +31,6 @@ install: ${ENSUREDIR} ${DESTDIR}${libdir} 755 ${ENSUREDIR} ${DESTDIR}${datadir} 755 diff --git a/chat/zephyr/patches/patch-an b/chat/zephyr/patches/patch-an new file mode 100644 index 00000000000..2f0d52bf97c --- /dev/null +++ b/chat/zephyr/patches/patch-an @@ -0,0 +1,67 @@ +$NetBSD: patch-an,v 1.1 2009/09/23 13:31:32 tnn Exp $ + +--- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 23:47:11.000000000 +0200 ++++ clients/zmailnotify/zmailnotify.c +@@ -144,7 +144,7 @@ main(argc, argv) + exit(1); + } + +- if ((getline(response, sizeof response, sfi) != OK) || ++ if ((get_line(response, sizeof response, sfi) != OK) || + (*response != '+')) { + fprintf(stderr,"%s: %s\n",prog,response); + exit(1); +@@ -498,7 +498,7 @@ pop_command(fmt, va_alist) + + if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); + +- if (getline(buf, sizeof buf, sfi) != OK) { ++ if (get_line(buf, sizeof buf, sfi) != OK) { + (void) strcpy(Errmsg, buf); + return(NOTOK); + } +@@ -519,7 +519,7 @@ int *nmsgs, *nbytes; + + if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK); + +- if (getline(buf, sizeof buf, sfi) != OK) { ++ if (get_line(buf, sizeof buf, sfi) != OK) { + (void) strcpy(Errmsg, buf); + return(NOTOK); + } +@@ -546,7 +546,7 @@ int (*action)(); + #endif + if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); + +- if (getline(buf, sizeof buf, sfi) != OK) { ++ if (get_line(buf, sizeof buf, sfi) != OK) { + (void) strcpy(Errmsg, buf); + return(NOTOK); + } +@@ -565,7 +565,7 @@ int (*action)(); + } + } + +-getline(buf, n, f) ++get_line(buf, n, f) + char *buf; + register int n; + FILE *f; +@@ -595,7 +595,7 @@ char *buf; + register int n; + FILE *f; + { +- if (getline(buf, n, f) != OK) return (NOTOK); ++ if (get_line(buf, n, f) != OK) return (NOTOK); + if (*buf == '.') { + if (*(buf+1) == '\0') { + return (DONE); +@@ -605,7 +605,7 @@ FILE *f; + } else if (*buf == '\0') { + /* suck up all future lines, since this is after all only for headers */ + while(! ((buf[0]=='.') && (buf[1] == '\0')) ) { +- if (getline(buf, n, f) != OK) return (NOTOK); ++ if (get_line(buf, n, f) != OK) return (NOTOK); + } + return DONE; + } |