[pkgsrc/trunk]: pkgsrc/chat/zephyr - rename conflicting getline()

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1329b19757c
branches:  trunk
changeset: 565491:c1329b19757c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Sep 23 13:31:31 2009 +0000

description:
- rename conflicting getline()
- honour PKGMANDIR

diffstat:

 chat/zephyr/distinfo         |   5 +-
 chat/zephyr/patches/patch-ai |  11 ++++++-
 chat/zephyr/patches/patch-an |  67 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 3 deletions(-)

diffs (112 lines):

diff -r b299ff4e357a -r c1329b19757c chat/zephyr/distinfo
--- a/chat/zephyr/distinfo      Wed Sep 23 13:20:36 2009 +0000
+++ b/chat/zephyr/distinfo      Wed Sep 23 13:31:31 2009 +0000
@@ -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-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 -r b299ff4e357a -r c1329b19757c chat/zephyr/patches/patch-ai
--- a/chat/zephyr/patches/patch-ai      Wed Sep 23 13:20:36 2009 +0000
+++ b/chat/zephyr/patches/patch-ai      Wed Sep 23 13:31:31 2009 +0000
@@ -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 -r b299ff4e357a -r c1329b19757c chat/zephyr/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/zephyr/patches/patch-an      Wed Sep 23 13:31:31 2009 +0000
@@ -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;
+     }