diff options
author | wiz <wiz@pkgsrc.org> | 2011-06-14 13:13:14 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-06-14 13:13:14 +0000 |
commit | 078e1f76cd8e7c6be4bb23a4847324fa9d1f60d3 (patch) | |
tree | b986a89ec0b64b43a9faa07f5f650591e6bd77ce /news | |
parent | 7d888fecd9b9b8e5a7c52b46b29f1d0ab536eba8 (diff) | |
download | pkgsrc-078e1f76cd8e7c6be4bb23a4847324fa9d1f60d3.tar.gz |
Fix build on NetBSD-current with getline().
Diffstat (limited to 'news')
-rw-r--r-- | news/nn/distinfo | 7 | ||||
-rw-r--r-- | news/nn/patches/patch-ac | 13 | ||||
-rw-r--r-- | news/nn/patches/patch-aux.c | 13 | ||||
-rw-r--r-- | news/nn/patches/patch-be | 17 |
4 files changed, 41 insertions, 9 deletions
diff --git a/news/nn/distinfo b/news/nn/distinfo index a56c46aea66..11fd78b712b 100644 --- a/news/nn/distinfo +++ b/news/nn/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.15 2006/12/01 13:54:27 joerg Exp $ +$NetBSD: distinfo,v 1.16 2011/06/14 13:13:14 wiz Exp $ SHA1 (nn-6.7.3.tar.Z) = 1879aae59131e4b86e82021802918a0a39cea826 RMD160 (nn-6.7.3.tar.Z) = 2617fe7dce42c36ae970579e27ebd00a60f23653 Size (nn-6.7.3.tar.Z) = 688446 bytes SHA1 (patch-aa) = 175941d5d91b822be577409f4d32420209b33d1c SHA1 (patch-ab) = 911d5e19c352085a2a9fa715d2dee4a8ebfe7fa9 -SHA1 (patch-ac) = bf00f22f8fcf9aeb4a0d324c373f91db84ec175a +SHA1 (patch-ac) = 6ad9ebb351c6c5e60add44ad71120dc09c16ea45 SHA1 (patch-ae) = 5d9968a29408cfc753b27cba6fc48076bb849317 SHA1 (patch-af) = 446d8359228f5afd73d9d770b78cbe573e39fac0 SHA1 (patch-ag) = 4857f66029c77e46e1506cb33a64ec098bdaeb39 @@ -19,6 +19,7 @@ SHA1 (patch-aq) = fb7ce095d66e4df324b6a6116256a5a7a7239f2e SHA1 (patch-ar) = 8c40f584182b734348d50489ffab1a03e791ef9c SHA1 (patch-at) = 11541ea36bbdacfbd84af6b3be4c4dbc983ef16d SHA1 (patch-au) = e247b3a62b24409a04a1f1604606d6e38474af67 +SHA1 (patch-aux.c) = 0d9104a39b9b8ae8335c52f9fe17172ef66e7052 SHA1 (patch-av) = 4013cfa3d4dc9bba84593ce68310e7d9b75b0aa0 SHA1 (patch-ax) = 5509d974e84f55d6fc28dd3b58ad3d94e56edec5 SHA1 (patch-ay) = d707b74d2c6d2f39b8515531cf90d435784deaf1 @@ -26,5 +27,5 @@ SHA1 (patch-az) = 206fcead17eb09c8c019eeb78335841ff9ce9c94 SHA1 (patch-ba) = a9c5dd3af5901d08bef80de67402b4cf82be6380 SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4 SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c -SHA1 (patch-be) = 61eaadbf56104d484055ebf3b05eeaac045e4450 +SHA1 (patch-be) = 207a85225b30fffbbf7cf69c8167a5e4fa0a078d SHA1 (patch-bf) = dd419adf7bb727e5ebd8a2cd7f3b69467bb49b44 diff --git a/news/nn/patches/patch-ac b/news/nn/patches/patch-ac index abc5d6fa959..d2035817633 100644 --- a/news/nn/patches/patch-ac +++ b/news/nn/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.7 2006/12/01 13:54:27 joerg Exp $ +$NetBSD: patch-ac,v 1.8 2011/06/14 13:13:14 wiz Exp $ ---- global.h.orig 2006-12-01 13:43:03.000000000 +0000 +--- global.h.orig 2005-04-01 05:39:01.000000000 +0000 +++ global.h @@ -114,8 +114,6 @@ extern uid_t user_id; @@ -11,3 +11,12 @@ $NetBSD: patch-ac,v 1.7 2006/12/01 13:54:27 joerg Exp $ /* * Storage management */ +@@ -258,7 +256,7 @@ int nn_truncate(char *, off_ + char *strsave(char *); + char *str3save(char *, char *, char *); + char *fgetstr(FILE *); +-int getline(char *, int); ++int nngetline(char *, int); + extern char *tmp_directory; + extern char *nntp_cache_dir; + #endif /* _NN_GLOBAL_H */ diff --git a/news/nn/patches/patch-aux.c b/news/nn/patches/patch-aux.c new file mode 100644 index 00000000000..e9820dc2dd8 --- /dev/null +++ b/news/nn/patches/patch-aux.c @@ -0,0 +1,13 @@ +$NetBSD: patch-aux.c,v 1.1 2011/06/14 13:13:31 wiz Exp $ + +--- aux.c.orig 2005-07-21 22:03:00.000000000 +0000 ++++ aux.c +@@ -507,7 +507,7 @@ aux_sh(article_header * ah, char *script + prompt_line = Lines - 1; + prompt("To: "); + unset_raw(); +- if (getline(&cc[0], sizeof(cc)) == 0) ++ if (nngetline(&cc[0], sizeof(cc)) == 0) + cc[0] = CR; + nn_raw(); + if (cc[0] != CR) diff --git a/news/nn/patches/patch-be b/news/nn/patches/patch-be index dfa97fdb2ae..5ecf3d1bf48 100644 --- a/news/nn/patches/patch-be +++ b/news/nn/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.2 2006/10/14 19:33:45 schwarz Exp $ +$NetBSD: patch-be,v 1.3 2011/06/14 13:13:14 wiz Exp $ ---- global.c.orig 2005-04-20 00:26:50.000000000 +0200 -+++ global.c 2006-10-14 20:43:21.000000000 +0200 -@@ -81,7 +81,6 @@ +--- global.c.orig 2005-04-19 22:26:50.000000000 +0000 ++++ global.c +@@ -81,7 +81,6 @@ int who_am_i; int dont_write_console = 0; int mail_errors_mode = 2; @@ -10,3 +10,12 @@ $NetBSD: patch-be,v 1.2 2006/10/14 19:33:45 schwarz Exp $ extern char *getlogin(), *getenv(); +@@ -1312,7 +1311,7 @@ fgetstr(FILE * f) + */ + + int +-getline(char *line, int max) ++nngetline(char *line, int max) + { + if (fgets(line, max, stdin) == NULL) + return 0; |