From e486ee7a002c2c2e8e70551189e5d3b908bd97c6 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Thu, 25 Feb 2010 16:05:57 +0000
Subject: fix a configure check which could easily get into an endless loop,
 and remove a pointless test for a __NCURSES_H symbol in the curses header,
 now this can build against NetBSD's wide curses

---
 news/tin/distinfo         |  3 ++-
 news/tin/options.mk       |  8 +-------
 news/tin/patches/patch-am | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 news/tin/patches/patch-am

diff --git a/news/tin/distinfo b/news/tin/distinfo
index dd4a79c8821..d74a6a25b63 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/10/22 22:01:25 wiz Exp $
+$NetBSD: distinfo,v 1.18 2010/02/25 16:05:57 drochner Exp $
 
 SHA1 (tin-1.9.4.tar.bz2) = e1f5ff2f04923137f43119b144f8a20e733eea23
 RMD160 (tin-1.9.4.tar.bz2) = 6a85e47ea06f2e86f2b8f688df137432ecb7c4e9
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = d956f88aff41969e25857af60b04e92c055fb8d2
 SHA1 (patch-aj) = db18012097b3f7fbc1108c1ec530658dc2d3ff1d
 SHA1 (patch-ak) = 746c6edfef424e8ccfd93f945e51eea4b93f4f1c
 SHA1 (patch-al) = f17d06620d7556f90cd72de443ac27fe91604896
+SHA1 (patch-am) = 86c465ae0571076b32f9b682f3daf320126280b7
diff --git a/news/tin/options.mk b/news/tin/options.mk
index 863f1f4913a..792e4b82530 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2008/07/14 10:09:56 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2010/02/25 16:05:57 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
 PKG_SUPPORTED_OPTIONS=		icu inet6 tin-use-inn-spool
@@ -28,12 +28,6 @@ CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.ncurses}
 .  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-screen=ncursesw
 CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.ncursesw}
-# XXX: NetBSD's wide curses are not accepted, because the configure
-# script doesn't find the proper headers.
-# This could be a bug in the buildlink framework for wide curses.
-# The next line is a workaround until someone(TM) finds time to
-# investigate this.
-USE_BUILTIN.ncursesw=	no
 .endif
 
 .if !empty(PKG_OPTIONS:Micu)
diff --git a/news/tin/patches/patch-am b/news/tin/patches/patch-am
new file mode 100644
index 00000000000..291fb80965a
--- /dev/null
+++ b/news/tin/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2010/02/25 16:05:57 drochner Exp $
+
+--- configure.orig	2009-02-11 20:29:48.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
+   do
++    if ! [ -d $cf_add_incdir ]; then
++      continue;
++    fi
+ 	while test $cf_add_incdir != /usr/include
+ 	do
+ 	  if test -d $cf_add_incdir
+@@ -8093,7 +8096,6 @@ printf("%s\n", NCURSES_VERSION);
+ #ifdef __NCURSES_H
+ printf("old\n");
+ #else
+-	make an error
+ #endif
+ #endif
+ 	
-- 
cgit v1.2.3