Update "xchat" package to version 1.8.2. Major changes compared to the

1.6.x release are:
- A new banlist window.
- Support for ircd numeric 005 and dynamic channel/nick modes.
- Uses WATCH command for notify list when available (like on Dalnet).
- Http proxy support.
- Throttle meter.
- Perl errors no longer stop xchat, just the script itself.
- Perl scripts can now use modules successfully.
- Efficiency improvements and bug fixes to xchat's text widget: xtext.
- IPv6 support.
- Lots of new foreign language translations.
- Japanese code conversion (Kanji locale <=> JIS translation).
- Compiles on win32.

6 files changed, 613 insertions, 315 deletions

diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 84a5b288144..a52e5ff5207 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:22 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/07/31 09:48:53 tron Exp $
 
-DISTNAME=	xchat-1.6.2
+DISTNAME=	xchat-1.8.2
 CATEGORIES=	chat x11 gnome
-MASTER_SITES=	${HOMEPAGE}/files/source/1.6/
+MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tron@netbsd.org
@@ -12,17 +12,24 @@ COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 DEPENDS+=	python>=2.0:../../lang/python
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
+USE_GMAKE=	YES
+USE_PERL5=	YES
+USE_X11BASE=	YES
+GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
+MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
+# Prevent invokation of "auto*" which caused build failures due to insufficient
+# arguments and environment.
 pre-configure:
-	@${TOUCH} ${WRKSRC}/stamp-h.in
+	@cd ${WRKSRC} && \
+	${RM} -f po/zh_TW.Big5.po && \
+	${TOUCH} aclocal.m4 stamp-h.in && \
+	${FIND} . -name Makefile.in | ${XARGS} ${TOUCH}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 8491a21cd6b..e4acad0f8ce 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:07:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/31 09:48:53 tron Exp $
 
-SHA1 (xchat-1.6.2.tar.bz2) = c8cfa244a64414dd3c7872e6ae09dc2473a870fc
-Size (xchat-1.6.2.tar.bz2) = 414309 bytes
-SHA1 (patch-aa) = 50d880fa4b6ba8f0d22d1726e81f1661a1c99177
-SHA1 (patch-ab) = 4b20419c5881a7342889b9a337196ad6c9af4223
-SHA1 (patch-ac) = 08e8e29b8e2e9ed1f2b87bbcd4e795c80dfc0ead
+SHA1 (xchat-1.8.2.tar.bz2) = 18fa80ddfe4863e92a03afbf5ea4302c82b14308
+Size (xchat-1.8.2.tar.bz2) = 618960 bytes
+SHA1 (patch-aa) = d870e35dae1fdfe976cbe9572146438ae0620dd3
+SHA1 (patch-ab) = 141689091f4533456050b1ab931af9390945d81f
+SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa
index 8cb186de4ba..640ad5bb252 100644
--- a/chat/xchat/patches/patch-aa
+++ b/chat/xchat/patches/patch-aa
@@ -1,13 +1,38 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:28 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/31 09:48:54 tron Exp $
 
---- po/Makefile.in.in.orig	Sun Oct 31 12:17:50 1999
-+++ po/Makefile.in.in	Mon Sep  4 19:30:55 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+--- configure.in.orig	Mon Jul 23 08:40:37 2001
++++ configure.in	Mon Jul 30 23:02:43 2001
+@@ -7,7 +7,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_CPP
+ 
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5"
++ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ AM_GNU_GETTEXT
+ 
+ AC_PATH_PROG(sedpath, sed)
+@@ -303,6 +303,7 @@
+ 			PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`
+ 			PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`
+ 			changequote([, ])dnl
++				AC_CHECK_LIB(util, openpty, LIBS="$LIBS -lutil")
+ 			if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
+ 				PY_LIBS="-lpython$PY_VERSION"
+ 				PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+@@ -544,6 +545,8 @@
+ AC_PATH_PROG(sortpath, sort)
+ AC_PATH_PROG(uniqpath, uniq)
+ 
++dnl order matters on the link line....
++if false; then
+ if test "_$trpath" != _; then
+ if test "_$sortpath" != _; then
+ if test "_$uniqpath" != _; then
+@@ -556,6 +559,7 @@
+ GUI_CFLAGS=`cat cflags`
+ rm -f cflags cflags2
+ 
++fi
+ fi
+ fi
+ fi
diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab
index 2c28fad4f6d..da8e62e5074 100644
--- a/chat/xchat/patches/patch-ab
+++ b/chat/xchat/patches/patch-ab
@@ -1,14 +1,23 @@
-$NetBSD: patch-ab,v 1.2 2001/02/05 15:30:24 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $
 
