diff -urNh ../ncurses-5.2.20020112a/aclocal.m4 ./aclocal.m4
--- ../ncurses-5.2.20020112a/aclocal.m4	Thu Jan 17 03:14:18 2002
+++ ./aclocal.m4	Tue Jun  4 00:15:31 2002
@@ -2216,6 +2216,18 @@
 		MK_SHARED_LIB='$(LD) -Bshareable -o $[@]'
 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
 		;;
+	netbsd-debian*)
+                if test "$DFT_LWR_MODEL" = "shared" ; then
+                        LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+                fi
+                if test "$cf_cv_ld_rpath" = yes ; then
+                        cf_ld_rpath_opt="-Wl,-rpath,"
+                        EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+                fi
+                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+                MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $[@] .$(REL_VERSION)`.$(ABI_VERSION),-stats,-lc -o $[@]'
+                ;;
 	netbsd*)
 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
 		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
diff -urNh ../ncurses-5.2.20020112a/config.guess ./config.guess
--- ../ncurses-5.2.20020112a/config.guess	Wed Jun  5 15:09:08 2002
+++ ./config.guess	Tue Jun  4 00:08:11 2002
@@ -127,6 +127,22 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:Debian*)
+	# Debian GNU/NetBSD hack (for the moment)
+	UNAME_MACHINE_ARCH=`(uname -m) 2>/dev/null` || \
+	    UNAME_MACHINE_ARCH=unknown 
+	case "${UNAME_MACHINE_ARCH}" in
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        esac
+        os=netbsd
+        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+        # contains redundant information, the shorter form:
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}-debian"
+        exit 0 ;;
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
diff -urNh ../ncurses-5.2.20020112a/config.sub ./config.sub
--- ../ncurses-5.2.20020112a/config.sub	Wed Jun  5 15:09:08 2002
+++ ./config.sub	Tue Jun  4 00:08:14 2002
@@ -118,7 +118,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | netbsd*-debian*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
diff -urNh ../ncurses-5.2.20020112a/configure ./configure
--- ../ncurses-5.2.20020112a/configure	Thu Jan 17 03:14:18 2002
+++ ./configure	Tue Jun  4 01:22:11 2002
@@ -2776,6 +2776,18 @@
 		MK_SHARED_LIB='$(LD) -Bshareable -o $@'
 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
 		;;
+	netbsd-debian*)
+                if test "$DFT_LWR_MODEL" = "shared" ; then
+                        LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+                fi
+                if test "$cf_cv_ld_rpath" = yes ; then
+                        cf_ld_rpath_opt="-Wl,-rpath,"
+                        EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+                fi
+                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+                MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $@ .$(REL_VERSION)`.$(ABI_VERSION),-stats,-lc -o $@'
+                ;;
 	netbsd*)
 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
 		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
diff -urNh ../ncurses-5.2.20020112a/include/curses.h.in ./include/curses.h.in
--- ../ncurses-5.2.20020112a/include/curses.h.in	Thu Jan 17 03:14:18 2002
+++ ./include/curses.h.in	Mon Jun  3 23:50:24 2002
@@ -280,7 +280,11 @@
 typedef unsigned long wchar_t;
 #endif /* _WCHAR_T */
 #ifndef _WINT_T
+#ifdef _BSD_WINT_T_
+typedef _BSD_WINT_T_ wint_t;
+#else
 typedef long int wint_t;
+#endif /*_BSD_WINT_T_ */
 #endif /* _WINT_T */
 
 #define CCHARW_MAX	5
diff -urNh ../ncurses-5.2.20020112a/ncurses/base/lib_bkgd.c ./ncurses/base/lib_bkgd.c
--- ../ncurses-5.2.20020112a/ncurses/base/lib_bkgd.c	Thu Jan 17 03:13:57 2002
+++ ./ncurses/base/lib_bkgd.c	Mon Jun  3 16:36:03 2002
@@ -70,7 +70,7 @@
 	    int tmp;
 
 	    wgetbkgrnd(win, &wch);
-	    tmp = wctob(CharOf(wch));
+	    wcstombs(tmp, CharOf(wch), 1);
 
 	    win->_bkgd = ((tmp == EOF) ? ' ' : (chtype) tmp) | AttrOf(wch);
 	}
diff -urNh ../ncurses-5.2.20020112a/ncurses/curses.priv.h ./ncurses/curses.priv.h
--- ../ncurses-5.2.20020112a/ncurses/curses.priv.h	Thu Jan 17 03:14:18 2002
+++ ./ncurses/curses.priv.h	Mon Jun  3 16:32:25 2002
@@ -571,7 +571,7 @@
 #define if_WIDEC(code)  code
 #define Charable(ch)	(!isnac(ch) &&  			   	\
 			 (ch).chars[1] == L'\0' &&			\
-                         (wctob(CharOf(ch)) == (char)CharOf(ch)))
+                         (wctomb(NULL,CharOf(ch)) == 0))
 
 #define L(ch)		L ## ch
 #else /* }{ */
diff -urNh ../ncurses-5.2.20020112a/ncurses/widechar/lib_wunctrl.c ./ncurses/widechar/lib_wunctrl.c
--- ../ncurses-5.2.20020112a/ncurses/widechar/lib_wunctrl.c	Sat Sep 22 19:18:02 2001
+++ ./ncurses/widechar/lib_wunctrl.c	Mon Jun  3 23:51:23 2002
@@ -46,8 +46,9 @@
 
     if (Charable(*wc)) {
 	const char *p;
-	for (p = unctrl(wctob(CharOf(*wc))), sp = str; *p;)
-	    *sp++ = btowc(*p++);
+	wctomb(p,CharOf(*wc));
+	for (p=unctrl(p), sp = str; *p;)
+ 	    mbtowc(*sp++, *p++, 1);
 	return str;
     } else
 	return wc->chars;