summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--news/tin/Makefile9
-rw-r--r--news/tin/PLIST4
-rw-r--r--news/tin/distinfo20
-rw-r--r--news/tin/patches/patch-ac51
-rw-r--r--news/tin/patches/patch-ad12
-rw-r--r--news/tin/patches/patch-ae12
-rw-r--r--news/tin/patches/patch-af13
-rw-r--r--news/tin/patches/patch-ag28
-rw-r--r--news/tin/patches/patch-ah23
-rw-r--r--news/tin/patches/patch-ai15
-rw-r--r--news/tin/patches/patch-aj110
-rw-r--r--news/tin/patches/patch-ak84
-rw-r--r--news/tin/patches/patch-al142
-rw-r--r--news/tin/patches/patch-am12
14 files changed, 17 insertions, 518 deletions
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 395355dd8ae..836db9c2d12 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2011/06/10 21:57:09 obache Exp $
+# $NetBSD: Makefile,v 1.46 2011/11/30 21:22:41 wiz Exp $
#
-DISTNAME= tin-1.9.4
-PKGREVISION= 3
+DISTNAME= tin-2.0.0
CATEGORIES= news
-MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/unstable/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/unstable/
+MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
+ ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
diff --git a/news/tin/PLIST b/news/tin/PLIST
index 1ab687c15b6..d3a19ea4cb0 100644
--- a/news/tin/PLIST
+++ b/news/tin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/07/22 10:00:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/11/30 21:22:41 wiz Exp $
bin/metamutt
bin/opt-case.pl
bin/rtin
@@ -15,11 +15,11 @@ man/man1/w2r.pl.1
man/man5/mmdf.5
man/man5/tin.5
share/doc/tin/WHATSNEW
+share/locale/da/LC_MESSAGES/tin.mo
share/locale/de/LC_MESSAGES/tin.mo
share/locale/en_GB/LC_MESSAGES/tin.mo
share/locale/et/LC_MESSAGES/tin.mo
share/locale/fr/LC_MESSAGES/tin.mo
share/locale/ru/LC_MESSAGES/tin.mo
-share/locale/rw/LC_MESSAGES/tin.mo
share/locale/sv/LC_MESSAGES/tin.mo
share/locale/tr/LC_MESSAGES/tin.mo
diff --git a/news/tin/distinfo b/news/tin/distinfo
index d74a6a25b63..9d2ff597e9b 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,18 +1,8 @@
-$NetBSD: distinfo,v 1.18 2010/02/25 16:05:57 drochner Exp $
+$NetBSD: distinfo,v 1.19 2011/11/30 21:22:41 wiz Exp $
-SHA1 (tin-1.9.4.tar.bz2) = e1f5ff2f04923137f43119b144f8a20e733eea23
-RMD160 (tin-1.9.4.tar.bz2) = 6a85e47ea06f2e86f2b8f688df137432ecb7c4e9
-Size (tin-1.9.4.tar.bz2) = 1526534 bytes
+SHA1 (tin-2.0.0.tar.bz2) = 7a11cc65476c9969fc7a86bea2f4041e3db504a9
+RMD160 (tin-2.0.0.tar.bz2) = a1347953f4f8858c7c1756c41587ac7e9975e236
+Size (tin-2.0.0.tar.bz2) = 1761102 bytes
SHA1 (patch-aa) = a3d40ff4e38230bcf8a3814c92ec2a75f85bf44e
SHA1 (patch-ab) = 34794d259ae4fb81888184ded9876ab5874d8731
-SHA1 (patch-ac) = b5e72a659414833db5f18c2e8f3404dadd03f87f
-SHA1 (patch-ad) = 598a9e287a343eff866ac95d89ed7724eb364c0c
-SHA1 (patch-ae) = 558deb467d7c3c423d4982952a736a501c906355
-SHA1 (patch-af) = c71cfb049312ac4931bb2d488623aa249d255486
-SHA1 (patch-ag) = 6885a9a8444129288207904084963705fb60aaea
-SHA1 (patch-ah) = bac7062665d7351f88081d8582110c079d828228
-SHA1 (patch-ai) = d956f88aff41969e25857af60b04e92c055fb8d2
-SHA1 (patch-aj) = db18012097b3f7fbc1108c1ec530658dc2d3ff1d
-SHA1 (patch-ak) = 746c6edfef424e8ccfd93f945e51eea4b93f4f1c
-SHA1 (patch-al) = f17d06620d7556f90cd72de443ac27fe91604896
-SHA1 (patch-am) = 86c465ae0571076b32f9b682f3daf320126280b7
+SHA1 (patch-am) = 958f7c158e599f17525bc6ada366e25276571b9b
diff --git a/news/tin/patches/patch-ac b/news/tin/patches/patch-ac
deleted file mode 100644
index 1f1a715272d..00000000000
--- a/news/tin/patches/patch-ac
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/07/22 10:53:51 wiz Exp $
-
---- src/refs.c.orig 2008-12-30 20:26:24.000000000 +0100
-+++ src/refs.c 2009-07-22 12:51:11.000000000 +0200
-@@ -56,7 +56,7 @@
- static struct t_msgid *add_msgid(int key, const char *msgid, struct t_msgid *newparent);
- static struct t_msgid *find_next(struct t_msgid *ptr);
- static struct t_msgid *parse_references(char *r);
--static t_bool valid_msgid(const char *msgid);
-+static t_bool valid_msgid(char *msgid);
- static unsigned int hash_msgid(const char *key);
- static void add_to_parent(struct t_msgid *ptr);
- static void build_thread(struct t_msgid *ptr);
-@@ -176,15 +176,16 @@
- * Checks if Message-ID has valid format
- * Returns TRUE if it does, FALSE if it does not
- *
-- * TODO: combine with post.c:damaged_id()?
-+ * TODO: combine with post.c:damaged_id()
- */
- static t_bool
- valid_msgid(
-- const char *msgid)
-+ char *msgid)
- {
- size_t mlen = 0;
- t_bool at_present = 0;
-
-+ str_trim(msgid);
- if (!msgid || *msgid != '<')
- return FALSE;
-
-@@ -968,6 +969,7 @@
- for_each_art(i) {
- art = &arts[i];
-
-+ art->refptr = add_msgid(MSGID_REF, art->msgid, NULL); /* preset art->refptr */
- if (art->refs) {
- strip_line(art->refs);
-
-@@ -999,9 +1001,7 @@
- art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, art->refs, NULL));
- FreeAndNull(art->refs);
- }
-- } else
-- if (valid_msgid(art->msgid))
-- art->refptr = add_msgid(MSGID_REF, art->msgid, NULL);
-+ }
- FreeAndNull(art->msgid); /* Now cached - discard this */
- }
-
diff --git a/news/tin/patches/patch-ad b/news/tin/patches/patch-ad
deleted file mode 100644
index 08b5aa09d7f..00000000000
--- a/news/tin/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/10/22 22:01:26 wiz Exp $
-
---- include/proto.h.orig 2009-01-25 19:59:14.000000000 +0100
-+++ include/proto.h
-@@ -503,6 +503,7 @@ extern t_bool prompt_option_string(enum
- extern t_bool prompt_string(const char *prompt, char *buf, int which_hist);
- extern void prompt_continue(void);
- extern void prompt_slk_redraw(void);
-+extern void prompt_yn_redraw(void);
-
- /* read.c */
- extern char *tin_fgets(FILE *fp, t_bool header);
diff --git a/news/tin/patches/patch-ae b/news/tin/patches/patch-ae
deleted file mode 100644
index 56d6b7babb7..00000000000
--- a/news/tin/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- include/tcurses.h.orig 2008-12-30 20:27:28.000000000 +0100
-+++ include/tcurses.h
-@@ -95,6 +95,7 @@
- # define HpGlitch(func) /*nothing*/
-
- extern int cmdReadCh(void);
-+extern int cmd_get_arrow_key(int prech);
- extern char *screen_contents(int row, int col, char *buffer);
- extern void MoveCursor(int row, int col);
- extern void my_erase(void);
diff --git a/news/tin/patches/patch-af b/news/tin/patches/patch-af
deleted file mode 100644
index 20ccc881290..00000000000
--- a/news/tin/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- include/tin.h.orig 2009-02-10 18:10:02.000000000 +0100
-+++ include/tin.h
-@@ -98,7 +98,7 @@
- #include <signal.h>
-
- enum context { cMain, cArt, cConfig, cFilter, cGroup, cHelp, cInfopager, cPage, cSelect, cThread };
--enum icontext { cNone, cGetline, cPromptSLK };
-+enum icontext { cNone, cGetline, cPromptCONT, cPromptSLK, cPromptYN };
- enum resizer { cNo, cYes, cRedraw };
- enum rc_state { RC_IGNORE, RC_CHECK, RC_UPGRADE, RC_DOWNGRADE, RC_ERROR };
-
diff --git a/news/tin/patches/patch-ag b/news/tin/patches/patch-ag
deleted file mode 100644
index 173529624c0..00000000000
--- a/news/tin/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/curses.c.orig 2008-12-30 20:26:23.000000000 +0100
-+++ src/curses.c
-@@ -32,6 +32,7 @@
- #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) && defined(M_UNIX)
- # define ReadWch cmdReadWch
- #endif /* MULTIBYTE_ABLE && !NO_LOCALE && M_UNIX */
-+#define get_arrow_key cmd_get_arrow_key
-
- void my_dummy(void) { } /* ANSI C requires non-empty file */
- t_bool have_linescroll = TRUE; /* USE_CURSES always allows line scrolling */
-@@ -920,6 +921,7 @@ word_highlight_string(
- tputs(_reset, 1, outchar);
- stow_cursor();
- }
-+#endif /* USE_CURSES */
-
-
- /*
-@@ -1142,7 +1144,6 @@ get_arrow_key(
- return KEYMAP_UNKNOWN;
- }
- }
--#endif /* USE_CURSES */
-
-
- /*
diff --git a/news/tin/patches/patch-ah b/news/tin/patches/patch-ah
deleted file mode 100644
index bc87284f67f..00000000000
--- a/news/tin/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/feed.c.orig 2008-12-30 20:26:23.000000000 +0100
-+++ src/feed.c
-@@ -607,8 +607,10 @@ feed_articles(
- EndWin(); /* Turn off curses/windowing */
- Raw(FALSE);
- fflush(stdout);
-+ set_signal_catcher(FALSE);
- if ((pipe_fp = popen(tinrc.default_pipe_command, "w")) == NULL) {
- perror_message(_(txt_command_failed), tinrc.default_pipe_command);
-+ set_signal_catcher(TRUE);
- Raw(TRUE);
- InitWin();
- return;
-@@ -846,6 +848,7 @@ got_sig_pipe_while_piping:
- got_sig_pipe = FALSE;
- fflush(pipe_fp);
- (void) pclose(pipe_fp);
-+ set_signal_catcher(TRUE);
- Raw(TRUE);
- InitWin();
- prompt_continue();
diff --git a/news/tin/patches/patch-ai b/news/tin/patches/patch-ai
deleted file mode 100644
index 40d78006b69..00000000000
--- a/news/tin/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/nntplib.c.orig 2009-02-09 11:03:19.000000000 +0100
-+++ src/nntplib.c
-@@ -888,6 +888,10 @@ get_server(
- * leave the s_gets() in that case)
- */
- while (nntp_rd_fp == NULL || s_gets(string, size, nntp_rd_fp) == NULL) {
-+ if (errno == EINTR) {
-+ errno = 0;
-+ continue;
-+ }
- if (quitting) /* Don't bother to reconnect */
- tin_done(NNTP_ERROR_EXIT); /* And don't try to disconnect again! */
-
diff --git a/news/tin/patches/patch-aj b/news/tin/patches/patch-aj
deleted file mode 100644
index d1df7c1f793..00000000000
--- a/news/tin/patches/patch-aj
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/prompt.c.orig 2009-01-23 16:10:39.000000000 +0100
-+++ src/prompt.c
-@@ -44,6 +44,7 @@
-
-
- static char *prompt_slk_message; /* prompt message for prompt_slk_redraw */
-+static char *prompt_yn_message;
-
- /*
- * Local prototypes
-@@ -163,7 +164,7 @@ prompt_yn(
- {
- char *keyprompt;
- char keyno[MAXKEYLEN], keyyes[MAXKEYLEN];
-- int keyyes_len = 0, keyno_len = 0, maxlen;
-+ int keyyes_len = 0, keyno_len = 0, maxlen, prompt_len;
- t_function func;
- #if defined (MULTIBYTE_ABLE) && !defined(NO_LOCALE)
- wint_t yes, no, prompt_ch, ch;
-@@ -194,21 +195,17 @@ prompt_yn(
- keyno_len = (int) strlen(keyno);
- #endif /* MULTIBYTE_ABLE && !NO_LOCALE */
- maxlen = MAX(keyyes_len, keyno_len);
-+ prompt_len = (int) strlen(prompt) + keyyes_len + keyno_len + maxlen + 6;
-+ prompt_yn_message = my_malloc(prompt_len + 1);
-+
-+ input_context = cPromptYN;
-
- do {
- prompt_ch = (default_answer ? yes : no);
- keyprompt = (default_answer ? keyyes : keyno);
-
-- if (!cmd_line) {
-- MoveCursor(cLINES, 0);
-- CleartoEOLN();
-- }
-- my_printf("%s (%s/%s) %-*s", prompt, keyyes, keyno, maxlen, keyprompt);
-- if (!cmd_line)
-- cursoron();
-- my_flush();
-- if (!cmd_line)
-- MoveCursor(cLINES, (int) strlen(prompt) + keyyes_len + keyno_len + 5);
-+ snprintf(prompt_yn_message, prompt_len, "%s (%s/%s) %-*s", prompt, keyyes, keyno, maxlen, keyprompt);
-+ prompt_yn_redraw();
-
- #if defined (MULTIBYTE_ABLE) && !defined(NO_LOCALE)
- if (((ch = ReadWch()) == '\n') || (ch == '\r'))
-@@ -248,6 +245,9 @@ prompt_yn(
- func = key_to_func(ch, prompt_keys);
- } while (func == NOT_ASSIGNED);
-
-+ input_context = cNone;
-+ FreeAndNull(prompt_yn_message);
-+
- if (!cmd_line) {
- clear_message();
- my_flush();
-@@ -256,6 +256,24 @@ prompt_yn(
- }
-
-
-+/* (Re)draws the prompt message for prompt_yn() */
-+void
-+prompt_yn_redraw(
-+ void)
-+{
-+ if (!cmd_line) {
-+ MoveCursor(cLINES, 0);
-+ CleartoEOLN();
-+ }
-+ my_printf("%s", prompt_yn_message);
-+ if (!cmd_line)
-+ cursoron();
-+ my_flush();
-+ if (!cmd_line)
-+ MoveCursor(cLINES, (int) strlen(prompt_yn_message) -1);
-+}
-+
-+
- /*
- * help_text is displayed near the bottom of the screen.
- * var is an index into a list containing size elements.
-@@ -745,11 +763,14 @@ prompt_continue(
- void)
- {
- int ch;
-+ int save_signal_context = signal_context;
-
- #ifdef USE_CURSES
- cmd_line = TRUE;
- #endif /* USE_CURSES */
- info_message(_(txt_return_key));
-+ signal_context = cMain;
-+ input_context = cPromptCONT;
-
- switch ((ch = ReadCh())) {
- case ESC:
-@@ -763,6 +784,10 @@ prompt_continue(
- break;
- }
-
-+ input_context = cNone;
-+ signal_context = save_signal_context;
-+ my_fputc('\n', stdout);
-+
- #ifdef USE_CURSES
- cmd_line = FALSE;
- my_retouch();
diff --git a/news/tin/patches/patch-ak b/news/tin/patches/patch-ak
deleted file mode 100644
index 26547f8be6c..00000000000
--- a/news/tin/patches/patch-ak
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/signal.c.orig 2008-12-30 20:26:25.000000000 +0100
-+++ src/signal.c
-@@ -104,6 +104,8 @@ int need_resize = cNo;
- */
- int NOTESLINES;
-
-+static t_bool redraw_after_suspend;
-+
-
- #ifndef __LCLINT__ /* lclint doesn't like it */
- static const struct {
-@@ -268,7 +270,7 @@ handle_resize(
- switch (signal_context) {
- case cArt:
- ClearScreen();
-- show_art_msg(curr_group->name);
-+ show_art_msg(CURR_GROUP.name);
- break;
-
- case cConfig:
-@@ -303,14 +305,24 @@ handle_resize(
- gl_redraw();
- break;
-
-+ case cPromptCONT:
-+ if (redraw_after_suspend)
-+ info_message(_(txt_return_key));
-+ break;
-+
- case cPromptSLK:
- prompt_slk_redraw();
- break;
-
-+ case cPromptYN:
-+ prompt_yn_redraw();
-+ break;
-+
- default:
- break;
- }
- my_fflush(stdout);
-+ redraw_after_suspend = FALSE;
- #endif /* SIGWINCH || SIGTSTP */
- }
-
-@@ -320,22 +332,34 @@ static void
- handle_suspend(
- void)
- {
-+ t_bool save_cmd_line = cmd_line;
-+ t_bool save_state = (!batch_mode || !cmd_line);
-+
- TRACE(("handle_suspend(%d)", signal_context));
-
- set_keypad_off();
- if (!cmd_line)
- set_xclick_off();
-
-- Raw(FALSE);
-+ if (save_state) {
-+ EndWin();
-+ Raw(FALSE);
-+ }
-+
- wait_message(0, _(txt_suspended_message), tin_progname);
-
- kill(0, SIGSTOP); /* Put ourselves to sleep */
-
- RESTORE_HANDLER(SIGTSTP, signal_handler);
-
-- if (!batch_mode) {
-+ if (save_state) {
- Raw(TRUE);
-+ InitWin();
-+ cmd_line = save_cmd_line;
-+ if (!cmd_line)
-+ my_retouch();
- need_resize = cRedraw; /* Flag a redraw */
-+ redraw_after_suspend = TRUE;
- }
- set_keypad_on();
- if (!cmd_line)
diff --git a/news/tin/patches/patch-al b/news/tin/patches/patch-al
deleted file mode 100644
index 581bdf6103e..00000000000
--- a/news/tin/patches/patch-al
+++ /dev/null
@@ -1,142 +0,0 @@
-$NetBSD: patch-al,v 1.1 2009/10/22 22:01:26 wiz Exp $
-
---- src/tcurses.c.orig 2008-12-30 20:26:25.000000000 +0100
-+++ src/tcurses.c
-@@ -896,72 +896,77 @@ get_arrow_key(
- # ifdef NCURSES_MOUSE_VERSION
- MEVENT my_event;
- # endif /* NCURSES_MOUSE_VERSION */
-- int ch = getch();
-+ int ch;
- int code = KEYMAP_UNKNOWN;
-
-- switch (ch) {
-- case KEY_DC:
-- code = KEYMAP_DEL;
-- break;
--
-- case KEY_IC:
-- code = KEYMAP_INS;
-- break;
--
-- case KEY_UP:
-- code = KEYMAP_UP;
-- break;
--
-- case KEY_DOWN:
-- code = KEYMAP_DOWN;
-- break;
--
-- case KEY_LEFT:
-- code = KEYMAP_LEFT;
-- break;
--
-- case KEY_RIGHT:
-- code = KEYMAP_RIGHT;
-- break;
--
-- case KEY_NPAGE:
-- code = KEYMAP_PAGE_DOWN;
-- break;
--
-- case KEY_PPAGE:
-- code = KEYMAP_PAGE_UP;
-- break;
--
-- case KEY_HOME:
-- code = KEYMAP_HOME;
-- break;
--
-- case KEY_END:
-- code = KEYMAP_END;
-- break;
-+ if (cmd_line)
-+ code = cmd_get_arrow_key(prech);
-+ else {
-+ ch = getch();
-+ switch (ch) {
-+ case KEY_DC:
-+ code = KEYMAP_DEL;
-+ break;
-+
-+ case KEY_IC:
-+ code = KEYMAP_INS;
-+ break;
-+
-+ case KEY_UP:
-+ code = KEYMAP_UP;
-+ break;
-+
-+ case KEY_DOWN:
-+ code = KEYMAP_DOWN;
-+ break;
-+
-+ case KEY_LEFT:
-+ code = KEYMAP_LEFT;
-+ break;
-+
-+ case KEY_RIGHT:
-+ code = KEYMAP_RIGHT;
-+ break;
-+
-+ case KEY_NPAGE:
-+ code = KEYMAP_PAGE_DOWN;
-+ break;
-+
-+ case KEY_PPAGE:
-+ code = KEYMAP_PAGE_UP;
-+ break;
-+
-+ case KEY_HOME:
-+ code = KEYMAP_HOME;
-+ break;
-+
-+ case KEY_END:
-+ code = KEYMAP_END;
-+ break;
-
- # ifdef NCURSES_MOUSE_VERSION
-- case KEY_MOUSE:
-- if (getmouse(&my_event) != ERR) {
-- switch ((int) my_event.bstate) {
-- case BUTTON1_CLICKED:
-- xmouse = MOUSE_BUTTON_1;
-- break;
--
-- case BUTTON2_CLICKED:
-- xmouse = MOUSE_BUTTON_2;
-- break;
--
-- case BUTTON3_CLICKED:
-- xmouse = MOUSE_BUTTON_3;
-- break;
-+ case KEY_MOUSE:
-+ if (getmouse(&my_event) != ERR) {
-+ switch ((int) my_event.bstate) {
-+ case BUTTON1_CLICKED:
-+ xmouse = MOUSE_BUTTON_1;
-+ break;
-+
-+ case BUTTON2_CLICKED:
-+ xmouse = MOUSE_BUTTON_2;
-+ break;
-+
-+ case BUTTON3_CLICKED:
-+ xmouse = MOUSE_BUTTON_3;
-+ break;
-+ }
-+ xcol = my_event.x; /* column */
-+ xrow = my_event.y; /* row */
-+ code = KEYMAP_MOUSE;
- }
-- xcol = my_event.x; /* column */
-- xrow = my_event.y; /* row */
-- code = KEYMAP_MOUSE;
-- }
-- break;
-+ break;
- # endif /* NCURSES_MOUSE_VERSION */
-+ }
- }
- return code;
- }
diff --git a/news/tin/patches/patch-am b/news/tin/patches/patch-am
index 291fb80965a..a187e6693a1 100644
--- a/news/tin/patches/patch-am
+++ b/news/tin/patches/patch-am
@@ -1,10 +1,10 @@
-$NetBSD: patch-am,v 1.1 2010/02/25 16:05:57 drochner Exp $
+$NetBSD: patch-am,v 1.2 2011/11/30 21:22:41 wiz Exp $
---- configure.orig 2009-02-11 20:29:48.000000000 +0000
+--- configure.orig 2011-08-22 22:03:55.000000000 +0000
+++ configure
-@@ -7996,6 +7996,9 @@ test "$cf_cv_curses_dir" != "no" && { \
- if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
- for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
+@@ -7706,6 +7706,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
+ if test -n "$cf_1st_incdir" ; then
+ for cf_add_incdir in $cf_1st_incdir
do
+ if ! [ -d $cf_add_incdir ]; then
+ continue;
@@ -12,7 +12,7 @@ $NetBSD: patch-am,v 1.1 2010/02/25 16:05:57 drochner Exp $
while test $cf_add_incdir != /usr/include
do
if test -d $cf_add_incdir
-@@ -8093,7 +8096,6 @@ printf("%s\n", NCURSES_VERSION);
+@@ -8803,7 +8806,6 @@ printf("%s\n", NCURSES_VERSION);
#ifdef __NCURSES_H
printf("old\n");
#else
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-12 15:16:26 +0000