-results of running autoconf on patched configure.in
-
---- configure.orig	Sun Dec 10 22:20:20 2000
-+++ configure	Mon Feb  5 09:43:51 2001
-@@ -4461,4 +4461,44 @@
- fi
+--- configure.orig	Mon Jul 23 08:40:41 2001
++++ configure	Tue Jul 31 10:39:27 2001
+@@ -1164,7 +1164,7 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
  
-+				echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-+echo "configure:4465: checking for openpty in -lutil" >&5
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5"
++ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+ echo "configure:1170: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+@@ -4431,7 +4431,47 @@
+ 			PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
+ 						PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`
+ 			PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`
+-						if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
++							echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
++echo "configure:4436: checking for openpty in -lutil" >&5
 +ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,7 +25,7 @@ results of running autoconf on patched configure.in
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 4473 "configure"
++#line 4444 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -27,7 +36,7 @@ results of running autoconf on patched configure.in
 +openpty()
 +; return 0; }
 +EOF
-+if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -47,493 +56,764 @@ results of running autoconf on patched configure.in
 +  echo "$ac_t""no" 1>&6
 +fi
 +
- 			else
- 				python=no
-@@ -4477,5 +4517,5 @@
- 		LIBS="$LIBS `$gnomepath applets --libs`"
- 		echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6
--echo "configure:4480: checking for applet_widget_init in -lpanel_applet" >&5
-+echo "configure:4520: checking for applet_widget_init in -lpanel_applet" >&5
- ac_lib_var=`echo panel_applet'_'applet_widget_init | sed 'y%./+-%__p_%'`
++			if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
+ 				PY_LIBS="-lpython$PY_VERSION"
+ 				PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+ 				PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+@@ -4441,7 +4481,7 @@
+ 
+ 				echo "$ac_t""ok" 1>&6
+ 				echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:4445: checking for pthread_create in -lpthread" >&5
++echo "configure:4485: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4485,5 +4525,5 @@
- LIBS="-lpanel_applet  $LIBS"
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4449,7 +4489,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4488 "configure"
-+#line 4528 "configure"
+-#line 4453 "configure"
++#line 4493 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4496,5 +4536,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -4460,7 +4500,7 @@
+ pthread_create()
  ; return 0; }
  EOF
--if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4537,5 +4577,5 @@
- 	LIBS="$LIBS -lcrypto"
- 	echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
--echo "configure:4540: checking for SSL_new in -lssl" >&5
-+echo "configure:4580: checking for SSL_new in -lssl" >&5
- ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
+ else
+@@ -4489,7 +4529,7 @@
+ 
+ 				if test "$PY_MAJOR" = "2."; then
+ 										echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+-echo "configure:4493: checking for openpty in -lutil" >&5
++echo "configure:4533: checking for openpty in -lutil" >&5
+ ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4545,5 +4585,5 @@
- LIBS="-lssl  $LIBS"
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4497,7 +4537,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lutil  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4501 "configure"
++#line 4541 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4508,7 +4548,7 @@
+ openpty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4536,7 +4576,7 @@
+ fi
+ 
+ 					echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:4540: checking for dbopen in -ldb" >&5
++echo "configure:4580: checking for dbopen in -ldb" >&5
+ ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4544,7 +4584,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4548 "configure"
 +#line 4588 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4556,5 +4596,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -4555,7 +4595,7 @@
+ dbopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4582,15 +4622,15 @@
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4585: checking for $ac_hdr" >&5
-+echo "configure:4625: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ else
+@@ -4601,7 +4641,7 @@
+ 		oldLIBS=$LIBS
+ 		LIBS="$LIBS `$gnomepath applets --libs`"
+ 		echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6
+-echo "configure:4605: checking for applet_widget_init in -lpanel_applet" >&5
++echo "configure:4645: checking for applet_widget_init in -lpanel_applet" >&5
+ ac_lib_var=`echo panel_applet'_'applet_widget_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4609,7 +4649,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpanel_applet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4613 "configure"
++#line 4653 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4620,7 +4660,7 @@
+ applet_widget_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4660,12 +4700,12 @@
+ 	for ac_func in getaddrinfo
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4664: checking for $ac_func" >&5
++echo "configure:4704: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4590 "configure"
-+#line 4630 "configure"
+-#line 4669 "configure"
++#line 4709 "configure"
  #include "confdefs.h"
- #include <$ac_hdr>
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4688,7 +4728,7 @@
+ 
+ ; return 0; }
  EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-@@ -4716,5 +4756,5 @@
- 	socks=no
- 	echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6
--echo "configure:4719: checking for SOCKSconnect in -lsocks5" >&5
-+echo "configure:4759: checking for SOCKSconnect in -lsocks5" >&5
- ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'`
+-if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4713,7 +4753,7 @@
+ done
+ 
+ 	echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
+-echo "configure:4717: checking whether to enable IPv6 support" >&5
++echo "configure:4757: checking whether to enable IPv6 support" >&5
+ 	if test "$have_getaddrinfo" = yes; then
+ 		echo "$ac_t""yes" 1>&6
+ 		cat >> confdefs.h <<\EOF
+@@ -4739,7 +4779,7 @@
+ 		LIBS="-L$openssl_path/lib $LIBS"
+ 	fi
+ 	echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
+-echo "configure:4743: checking for SSL_new in -lssl" >&5
++echo "configure:4783: checking for SSL_new in -lssl" >&5
+ ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4724,5 +4764,5 @@
- LIBS="-lsocks5  $LIBS"
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4747,7 +4787,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4727 "configure"
-+#line 4767 "configure"
+-#line 4751 "configure"
++#line 4791 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4735,5 +4775,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -4758,7 +4798,7 @@
+ SSL_new()
  ; return 0; }
  EOF
--if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4760,15 +4800,15 @@
+ else
+@@ -4788,17 +4828,17 @@
+ do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4763: checking for $ac_hdr" >&5
-+echo "configure:4803: checking for $ac_hdr" >&5
+-echo "configure:4792: checking for $ac_hdr" >&5
++echo "configure:4832: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4768 "configure"
-+#line 4808 "configure"
+-#line 4797 "configure"
++#line 4837 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:4802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
-@@ -4828,10 +4868,10 @@
+   rm -rf conftest*
+@@ -4845,12 +4885,12 @@
+ 	for ac_func in dlopen
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4831: checking for $ac_func" >&5
-+echo "configure:4871: checking for $ac_func" >&5
+-echo "configure:4849: checking for $ac_func" >&5
++echo "configure:4889: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4836 "configure"
-+#line 4876 "configure"
+-#line 4854 "configure"
++#line 4894 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -4856,5 +4896,5 @@
+     which can conflict with char $ac_func(); below.  */
+@@ -4873,7 +4913,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
-@@ -4884,10 +4924,10 @@
+ else
+@@ -4901,12 +4941,12 @@
+ 		for ac_func in dlerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4887: checking for $ac_func" >&5
-+echo "configure:4927: checking for $ac_func" >&5
+-echo "configure:4905: checking for $ac_func" >&5
++echo "configure:4945: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4892 "configure"
-+#line 4932 "configure"
+-#line 4910 "configure"
++#line 4950 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -4912,5 +4952,5 @@
+     which can conflict with char $ac_func(); below.  */
+@@ -4929,7 +4969,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
-@@ -4969,5 +5009,5 @@
- 
+ else
+@@ -5049,7 +5089,7 @@
+ if test "$socks" = yes; then
+ 	socks=no
+ 	echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6
+-echo "configure:5053: checking for SOCKSconnect in -lsocks5" >&5
++echo "configure:5093: checking for SOCKSconnect in -lsocks5" >&5
+ ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5057,7 +5097,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocks5  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4972 "configure"
-+#line 5012 "configure"
+-#line 5061 "configure"
++#line 5101 "configure"
  #include "confdefs.h"
- #include <sys/socket.h>
-@@ -4987,10 +5027,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5068,7 +5108,7 @@
+ SOCKSconnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5093,17 +5133,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5097: checking for $ac_hdr" >&5
++echo "configure:5137: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5102 "configure"
++#line 5142 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5160,17 +5200,17 @@
+ if test "$WITH_JAPANESE" = "yes"; then
+ 	ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
+-echo "configure:5164: checking for iconv.h" >&5
++echo "configure:5204: checking for iconv.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5169 "configure"
++#line 5209 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5227,12 +5267,12 @@
+ for ac_func in snprintf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4990: checking for $ac_func" >&5
-+echo "configure:5030: checking for $ac_func" >&5
+-echo "configure:5231: checking for $ac_func" >&5
++echo "configure:5271: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4995 "configure"
-+#line 5035 "configure"
+-#line 5236 "configure"
++#line 5276 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5015,5 +5055,5 @@
+     which can conflict with char $ac_func(); below.  */
+@@ -5255,7 +5295,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
-@@ -5043,10 +5083,10 @@
+ else
+@@ -5283,12 +5323,12 @@
+ for ac_func in vsnprintf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5046: checking for $ac_func" >&5
-+echo "configure:5086: checking for $ac_func" >&5
+-echo "configure:5287: checking for $ac_func" >&5
++echo "configure:5327: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5051 "configure"
-+#line 5091 "configure"
+-#line 5292 "configure"
++#line 5332 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5071,5 +5111,5 @@
+     which can conflict with char $ac_func(); below.  */
+@@ -5311,7 +5351,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
-@@ -5099,10 +5139,10 @@
+ else
+@@ -5339,12 +5379,12 @@
+ for ac_func in setenv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5102: checking for $ac_func" >&5
-+echo "configure:5142: checking for $ac_func" >&5
+-echo "configure:5343: checking for $ac_func" >&5
++echo "configure:5383: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5107 "configure"
-+#line 5147 "configure"
+-#line 5348 "configure"
++#line 5388 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5127,5 +5167,5 @@
+     which can conflict with char $ac_func(); below.  */
+@@ -5367,7 +5407,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
-@@ -5153,10 +5193,10 @@
+ else
+@@ -5393,12 +5433,12 @@
+ 
  
  echo $ac_n "checking for select""... $ac_c" 1>&6
--echo "configure:5156: checking for select" >&5
-+echo "configure:5196: checking for select" >&5
+-echo "configure:5397: checking for select" >&5
++echo "configure:5437: checking for select" >&5
  if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5161 "configure"
-+#line 5201 "configure"
+-#line 5402 "configure"
++#line 5442 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5181,5 +5221,5 @@
+     which can conflict with char select(); below.  */
+@@ -5421,7 +5461,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_select=yes"
-@@ -5199,5 +5239,5 @@
+ else
+@@ -5439,7 +5479,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
--echo "configure:5202: checking for select in -lsocket" >&5
-+echo "configure:5242: checking for select in -lsocket" >&5
+-echo "configure:5443: checking for select in -lsocket" >&5
++echo "configure:5483: checking for select in -lsocket" >&5
  ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5207,5 +5247,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5447,7 +5487,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5210 "configure"
-+#line 5250 "configure"
+-#line 5451 "configure"
++#line 5491 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5218,5 +5258,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5458,7 +5498,7 @@
+ select()
  ; return 0; }
  EOF
--if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5244,5 +5284,5 @@
+ else
+@@ -5484,7 +5524,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6
--echo "configure:5247: checking for select in -lnsl" >&5
-+echo "configure:5287: checking for select in -lnsl" >&5
+-echo "configure:5488: checking for select in -lnsl" >&5
++echo "configure:5528: checking for select in -lnsl" >&5
  ac_lib_var=`echo nsl'_'select | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5252,5 +5292,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5492,7 +5532,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5255 "configure"
-+#line 5295 "configure"
+-#line 5496 "configure"
++#line 5536 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5263,5 +5303,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5503,7 +5543,7 @@
+ select()
  ; return 0; }
  EOF
--if { (eval echo configure:5266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5289,5 +5329,5 @@
+ else
+@@ -5529,7 +5569,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for select in -linet""... $ac_c" 1>&6
--echo "configure:5292: checking for select in -linet" >&5
-+echo "configure:5332: checking for select in -linet" >&5
+-echo "configure:5533: checking for select in -linet" >&5
++echo "configure:5573: checking for select in -linet" >&5
  ac_lib_var=`echo inet'_'select | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5297,5 +5337,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5537,7 +5577,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-linet  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5300 "configure"
-+#line 5340 "configure"
+-#line 5541 "configure"
++#line 5581 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5308,5 +5348,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5548,7 +5588,7 @@
+ select()
  ; return 0; }
  EOF
--if { (eval echo configure:5311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5334,5 +5374,5 @@
+ else
+@@ -5574,7 +5614,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6
--echo "configure:5337: checking for select in -lcposix" >&5
-+echo "configure:5377: checking for select in -lcposix" >&5
+-echo "configure:5578: checking for select in -lcposix" >&5
++echo "configure:5618: checking for select in -lcposix" >&5
  ac_lib_var=`echo cposix'_'select | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5342,5 +5382,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5582,7 +5622,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lcposix  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5345 "configure"
-+#line 5385 "configure"
+-#line 5586 "configure"
++#line 5626 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5353,5 +5393,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5593,7 +5633,7 @@
+ select()
  ; return 0; }
  EOF
--if { (eval echo configure:5356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5379,5 +5419,5 @@
+ else
+@@ -5619,7 +5659,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6
--echo "configure:5382: checking for select in -lnet" >&5
-+echo "configure:5422: checking for select in -lnet" >&5
+-echo "configure:5623: checking for select in -lnet" >&5
++echo "configure:5663: checking for select in -lnet" >&5
  ac_lib_var=`echo net'_'select | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5387,5 +5427,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5627,7 +5667,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5390 "configure"
-+#line 5430 "configure"
+-#line 5631 "configure"
++#line 5671 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5638,7 +5678,7 @@
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5678,7 +5718,7 @@
+ 
+ 
+ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
+-echo "configure:5682: checking for select in -lsocket" >&5
++echo "configure:5722: checking for select in -lsocket" >&5
+ ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5686,7 +5726,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5690 "configure"
++#line 5730 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5398,5 +5438,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5697,7 +5737,7 @@
+ select()
  ; return 0; }
  EOF
--if { (eval echo configure:5401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5438,10 +5478,10 @@
+ else
+@@ -5726,12 +5766,12 @@
+ 
  
  echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:5441: checking for gethostbyname" >&5
-+echo "configure:5481: checking for gethostbyname" >&5
+-echo "configure:5730: checking for gethostbyname" >&5
++echo "configure:5770: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5446 "configure"
-+#line 5486 "configure"
+-#line 5735 "configure"
++#line 5775 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5466,5 +5506,5 @@
+     which can conflict with char gethostbyname(); below.  */
+@@ -5754,7 +5794,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
-@@ -5484,5 +5524,5 @@
+ else
+@@ -5772,7 +5812,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
--echo "configure:5487: checking for gethostbyname in -lresolv" >&5
-+echo "configure:5527: checking for gethostbyname in -lresolv" >&5
+-echo "configure:5776: checking for gethostbyname in -lresolv" >&5
++echo "configure:5816: checking for gethostbyname in -lresolv" >&5
  ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5492,5 +5532,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5780,7 +5820,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5495 "configure"
-+#line 5535 "configure"
+-#line 5784 "configure"
++#line 5824 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5503,5 +5543,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5791,7 +5831,7 @@
+ gethostbyname()
  ; return 0; }
  EOF
--if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5529,5 +5569,5 @@
+ else
+@@ -5817,7 +5857,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:5532: checking for gethostbyname in -lnsl" >&5
-+echo "configure:5572: checking for gethostbyname in -lnsl" >&5
+-echo "configure:5821: checking for gethostbyname in -lnsl" >&5
++echo "configure:5861: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5537,5 +5577,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5825,7 +5865,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5540 "configure"
-+#line 5580 "configure"
+-#line 5829 "configure"
++#line 5869 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5548,5 +5588,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5836,7 +5876,7 @@
+ gethostbyname()
  ; return 0; }
  EOF
--if { (eval echo configure:5551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5581,10 +5621,10 @@
+ else
+@@ -5869,12 +5909,12 @@
+ 
  
  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
--echo "configure:5584: checking for gethostname" >&5
-+echo "configure:5624: checking for gethostname" >&5
+-echo "configure:5873: checking for gethostname" >&5
++echo "configure:5913: checking for gethostname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5589 "configure"
-+#line 5629 "configure"
+-#line 5878 "configure"
++#line 5918 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5609,5 +5649,5 @@
+     which can conflict with char gethostname(); below.  */
+@@ -5897,7 +5937,7 @@
+ 
  ; return 0; }
  EOF
--if { (eval echo configure:5612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostname=yes"
-@@ -5627,5 +5667,5 @@
+ else
+@@ -5915,7 +5955,7 @@
+ else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
--echo "configure:5630: checking for gethostname in -lnsl" >&5
-+echo "configure:5670: checking for gethostname in -lnsl" >&5
+-echo "configure:5919: checking for gethostname in -lnsl" >&5
++echo "configure:5959: checking for gethostname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -5635,5 +5675,5 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5923,7 +5963,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5638 "configure"
-+#line 5678 "configure"
+-#line 5927 "configure"
++#line 5967 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5646,5 +5686,5 @@
+ /* We use char because int might match the return type of a gcc2
+@@ -5934,7 +5974,7 @@
+ gethostname()
  ; return 0; }
  EOF
--if { (eval echo configure:5649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -5688,15 +5728,15 @@
+ else
+@@ -5976,17 +6016,17 @@
+ do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5691: checking for $ac_hdr" >&5
-+echo "configure:5731: checking for $ac_hdr" >&5
+-echo "configure:5980: checking for $ac_hdr" >&5
++echo "configure:6020: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5696 "configure"
-+#line 5736 "configure"
+-#line 5985 "configure"
++#line 6025 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
-@@ -5731,5 +5771,5 @@
+   rm -rf conftest*
+@@ -6020,7 +6060,7 @@
+ # Extract the first word of "tr", so it can be a program name with args.
  set dummy tr; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5734: checking for $ac_word" >&5
-+echo "configure:5774: checking for $ac_word" >&5
+-echo "configure:6024: checking for $ac_word" >&5
++echo "configure:6064: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5766,5 +5806,5 @@
+ else
+@@ -6055,7 +6095,7 @@
+ # Extract the first word of "sort", so it can be a program name with args.
  set dummy sort; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5769: checking for $ac_word" >&5
-+echo "configure:5809: checking for $ac_word" >&5
+-echo "configure:6059: checking for $ac_word" >&5
++echo "configure:6099: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5801,5 +5841,5 @@
+ else
+@@ -6090,7 +6130,7 @@
+ # Extract the first word of "uniq", so it can be a program name with args.
  set dummy uniq; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5804: checking for $ac_word" >&5
-+echo "configure:5844: checking for $ac_word" >&5
+-echo "configure:6094: checking for $ac_word" >&5
++echo "configure:6134: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5845,11 +5885,4 @@
- GUI_CFLAGS=`cat cflags`
+ else
+@@ -6123,6 +6163,7 @@
+ fi
  
--echo $GUI_LIBS > cflags
--tr " " "\n" < cflags > cflags2
--sort cflags2 > cflags
--uniq cflags > cflags2
--tr "\n" " " < cflags2 > cflags
--GUI_LIBS=`cat cflags`
--rm -f cflags cflags2
  
++if false; then
+ if test "_$trpath" != _; then
+ if test "_$sortpath" != _; then
+ if test "_$uniqpath" != _; then
+@@ -6135,6 +6176,7 @@
+ GUI_CFLAGS=`cat cflags`
+ rm -f cflags cflags2
+ 
++fi
+ fi
+ fi
  fi
diff --git a/chat/xchat/patches/patch-ac b/chat/xchat/patches/patch-ac
index 5e74fad256b..429e8e7e1b0 100644
--- a/chat/xchat/patches/patch-ac
+++ b/chat/xchat/patches/patch-ac
@@ -1,30 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/02/05 15:30:24 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/31 09:48:54 tron Exp $
 
---- configure.in.orig	Sun Dec 10 22:20:09 2000
-+++ configure.in	Mon Feb  5 09:43:34 2001
-@@ -304,4 +304,5 @@
- 				AC_MSG_RESULT(ok)
- 				AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread")
-+				AC_CHECK_LIB(util, openpty, LIBS="$LIBS -lutil")
- 			else
- 				python=no
-@@ -505,11 +506,12 @@
- GUI_CFLAGS=`cat cflags`
- 
--echo $GUI_LIBS > cflags
--tr " " "\n" < cflags > cflags2
--sort cflags2 > cflags
--uniq cflags > cflags2
--tr "\n" " " < cflags2 > cflags
--GUI_LIBS=`cat cflags`
--rm -f cflags cflags2
-+dnl order matters on the link line....
-+dnl echo $GUI_LIBS > cflags
-+dnl tr " " "\n" < cflags > cflags2
-+dnl sort cflags2 > cflags
-+dnl uniq cflags > cflags2
-+dnl tr "\n" " " < cflags2 > cflags
-+dnl GUI_LIBS=`cat cflags`
-+dnl rm -f cflags cflags2
- 
- fi
+--- po/Makefile.in.in.orig	Sun Oct 31 12:17:50 1999
++++ po/Makefile.in.in	Mon Sep  4 19:30:55 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/chat/xchat/pkg/PLIST b/chat/xchat/pkg/PLIST
index ba11567a7a2..452d20db7c7 100644
--- a/chat/xchat/pkg/PLIST
+++ b/chat/xchat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/25 18:32:15 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/31 09:48:54 tron Exp $
 bin/xchat
 bin/xchat-text
 share/doc/xchat/xchat-1.html
@@ -13,29 +13,32 @@ share/doc/xchat/xchat-8.html
 share/doc/xchat/xchat-9.html
 share/doc/xchat/xchat.html
 share/gnome/apps/Internet/xchat.desktop
-share/locale/ca/LC_MESSAGES/xchat.mo
-share/locale/cs/LC_MESSAGES/xchat.mo
-share/locale/da/LC_MESSAGES/xchat.mo
-share/locale/de/LC_MESSAGES/xchat.mo
-share/locale/el/LC_MESSAGES/xchat.mo
-share/locale/es/LC_MESSAGES/xchat.mo
-share/locale/fr/LC_MESSAGES/xchat.mo
-share/locale/he/LC_MESSAGES/xchat.mo
-share/locale/hu/LC_MESSAGES/xchat.mo
-share/locale/it/LC_MESSAGES/xchat.mo
-share/locale/ja/LC_MESSAGES/xchat.mo
-share/locale/ko/LC_MESSAGES/xchat.mo
-share/locale/lt/LC_MESSAGES/xchat.mo
-share/locale/nl/LC_MESSAGES/xchat.mo
-share/locale/pt_BR/LC_MESSAGES/xchat.mo
-share/locale/sl/LC_MESSAGES/xchat.mo
-share/locale/sr_YU/LC_MESSAGES/xchat.mo
-share/locale/pt/LC_MESSAGES/xchat.mo
-share/locale/ru/LC_MESSAGES/xchat.mo
-share/locale/ro/LC_MESSAGES/xchat.mo
-share/locale/sk/LC_MESSAGES/xchat.mo
-share/locale/sv/LC_MESSAGES/xchat.mo
-share/locale/uk/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
-share/pixmaps/xchat_wm.png
 @dirrm share/doc/xchat