Pullup revisions 1.58 and 1.59 to the 1.6 pkgsrc branch.

Requested by Thomas Klausner. > Date: Mon, 19 Aug 2002 18:17:57 +0300 (EEST) > From: Thomas Klausner <wiz@netbsd.org> > > Module Name: pkgsrc > Committed By: wiz > Date: Mon Aug 19 15:17:56 UTC 2002 > > Modified Files: > pkgsrc/security/openssl: Makefile > > Log Message: > Compile no-shared on 1.4.x. This makes the package install and work for me > on 1.4.2/i386. Approved by agc. > Date: Mon, 19 Aug 2002 19:00:07 +0300 (EEST) > From: Thomas Klausner <wiz@netbsd.org> > > Module Name: pkgsrc > Committed By: wiz > Date: Mon Aug 19 16:00:07 UTC 2002 > > Modified Files: > pkgsrc/security/openssl: Makefile > > Log Message: > Fix a comment, and improve pattern to also work on netbsd-1-4.
author: agc <agc> 2002-08-20 12:33:49 +0000
committer: agc <agc> 2002-08-20 12:33:49 +0000
commit: 574ab4dfa77a0822f99d67912722afc9e0900b41 (patch)
tree: 3ebf3987da8eed6504a9fe0d16356bb9bc9a0edd
parent: 8ca51e197d519d2eaedc0758729571fc4ddedb7d (diff)
download: pkgsrc-574ab4dfa77a0822f99d67912722afc9e0900b41.tar.gz
94 files changed, 2275 insertions, 4440 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 39997d2bc1a..d39da665241 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2002/08/19 19:59:36 tron Exp $
+# $NetBSD: Makefile,v 1.23 2002/07/26 17:36:24 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=	1
+
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-zvt
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 7f0000b46d6..b947033e3ea 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:59:37 tron Exp $
+# $NetBSD: Makefile.common,v 1.1 2002/07/26 17:36:24 wiz Exp $
 
-DISTNAME=	xchat-1.8.10
+DISTNAME=	xchat-1.8.9
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -22,7 +22,6 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	ac_cv_lib_intl_bindtextdomain='yes'
 CONFIGURE_ENV+=	pythonpath=${PYTHONBIN}
 MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
-USE_GNU_GETTEXT=	YES
 BUILD_USES_MSGFMT=	YES
 
 BUILD_DEFS+=	USE_INET6 USE_SOCKS
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index 8eed49bcf12..9fb9472637c 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:59:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/16 14:59:38 tron Exp $
 bin/xchat
 bin/xchat-text
 share/doc/xchat/xchat-1.html
@@ -30,7 +30,6 @@ ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pl/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
@@ -41,8 +40,6 @@ ${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/vi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
 @dirrm share/doc/xchat
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index f2c48a9ba8c..a49eed7142f 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.16 2002/08/19 19:59:38 tron Exp $
+$NetBSD: distinfo,v 1.15 2002/07/19 05:22:51 mycroft Exp $
 
-SHA1 (xchat-1.8.10.tar.bz2) = 10c85bd23faa58f2f962eec6a96364e9743ac91c
-Size (xchat-1.8.10.tar.bz2) = 824407 bytes
+SHA1 (xchat-1.8.9.tar.bz2) = feb8dab8dab8170586ff18caa09fe510ba0a4d46
+Size (xchat-1.8.9.tar.bz2) = 747762 bytes
+SHA1 (patch-aa) = 86bcdaf1ccd33d64fc44583eec39e192dfcba06d
+SHA1 (patch-ab) = 416a335b6e8d77a61fddabc823d77e3151dc359d
 SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
 SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7
 SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa
new file mode 100644
index 00000000000..3c7de209de3
--- /dev/null
+++ b/chat/xchat/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2002/06/06 11:25:53 manu Exp $
+
+--- configure.in.orig	Thu Jun  6 13:02:43 2002
++++ configure.in	Thu Jun  6 13:04:13 2002
+@@ -7,9 +7,9 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_CPP
+ 
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pl 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 lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ AM_GNU_GETTEXT
+ 
+ AC_PATH_PROG(sedpath, sed)
+ if test "_$sedpath" = _; then
diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab
new file mode 100644
index 00000000000..01b5bd58995
--- /dev/null
+++ b/chat/xchat/patches/patch-ab
@@ -0,0 +1,1784 @@
+$NetBSD: patch-ab,v 1.6 2002/06/06 11:25:53 manu Exp $
+
+--- configure.orig	Sat Apr 27 06:57:11 2002
++++ configure	Thu Jun  6 13:14:57 2002
+@@ -1191,9 +1191,9 @@
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ 
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv 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 lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ 
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+@@ -1781,9 +1781,9 @@
+ EOF
+ 
+ fi
+ 
+-for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
++for ac_hdr in unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1790: checking for $ac_hdr" >&5
+@@ -1913,26 +1913,13 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
+-
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-
+ /* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
++# ifdef HAVE_UNISTD_H
++#  include <unistd.h>
++# endif
+ 
+ /* Assume that all systems that can run configure have sys/param.h.  */
+ # ifndef HAVE_SYS_PARAM_H
+ #  define HAVE_SYS_PARAM_H 1
+@@ -2038,9 +2025,9 @@
+ 	exit(0);
+ }
+ 
+ EOF
+-if { (eval echo configure:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2062,14 +2049,14 @@
+ fi
+ 
+ 
+     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+-echo "configure:2067: checking whether we are using the GNU C Library 2.1 or newer" >&5
++echo "configure:2054: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2072 "configure"
++#line 2059 "configure"
+ #include "confdefs.h"
+ 
+ #include <features.h>
+ #ifdef __GNU_LIBRARY__
+@@ -2103,19 +2090,19 @@
+ stdlib.h string.h unistd.h sys/param.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2108: checking for $ac_hdr" >&5
++echo "configure:2095: 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 2113 "configure"
++#line 2100 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2105: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -2144,14 +2131,14 @@
+ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+ strdup strtoul tsearch __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2149: checking for $ac_func" >&5
++echo "configure:2136: 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 2154 "configure"
++#line 2141 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -2172,9 +2159,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2164: \"$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
+   echo "configure: failed program was:" >&5
+@@ -2212,17 +2199,17 @@
+ fi
+ 
+ 
+   echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:2217: checking for iconv" >&5
++echo "configure:2204: checking for iconv" >&5
+ if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_cv_lib_iconv=no
+     cat > conftest.$ac_ext <<EOF
+-#line 2225 "configure"
++#line 2212 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+ int main() {
+@@ -2230,9 +2217,9 @@
+        iconv(cd,NULL,NULL,NULL,NULL);
+        iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_func_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2242,9 +2229,9 @@
+     if test "$am_cv_func_iconv" != yes; then
+       am_save_LIBS="$LIBS"
+       LIBS="$LIBS -liconv"
+       cat > conftest.$ac_ext <<EOF
+-#line 2247 "configure"
++#line 2234 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+ int main() {
+@@ -2252,9 +2239,9 @@
+          iconv(cd,NULL,NULL,NULL,NULL);
+          iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_lib_iconv=yes
+         am_cv_func_iconv=yes
+ else
+@@ -2273,15 +2260,15 @@
+ #define HAVE_ICONV 1
+ EOF
+ 
+     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+-echo "configure:2278: checking for iconv declaration" >&5
++echo "configure:2265: checking for iconv declaration" >&5
+     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+       cat > conftest.$ac_ext <<EOF
+-#line 2284 "configure"
++#line 2271 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -2298,9 +2285,9 @@
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_proto_iconv_arg1=""
+ else
+   echo "configure: failed program was:" >&5
+@@ -2327,21 +2314,21 @@
+   
+ 
+    
+   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+-echo "configure:2332: checking for nl_langinfo and CODESET" >&5
++echo "configure:2319: checking for nl_langinfo and CODESET" >&5
+ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2337 "configure"
++#line 2324 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int main() {
+ char* cs = nl_langinfo(CODESET);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_langinfo_codeset=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2362,21 +2349,21 @@
+   fi
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:2367: checking for LC_MESSAGES" >&5
++echo "configure:2354: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2372 "configure"
++#line 2359 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2395,9 +2382,9 @@
+ 
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:2400: checking whether NLS is requested" >&5
++echo "configure:2387: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+   USE_NLS=$enableval
+@@ -2417,9 +2404,9 @@
+ #define ENABLE_NLS 1
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:2422: checking whether included gettext is requested" >&5
++echo "configure:2409: checking whether included gettext is requested" >&5
+       # Check whether --with-included-gettext or --without-included-gettext was given.
+ if test "${with_included_gettext+set}" = set; then
+   withval="$with_included_gettext"
+   nls_cv_force_use_gnu_gettext=$withval
+@@ -2437,19 +2424,19 @@
+         
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:2442: checking for libintl.h" >&5
++echo "configure:2429: checking for libintl.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 2447 "configure"
++#line 2434 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2439: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -2464,23 +2451,23 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+-echo "configure:2469: checking for GNU gettext in libc" >&5
++echo "configure:2456: checking for GNU gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2474 "configure"
++#line 2461 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+ int main() {
+ bindtextdomain ("", "");
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libc=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2494,25 +2481,25 @@
+ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
+ 
+ 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+ 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+-echo "configure:2499: checking for GNU gettext in libintl" >&5
++echo "configure:2486: checking for GNU gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   gt_save_LIBS="$LIBS"
+ 		LIBS="$LIBS -lintl $LIBICONV"
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2506 "configure"
++#line 2493 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+ int main() {
+ bindtextdomain ("", "");
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libintl=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2543,14 +2530,14 @@
+ 	     LIBS="$LIBS $INTLLIBS"
+ 	     for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2548: checking for $ac_func" >&5
++echo "configure:2535: 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 2553 "configure"
++#line 2540 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -2571,9 +2558,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2563: \"$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
+   echo "configure: failed program was:" >&5
+@@ -2600,9 +2587,9 @@
+ 
+ 	     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2605: checking for $ac_word" >&5
++echo "configure:2592: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MSGFMT" in
+@@ -2634,9 +2621,9 @@
+ 	     if test "$MSGFMT" != "no"; then
+ 	       # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2639: checking for $ac_word" >&5
++echo "configure:2626: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GMSGFMT" in
+@@ -2672,9 +2659,9 @@
+ 
+ 	     # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2677: checking for $ac_word" >&5
++echo "configure:2664: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$XGETTEXT" in
+@@ -2722,9 +2709,9 @@
+                 INTLOBJS="\$(GETTOBJS)"
+         # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2727: checking for $ac_word" >&5
++echo "configure:2714: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MSGFMT" in
+@@ -2756,9 +2743,9 @@
+ 
+         # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2761: checking for $ac_word" >&5
++echo "configure:2748: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GMSGFMT" in
+@@ -2792,9 +2779,9 @@
+ 
+         # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2797: checking for $ac_word" >&5
++echo "configure:2784: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$XGETTEXT" in
+@@ -2854,9 +2841,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2859: checking for $ac_word" >&5
++echo "configure:2846: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$INTLBISON"; then
+@@ -2887,9 +2874,9 @@
+     if test -z "$INTLBISON"; then
+       ac_verc_fail=yes
+     else
+             echo $ac_n "checking version of bison""... $ac_c" 1>&6
+-echo "configure:2892: checking version of bison" >&5
++echo "configure:2879: checking version of bison" >&5
+       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+       case $ac_prog_version in
+         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+@@ -2934,9 +2921,9 @@
+      if test "x$ALL_LINGUAS" = "x"; then
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:2939: checking for catalogs to be installed" >&5
++echo "configure:2926: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for presentlang in $ALL_LINGUAS; do
+          useit=no
+          for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+@@ -2977,9 +2964,9 @@
+ 
+ # Extract the first word of "sed", so it can be a program name with args.
+ set dummy sed; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2982: checking for $ac_word" >&5
++echo "configure:2969: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$sedpath" in
+@@ -3016,9 +3003,9 @@
+ 
+ # Extract the first word of "uname", so it can be a program name with args.
+ set dummy uname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3021: checking for $ac_word" >&5
++echo "configure:3008: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_unamepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$unamepath" in
+@@ -3052,9 +3039,9 @@
+ if test "_$unamepath" = _; then
+ 	system="unknown"
+ else
+ 	echo $ac_n "checking system type""... $ac_c" 1>&6
+-echo "configure:3057: checking system type" >&5
++echo "configure:3044: checking system type" >&5
+ 	system=`$unamepath -s`
+ 	echo "$ac_t""$system" 1>&6
+ 	if test "$system" = "Linux"; then
+ 		cat >> confdefs.h <<\EOF
+@@ -3262,17 +3249,17 @@
+ if test "$glib" = no; then
+ 	glibreplace=yes
+ 	gtkfe=no
+ 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3267: checking for dlopen in -ldl" >&5
++echo "configure:3254: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3275 "configure"
++#line 3262 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -3281,9 +3268,9 @@
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3273: \"$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
+   echo "configure: failed program was:" >&5
+@@ -3367,9 +3354,9 @@
+ 
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3372: checking for $ac_word" >&5
++echo "configure:3359: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GLIB_CONFIG" in
+@@ -3402,9 +3389,9 @@
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:3407: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:3394: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+@@ -3425,9 +3412,9 @@
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3430 "configure"
++#line 3417 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+@@ -3501,9 +3488,9 @@
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:3506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3521,17 +3508,17 @@
+   if test "x$no_glib" = x ; then
+      echo "$ac_t""yes" 1>&6
+      
+ 		echo $ac_n "checking for Glib compile flags""... $ac_c" 1>&6
+-echo "configure:3526: checking for Glib compile flags" >&5
++echo "configure:3513: checking for Glib compile flags" >&5
+ 		GLIB_CFLAGS=`$GLIB_CONFIG --cflags`
+ 		GLIB_LIBS=`$GLIB_CONFIG gmodule --libs`
+ 		CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ 		LIBS="$LIBS $GLIB_LIBS"
+ 		echo "$ac_t""ok" 1>&6
+ 		if test "$prefix" = "NONE"; then
+ 			echo $ac_n "checking glib-config for prefix""... $ac_c" 1>&6
+-echo "configure:3534: checking glib-config for prefix" >&5
++echo "configure:3521: checking glib-config for prefix" >&5
+ 			prefix=`$GLIB_CONFIG --prefix`
+ 			echo "$ac_t""$prefix" 1>&6
+ 		fi
+ 		cat >> confdefs.h <<EOF
+@@ -3552,9 +3539,9 @@
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 3557 "configure"
++#line 3544 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+@@ -3562,9 +3549,9 @@
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+@@ -3602,17 +3589,17 @@
+ 			echo "configure: warning: Cannot find GLIB! Not building GTK frontend" 1>&2
+ 		fi
+ 
+ 		echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3607: checking for dlopen in -ldl" >&5
++echo "configure:3594: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3615 "configure"
++#line 3602 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -3621,9 +3608,9 @@
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3613: \"$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
+   echo "configure: failed program was:" >&5
+@@ -3710,9 +3697,9 @@
+ 
+   # Extract the first word of "gtk-config", so it can be a program name with args.
+ set dummy gtk-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3715: checking for $ac_word" >&5
++echo "configure:3702: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GTK_CONFIG" in
+@@ -3745,9 +3732,9 @@
+ fi
+ 
+   min_gtk_version=1.2.0
+   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+-echo "configure:3750: checking for GTK - version >= $min_gtk_version" >&5
++echo "configure:3737: checking for GTK - version >= $min_gtk_version" >&5
+   no_gtk=""
+   if test "$GTK_CONFIG" = "no" ; then
+     no_gtk=yes
+   else
+@@ -3768,9 +3755,9 @@
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3773 "configure"
++#line 3760 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+@@ -3846,9 +3833,9 @@
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3880,9 +3867,9 @@
+           echo "*** Could not run GTK test program, checking why..."
+           CFLAGS="$CFLAGS $GTK_CFLAGS"
+           LIBS="$LIBS $GTK_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 3885 "configure"
++#line 3872 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+@@ -3890,9 +3877,9 @@
+ int main() {
+  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GTK or finding the wrong"
+           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+@@ -3950,9 +3937,9 @@
+ if test "$gnome" = yes; then
+ 	# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3955: checking for $ac_word" >&5
++echo "configure:3942: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -3983,9 +3970,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6
+-echo "configure:3988: checking for Gnome compile flags" >&5
++echo "configure:3975: checking for Gnome compile flags" >&5
+ 	GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null`
+ 	if test "_$GNOME_CFLAGS" = _ ; then
+ 		gnome=no
+ 		echo "$ac_t""Gnome not found, building without it." 1>&6
+@@ -4011,9 +3998,9 @@
+ 	if test "$gnome" = no; then
+ 		# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4016: checking for $ac_word" >&5
++echo "configure:4003: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -4045,9 +4032,9 @@
+ fi
+ 
+ 	fi
+ 	echo $ac_n "checking for zvt""... $ac_c" 1>&6
+-echo "configure:4050: checking for zvt" >&5
++echo "configure:4037: checking for zvt" >&5
+ 	if test "_$gnomepath" = "_"; then
+ 		echo "$ac_t""No gnome-config, can't do it." 1>&6
+ 		zvt=no
+ 	else
+@@ -4067,9 +4054,9 @@
+ if test "$gdk_pixbuf" = yes ; then
+ 	# Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
+ set dummy gdk-pixbuf-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4072: checking for $ac_word" >&5
++echo "configure:4059: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gdkpixbufpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gdkpixbufpath" in
+@@ -4103,9 +4090,9 @@
+ 	if test "$gnome" = no; then
+ 		# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4108: checking for $ac_word" >&5
++echo "configure:4095: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -4137,9 +4124,9 @@
+ fi
+ 
+ 	fi
+ 	echo $ac_n "checking for gdk-pixbuf >= 0.8""... $ac_c" 1>&6
+-echo "configure:4142: checking for gdk-pixbuf >= 0.8" >&5
++echo "configure:4129: checking for gdk-pixbuf >= 0.8" >&5
+ 	GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
+ 	GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
+ 	if test "_$GDK_PIXBUF_CFLAGS" = _; then
+ 		echo "$ac_t""not found, building without gdk-pixbuf." 1>&6
+@@ -4171,9 +4158,9 @@
+ if test "$perl" = yes; then
+ 	# Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4176: checking for $ac_word" >&5
++echo "configure:4163: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_perlpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$perlpath" in
+@@ -4204,9 +4191,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6
+-echo "configure:4209: checking for Perl compile flags" >&5
++echo "configure:4196: checking for Perl compile flags" >&5
+ 	PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+ 	if test "_$PERL_CFLAGS" = _ ; then
+ 		echo "$ac_t""not found, building without perl." 1>&6
+ 		perl=no
+@@ -4228,14 +4215,14 @@
+ 
+ 		for ac_func in eval_pv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4233: checking for $ac_func" >&5
++echo "configure:4220: 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 4238 "configure"
++#line 4225 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4256,9 +4243,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4248: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4282,9 +4269,9 @@
+ done
+ 
+ 
+ 		echo $ac_n "checking for old perl""... $ac_c" 1>&6
+-echo "configure:4287: checking for old perl" >&5
++echo "configure:4274: checking for old perl" >&5
+ 		PERL_OLD=`$perlpath -e 'if($]<5.006){printf"yes\n";}else{printf"no\n";}'`
+ 		if test "$PERL_OLD" = "yes"; then
+ 			cat >> confdefs.h <<\EOF
+ #define OLD_PERL 1
+@@ -4302,9 +4289,9 @@
+ 	if test "$python" = yes; then
+ 		# Extract the first word of "python", so it can be a program name with args.
+ set dummy python; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4307: checking for $ac_word" >&5
++echo "configure:4294: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_pythonpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$pythonpath" in
+@@ -4338,9 +4325,9 @@
+ 		if test "_$pythonpath" = _ ; then
+ 			python=no
+ 		else
+ 			echo $ac_n "checking for Python compile flags""... $ac_c" 1>&6
+-echo "configure:4343: checking for Python compile flags" >&5
++echo "configure:4330: checking for Python compile flags" >&5
+ 			PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
+ 			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]'`
+@@ -4353,17 +4340,17 @@
+ EOF
+ 
+ 				echo "$ac_t""ok" 1>&6
+ 				echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:4358: checking for pthread_create in -lpthread" >&5
++echo "configure:4345: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4366 "configure"
++#line 4353 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4372,9 +4359,9 @@
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4364: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4401,17 +4388,17 @@
+ fi
+ 
+ 				if test "$PY_MAJOR" = "2."; then
+ 										echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+-echo "configure:4406: checking for openpty in -lutil" >&5
++echo "configure:4393: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lutil  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4414 "configure"
++#line 4401 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4420,9 +4407,9 @@
+ int main() {
+ openpty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4412: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4448,17 +4435,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 					echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:4453: checking for dbopen in -ldb" >&5
++echo "configure:4440: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4461 "configure"
++#line 4448 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4467,9 +4454,9 @@
+ int main() {
+ dbopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4459: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4513,17 +4500,17 @@
+ 	if test "$gnome" = yes; then
+ 		oldLIBS=$LIBS
+ 		LIBS="$LIBS `$gnomepath applets --libs`"
+ 		echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6
+-echo "configure:4518: checking for applet_widget_init in -lpanel_applet" >&5
++echo "configure:4505: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpanel_applet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4526 "configure"
++#line 4513 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4532,9 +4519,9 @@
+ int main() {
+ applet_widget_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4524: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4573,14 +4560,14 @@
+ if test "$ipv6" = yes; then
+ 	for ac_func in getaddrinfo
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4578: checking for $ac_func" >&5
++echo "configure:4565: 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 4583 "configure"
++#line 4570 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4601,9 +4588,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4593: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4626,9 +4613,9 @@
+ fi
+ done
+ 
+ 	echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
+-echo "configure:4631: checking whether to enable IPv6 support" >&5
++echo "configure:4618: checking whether to enable IPv6 support" >&5
+ 	if test "$have_getaddrinfo" = yes; then
+ 		echo "$ac_t""yes" 1>&6
+ 		cat >> confdefs.h <<\EOF
+ #define USE_IPV6 1
+@@ -4652,17 +4639,17 @@
+ 	if test -n "$openssl_path"; then
+ 		LIBS="-L$openssl_path/lib $LIBS"
+ 	fi
+ 	echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
+-echo "configure:4657: checking for SSL_new in -lssl" >&5
++echo "configure:4644: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lssl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4665 "configure"
++#line 4652 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4671,9 +4658,9 @@
+ int main() {
+ SSL_new()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4663: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4701,19 +4688,19 @@
+ 		for ac_hdr in openssl/ssl.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4706: checking for $ac_hdr" >&5
++echo "configure:4693: 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 4711 "configure"
++#line 4698 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4703: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -4758,14 +4745,14 @@
+ if test "$plugin" = yes; then
+ 	for ac_func in dlopen
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4763: checking for $ac_func" >&5
++echo "configure:4750: 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 4768 "configure"
++#line 4755 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4786,9 +4773,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4791: \"$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
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -4814,14 +4801,14 @@
+ 	if test "$have_dl" = yes; then
+ 		for ac_func in dlerror
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4819: checking for $ac_func" >&5
++echo "configure:4806: 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 4824 "configure"
++#line 4811 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4842,9 +4829,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4834: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4953,17 +4940,17 @@
+ 
+ if test "$socks" = yes; then
+ 	socks=no
+ 	echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6
+-echo "configure:4958: checking for SOCKSconnect in -lsocks5" >&5
++echo "configure:4945: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocks5  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4966 "configure"
++#line 4953 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4972,9 +4959,9 @@
+ int main() {
+ SOCKSconnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4964: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4997,19 +4984,19 @@
+ 		for ac_hdr in socks.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5002: checking for $ac_hdr" >&5
++echo "configure:4989: 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 5007 "configure"
++#line 4994 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4999: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5064,19 +5051,19 @@
+ 
+ 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:5069: checking for iconv.h" >&5
++echo "configure:5056: 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 5074 "configure"
++#line 5061 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5066: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5111,9 +5098,9 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for i386/MMX support""... $ac_c" 1>&6
+-echo "configure:5116: checking for i386/MMX support" >&5
++echo "configure:5103: checking for i386/MMX support" >&5
+ if test "$mmx" = "yes"; then
+   machine=`uname -m`
+   case $machine in
+     i386|i486|i586|i686|i786)
+@@ -5164,14 +5151,14 @@
+ 
+ for ac_func in snprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5169: checking for $ac_func" >&5
++echo "configure:5156: 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 5174 "configure"
++#line 5161 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5192,9 +5179,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5184: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5220,14 +5207,14 @@
+ 
+ for ac_func in vsnprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5225: checking for $ac_func" >&5
++echo "configure:5212: 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 5230 "configure"
++#line 5217 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5248,9 +5235,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5240: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5276,14 +5263,14 @@
+ 
+ for ac_func in setenv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5281: checking for $ac_func" >&5
++echo "configure:5268: 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 5286 "configure"
++#line 5273 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5304,9 +5291,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5296: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5330,14 +5317,14 @@
+ done
+ 
+ 
+ echo $ac_n "checking for select""... $ac_c" 1>&6
+-echo "configure:5335: checking for select" >&5
++echo "configure:5322: 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 5340 "configure"
++#line 5327 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char select(); below.  */
+ #include <assert.h>
+@@ -5358,9 +5345,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_select=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5376,17 +5363,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
+-echo "configure:5381: checking for select in -lsocket" >&5
++echo "configure:5368: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5389 "configure"
++#line 5376 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5395,9 +5382,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5387: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5421,17 +5408,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6
+-echo "configure:5426: checking for select in -lnsl" >&5
++echo "configure:5413: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5434 "configure"
++#line 5421 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5440,9 +5427,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5432: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5466,17 +5453,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -linet""... $ac_c" 1>&6
+-echo "configure:5471: checking for select in -linet" >&5
++echo "configure:5458: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5479 "configure"
++#line 5466 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5485,9 +5472,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5477: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5511,17 +5498,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6
+-echo "configure:5516: checking for select in -lcposix" >&5
++echo "configure:5503: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5524 "configure"
++#line 5511 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5530,9 +5517,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5522: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5556,17 +5543,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6
+-echo "configure:5561: checking for select in -lnet" >&5
++echo "configure:5548: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5569 "configure"
++#line 5556 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5575,9 +5562,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5567: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5615,17 +5602,17 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
+-echo "configure:5620: checking for select in -lsocket" >&5
++echo "configure:5607: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5628 "configure"
++#line 5615 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5634,9 +5621,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5626: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5663,14 +5650,14 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:5668: checking for gethostbyname" >&5
++echo "configure:5655: 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 5673 "configure"
++#line 5660 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+ #include <assert.h>
+@@ -5691,9 +5678,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5709,17 +5696,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
+-echo "configure:5714: checking for gethostbyname in -lresolv" >&5
++echo "configure:5701: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lresolv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5722 "configure"
++#line 5709 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5728,9 +5715,9 @@
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5720: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5754,17 +5741,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:5759: checking for gethostbyname in -lnsl" >&5
++echo "configure:5746: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5767 "configure"
++#line 5754 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5773,9 +5760,9 @@
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5765: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5806,14 +5793,14 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6
+-echo "configure:5811: checking for gethostname" >&5
++echo "configure:5798: 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 5816 "configure"
++#line 5803 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostname(); below.  */
+ #include <assert.h>
+@@ -5834,9 +5821,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostname=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5852,17 +5839,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
+-echo "configure:5857: checking for gethostname in -lnsl" >&5
++echo "configure:5844: 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
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5865 "configure"
++#line 5852 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5871,9 +5858,9 @@
+ int main() {
+ gethostname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5863: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5913,19 +5900,19 @@
+ for ac_hdr in strings.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5918: checking for $ac_hdr" >&5
++echo "configure:5905: 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 5923 "configure"
++#line 5910 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5915: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5951,15 +5938,15 @@
+ done
+ 
+ 
+ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+-echo "configure:5956: checking for socklen_t" >&5
++echo "configure:5943: checking for socklen_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 5962 "configure"
++#line 5949 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -5992,9 +5979,9 @@
+ 
+ # 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:5997: checking for $ac_word" >&5
++echo "configure:5984: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$trpath" in
+@@ -6027,9 +6014,9 @@
+ 
+ # 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:6032: checking for $ac_word" >&5
++echo "configure:6019: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$sortpath" in
+@@ -6062,9 +6049,9 @@
+ 
+ # 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:6067: checking for $ac_word" >&5
++echo "configure:6054: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$uniqpath" in
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 942a57d8f9b..2e1a72aae51 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2002/08/19 19:29:18 mycroft Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/01 05:48:07 jlam Exp $
 
-DISTNAME=	openldap-2.0.25
+DISTNAME=	openldap-2.0.23
 SVR4_PKGNAME=	oldap
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 570cf3c16d7..836305b1e7d 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/19 19:29:18 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/02/13 12:21:24 martti Exp $
 bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
@@ -19,17 +19,17 @@ lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/liblber.so.2
-lib/liblber.so.2.16
+lib/liblber.so.2.15
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap.so.2
-lib/libldap.so.2.16
+lib/libldap.so.2.15
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
 lib/libldap_r.so.2
-lib/libldap_r.so.2.16
+lib/libldap_r.so.2.15
 libexec/fax500
 libexec/go500
 libexec/go500gw
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index e32ffc86fbc..42c62edd44c 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/08/19 19:29:19 mycroft Exp $
+$NetBSD: distinfo,v 1.11 2002/02/13 12:21:25 martti Exp $
 
-SHA1 (openldap-2.0.25.tgz) = fc62147b4de1057bbd3797471a7773406a212e61
-Size (openldap-2.0.25.tgz) = 1304098 bytes
+SHA1 (openldap-2.0.23.tgz) = c4b30d1537ad6318de72ba59847bf512a6a061ea
+Size (openldap-2.0.23.tgz) = 1302928 bytes
 SHA1 (patch-aa) = 8577dfc802eda5e789aa7e66ff9bd9cbb1ca1777
 SHA1 (patch-ab) = f2b00ef942da01fda134ac37086f59d371efa152
diff --git a/devel/apr-devel/Makefile b/devel/apr-devel/Makefile
index ec30bf9ece1..fdd9415ba2c 100644
--- a/devel/apr-devel/Makefile
+++ b/devel/apr-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/19 19:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/03 15:49:22 hubertf Exp $
 
 DISTNAME=	apr_20020725223645
 PKGNAME=	apr-0.20020725223645
@@ -10,11 +10,10 @@ MAINTAINER=	joelw@unix.se
 HOMEPAGE=	http://apr.apache.org/
 COMMENT=	Apache Portable Run-time, a system portability layer
 
-BUILD_DEPENDS=	autoconf>=2.50:../../devel/autoconf-devel
+DEPENDS=	autoconf>=2.50:../../devel/autoconf-devel
+DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/build/ldconfig
 WRKSRC=		${WRKDIR}
 
 pre-configure:
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index ee50509323e..a17a5af67bd 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/19 19:20:34 seb Exp $
+# $NetBSD: Makefile,v 1.12 2002/07/19 03:07:21 schmonz Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -21,8 +21,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--with-included-gettext
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 PATCHDIR=		${.CURDIR}/../../devel/gettext/patches
 DISTINFO_FILE=		${.CURDIR}/../../devel/gettext/distinfo
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index 81875fa2411..73173fd78ec 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/19 19:20:34 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/07/19 03:07:21 schmonz Exp $
 
 DISTNAME=		gettext-0.10.35
 PKGNAME=		gettext-m4-0.10.35
@@ -15,8 +15,6 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-included-gettext
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 PATCHDIR=		${.CURDIR}/../../devel/gettext/patches
 DISTINFO_FILE=		${.CURDIR}/../../devel/gettext/distinfo
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index c898996548e..f8cb0e8906d 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/08/19 19:20:30 seb Exp $
+# $NetBSD: Makefile,v 1.35 2002/07/19 03:07:21 schmonz Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -19,8 +19,6 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 INFO_FILES=		gettext.info
 TEXINFO_OVERRIDE=	YES
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index d43d48bed23..ed5b661ca34 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/08/19 19:20:31 seb Exp $
+$NetBSD: distinfo,v 1.4 2002/07/21 19:26:30 schmonz Exp $
 
 SHA1 (gettext-0.10.35.tar.gz) = fcf5aedd794b45f9a63cb30deba96e842cc2d77c
 Size (gettext-0.10.35.tar.gz) = 713694 bytes
-SHA1 (patch-aa) = 059c972c3a1de3801b7369715c18183f483a4b03
+SHA1 (patch-aa) = 3a08075e113a90cb4848718a73b55e572be7d1bb
 SHA1 (patch-ab) = aa7e3c08b3b598d48c768bea0d7afe9e375c4174
-SHA1 (patch-ac) = 78ddaf89f7f069751097c6a692a04dbaf9a3914f
+SHA1 (patch-ac) = a31996698a632614bbf5269bcd22b4d3e7077e0c
 SHA1 (patch-ad) = c30246c62ad2a3809f092d4e83747a781437fc8c
 SHA1 (patch-ae) = a5b82ab8b98c34a8889d60fd9cb224bc1ccdd4d0
 SHA1 (patch-af) = 1e93d62e848f3dd6d902c0c91b32bb593f3afc43
@@ -12,4 +12,4 @@ SHA1 (patch-ag) = 72e94b26e72ff9d3a7af01304e1854fe48b1b5de
 SHA1 (patch-ah) = 2822c9d3a6e9f2a9ae0d4b5ed5c25525e3d4f34d
 SHA1 (patch-ai) = dd77fb17fae639152ae1deca233f3a56629ecaea
 SHA1 (patch-aj) = d0f2f662d895c015f85df0eedd4cc7d2e4170122
-SHA1 (patch-ak) = ab2ecc0805258b029782f51a357e0b8c8abd02fa
+SHA1 (patch-ak) = d75e08203f779c26094e876aee5869c3aa1d9dff
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 2eb0197f563..dc527e97766 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,19 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2002/08/19 19:20:32 seb Exp $
+$NetBSD: patch-aa,v 1.7 2000/06/30 17:07:36 danw Exp $
 
-Build shared libintl. And force directory for locale date.
+Build shared libintl
 
---- configure.orig	Fri May  1 07:48:25 1998
-+++ configure
-@@ -3690,7 +3690,7 @@ fi
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=${PKGLOCALEDIR}
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -3958,7 +3958,7 @@ fi
+--- configure.orig	Fri Jun 23 04:15:24 2000
++++ configure	Fri Jun 23 04:15:36 2000
+@@ -3958,7 +3958,7 @@
     fi
     
  
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
index ea4848e55d9..a98280b519a 100644
--- a/devel/gettext/patches/patch-ac
+++ b/devel/gettext/patches/patch-ac
@@ -1,18 +1,14 @@
-$NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $
+$NetBSD: patch-ac,v 1.2 2000/11/29 05:05:29 itojun Exp $
 
---- intl/Makefile.in.orig	Mon Apr 27 23:53:18 1998
-+++ intl/Makefile.in
-@@ -119,11 +119,11 @@ install-exec: all
- 	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
- 	  fi; \
+--- intl/Makefile.in.orig	Mon Apr 27 14:53:18 1998
++++ intl/Makefile.in	Tue Nov 28 21:02:03 2000
+@@ -121,3 +121,3 @@
  	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
 -	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+	  $(LIBTOOL) --mode=install ${INSTALL_DATA} libintl.la $(libdir); \
++	  $(LIBTOOL) install -c libintl.la $(libdir); \
  	else \
- 	  : ; \
+@@ -125,3 +125,3 @@
  	fi
 -install-data: all
 +install-data:
  	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r $(MKINSTALLDIRS); then \
- 	    $(MKINSTALLDIRS) $(gettextsrcdir); \
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index fd605336be6..a148709a9f4 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,19 +1,10 @@
-$NetBSD: patch-ak,v 1.2 2002/08/19 19:20:33 seb Exp $
+$NetBSD: patch-ak,v 1.1 2000/10/31 17:06:19 itojun Exp $
 
-Use locally-built msgfmt. And fix locale directory.
+use locally-built msgfmt.
 
---- po/Makefile.in.in.orig	Wed Apr 29 03:53:09 1998
-+++ po/Makefile.in.in
-@@ -20,7 +20,7 @@ prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
- localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
-@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL
+--- po/Makefile.in.in-	Wed Nov  1 01:46:43 2000
++++ po/Makefile.in.in	Wed Nov  1 01:47:00 2000
+@@ -30,9 +30,9 @@
  
  CC = @CC@
  GENCAT = @GENCAT@
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 91495728a53..c6d0a1cfb1c 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2002/08/19 18:39:16 seb Exp $
+# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:11 seb Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
 #
 
 DISTNAME=       make-3.79.1
 PKGNAME=        gmake-3.79.1
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU:=make/}
 
@@ -19,14 +18,6 @@ CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 TEXINFO_OVERRIDE=	YES
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${GMAKE_NSEC_TIMESTAMPS} == "NO")
-CONFIGURE_ARGS+=	--disable-nsec-timestamps
-.endif
-
-BUILD_DEFS+=	GMAKE_NSEC_TIMESTAMPS
-
 post-extract:
 	${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig
 	${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 667b2f8be49..210a70b20a5 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/19 19:07:19 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 2002/05/08 17:43:40 drochner Exp $
 #
 
-DISTNAME=	libusb-0.1.6a
+DISTNAME=	libusb-0.1.5
+PKGREVISION=1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 542fa5fec8d..d90c82c0a06 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/19 19:07:19 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/07 07:31:48 martti Exp $
 bin/libusb-config
 include/usb.h
 lib/libusb-0.1.so
 lib/libusb-0.1.so.5
-lib/libusb-0.1.so.5.1
+lib/libusb-0.1.so.5.0
 lib/libusb.a
 lib/libusb.la
 lib/libusb.so
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 52aa46b039a..5d5adc25111 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/08/19 19:07:19 mycroft Exp $
+$NetBSD: distinfo,v 1.6 2002/03/03 15:23:10 veego Exp $
 
-SHA1 (libusb-0.1.6a.tar.gz) = 79ef093d70b5f4597a4227178ad00b6aa5ed49b0
-Size (libusb-0.1.6a.tar.gz) = 180291 bytes
-SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
+SHA1 (libusb-0.1.5.tar.gz) = 519bb37993f01aefdc821cded229ca39e2112620
+Size (libusb-0.1.5.tar.gz) = 186539 bytes
+SHA1 (patch-ac) = 4e68ca416a75d54845bb0c19e17bd1c3d42ed252
+SHA1 (patch-ad) = 8674eb850989ecaaa9306f6da5919e7b025b363a
diff --git a/devel/libusb/patches/patch-ac b/devel/libusb/patches/patch-ac
index 77c9f483124..971a36d9e12 100644
--- a/devel/libusb/patches/patch-ac
+++ b/devel/libusb/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.2 2002/08/19 19:07:21 mycroft Exp $
+$NetBSD: patch-ac,v 1.1.1.1 2001/03/28 10:11:41 drochner Exp $
 
---- libusb-config.in.orig	Mon May 13 22:29:07 2002
-+++ libusb-config.in	Thu Jul 11 01:57:07 2002
+--- libusb-config.in.orig	Fri Feb 16 18:10:59 2001
++++ libusb-config.in	Fri Feb 16 18:12:52 2001
 @@ -75,5 +75,5 @@
  	echo $includes
  fi
  if test "$echo_libs" = "yes"; then
--	echo -L@libdir@ -lusb @OSLIBS@
-+	echo -L@libdir@ -Wl,-R@libdir@ -lusb @OSLIBS@
+-	echo -L@libdir@ -lusb
++	echo -L@libdir@ -Wl,-R@libdir@ -lusb
  fi
diff --git a/devel/libusb/patches/patch-ad b/devel/libusb/patches/patch-ad
new file mode 100644
index 00000000000..d0c08cf2d3f
--- /dev/null
+++ b/devel/libusb/patches/patch-ad
@@ -0,0 +1,109 @@
+$NetBSD: patch-ad,v 1.2 2002/03/03 15:22:28 veego Exp $
+
+--- bsd.c.orig	Thu Feb  7 07:43:25 2002
++++ bsd.c	Sun Mar  3 14:59:58 2002
+@@ -37,6 +37,16 @@
+ 
+ #include <dev/usb/usb.h>
+ 
++#ifndef USB_STACK_VERSION
++#define uai_interface_index interface_index
++#define uai_alt_no alt_no
++#define ucr_request request
++#define ucr_data data 
++#define ucr_flags flags
++#define udi_addr addr
++#define udi_devnames devnames
++#endif
++
+ #include "usbi.h"
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -151,8 +161,8 @@
+   if (dev->interface < 0)
+     USB_ERROR(-EINVAL);
+ 
+-  intf.interface_index = dev->interface;
+-  intf.alt_no = alternate;
++  intf.uai_interface_index = dev->interface;
++  intf.uai_alt_no = alternate;
+ 
+   ret = ioctl(dev->fd, USB_SET_ALTINTERFACE, &intf);
+   if (ret < 0)
+@@ -182,6 +192,11 @@
+ #else
+     snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->device->filename, ep);
+ #endif
++    /* Try to open it O_RDWR first for those devices which have in and out
++     * endpoints with the same address (eg 0x02 and 0x82)
++     */
++    fd = open(buf, O_RDWR);
++    if (fd < 0 && errno == ENXIO)
+     fd = open(buf, mode);
+     if (fd < 0)
+       USB_ERROR_STR(fd, "can't open %s for bulk read: %s\n",
+@@ -284,14 +299,14 @@
+     fprintf(stderr, "usb_control_msg: %d %d %d %d %p %d %d\n",
+             requesttype, request, value, index, bytes, size, timeout);
+ 
+-  req.request.bmRequestType = requesttype;
+-  req.request.bRequest = request;
+-  USETW(req.request.wValue, value);
+-  USETW(req.request.wIndex, index);
+-  USETW(req.request.wLength, size);
++  req.ucr_request.bmRequestType = requesttype;
++  req.ucr_request.bRequest = request;
++  USETW(req.ucr_request.wValue, value);
++  USETW(req.ucr_request.wIndex, index);
++  USETW(req.ucr_request.wLength, size);
+ 
+-  req.data = bytes;
+-  req.flags = 0;
++  req.ucr_data = bytes;
++  req.ucr_flags = 0;
+ 
+   ret = ioctl(dev->fd, USB_SET_TIMEOUT, &timeout);
+   if (ret < 0)
+@@ -303,7 +318,7 @@
+     USB_ERROR_STR(ret, "error sending control message: %s",
+                   strerror(errno));
+ 
+-  return UGETW(req.request.wLength);
++  return UGETW(req.ucr_request.wLength);
+ }
+ 
+ int usb_find_devices_on_bus(struct usb_bus *bus)
+@@ -321,20 +336,20 @@
+     struct usb_device *dev;
+     char buf[20];
+ 
+-    di.addr = device;
++    di.udi_addr = device;
+     if (ioctl(cfd, USB_DEVICEINFO, &di) < 0)
+       continue;
+ 
+     /* There's a device; is it one we should mess with? */
+ 
+-    if (strncmp(di.devnames[0], "ugen", 4) != 0)
++    if (strncmp(di.udi_devnames[0], "ugen", 4) != 0)
+       /* best not to play with things we don't understand */
+       continue;
+ 
+ #if __FreeBSD__
+-    snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.devnames[0]);
++    snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.udi_devnames[0]);
+ #else
+-    snprintf(buf, sizeof(buf) - 1, "/dev/%s.00", di.devnames[0]);
++    snprintf(buf, sizeof(buf) - 1, "/dev/%s.00", di.udi_devnames[0]);
+ #endif
+ 
+     /* Don't re-add it if we were called multiple times */
+@@ -364,7 +379,7 @@
+      * This seemed easier than having 2 variables...
+      */
+ #if __NetBSD__
+-    snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.devnames[0]);
++    snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.udi_devnames[0]);
+ #endif
+ 
+     strncpy(dev->filename, buf, sizeof(dev->filename) - 1);
diff --git a/emulators/compat11/Makefile b/emulators/compat11/Makefile
deleted file mode 100644
index 2c5ed1caae0..00000000000
--- a/emulators/compat11/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.12 1999/12/18 13:41:29 abs Exp $
-#
-
-DISTNAME=	compat11
-PKGNAME=	compat11-1.1
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	_${ARCH}.tgz
-
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.netbsd.org/Releases/formal-1.1/index.html
-
-DEPENDS+=	compat12-1.2.1:../../emulators/compat12
-
-ONLY_FOR_ARCHS=	amiga atari hp300 i386 mac68k mvme68k pc532 sparc sun3
-
-MIRROR_DISTFILE= no
-HAS_CONFIGURE=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/usr/lib
-PLIST_SRC=	${WRKSRC}/.PLIST
-
-pre-configure:
-	@${INSTALL} -c -m 755 ${FILESDIR}/configure ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
-
-# for sun3x in 1.3.x, get sun3 package
-.if (${ARCH} == "sun3x")
-ARCH=	sun3
-.endif
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 4137f3c5758..efea1d219dc 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/08/19 15:02:50 mycroft Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:33 hubertf Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
-PKGREVISION=	2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/
@@ -28,8 +28,8 @@ post-extract:
 	(cd ${WRKDIR}; ${GTAR} xzf sndserv.tgz)
 
 do-build:
-	cd ${WRKSRC}/${DISTNAME} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-	cd ${WRKSRC}/sndserv && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	cd ${WRKSRC}/${DISTNAME} ; ${GMAKE}
+	cd ${WRKSRC}/sndserv ; ${GMAKE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom ${PREFIX}/bin/xdoom
diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo
index 38b5dc48f07..a1b40ce20f2 100644
--- a/games/xdoom/distinfo
+++ b/games/xdoom/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/19 14:49:47 mycroft Exp $
+$NetBSD: distinfo,v 1.4 2002/07/29 11:09:50 blymn Exp $
 
 SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99
 Size (doomsrc.zip) = 362698 bytes
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = 32d4389a7fc2413d19fe8f66d6da9205effa710a
 SHA1 (patch-ac) = d47c6e1388f3d2d7ea5dbc074c5bec34adf14f1f
 SHA1 (patch-ad) = cb8e892e9fa561960da46c0bfea61bcf65246458
 SHA1 (patch-ae) = 5bba08b0ae36e3a9b9b48b1dba9570035cf1a54d
-SHA1 (patch-af) = 19367ee3112bfd0e5c054749347e642e6d0ff2ee
+SHA1 (patch-af) = 04b9683d1f4426240e83a47f9f14f7c0cc91a5e9
 SHA1 (patch-ag) = accb03154ee6fcd8771b5cd782bb4f4fb0c96b1b
 SHA1 (patch-ah) = 8ce7eff703079ca435bcffd125483285d8bade5c
 SHA1 (patch-ai) = 26222ea901448bf134bda6de0843f6fa6f220339
diff --git a/games/xdoom/patches/patch-af b/games/xdoom/patches/patch-af
index 1ce5414f854..9c6ffd33019 100644
--- a/games/xdoom/patches/patch-af
+++ b/games/xdoom/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2002/08/19 14:49:48 mycroft Exp $
+$NetBSD: patch-af,v 1.4 2000/02/03 16:01:15 abs Exp $
 
 --- linuxdoom-1.10/g_game.c.orig	Mon Dec 22 20:35:29 1997
 +++ linuxdoom-1.10/g_game.c	Thu Feb  3 01:33:47 2000
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.5 2002/08/19 14:49:48 mycroft Exp $
      {
 -      fprintf( stderr, "Demo is from a different game version!\n");
 +      fprintf( stderr, "Demo is from a different game version (%.2f / %.2f)!\n",
-+				    *demo_p/100.0, VERSION/100.0);
++				    demo_p[-1]/(float)100, VERSION/(float)100);
        gameaction = ga_nothing;
        return;
      }
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index a2f6d0da4a2..f81a950480f 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/08/19 18:57:57 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/12 18:29:29 mycroft Exp $
 
-DISTNAME=	ogle-0.8.5
+DISTNAME=	ogle-0.8.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -29,6 +29,5 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../misc/libdvdread/buildlink.mk"
 .include "../../textproc/libxml2/buildlink.mk"
-.include "../../audio/mad/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST
index 2930d742a19..291fa7ccafd 100644
--- a/graphics/ogle/PLIST
+++ b/graphics/ogle/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/19 18:57:57 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/12 18:29:29 mycroft Exp $
 bin/ifo_dump
 bin/ogle
 include/ogle/dvd.h
 include/ogle/dvdcontrol.h
 include/ogle/msgevents.h
 include/ogle/dvdevents.h
-lib/ogle/libmsgevents.so.5.0
-lib/ogle/libmsgevents.so.5
+lib/ogle/libmsgevents.so.4.0
+lib/ogle/libmsgevents.so.4
 lib/ogle/libmsgevents.so
 lib/ogle/libmsgevents.la
 lib/ogle/libmsgevents.a
-lib/ogle/libdvdcontrol.so.8.0
-lib/ogle/libdvdcontrol.so.8
+lib/ogle/libdvdcontrol.so.7.0
+lib/ogle/libdvdcontrol.so.7
 lib/ogle/libdvdcontrol.so
 lib/ogle/libdvdcontrol.la
 lib/ogle/libdvdcontrol.a
diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo
index dd1e78b4003..e3d724a4529 100644
--- a/graphics/ogle/distinfo
+++ b/graphics/ogle/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2002/08/19 18:57:58 mycroft Exp $
+$NetBSD: distinfo,v 1.6 2002/07/12 18:29:29 mycroft Exp $
 
-SHA1 (ogle-0.8.5.tar.gz) = b1853f49fa8847a3079f32ca4487845a9fbb549d
-Size (ogle-0.8.5.tar.gz) = 449086 bytes
+SHA1 (ogle-0.8.4.tar.gz) = 15ab65b6ec9cd7631b1c4341896072fa308fc15c
+Size (ogle-0.8.4.tar.gz) = 437475 bytes
 SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef
-SHA1 (patch-ab) = 30907590717a329cb7d2456647971055bf038f7d
+SHA1 (patch-ab) = 4f921f7c65de8bc0f9b1ef54442ae6f9462bb8d3
 SHA1 (patch-ac) = 0443cd0493039150c79b54f876349ab2c7601fcf
 SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26
 SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58
-SHA1 (patch-ag) = 67fad5e4962ace6dfc65492361f29fed029babc2
+SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7
 SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc
 SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d
diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab
index d02f30952d1..a4775be0d4d 100644
--- a/graphics/ogle/patches/patch-ab
+++ b/graphics/ogle/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $
+$NetBSD: patch-ab,v 1.3 2002/07/12 18:29:29 mycroft Exp $
 
---- configure.in.orig	Mon Aug  5 18:30:55 2002
-+++ configure.in	Mon Aug 12 18:35:45 2002
-@@ -403,16 +403,16 @@
+--- configure.in.orig	Sat Jun 29 22:49:43 2002
++++ configure.in	Thu Jul 11 02:18:38 2002
+@@ -351,16 +351,16 @@
      esac
  fi
  
@@ -20,10 +20,10 @@ $NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $
  dnl sys/audioio.h
 -        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao OpenBSD audio support])
 +        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao NetBSD/OpenBSD audio support])
- 	BUILD_AUDIO_OBSD=1
  	DEFAULT_AUDIO_DRIVER="obsd"
  	DEFAULT_AUDIO_DEVICE="/dev/audio"
-@@ -425,7 +425,7 @@
+     ;;
+@@ -372,7 +372,7 @@
      [  --disable-sunaudio      make a version not using Sun audio])
  if test "x$enable_sunaudio" != xno; then
      case "$host" in
diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag
index 8af3b5a5fd9..14b7ff172a4 100644
--- a/graphics/ogle/patches/patch-ag
+++ b/graphics/ogle/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.2 2002/08/19 18:57:59 mycroft Exp $
+$NetBSD: patch-ag,v 1.1 2002/06/16 18:12:59 wiz Exp $
 
---- ogle/dvdcontrol.h.orig	Sat Aug  3 17:34:50 2002
-+++ ogle/dvdcontrol.h	Mon Aug 12 18:37:09 2002
+--- ogle/dvdcontrol.h.orig	Tue Apr  2 21:06:05 2002
++++ ogle/dvdcontrol.h	Thu Jun 13 13:57:32 2002
 @@ -22,7 +22,7 @@
  #include <ogle/dvd.h>
- #include <ogle/msgevents.h> /* Only for the hack with DVDNextEvent !! */
+ #include <ogle/msgevents.h> // Only for the hack with DVDNextEvent !!
  
 -#if (defined(__unix__) || defined(unix)) && !defined(USG)
 +#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG)
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 1c4cc162857..6099209bbd1 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/08/19 18:58:00 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 2002/06/16 18:34:19 wiz Exp $
 
-DISTNAME=	ogle_gui-0.8.5
+DISTNAME=	ogle_gui-0.8.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	GUI for the Ogle DVD player
 
-DEPENDS+=	ogle>=0.8.5:../../graphics/ogle
+DEPENDS+=	ogle>=0.8.3:../../graphics/ogle
 # Normally, we would use the "../../devel/libglade/buildlink.mk" file,
 # but this doesn't work here, because ogle_gui wants libxml2 and the
 # buildlink file for libglade would also link it with libxml1.
diff --git a/graphics/ogle_gui/distinfo b/graphics/ogle_gui/distinfo
index fb4067324e7..15c61ca3f74 100644
--- a/graphics/ogle_gui/distinfo
+++ b/graphics/ogle_gui/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/08/19 18:58:00 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2002/06/16 18:34:19 wiz Exp $
 
-SHA1 (ogle_gui-0.8.5.tar.gz) = e24f2b0dec2b91995e44b713328999f0add3bda4
-Size (ogle_gui-0.8.5.tar.gz) = 370182 bytes
+SHA1 (ogle_gui-0.8.3.tar.gz) = aa418375f455f82fbff7b4af04d44e36f9c0a7cf
+Size (ogle_gui-0.8.3.tar.gz) = 354405 bytes
 SHA1 (patch-aa) = 1238dfb676a32186231c3be20441b279f70329ff
 SHA1 (patch-ac) = 5a06dcc97b6749d533eaab1ba9d1128ca2a8368c
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 4378c4c3ccf..9c35585bf76 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.1 2002/02/10 00:50:42 rh Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
@@ -12,7 +12,7 @@ COMMENT?=	API for access to scanners, digitals camera, frame grabbers etc.
 
 SANE_MAJOR=	1
 SANE_MINOR=	0
-SANE_MICRO=	8
+SANE_MICRO=	7
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR}
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 29ecfa3fb20..753a51046cd 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/10 00:50:42 rh Exp $
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
@@ -9,19 +9,15 @@ etc/sane.d/artec.conf
 etc/sane.d/avision.conf
 etc/sane.d/bh.conf
 etc/sane.d/canon.conf
-etc/sane.d/canon630u.conf
 etc/sane.d/coolscan.conf
-etc/sane.d/coolscan2.conf
 etc/sane.d/dc210.conf
 etc/sane.d/dc240.conf
 etc/sane.d/dc25.conf
 etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
 etc/sane.d/epson.conf
-etc/sane.d/fujitsu.conf
 etc/sane.d/hp.conf
-etc/sane.d/leo.conf
-etc/sane.d/matsushita.conf
+etc/sane.d/m3096g.conf
 etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
@@ -34,14 +30,11 @@ etc/sane.d/plustek.conf
 etc/sane.d/ricoh.conf
 etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
-etc/sane.d/sceptre.conf
 etc/sane.d/sharp.conf
 etc/sane.d/snapscan.conf
 etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
-etc/sane.d/teco1.conf
-etc/sane.d/test.conf
 etc/sane.d/umax.conf
 etc/sane.d/umax1220u.conf
 etc/sane.d/umax_pp.conf
@@ -52,182 +45,192 @@ lib/libsane.la
 lib/libsane.so
 lib/libsane.so.${SANE_MAJOR}
 lib/libsane.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-abaton.a
 lib/sane/libsane-abaton.la
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.${SANE_MAJOR}
 lib/sane/libsane-abaton.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-agfafocus.a
 lib/sane/libsane-agfafocus.la
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.${SANE_MAJOR}
 lib/sane/libsane-agfafocus.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-apple.a
 lib/sane/libsane-apple.la
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.${SANE_MAJOR}
 lib/sane/libsane-apple.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-artec.a
 lib/sane/libsane-artec.la
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.${SANE_MAJOR}
 lib/sane/libsane-artec.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-as6e.a
 lib/sane/libsane-as6e.la
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.${SANE_MAJOR}
 lib/sane/libsane-as6e.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-avision.a
 lib/sane/libsane-avision.la
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.${SANE_MAJOR}
 lib/sane/libsane-avision.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-bh.a
 lib/sane/libsane-bh.la
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.${SANE_MAJOR}
 lib/sane/libsane-bh.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.${SANE_MAJOR}
 lib/sane/libsane-canon.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-canon630u.la
-lib/sane/libsane-canon630u.so
-lib/sane/libsane-canon630u.so.${SANE_MAJOR}
-lib/sane/libsane-canon630u.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.${SANE_MAJOR}
 lib/sane/libsane-coolscan.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-coolscan2.la
-lib/sane/libsane-coolscan2.so
-lib/sane/libsane-coolscan2.so.${SANE_MAJOR}
-lib/sane/libsane-coolscan2.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-dc210.a
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.${SANE_MAJOR}
 lib/sane/libsane-dc210.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-dc240.a
 lib/sane/libsane-dc240.la
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.${SANE_MAJOR}
 lib/sane/libsane-dc240.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.${SANE_MAJOR}
 lib/sane/libsane-dc25.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.${SANE_MAJOR}
 lib/sane/libsane-dll.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.la
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.${SANE_MAJOR}
 lib/sane/libsane-dmc.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-epson.a
 lib/sane/libsane-epson.la
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.${SANE_MAJOR}
 lib/sane/libsane-epson.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-fujitsu.la
-lib/sane/libsane-fujitsu.so
-lib/sane/libsane-fujitsu.so.${SANE_MAJOR}
-lib/sane/libsane-fujitsu.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.${SANE_MAJOR}
 lib/sane/libsane-hp.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-leo.la
-lib/sane/libsane-leo.so
-lib/sane/libsane-leo.so.${SANE_MAJOR}
-lib/sane/libsane-leo.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-matsushita.la
-lib/sane/libsane-matsushita.so
-lib/sane/libsane-matsushita.so.${SANE_MAJOR}
-lib/sane/libsane-matsushita.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-m3096g.a
+lib/sane/libsane-m3096g.la
+lib/sane/libsane-m3096g.so
+lib/sane/libsane-m3096g.so.${SANE_MAJOR}
+lib/sane/libsane-m3096g.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.${SANE_MAJOR}
 lib/sane/libsane-microtek.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.la
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.${SANE_MAJOR}
 lib/sane/libsane-microtek2.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.${SANE_MAJOR}
 lib/sane/libsane-mustek.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-mustek_pp.a
 lib/sane/libsane-mustek_pp.la
 lib/sane/libsane-mustek_pp.so
 lib/sane/libsane-mustek_pp.so.${SANE_MAJOR}
 lib/sane/libsane-mustek_pp.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-mustek_usb.a
 lib/sane/libsane-mustek_usb.la
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.${SANE_MAJOR}
 lib/sane/libsane-mustek_usb.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-nec.a
 lib/sane/libsane-nec.la
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.${SANE_MAJOR}
 lib/sane/libsane-nec.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-net.a
 lib/sane/libsane-net.la
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.${SANE_MAJOR}
 lib/sane/libsane-net.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-pie.a
 lib/sane/libsane-pie.la
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.${SANE_MAJOR}
 lib/sane/libsane-pie.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-pint.a
 lib/sane/libsane-pint.la
 lib/sane/libsane-pint.so
 lib/sane/libsane-pint.so.${SANE_MAJOR}
 lib/sane/libsane-pint.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-plustek.a
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.${SANE_MAJOR}
 lib/sane/libsane-plustek.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-ricoh.a
 lib/sane/libsane-ricoh.la
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.${SANE_MAJOR}
 lib/sane/libsane-ricoh.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.${SANE_MAJOR}
 lib/sane/libsane-s9036.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-sceptre.la
-lib/sane/libsane-sceptre.so
-lib/sane/libsane-sceptre.so.${SANE_MAJOR}
-lib/sane/libsane-sceptre.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-sharp.a
 lib/sane/libsane-sharp.la
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.${SANE_MAJOR}
 lib/sane/libsane-sharp.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-sm3600.a
 lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3600.so
 lib/sane/libsane-sm3600.so.${SANE_MAJOR}
 lib/sane/libsane-sm3600.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.${SANE_MAJOR}
 lib/sane/libsane-snapscan.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-sp15c.a
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.${SANE_MAJOR}
 lib/sane/libsane-sp15c.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-st400.a
 lib/sane/libsane-st400.la
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.${SANE_MAJOR}
 lib/sane/libsane-st400.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.${SANE_MAJOR}
 lib/sane/libsane-tamarack.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-teco1.la
-lib/sane/libsane-teco1.so
-lib/sane/libsane-teco1.so.${SANE_MAJOR}
-lib/sane/libsane-teco1.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-test.la
-lib/sane/libsane-test.so
-lib/sane/libsane-test.so.${SANE_MAJOR}
-lib/sane/libsane-test.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-umax.a
 lib/sane/libsane-umax.la
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.${SANE_MAJOR}
 lib/sane/libsane-umax.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-umax1220u.a
 lib/sane/libsane-umax1220u.la
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.${SANE_MAJOR}
 lib/sane/libsane-umax1220u.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-umax_pp.a
 lib/sane/libsane-umax_pp.la
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.${SANE_MAJOR}
@@ -243,10 +246,7 @@ man/man5/sane-as6e.5
 man/man5/sane-avision.5
 man/man5/sane-bh.5
 man/man5/sane-canon.5
-man/man5/sane-canon630u.5
-man/man5/sane-canon_pp.5
 man/man5/sane-coolscan.5
-man/man5/sane-coolscan2.5
 man/man5/sane-dc210.5
 man/man5/sane-dc240.5
 man/man5/sane-dc25.5
@@ -256,8 +256,6 @@ man/man5/sane-epson.5
 man/man5/sane-fujitsu.5
 man/man5/sane-gphoto2.5
 man/man5/sane-hp.5
-man/man5/sane-leo.5
-man/man5/sane-matsushita.5
 man/man5/sane-microtek.5
 man/man5/sane-microtek2.5
 man/man5/sane-mustek.5
@@ -272,16 +270,12 @@ man/man5/sane-pnm.5
 man/man5/sane-qcam.5
 man/man5/sane-ricoh.5
 man/man5/sane-s9036.5
-man/man5/sane-sceptre.5
 man/man5/sane-scsi.5
 man/man5/sane-sharp.5
 man/man5/sane-sm3600.5
 man/man5/sane-snapscan.5
-man/man5/sane-sp15c.5
 man/man5/sane-st400.5
 man/man5/sane-tamarack.5
-man/man5/sane-teco1.5
-man/man5/sane-test.5
 man/man5/sane-umax.5
 man/man5/sane-umax1220u.5
 man/man5/sane-umax_pp.5
@@ -309,12 +303,9 @@ share/doc/sane-${SANE_VERSION}/TODO
 share/doc/sane-${SANE_VERSION}/backend-writing.txt
 share/doc/sane-${SANE_VERSION}/canon/canon.changes
 share/doc/sane-${SANE_VERSION}/canon/canon.install2700F.txt
-share/doc/sane-${SANE_VERSION}/matsushita/matsushita.txt
 share/doc/sane-${SANE_VERSION}/mustek/mustek.CHANGES
 share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.CHANGES
 share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.TODO
-share/doc/sane-${SANE_VERSION}/sceptre/s1200.txt
-share/doc/sane-${SANE_VERSION}/teco/teco1.txt
 share/doc/sane-${SANE_VERSION}/umax/sane-logo.jpg
 share/doc/sane-${SANE_VERSION}/umax/sane-logo2.jpg
 share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced-options-doc.html
@@ -349,11 +340,8 @@ share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES
 share/doc/sane-${SANE_VERSION}/umax/umax.FAQ
 share/doc/sane-${SANE_VERSION}/umax/umax.TODO
 @dirrm share/doc/sane-${SANE_VERSION}/umax
-@dirrm share/doc/sane-${SANE_VERSION}/teco
-@dirrm share/doc/sane-${SANE_VERSION}/sceptre
 @dirrm share/doc/sane-${SANE_VERSION}/mustek_usb
 @dirrm share/doc/sane-${SANE_VERSION}/mustek
-@dirrm share/doc/sane-${SANE_VERSION}/matsushita
 @dirrm share/doc/sane-${SANE_VERSION}/canon
 @dirrm share/doc/sane-${SANE_VERSION}
 @dirrm lib/sane
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index f86fa80337c..6acb19ca668 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $
+$NetBSD: distinfo,v 1.8 2002/02/18 23:49:07 mycroft Exp $
 
-SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a
-Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes
-SHA1 (patch-aa) = ace1112377c0a330d80183193bf15b8ffbff2da3
+SHA1 (sane-backends-1.0.7.tar.gz) = 5e527b62d067b50965155d9e0836c207139307e5
+Size (sane-backends-1.0.7.tar.gz) = 1867577 bytes
+SHA1 (patch-aa) = c17cbd11a05dcf62d0c2183859eeeac259a0026a
+SHA1 (patch-ae) = ea66a072d1b0d22eacaab77b2aee8fe06a461706
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 015b78b3531..d4b76c6b251 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $
+$NetBSD: patch-aa,v 1.4 2002/02/10 00:50:42 rh Exp $
 
---- doc/Makefile.in.orig	Sun May  5 16:59:45 2002
-+++ doc/Makefile.in	Sat Jul 13 03:15:58 2002
+--- doc/Makefile.in.orig	Sat Jan 19 17:58:06 2002
++++ doc/Makefile.in
 @@ -24,7 +24,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -11,18 +11,18 @@ $NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $
  
  MKDIR = $(top_srcdir)/mkinstalldirs
  INSTALL = @INSTALL@
-@@ -54,7 +54,7 @@
+@@ -51,7 +51,7 @@
  READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
            PROJECTS README README.aix README.hp-ux README.linux README.os2 \
            README.solaris README.unixware2 README.unixware7 TODO
 -DOCS    = backend-writing.txt sane.ps sane.dvi
 +DOCS    = backend-writing.txt
- BACKDIRS= canon matsushita mustek mustek_usb umax sceptre teco
+ BACKDIRS= canon mustek mustek_usb umax
  LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS latex
  DLH	= TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
-@@ -89,7 +89,7 @@
+@@ -82,7 +82,7 @@
  .PHONY: all clean depend dist distclean html html-man install \
-   install-mostang sane-html uninstall
+   install-mostang sane-backends.html sane-html uninstall
  
 -all: sane.ps $(MANPAGES) 
 +all: $(MANPAGES) 
diff --git a/graphics/sane-backends/patches/patch-ae b/graphics/sane-backends/patches/patch-ae
new file mode 100644
index 00000000000..ceeb2505270
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ae
@@ -0,0 +1,61 @@
+$NetBSD: patch-ae,v 1.2 2002/02/18 23:49:08 mycroft Exp $
+
+--- frontend/scanimage.c.orig	Sat Feb 16 12:54:39 2002
++++ frontend/scanimage.c	Sat Feb 16 13:06:23 2002
+@@ -64,6 +64,9 @@
+ }
+ Image;
+ 
++
++void damn_i386_centric_vprintf(const char *, const char **);
++
+ #define OPTION_FORMAT   1001
+ #define OPTION_MD5	1002
+ #define OPTION_BATCH_COUNT	1003
+@@ -1561,8 +1564,8 @@
+ 	                  }
+ 	                start = percent;
+ 	              }
+-	            vprintf(fmt, arglist);
+-		    va_end(arglist);
++	            damn_i386_centric_vprintf(fmt, arglist);
++		    free(arglist);
+ 	          }
+ 	      }
+ 	        
+@@ -1910,3 +1913,35 @@
+ 
+   return status;
+ }
++
++void damn_i386_centric_vprintf(const char *fmt, const char **arglist)
++	{
++	int c;
++
++	while(c = *fmt++)
++		{
++		switch(c)
++			{
++			case '%':
++				switch(*fmt++)
++					{
++					case 'i':
++						fprintf(stdout, "%d", (int) *arglist++);
++						break;
++					case 's':
++						fputs(*arglist++, stdout);
++						break;
++					case '%':
++					default:
++						fputc('%', stdout);
++						break;
++					}
++				break;
++
++			default:
++				fputc(c, stdout);
++				break;
++			}
++		}
++	}
++
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 094f8822f06..68cd1e855fe 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/08/19 19:18:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:17 fredb Exp $
 
 .include "../../graphics/sane-backends/Makefile.common"
 
 DISTNAME=       sane-frontends-${SANE_VERSION}
+PKGREVISION=	1
 
 COMMENT=	Frontends for access to scanners, digitals camera, frame grabbers etc
 
diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo
index 04983bc6e18..214b32487e3 100644
--- a/graphics/sane-frontends/distinfo
+++ b/graphics/sane-frontends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/19 19:18:31 mycroft Exp $
+$NetBSD: distinfo,v 1.4 2002/02/10 00:52:18 rh Exp $
 
-SHA1 (sane-frontends-1.0.8.tar.gz) = ccf798639e2b4f852aab4abc9e53077f51797df6
-Size (sane-frontends-1.0.8.tar.gz) = 173886 bytes
+SHA1 (sane-frontends-1.0.7.tar.gz) = 8db056bb620212429062647d74adc4b904d5bde9
+Size (sane-frontends-1.0.7.tar.gz) = 172061 bytes
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index f56074c1193..f85929e5a2b 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2002/08/19 19:36:48 mycroft Exp $
+# $NetBSD: Makefile,v 1.32 2002/03/13 17:37:19 fredb Exp $
 #
 
-DISTNAME=	xsane-0.86
+DISTNAME=	xsane-0.80
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xsane/PLIST b/graphics/xsane/PLIST
index 280ab1baab5..5f6273bbb52 100644
--- a/graphics/xsane/PLIST
+++ b/graphics/xsane/PLIST
@@ -1,120 +1,93 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/19 19:36:48 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:48 zuntum Exp $
 bin/xsane
 man/man1/xsane.1
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xsane.mo
+share/locale/cs/LC_MESSAGES/xsane.mo
+share/locale/de/LC_MESSAGES/xsane.mo
+share/locale/fr/LC_MESSAGES/xsane.mo
+share/locale/it/LC_MESSAGES/xsane.mo
+share/locale/ja/LC_MESSAGES/xsane.mo
+share/locale/ru/LC_MESSAGES/xsane.mo
+share/locale/sl/LC_MESSAGES/xsane.mo
+share/locale/sv/LC_MESSAGES/xsane.mo
+share/locale/tr/LC_MESSAGES/xsane.mo
+share/sane/sane-backends-doc.html
+share/sane/sane-pnm-doc.html
+share/sane/sane-problems-doc.html
+share/sane/sane-scantips-doc.html
+share/sane/sane-xsane-advanced-doc.html
+share/sane/sane-xsane-color-correction-doc.html
+share/sane/sane-xsane-copy-doc.html
+share/sane/sane-xsane-doc.html
+share/sane/sane-xsane-empty-doc.html
+share/sane/sane-xsane-fax-doc.html
+share/sane/sane-xsane-gimp-doc.html
+share/sane/sane-xsane-histogram-doc.html
+share/sane/sane-xsane-main-doc.html
+share/sane/sane-xsane-preview-doc.html
+share/sane/sane-xsane-scan-doc.html
+share/sane/sane-xsane-setup-copy-doc.html
+share/sane/sane-xsane-setup-display-doc.html
+share/sane/sane-xsane-setup-enhancement-doc.html
+share/sane/sane-xsane-setup-fax-doc.html
+share/sane/sane-xsane-setup-image-doc.html
+share/sane/sane-xsane-setup-mail-doc.html
+share/sane/sane-xsane-setup-save-doc.html
+share/sane/sane-xsane-standard-doc.html
+share/sane/xsane-advanced.jpg
+share/sane/xsane-autoenhance.jpg
+share/sane/xsane-autoselect.jpg
+share/sane/xsane-brightness.jpg
+share/sane/xsane-colormode.jpg
+share/sane/xsane-contrast.jpg
+share/sane/xsane-copy.jpg
+share/sane/xsane-default.jpg
+share/sane/xsane-delete-preview-cache.jpg
+share/sane/xsane-disk.jpg
+share/sane/xsane-fax-project.jpg
+share/sane/xsane-fax.jpg
+share/sane/xsane-gamma.jpg
+share/sane/xsane-gimp.jpg
+share/sane/xsane-histogram.jpg
+share/sane/xsane-logo2.jpg
+share/sane/xsane-negative.jpg
+share/sane/xsane-pipette-black.jpg
+share/sane/xsane-pipette-gray.jpg
+share/sane/xsane-pipette-white.jpg
+share/sane/xsane-preferences.jpg
+share/sane/xsane-preset-area.jpg
+share/sane/xsane-preview.jpg
+share/sane/xsane-printer.jpg
+share/sane/xsane-resolution.jpg
+share/sane/xsane-restore.jpg
+share/sane/xsane-rgb-default.jpg
+share/sane/xsane-rotation.jpg
+share/sane/xsane-scansource.jpg
+share/sane/xsane-setup-copy.jpg
+share/sane/xsane-setup-display.jpg
+share/sane/xsane-setup-enhancement.jpg
+share/sane/xsane-setup-fax.jpg
+share/sane/xsane-setup-image.jpg
+share/sane/xsane-setup-mail.jpg
+share/sane/xsane-setup-save.jpg
+share/sane/xsane-standard.jpg
+share/sane/xsane-store.jpg
+share/sane/xsane-threshold.jpg
+share/sane/xsane-visible-area.jpg
+share/sane/xsane-zoom-in.jpg
+share/sane/xsane-zoom-not.jpg
+share/sane/xsane-zoom-out.jpg
+share/sane/xsane-zoom-undo.jpg
+share/sane/xsane-zoom.jpg
+share/sane/xsane.jpg
 share/sane/xsane/Mustek-logo.xpm
-share/sane/xsane/Plustek-logo.xpm
 share/sane/xsane/UMAX-logo.xpm
-share/sane/xsane/doc/sane-backends-doc.html
-share/sane/xsane/doc/sane-pnm-doc.html
-share/sane/xsane/doc/sane-problems-doc.html
-share/sane/xsane/doc/sane-scantips-doc.html
-share/sane/xsane/doc/sane-xsane-advanced-doc.html
-share/sane/xsane/doc/sane-xsane-color-correction-doc.html
-share/sane/xsane/doc/sane-xsane-copy-doc.html
-share/sane/xsane/doc/sane-xsane-doc.html
-share/sane/xsane/doc/sane-xsane-empty-doc.html
-share/sane/xsane/doc/sane-xsane-fax-doc.html
-share/sane/xsane/doc/sane-xsane-gimp-doc.html
-share/sane/xsane/doc/sane-xsane-histogram-doc.html
-share/sane/xsane/doc/sane-xsane-mail-doc.html
-share/sane/xsane/doc/sane-xsane-main-doc.html
-share/sane/xsane/doc/sane-xsane-preview-doc.html
-share/sane/xsane/doc/sane-xsane-save-doc.html
-share/sane/xsane/doc/sane-xsane-setup-copy-doc.html
-share/sane/xsane/doc/sane-xsane-setup-display-doc.html
-share/sane/xsane/doc/sane-xsane-setup-enhancement-doc.html
-share/sane/xsane/doc/sane-xsane-setup-fax-doc.html
-share/sane/xsane/doc/sane-xsane-setup-image-doc.html
-share/sane/xsane/doc/sane-xsane-setup-mail-doc.html
-share/sane/xsane/doc/sane-xsane-setup-save-doc.html
-share/sane/xsane/doc/sane-xsane-standard-doc.html
-share/sane/xsane/doc/sane-xsane-viewer-doc.html
-share/sane/xsane/doc/xsane-advanced.jpg
-share/sane/xsane/doc/xsane-autoenhance.jpg
-share/sane/xsane/doc/xsane-autoraise_scanarea.jpg
-share/sane/xsane/doc/xsane-autoselect.jpg
-share/sane/xsane/doc/xsane-blur.jpg
-share/sane/xsane/doc/xsane-brightness.jpg
-share/sane/xsane/doc/xsane-clone.jpg
-share/sane/xsane/doc/xsane-colormode.jpg
-share/sane/xsane/doc/xsane-contrast.jpg
-share/sane/xsane/doc/xsane-copy.jpg
-share/sane/xsane/doc/xsane-default.jpg
-share/sane/xsane/doc/xsane-delete-preview-cache.jpg
-share/sane/xsane/doc/xsane-despeckle.jpg
-share/sane/xsane/doc/xsane-disk.jpg
-share/sane/xsane/doc/xsane-fax-project.jpg
-share/sane/xsane/doc/xsane-fax.jpg
-share/sane/xsane/doc/xsane-gamma.jpg
-share/sane/xsane/doc/xsane-gimp.jpg
-share/sane/xsane/doc/xsane-histogram.jpg
-share/sane/xsane/doc/xsane-logo2.jpg
-share/sane/xsane/doc/xsane-mail-project.jpg
-share/sane/xsane/doc/xsane-mail.jpg
-share/sane/xsane/doc/xsane-medium.jpg
-share/sane/xsane/doc/xsane-mirror-x.jpg
-share/sane/xsane/doc/xsane-mirror-y.jpg
-share/sane/xsane/doc/xsane-negative.jpg
-share/sane/xsane/doc/xsane-ocr.jpg
-share/sane/xsane/doc/xsane-pipette-black.jpg
-share/sane/xsane/doc/xsane-pipette-gray.jpg
-share/sane/xsane/doc/xsane-pipette-white.jpg
-share/sane/xsane/doc/xsane-preferences.jpg
-share/sane/xsane/doc/xsane-preset-area.jpg
-share/sane/xsane/doc/xsane-preview.jpg
-share/sane/xsane/doc/xsane-printer.jpg
-share/sane/xsane/doc/xsane-resolution.jpg
-share/sane/xsane/doc/xsane-restore.jpg
-share/sane/xsane/doc/xsane-rgb-default.jpg
-share/sane/xsane/doc/xsane-rotate-180.jpg
-share/sane/xsane/doc/xsane-rotate-270.jpg
-share/sane/xsane/doc/xsane-rotate-90.jpg
-share/sane/xsane/doc/xsane-rotation.jpg
-share/sane/xsane/doc/xsane-save.jpg
-share/sane/xsane/doc/xsane-scale.jpg
-share/sane/xsane/doc/xsane-scansource.jpg
-share/sane/xsane/doc/xsane-setup-copy.jpg
-share/sane/xsane/doc/xsane-setup-display.jpg
-share/sane/xsane/doc/xsane-setup-enhancement.jpg
-share/sane/xsane/doc/xsane-setup-fax.jpg
-share/sane/xsane/doc/xsane-setup-image.jpg
-share/sane/xsane/doc/xsane-setup-mail.jpg
-share/sane/xsane/doc/xsane-setup-ocr.jpg
-share/sane/xsane/doc/xsane-setup-save.jpg
-share/sane/xsane/doc/xsane-standard.jpg
-share/sane/xsane/doc/xsane-store.jpg
-share/sane/xsane/doc/xsane-threshold.jpg
-share/sane/xsane/doc/xsane-viewer-window.jpg
-share/sane/xsane/doc/xsane-viewer.jpg
-share/sane/xsane/doc/xsane-visible-area.jpg
-share/sane/xsane/doc/xsane-zoom-in.jpg
-share/sane/xsane/doc/xsane-zoom-not.jpg
-share/sane/xsane/doc/xsane-zoom-out.jpg
-share/sane/xsane/doc/xsane-zoom-undo.jpg
-share/sane/xsane/doc/xsane-zoom.jpg
-share/sane/xsane/doc/xsane.jpg
 share/sane/xsane/sane-epson-logo.xpm
 share/sane/xsane/sane-hp-logo.xpm
 share/sane/xsane/sane-umax-logo.xpm
 share/sane/xsane/sane-xsane-logo.xpm
 share/sane/xsane/xsane-calibration.pnm
-share/sane/xsane/xsane-eula.txt
-share/sane/xsane/xsane-gpl.txt
+share/sane/xsane/xsane-license.txt
 share/sane/xsane/xsane-logo.xpm
 share/sane/xsane/xsane-startimage.pnm
 share/sane/xsane/xsane-style.rc
-@dirrm share/sane/xsane/doc
 @dirrm share/sane/xsane
-@dirrm share/sane
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index a0946f5243f..3dd609ce80a 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/19 19:36:49 mycroft Exp $
+$NetBSD: distinfo,v 1.4 2001/10/15 21:28:42 veego Exp $
 
-SHA1 (xsane-0.86.tar.gz) = 9ca1dc7be786073101a9eda4e77555aac455422c
-Size (xsane-0.86.tar.gz) = 2259870 bytes
+SHA1 (xsane-0.80.tar.gz) = da176c70271ab22666ab79fa7b2af61a3037fd4c
+Size (xsane-0.80.tar.gz) = 1364632 bytes
diff --git a/lang/gcc/PLIST.SunOS b/lang/gcc/PLIST.SunOS
index 198a1964052..3fa50da5419 100644
--- a/lang/gcc/PLIST.SunOS
+++ b/lang/gcc/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2002/08/19 18:20:08 seb Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.3 2002/03/14 16:21:57 wiz Exp $
 ${MACHINE_GNU_PLATFORM}/include/_G_config.h
 ${MACHINE_GNU_PLATFORM}/include/assert.h
 bin/${MACHINE_GNU_PLATFORM}-gcc
@@ -294,8 +294,8 @@ lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.a
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.so
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/specs
 lib/libiberty.a
-lib/libstdc++.a.2.10.0
-lib/libstdc++.so.2.10.0
+lib/libstdc++.a.2.10.0nb1
+lib/libstdc++.so.2.10.0nb1
 man/man1/cccp.1
 man/man1/g++.1
 man/man1/g77.1
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 1bc8007f358..8f90ea39222 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.82 2002/08/19 18:39:14 seb Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.81 2002/08/15 00:34:04 fredb Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -575,12 +575,6 @@ GAWK_ENABLE_PORTALS?=	NO
 # Possible: YES, NO
 # Default: NO
 
-GMAKE_NSEC_TIMESTAMPS?=	NO
-# Used by GNU make to enable/disable support of micro- and nano-second
-# timestamp values provided by stat(2).
-# Possible: YES, NO
-# Default: NO
-
 #GQMPEG_NO_JAPANESE?=	yes
 # Can be enabled to handle keep gqmpeg from interpreting ID3 tags
 # different, to make it possible to read japanese language tags, which
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 8588e8378a1..e4faac200df 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/08/19 18:26:22 seb Exp $
+$NetBSD: distinfo,v 1.9 2002/06/28 06:03:04 itojun Exp $
 
 SHA1 (bind/8.3.3/bind-src.tar.gz) = d78e1e0818c16e6a81b2fbd545b564e73c1229fe
 Size (bind/8.3.3/bind-src.tar.gz) = 1411990 bytes
@@ -10,4 +10,3 @@ SHA1 (patch-ac) = fdf75b6b53fe4b9ab6ca74b90400edda54a825b1
 SHA1 (patch-ad) = 6ac74cfd60df2a9eb9b3dc7c74dab1dc68feadad
 SHA1 (patch-ae) = 06268d28805c287721954de0676abf9327f64e13
 SHA1 (patch-af) = 9dacac60b3ad0101330144d29a3f0ee4108fe781
-SHA1 (patch-ag) = 9bf580c08118b44b4f82810ea65cb82b55bb506c
diff --git a/net/tnftp/files/install-sh b/net/tnftp/files/install-sh
deleted file mode 100755
index e9de23842dc..00000000000
--- a/net/tnftp/files/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/net/tnftp/files/libedit/Makefile.in b/net/tnftp/files/libedit/Makefile.in
deleted file mode 100644
index 65304b33245..00000000000
--- a/net/tnftp/files/libedit/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#	$Id: Makefile.in,v 1.1.1.1 1999/10/11 07:02:45 lukem Exp $
-#
-
-srcdir	= @srcdir@
-VPATH	= @srcdir@
-SHELL	= /bin/sh
-
-CC	= @CC@
-CFLAGS	= -I${srcdir} -I${srcdir}/.. -I. -I.. @INCLUDES@ @CFLAGS@
-
-AR	= @AR@
-RANLIB	= @RANLIB@
-
-LIB	= libedit.a
-
-SRCS	= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
-	  parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c \
-	  tokenizer.c history.c
-OBJS	= ${SRCS:.c=.o}
-
-
-all:	${LIB}
-
-${LIB}: ${OBJS}
-	${AR} cr $@ ${OBJS}
-	${RANLIB} $@
-
-install:
-
-clean:
-	rm -f ${LIB} ${OBJS}
-	rm -f common.h emacs.h fcns.c fcns.h help.c help.h vi.h
-
-distclean: clean
-	rm -f Makefile makelist
-
-
-vi.h: vi.c
-	sh makelist -h ${srcdir}/vi.c > $@
-
-emacs.h: emacs.c
-	sh makelist -h ${srcdir}/emacs.c > $@
-
-common.h: common.c
-	sh makelist -h ${srcdir}/common.c > $@
-
-fcns.h: vi.h emacs.h common.h
-	sh makelist -fh vi.h emacs.h common.h > $@
-
-fcns.c: vi.h emacs.h common.h fcns.h
-	sh makelist -fc vi.h emacs.h common.h > $@
-
-help.c: vi.c emacs.c common.c
-	sh makelist -bc ${srcdir}/vi.c ${srcdir}/emacs.c ${srcdir}/common.c > $@
-
-help.h: vi.c emacs.c common.c
-	sh makelist -bh ${srcdir}/vi.c ${srcdir}/emacs.c ${srcdir}/common.c > $@
-
-${OBJS}: common.h emacs.h fcns.c fcns.h help.c help.h vi.h
diff --git a/net/tnftp/files/libedit/chared.h b/net/tnftp/files/libedit/chared.h
deleted file mode 100644
index fbc14914c87..00000000000
--- a/net/tnftp/files/libedit/chared.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*	$NetBSD: chared.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)chared.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.chared.h: Character editor interface
- */
-#ifndef _h_el_chared
-#define	_h_el_chared
-
-#include <ctype.h>
-#include <string.h>
-
-#include "histedit.h"
-
-#define	EL_MAXMACRO	10
-
-/*
- * This is a issue of basic "vi" look-and-feel. Defining VI_MOVE works
- * like real vi: i.e. the transition from command<->insert modes moves
- * the cursor.
- *
- * On the other hand we really don't want to move the cursor, because
- * all the editing commands don't include the character under the cursor.
- * Probably the best fix is to make all the editing commands aware of
- * this fact.
- */
-#define	VI_MOVE
-
-
-typedef struct c_macro_t {
-	int	  level;
-	char	**macro;
-	char	 *nline;
-} c_macro_t;
-
-/*
- * Undo information for both vi and emacs
- */
-typedef struct c_undo_t {
-	int	 action;
-	size_t	 isize;
-	size_t	 dsize;
-	char	*ptr;
-	char	*buf;
-} c_undo_t;
-
-/*
- * Current action information for vi
- */
-typedef struct c_vcmd_t {
-	int	 action;
-	char	*pos;
-	char	*ins;
-} c_vcmd_t;
-
-/*
- * Kill buffer for emacs
- */
-typedef struct c_kill_t {
-	char	*buf;
-	char	*last;
-	char	*mark;
-} c_kill_t;
-
-/*
- * Note that we use both data structures because the user can bind
- * commands from both editors!
- */
-typedef struct el_chared_t {
-	c_undo_t	c_undo;
-	c_kill_t	c_kill;
-	c_vcmd_t	c_vcmd;
-	c_macro_t	c_macro;
-} el_chared_t;
-
-
-#define	STReof		"^D\b\b"
-#define	STRQQ		"\"\""
-
-#define	isglob(a)	(strchr("*[]?", (a)) != NULL)
-#define	isword(a)	(isprint(a))
-
-#define	NOP		0x00
-#define	DELETE		0x01
-#define	INSERT		0x02
-#define	CHANGE		0x04
-
-#define	CHAR_FWD	0
-#define	CHAR_BACK	1
-
-#define	MODE_INSERT	0
-#define	MODE_REPLACE	1
-#define	MODE_REPLACE_1	2
-
-#include "common.h"
-#include "vi.h"
-#include "emacs.h"
-#include "search.h"
-#include "fcns.h"
-
-
-protected int	 cv__isword(int);
-protected void	 cv_delfini(EditLine *);
-protected char	*cv__endword(char *, char *, int);
-protected int	 ce__isword(int);
-protected void	 cv_undo(EditLine *, int, size_t, char *);
-protected char	*cv_next_word(EditLine*, char *, char *, int, int (*)(int));
-protected char	*cv_prev_word(EditLine*, char *, char *, int, int (*)(int));
-protected char	*c__next_word(char *, char *, int, int (*)(int));
-protected char	*c__prev_word(char *, char *, int, int (*)(int));
-protected void	 c_insert(EditLine *, int);
-protected void	 c_delbefore(EditLine *, int);
-protected void	 c_delafter(EditLine *, int);
-protected int	 c_gets(EditLine *, char *);
-protected int	 c_hpos(EditLine *);
-
-protected int	 ch_init(EditLine *);
-protected void	 ch_reset(EditLine *);
-protected int	 ch_enlargebufs(EditLine *, size_t);
-protected void	 ch_end(EditLine *);
-
-#endif /* _h_el_chared */
diff --git a/net/tnftp/files/libedit/editline.3 b/net/tnftp/files/libedit/editline.3
deleted file mode 100644
index b9463ee5a23..00000000000
--- a/net/tnftp/files/libedit/editline.3
+++ /dev/null
@@ -1,646 +0,0 @@
-.\"	$NetBSD: editline.3,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $
-.\"
-.\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 12, 1999
-.Os
-.Dt EDITLINE 3
-.Sh NAME
-.Nm editline ,
-.Nm el_init ,
-.Nm el_end ,
-.Nm el_reset ,
-.Nm el_gets ,
-.Nm el_getc ,
-.Nm el_push ,
-.Nm el_parse ,
-.Nm el_set ,
-.Nm el_source ,
-.Nm el_resize ,
-.Nm el_line ,
-.Nm el_insertstr ,
-.Nm el_deletestr ,
-.Nm history_init ,
-.Nm history_end ,
-.Nm history
-.Nd line editor and history functions
-.Sh LIBRARY
-.Lb libedit
-.Sh SYNOPSIS
-.Fd #include \*[Lt]histedit.h\*[Gt]
-.Ft EditLine *
-.Fn el_init "const char *prog" "FILE *fin" "FILE *fout" "FILE *ferr"
-.Ft void
-.Fn el_end "EditLine *e"
-.Ft void
-.Fn el_reset "EditLine *e"
-.Ft const char *
-.Fn el_gets "EditLine *e" "int *count"
-.Ft int
-.Fn el_getc "EditLine *e" "char *ch"
-.Ft void
-.Fn el_push "EditLine *e" "const char *str"
-.Ft int
-.Fn el_parse "EditLine *e" "int argc" "char *argv[]"
-.Ft int
-.Fn el_set "EditLine *e" "int op" "..."
-.Ft int
-.Fn el_get "EditLine *e" "int op" "void *result"
-.Ft int
-.Fn el_source "EditLine *e" "const char *file"
-.Ft void
-.Fn el_resize "EditLine *e"
-.Ft const LineInfo *
-.Fn el_line "EditLine *e"
-.Ft int
-.Fn el_insertstr "EditLine *e" "const char *str"
-.Ft void
-.Fn el_deletestr "EditLine *e" "int count"
-.Ft History *
-.Fn history_init
-.Ft void
-.Fn history_end "History *h"
-.Ft int
-.Fn history "History *h" "HistEvent *ev" "int op" "..."
-.Sh DESCRIPTION
-The
-.Nm
-library provides generic line editing and history functions,
-similar to those found in
-.Xr sh 1 .
-.Pp
-These functions are available in the
-.Nm libedit
-library (which needs the
-.Nm libtermcap
-library).
-Programs should be linked with
-.Fl ledit ltermcap .
-.Sh LINE EDITING FUNCTIONS
-The line editing functions use a common data structure,
-.Fa EditLine ,
-which is created by
-.Fn el_init
-and freed by
-.Fn el_end .
-.Pp
-The following functions are available:
-.Bl -tag -width 4n
-.It Fn el_init
-Initialise the line editor, and return a data structure
-to be used by all other line editing functions.
-.Fa prog
-is the name of the invoking program, used when reading the
-.Xr editrc 5
-file to determine which settings to use.
-.Fa fin ,
-.Fa fout
-and
-.Fa ferr
-are the input, output, and error streams (respectively) to use.
-In this documentation, references to
-.Dq the tty
-are actually to this input/output stream combination.
-.It Fn el_end
-Clean up and finish with
-.Fa e ,
-assumed to have been created with
-.Fn el_init .
-.It Fn el_reset
-Reset the tty and the parser.
-This should be called after an error which may have upset the tty's
-state.
-.It Fn el_gets
-Read a line from the tty.
-.Fa count
-is modified to contain the number of characters read.
-Returns the line read if successful, or
-.Dv NULL
-if no characters were read or if an error occurred.
-.It Fn el_getc
-Read a character from the tty.
-.Fa ch
-is modified to contain the character read.
-Returns the number of characters read if successful, -1 otherwise.
-.It Fn el_push
-Pushes
-.Fa str
-back onto the input stream.
-This is used by the macro expansion mechanism.
-Refer to the description of
-.Ic bind
-.Fl s
-in
-.Xr editrc 5
-for more information.
-.It Fn el_parse
-Parses the
-.Fa argv
-array (which is
-.Fa argc
-elements in size)
-to execute builtin
-.Nm
-commands.
-If the command is prefixed with
-.Dq prog :
-then
-.Fn el_parse
-will only execute the command if
-.Dq prog
-matches the
-.Fa prog
-argument supplied to
-.Fn el_init .
-The return value is
--1 if the command is unknown,
-0 if there was no error or
-.Dq prog
-didn't match, or
-1 if the command returned an error.
-Refer to
-.Xr editrc 5
-for more information.
-.It Fn el_set
-Set
-.Nm
-parameters.
-.Fa op
-determines which parameter to set, and each operation has its
-own parameter list.
-.Pp
-The following values for
-.Fa op
-are supported, along with the required argument list:
-.Bl -tag -width 4n
-.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)"
-Define prompt printing function as
-.Fa f ,
-which is to return a string that contains the prompt.
-.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)"
-Define right side prompt printing function as
-.Fa f ,
-which is to return a string that contains the prompt.
-.It Dv EL_TERMINAL , Fa "const char *type"
-Define terminal type of the tty to be
-.Fa type ,
-or to
-.Ev TERM
-if
-.Fa type
-is
-.Dv NULL .
-.It Dv EL_EDITOR , Fa "const char *mode"
-Set editing mode to
-.Fa mode ,
-which must be one of
-.Dq emacs
-or
-.Dq vi .
-.It Dv EL_SIGNAL , Fa "int flag"
-If
-.Fa flag
-is non-zero,
-.Nm
-will install its own signal handler for the following signals when
-reading command input:
-.Dv SIGCONT ,
-.Dv SIGHUP ,
-.Dv SIGINT ,
-.Dv SIGQUIT ,
-.Dv SIGSTOP ,
-.Dv SIGTERM ,
-.Dv SIGTSTP ,
-and
-.Dv SIGWINCH .
-Otherwise, the current signal handlers will be used.
-.It Dv EL_BIND , Xo
-.Fa "const char *" ,
-.Fa "..." ,
-.Dv NULL
-.Xc
-Perform the
-.Ic bind
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_ECHOTC , Xo
-.Fa "const char *" ,
-.Fa "..." ,
-.Dv NULL
-.Xc
-Perform the
-.Ic echotc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_SETTC , Xo
-.Fa "const char *" ,
-.Fa "..." ,
-.Dv NULL
-.Xc
-Perform the
-.Ic settc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_SETTY , Xo
-.Fa "const char *" ,
-.Fa "..." ,
-.Dv NULL
-.Xc
-Perform the
-.Ic setty
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_TELLTC , Xo
-.Fa "const char *" ,
-.Fa "..." ,
-.Dv NULL
-.Xc
-Perform the
-.Ic telltc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_ADDFN , Xo
-.Fa "const char *name" ,
-.Fa "const char *help" ,
-.Fa "unsigned char (*func)(EditLine *e, int ch)"
-.Xc
-Add a user defined function,
-.Fn func ,
-referred to as
-.Fa name
-which is invoked when a key which is bound to
-.Fa name
-is entered.
-.Fa help
-is a description of
-.Fa name .
-At invocation time,
-.Fa ch
-is the key which caused the invocation.
-The return value of
-.Fn func
-should be one of:
-.Bl -tag -width "CC_REDISPLAY"
-.It Dv CC_NORM
-Add a normal character.
-.It Dv CC_NEWLINE
-End of line was entered.
-.It Dv CC_EOF
-EOF was entered.
-.It Dv CC_ARGHACK
-Expecting further command input as arguments, do nothing visually.
-.It Dv CC_REFRESH
-Refresh display.
-.It Dv CC_REFRESH_BEEP
-Refresh display, and beep.
-.It Dv CC_CURSOR
-Cursor moved, so update and perform
-.Dv CC_REFRESH .
-.It Dv CC_REDISPLAY
-Redisplay entire input line.
-This is useful if a key binding outputs extra information.
-.It Dv CC_ERROR
-An error occurred.
-Beep, and flush tty.
-.It Dv CC_FATAL
-Fatal error, reset tty to known state.
-.El
-.It Dv EL_HIST , Xo
-.Fa "History *(*func)(History *, int op, ...)" ,
-.Fa "const char *ptr"
-.Xc
-Defines which history function to use, which is usually
-.Fn history .
-.Fa ptr
-should be the value returned by
-.Fn history_init .
-.It Dv EL_EDITMODE , Fa "int flag"
-If
-.Fa flag
-is non-zero,
-editing is enabled (the default).
-Note that this is only an indication, and does not
-affect the operation of
-.Nm "" .
-At this time, it is the caller's responsibility to
-check this
-(using
-.Fn el_get )
-to determine if editing should be enabled or not.
-.It Dv EL_GETCFN , Fa "int (*f)(EditLine *, char *c)"
-Define the character reading function as
-.Fa f ,
-which is to return the number of characters read and store them in
-.Fa c .
-This function is called internally by
-.Fn el_gets
-and
-.Fn el_getc .
-The builtin function can be set or restored with the special function
-name ``EL_BUILTIN_GETCFN''.
-.It Dv EL_CLIENTDATA , Fa "void *data"
-Register
-.Fa data
-to be associated with this EditLine structure. It can be retrieved with
-the corresponding
-.Fn el_get
-call.
-.El
-.It Fn el_get
-Get
-.Nm
-parameters.
-.Fa op
-determines which parameter to retrieve into
-.Fa result .
-.Pp
-The following values for
-.Fa op
-are supported, along with actual type of
-.Fa result :
-.Bl -tag -width 4n
-.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)"
-Return a pointer to the function that displays the prompt.
-.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)"
-Return a pointer to the function that displays the rightside prompt.
-.It Dv EL_EDITOR , Fa "const char *"
-Return the name of the editor, which will be one of
-.Dq emacs
-or
-.Dq vi .
-.It Dv EL_SIGNAL , Fa "int *"
-Return non-zero if
-.Nm
-has installed private signal handlers (see
-.Fn el_get
-above).
-.It Dv EL_EDITMODE, Fa "int *"
-Return non-zero if editing is enabled.
-.It Dv EL_GETCFN, Fa "int (**f)(EditLine *, char *)"
-Return a pointer to the function that read characters, which is equal to
-``EL_BUILTIN_GETCFN'' in the case of the default builtin function.
-.It Dv EL_CLIENTDATA , Fa "void **data"
-Retrieve
-.Fa data
-previously registered with the corresponding
-.Fn el_set
-call.
-.El
-.It Fn el_source
-Initialise
-.Nm
-by reading the contents of
-.Fa file .
-.Fn el_parse
-is called for each line in
-.Fa file .
-If
-.Fa file
-is
-.Dv NULL ,
-try
-.Pa $PWD/.editrc
-then
-.Pa $HOME/.editrc .
-Refer to
-.Xr editrc 5
-for details on the format of
-.Fa file .
-.It Fn el_resize
-Must be called if the terminal size changes.
-If
-.Dv EL_SIGNAL
-has been set with
-.Fn el_set ,
-then this is done automatically.
-Otherwise, it's the responsibility of the application to call
-.Fn el_resize
-on the appropriate occasions.
-.It Fn el_line
-Return the editing information for the current line in a
-.Fa LineInfo
-structure, which is defined as follows:
-.Bd -literal
-typedef struct lineinfo {
-    const char *buffer;    /* address of buffer */
-    const char *cursor;    /* address of cursor */
-    const char *lastchar;  /* address of last character */
-} LineInfo;
-.Ed
-.It Fn el_insertstr
-Insert
-.Fa str
-into the line at the cursor.
-Returns -1 if
-.Fa str
-is empty or won't fit, and 0 otherwise.
-.It Fn el_deletestr
-Delete
-.Fa num
-characters before the cursor.
-.El
-.Sh HISTORY LIST FUNCTIONS
-The history functions use a common data structure,
-.Fa History ,
-which is created by
-.Fn history_init
-and freed by
-.Fn history_end .
-.Pp
-The following functions are available:
-.Bl -tag -width 4n
-.It Fn history_init
-Initialise the history list, and return a data structure
-to be used by all other history list functions.
-.It Fn history_end
-Clean up and finish with
-.Fa h ,
-assumed to have been created with
-.Fn history_init .
-.It Fn history
-Perform operation
-.Fa op
-on the history list, with optional arguments as needed by the
-operation.
-.Fa ev
-is changed accordingly to operation.
-The following values for
-.Fa op
-are supported, along with the required argument list:
-.Bl -tag -width 4n
-.It Dv H_SETSIZE , Fa "int size"
-Set size of history to
-.Fa size
-elements.
-.It Dv H_GETSIZE
-Get number of events currently in history.
-.It Dv H_END
-Cleans up and finishes with
-.Fa h ,
-assumed to be created with
-.Fn history_init .
-.It Dv H_CLEAR
-Clear the history.
-.It Dv H_FUNC , Xo
-.Fa "void *ptr" ,
-.Fa "history_gfun_t first" ,
-.Fa "history_gfun_t next" ,
-.Fa "history_gfun_t last" ,
-.Fa "history_gfun_t prev" ,
-.Fa "history_gfun_t curr" ,
-.Fa "history_sfun_t set" ,
-.Fa "history_vfun_t clear" ,
-.Fa "history_efun_t enter" ,
-.Fa "history_efun_t add"
-.Xc
-Define functions to perform various history operations.
-.Fa ptr
-is the argument given to a function when it's invoked.
-.It Dv H_FIRST
-Return the first element in the history.
-.It Dv H_LAST
-Return the last element in the history.
-.It Dv H_PREV
-Return the previous element in the history.
-.It Dv H_NEXT
-Return the next element in the history.
-.It Dv H_CURR
-Return the current element in the history.
-.It Dv H_SET
-Set the cursor to point to the requested element.
-.It Dv H_ADD , Fa "const char *str"
-Append
-.Fa str
-to the current element of the history, or create an element with
-.It Dv H_APPEND , Fa "const char *str"
-Append
-.Fa str
-to the last new element of the history.
-.It Dv H_ENTER , Fa "const char *str"
-Add
-.Fa str
-as a new element to the history, and, if necessary,
-removing the oldest entry to keep the list to the created size.
-.It Dv H_PREV_STR , Fa "const char *str"
-Return the closest previous event that starts with
-.Fa str .
-.It Dv H_NEXT_STR , Fa "const char *str"
-Return the closest next event that starts with
-.Fa str .
-.It Dv H_PREV_EVENT , Fa "int e"
-Return the previous event numbered
-.Fa e .
-.It Dv H_NEXT_EVENT , Fa "int e"
-Return the next event numbered
-.Fa e .
-.It Dv H_LOAD , Fa "const char *file"
-Load the history list stored in
-.Fa file .
-.It Dv H_SAVE , Fa "const char *file"
-Save the history list to
-.Fa file .
-.El
-.Pp
-.Fn history
-returns 0 if the operation
-.Fa op
-succeeds. Otherwise, -1 is returned and
-.Fa ev
-is updated to contain more details about the error.
-.El
-.\"XXX.Sh EXAMPLES
-.\"XXX: provide some examples
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr signal 3 ,
-.Xr termcap 3 ,
-.Xr editrc 5
-.Sh HISTORY
-The
-.Nm
-library first appeared in
-.Bx 4.4 .
-.Dv CC_REDISPLAY
-appeared in
-.Nx 1.3 .
-.Dv CC_REFRESH_BEEP ,
-.Dv EL_EDITMODE
-and the readline emulation appeared in
-.Nx 1.4 .
-.Dv EL_RPROMPT
-appeared in
-.Nx 1.5 .
-.Sh AUTHORS
-The
-.Nm
-library was written by Christos Zoulas.
-Luke Mewburn wrote this manual and implemented
-.Dv CC_REDISPLAY ,
-.Dv CC_REFRESH_BEEP ,
-.Dv EL_EDITMODE ,
-and
-.Dv EL_RPROMPT .
-Jaromir Dolecek implemented the readline emulation.
-.Sh BUGS
-The tokenization functions are not publicly defined in
-.Fd \*[Lt]histedit.h\*[Gt] .
-.Pp
-At this time, it is the responsibility of the caller to
-check the result of the
-.Dv EL_EDITMODE
-operation of
-.Fn el_get
-(after an
-.Fn el_source
-or
-.Fn el_parse )
-to determine if
-.Nm
-should be used for further input.
-I.e.,
-.Dv EL_EDITMODE
-is purely an indication of the result of the most recent
-.Xr editrc 5
-.Ic edit
-command.
diff --git a/net/tnftp/files/libedit/editrc.5 b/net/tnftp/files/libedit/editrc.5
deleted file mode 100644
index 58686683d4c..00000000000
--- a/net/tnftp/files/libedit/editrc.5
+++ /dev/null
@@ -1,491 +0,0 @@
-.\"	$NetBSD: editrc.5,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $
-.\"
-.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 8, 2000
-.Os
-.Dt EDITRC 5
-.Sh NAME
-.Nm editrc
-.Nd configuration file for editline library
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-The
-.Nm
-file defines various settings to be used by the
-.Xr editline 3
-library.
-.Pp
-The format of each line is:
-.Dl [prog:]command [arg [...]]
-.Pp
-.Ar command
-is one of the
-.Xr editline 3
-builtin commands.
-Refer to
-.Sx BUILTIN COMMANDS
-for more information.
-.Pp
-.Ar prog
-is the program name string that a program defines when it calls
-.Xr el_init 3
-to setup
-.Xr editline 3 ,
-which is usually
-.Va argv[0] .
-.Ar command
-will be executed for any program which matches
-.Ar prog .
-.Pp
-.Ar prog
-may also be a
-.Xr regex 3
-style
-regular expression, in which case
-.Ar command
-will be executed for any program that matches the regular expression.
-.Pp
-If
-.Ar prog
-is absent,
-.Ar command
-is executed for all programs.
-.Sh BUILTIN COMMANDS
-The
-.Nm editline
-library has some builtin commands, which affect the way
-that the line editing and history functions operate.
-These are based on similar named builtins present in the
-.Xr tcsh 1
-shell.
-.Pp
-The following builtin commands are available:
-.Bl -tag -width 4n
-.It Ic bind Xo
-.Op Fl a
-.Op Fl e
-.Op Fl k
-.Op Fl l
-.Op Fl r
-.Op Fl s
-.Op Fl v
-.Op Ar key Op Ar command
-.Xc
-Without options, list all bound keys, and the editor command to which
-each is bound.
-If
-.Ar key
-is supplied, show the bindings for
-.Ar key .
-If
-.Ar key command
-is supplied, bind
-.Ar command
-to
-.Ar key .
-Options include:
-.Bl -tag -width 4n
-.It Fl e
-Bind all keys to the standard GNU Emacs-like bindings.
-.It Fl v
-Bind all keys to the standard
-.Xr vi 1 -like
-bindings.
-.It Fl a
-List or change key bindings in the
-.Xr vi 1
-mode alternate (command mode) key map.
-.It Fl k
-.Ar key
-is interpreted as a symbolic arrow key name, which may be one of
-.Sq up ,
-.Sq down ,
-.Sq left
-or
-.Sq right .
-.It Fl l
-List all editor commands and a short description of each.
-.It Fl r
-Remove a key's binding.
-.It Fl s
-.Ar command
-is taken as a literal string and treated as terminal input when
-.Ar key
-is typed.
-Bound keys in
-.Ar command
-are themselves reinterpreted, and this continues for ten levels of
-interpretation.
-.El
-.Pp
-.Ar command
-may be one of the commands documented in
-.Sx "EDITOR COMMANDS"
-below, or another key.
-.Pp
-.Ar key
-and
-.Ar command
-can contain control characters of the form
-.Sm off
-.Sq No ^ Ar character
-.Sm on
-.Po
-e.g.
-.Sq ^A
-.Pc ,
-and the following backslashed escape sequences:
-.Pp
-.Bl -tag -compact -offset indent -width 4n
-.It Ic \ea
-Bell
-.It Ic \eb
-Backspace
-.It Ic \ee
-Escape
-.It Ic \ef
-Formfeed
-.It Ic \en
-Newline
-.It Ic \er
-Carriage return
-.It Ic \et
-Horizontal tab
-.It Ic \ev
-Vertical tab
-.Sm off
-.It Sy \e Ar nnn
-.Sm on
-The ASCII character corresponding to the octal number
-.Ar nnn .
-.El
-.Pp
-.Sq \e
-nullifies the special meaning of the following character,
-if it has any, notably
-.Sq \e
-and
-.Sq ^ .
-.It Ic echotc Xo
-.Op Fl sv
-.Ar arg
-.Ar ...
-.Xc
-Exercise terminal capabilities given in
-.Ar arg Ar ... .
-If
-.Ar arg
-is
-.Sq baud ,
-.Sq cols ,
-.Sq lines ,
-.Sq rows ,
-.Sq meta or
-.Sq tabs ,
-the value of that capability is printed, with
-.Dq yes
-or
-.Dq no
-indicating that the terminal does or does not have that capability.
-.Pp
-.Fl s
-returns an emptry string for non-existent capabilities, rather than
-causing an error.
-.Fl v
-causes messages to be verbose.
-.It Ic edit Op Li on | Li off
-Enable or disable the
-.Nm editline
-functionality in a program.
-.It Ic history
-List the history.
-.It Ic telltc
-List the values of all the terminal capabilities (see
-.Xr termcap 5 ) .
-.It Ic settc Ar cap Ar val
-Set the terminal capability
-.Ar cap
-to
-.Ar val ,
-as defined in
-.Xr termcap 5 .
-No sanity checking is done.
-.It Ic setty Xo
-.Op Fl a
-.Op Fl d
-.Op Fl q
-.Op Fl x
-.Op Ar +mode
-.Op Ar -mode
-.Op Ar mode
-.Xc
-Control which tty modes that
-.Nm
-won't allow the user to change.
-.Fl d ,
-.Fl q
-or
-.Fl x
-tells
-.Ic setty
-to act on the
-.Sq edit ,
-.Sq quote
-or
-.Sq execute
-set of tty modes respectively; defaulting to
-.Fl x .
-.Pp
-Without other arguments,
-.Ic setty
-lists the modes in the chosen set which are fixed on
-.Po
-.Sq +mode
-.Pc
-or off
-.Po
-.Sq -mode
-.Pc .
-.Fl a
-lists all tty modes in the chosen set regardless of the setting.
-With
-.Ar +mode ,
-.Ar -mode
-or
-.Ar mode ,
-fixes
-.Ar mode
-on or off or removes control of
-.Ar mode
-in the chosen set.
-.El
-.Sh EDITOR COMMANDS
-The following editor commands are available for use in key bindings:
-.\" Section automatically generated with makelist
-.Bl -tag -width 4n
-.It Ic vi-paste-next
-Vi paste previous deletion to the right of the cursor.
-.It Ic vi-paste-prev
-Vi paste previous deletion to the left of the cursor.
-.It Ic vi-prev-space-word
-Vi move to the previous space delimited word.
-.It Ic vi-prev-word
-Vi move to the previous word.
-.It Ic vi-next-space-word
-Vi move to the next space delimited word.
-.It Ic vi-next-word
-Vi move to the next word.
-.It Ic vi-change-case
-Vi change case of character under the cursor and advance one character.
-.It Ic vi-change-meta
-Vi change prefix command.
-.It Ic vi-insert-at-bol
-Vi enter insert mode at the beginning of line.
-.It Ic vi-replace-char
-Vi replace character under the cursor with the next character typed.
-.It Ic vi-replace-mode
-Vi enter replace mode.
-.It Ic vi-substitute-char
-Vi replace character under the cursor and enter insert mode.
-.It Ic vi-substitute-line
-Vi substitute entire line.
-.It Ic vi-change-to-eol
-Vi change to end of line.
-.It Ic vi-insert
-Vi enter insert mode.
-.It Ic vi-add
-Vi enter insert mode after the cursor.
-.It Ic vi-add-at-eol
-Vi enter insert mode at end of line.
-.It Ic vi-delete-meta
-Vi delete prefix command.
-.It Ic vi-end-word
-Vi move to the end of the current space delimited word.
-.It Ic vi-to-end-word
-Vi move to the end of the current word.
-.It Ic vi-undo
-Vi undo last change.
-.It Ic vi-command-mode
-Vi enter command mode (use alternative key bindings).
-.It Ic vi-zero
-Vi move to the beginning of line.
-.It Ic vi-delete-prev-char
-Vi move to previous character (backspace).
-.It Ic vi-list-or-eof
-Vi list choices for completion or indicate end of file if empty line.
-.It Ic vi-kill-line-prev
-Vi cut from beginning of line to cursor.
-.It Ic vi-search-prev
-Vi search history previous.
-.It Ic vi-search-next
-Vi search history next.
-.It Ic vi-repeat-search-next
-Vi repeat current search in the same search direction.
-.It Ic vi-repeat-search-prev
-Vi repeat current search in the opposite search direction.
-.It Ic vi-next-char
-Vi move to the character specified next.
-.It Ic vi-prev-char
-Vi move to the character specified previous.
-.It Ic vi-to-next-char
-Vi move up to the character specified next.
-.It Ic vi-to-prev-char
-Vi move up to the character specified previous.
-.It Ic vi-repeat-next-char
-Vi repeat current character search in the same search direction.
-.It Ic vi-repeat-prev-char
-Vi repeat current character search in the opposite search direction.
-.It Ic em-delete-or-list
-Delete character under cursor or list completions if at end of line.
-.It Ic em-delete-next-word
-Cut from cursor to end of current word.
-.It Ic em-yank
-Paste cut buffer at cursor position.
-.It Ic em-kill-line
-Cut the entire line and save in cut buffer.
-.It Ic em-kill-region
-Cut area between mark and cursor and save in cut buffer.
-.It Ic em-copy-region
-Copy area between mark and cursor to cut buffer.
-.It Ic em-gosmacs-traspose
-Exchange the two characters before the cursor.
-.It Ic em-next-word
-Move next to end of current word.
-.It Ic em-upper-case
-Uppercase the characters from cursor to end of current word.
-.It Ic em-capitol-case
-Capitalize the characters from cursor to end of current word.
-.It Ic em-lower-case
-Lowercase the characters from cursor to end of current word.
-.It Ic em-set-mark
-Set the mark at cursor.
-.It Ic em-exchange-mark
-Exchange the cursor and mark.
-.It Ic em-universal-argument
-Universal argument (argument times 4).
-.It Ic em-meta-next
-Add 8th bit to next character typed.
-.It Ic em-toggle-overwrite
-Switch from insert to overwrite mode or vice versa.
-.It Ic em-copy-prev-word
-Copy current word to cursor.
-.It Ic em-inc-search-next
-Emacs incremental next search.
-.It Ic em-inc-search-prev
-Emacs incremental reverse search.
-.It Ic ed-end-of-file
-Indicate end of file.
-.It Ic ed-insert
-Add character to the line.
-.It Ic ed-delete-prev-word
-Delete from beginning of current word to cursor.
-.It Ic ed-delete-next-char
-Delete character under cursor.
-.It Ic ed-kill-line
-Cut to the end of line.
-.It Ic ed-move-to-end
-Move cursor to the end of line.
-.It Ic ed-move-to-beg
-Move cursor to the beginning of line.
-.It Ic ed-transpose-chars
-Exchange the character to the left of the cursor with the one under it.
-.It Ic ed-next-char
-Move to the right one character.
-.It Ic ed-prev-word
-Move to the beginning of the current word.
-.It Ic ed-prev-char
-Move to the left one character.
-.It Ic ed-quoted-insert
-Add the next character typed verbatim.
-.It Ic ed-digit
-Adds to argument or enters a digit.
-.It Ic ed-argument-digit
-Digit that starts argument.
-.It Ic ed-unassigned
-Indicates unbound character.
-.It Ic ed-tty-sigint
-Tty interrupt character.
-.It Ic ed-tty-dsusp
-Tty delayed suspend character.
-.It Ic ed-tty-flush-output
-Tty flush output characters.
-.It Ic ed-tty-sigquit
-Tty quit character.
-.It Ic ed-tty-sigtstp
-Tty suspend character.
-.It Ic ed-tty-stop-output
-Tty disallow output characters.
-.It Ic ed-tty-start-output
-Tty allow output characters.
-.It Ic ed-newline
-Execute command.
-.It Ic ed-delete-prev-char
-Delete the character to the left of the cursor.
-.It Ic ed-clear-screen
-Clear screen leaving current line at the top.
-.It Ic ed-redisplay
-Redisplay everything.
-.It Ic ed-start-over
-Erase current line and start from scratch.
-.It Ic ed-sequence-lead-in
-First character in a bound sequence.
-.It Ic ed-prev-history
-Move to the previous history line.
-.It Ic ed-next-history
-Move to the next history line.
-.It Ic ed-search-prev-history
-Search previous in history for a line matching the current.
-.It Ic ed-search-next-history
-Search next in history for a line matching the current.
-.It Ic ed-prev-line
-Move up one line.
-.It Ic ed-next-line
-Move down one line.
-.It Ic ed-command
-Editline extended command.
-.El
-.\" End of section automatically generated with makelist
-.Sh SEE ALSO
-.Xr editline 3 ,
-.Xr regex 3 ,
-.Xr termcap 5
-.Sh AUTHORS
-The
-.Nm editline
-library was written by Christos Zoulas,
-and this manual was written by Luke Mewburn,
-with some sections inspired by
-.Xr tcsh 1 .
diff --git a/net/tnftp/files/libedit/el.h b/net/tnftp/files/libedit/el.h
deleted file mode 100644
index a22106e7471..00000000000
--- a/net/tnftp/files/libedit/el.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*	$NetBSD: el.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)el.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.h: Internal structures.
- */
-#ifndef _h_el
-#define	_h_el
-/*
- * Local defaults
- */
-#define	KSHVI
-#define	VIDEFAULT
-#define	ANCHOR
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#define	EL_BUFSIZ	1024		/* Maximum line size		*/
-
-#define	HANDLE_SIGNALS	1<<0
-#define	NO_TTY		1<<1
-#define	EDIT_DISABLED	1<<2
-
-typedef int bool_t;			/* True or not			*/
-
-typedef unsigned char el_action_t;	/* Index to command array	*/
-
-typedef struct coord_t {		/* Position on the screen	*/
-	int	h;
-	int	v;
-} coord_t;
-
-typedef struct el_line_t {
-	char	*buffer;		/* Input line			*/
-	char	*cursor;		/* Cursor position		*/
-	char	*lastchar;		/* Last character		*/
-	const char	*limit;			/* Max position			*/
-} el_line_t;
-
-/*
- * Editor state
- */
-typedef struct el_state_t {
-	int		inputmode;	/* What mode are we in?		*/
-	int		doingarg;	/* Are we getting an argument?	*/
-	int		argument;	/* Numeric argument		*/
-	int		metanext;	/* Is the next char a meta char */
-	el_action_t	lastcmd;	/* Previous command		*/
-} el_state_t;
-
-/*
- * Until we come up with something better...
- */
-#define	el_malloc(a)	malloc(a)
-#define	el_realloc(a,b)	realloc(a, b)
-#define	el_free(a)	free(a)
-
-#include "tty.h"
-#include "prompt.h"
-#include "key.h"
-#include "term.h"
-#include "refresh.h"
-#include "chared.h"
-#include "common.h"
-#include "search.h"
-#include "hist.h"
-#include "map.h"
-#include "parse.h"
-#include "sig.h"
-#include "help.h"
-#include "read.h"
-
-struct editline {
-	char		 *el_prog;	/* the program name		*/
-	FILE		 *el_outfile;	/* Stdio stuff			*/
-	FILE		 *el_errfile;	/* Stdio stuff			*/
-	int		  el_infd;	/* Input file descriptor	*/
-	int		  el_flags;	/* Various flags.		*/
-	coord_t		  el_cursor;	/* Cursor location		*/
-	char		**el_display;	/* Real screen image = what is there */
-	char		**el_vdisplay;	/* Virtual screen image = what we see */
-	void		 *el_data;	/* Client data			*/
-	el_line_t	  el_line;	/* The current line information	*/
-	el_state_t	  el_state;	/* Current editor state		*/
-	el_term_t	  el_term;	/* Terminal dependent stuff	*/
-	el_tty_t	  el_tty;	/* Tty dependent stuff		*/
-	el_refresh_t	  el_refresh;	/* Refresh stuff		*/
-	el_prompt_t	  el_prompt;	/* Prompt stuff			*/
-	el_prompt_t	  el_rprompt;	/* Prompt stuff			*/
-	el_chared_t	  el_chared;	/* Characted editor stuff	*/
-	el_map_t	  el_map;	/* Key mapping stuff		*/
-	el_key_t	  el_key;	/* Key binding stuff		*/
-	el_history_t	  el_history;	/* History stuff		*/
-	el_search_t	  el_search;	/* Search stuff			*/
-	el_signal_t	  el_signal;	/* Signal handling stuff	*/
-	el_read_t	  el_read;	/* Character reading stuff	*/
-};
-
-protected int	el_editmode(EditLine *, int, const char **);
-
-#ifdef DEBUG
-#define EL_ABORT(a)	(void) (fprintf(el->el_errfile, "%s, %d: ", \
-				__FILE__, __LINE__), fprintf a, abort())
-#else
-#define EL_ABORT(a)	abort()
-#endif
-#endif /* _h_el */
diff --git a/net/tnftp/files/libedit/hist.h b/net/tnftp/files/libedit/hist.h
deleted file mode 100644
index efe3431ead2..00000000000
--- a/net/tnftp/files/libedit/hist.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: hist.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)hist.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.hist.c: History functions
- */
-#ifndef _h_el_hist
-#define	_h_el_hist
-
-#include "histedit.h"
-
-typedef int (*hist_fun_t)(ptr_t, HistEvent *, int, ...);
-
-typedef struct el_history_t {
-	char		*buf;		/* The history buffer		*/
-	size_t		sz;		/* Size of history buffer	*/
-	char		*last;		/* The last character		*/
-	int		 eventno;	/* Event we are looking for	*/
-	ptr_t		 ref;		/* Argument for history fcns	*/
-	hist_fun_t	 fun;		/* Event access			*/
-	HistEvent	 ev;		/* Event cookie			*/
-} el_history_t;
-
-#define	HIST_FUN(el, fn, arg)	\
-    ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
-	fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
-
-#define	HIST_NEXT(el)		HIST_FUN(el, H_NEXT, NULL)
-#define	HIST_FIRST(el)		HIST_FUN(el, H_FIRST, NULL)
-#define	HIST_LAST(el)		HIST_FUN(el, H_LAST, NULL)
-#define	HIST_PREV(el)		HIST_FUN(el, H_PREV, NULL)
-#define	HIST_EVENT(el, num)	HIST_FUN(el, H_EVENT, num)
-#define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
-#define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
-
-protected int		hist_init(EditLine *);
-protected void		hist_end(EditLine *);
-protected el_action_t	hist_get(EditLine *);
-protected int		hist_set(EditLine *, hist_fun_t, ptr_t);
-protected int		hist_list(EditLine *, int, const char **);
-protected int		hist_enlargebuf(EditLine *, size_t, size_t);
-
-#endif /* _h_el_hist */
diff --git a/net/tnftp/files/libedit/histedit.h b/net/tnftp/files/libedit/histedit.h
deleted file mode 100644
index 7ba31694090..00000000000
--- a/net/tnftp/files/libedit/histedit.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*	$NetBSD: histedit.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
- */
-
-/*
- * histedit.h: Line editor and history interface.
- */
-#ifndef _HISTEDIT_H_
-#define	_HISTEDIT_H_
-
-#define	LIBEDIT_MAJOR 2
-#define	LIBEDIT_MINOR 6
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/*
- * ==== Editing ====
- */
-typedef struct editline EditLine;
-
-/*
- * For user-defined function interface
- */
-typedef struct lineinfo {
-	const char	*buffer;
-	const char	*cursor;
-	const char	*lastchar;
-} LineInfo;
-
-
-/*
- * EditLine editor function return codes.
- * For user-defined function interface
- */
-#define	CC_NORM		0
-#define	CC_NEWLINE	1
-#define	CC_EOF		2
-#define	CC_ARGHACK	3
-#define	CC_REFRESH	4
-#define	CC_CURSOR	5
-#define	CC_ERROR	6
-#define	CC_FATAL	7
-#define	CC_REDISPLAY	8
-#define	CC_REFRESH_BEEP	9
-
-/*
- * Initialization, cleanup, and resetting
- */
-EditLine	*el_init(const char *, FILE *, FILE *, FILE *);
-void		 el_reset(EditLine *);
-void		 el_end(EditLine *);
-
-
-/*
- * Get a line, a character or push a string back in the input queue
- */
-const char	*el_gets(EditLine *, int *);
-int		 el_getc(EditLine *, char *);
-void		 el_push(EditLine *, char *);
-
-/*
- * Beep!
- */
-void		 el_beep(EditLine *);
-
-/*
- * High level function internals control
- * Parses argc, argv array and executes builtin editline commands
- */
-int		 el_parse(EditLine *, int, const char **);
-
-/*
- * Low level editline access functions
- */
-int		 el_set(EditLine *, int, ...);
-int		 el_get(EditLine *, int, void *);
-
-/*
- * el_set/el_get parameters
- */
-#define	EL_PROMPT	0	/* , el_pfunc_t);		*/
-#define	EL_TERMINAL	1	/* , const char *);		*/
-#define	EL_EDITOR	2	/* , const char *);		*/
-#define	EL_SIGNAL	3	/* , int);			*/
-#define	EL_BIND		4	/* , const char *, ..., NULL);	*/
-#define	EL_TELLTC	5	/* , const char *, ..., NULL);	*/
-#define	EL_SETTC	6	/* , const char *, ..., NULL);	*/
-#define	EL_ECHOTC	7	/* , const char *, ..., NULL);	*/
-#define	EL_SETTY	8	/* , const char *, ..., NULL);	*/
-#define	EL_ADDFN	9	/* , const char *, const char *	*/
-				/* , el_func_t);		*/
-#define	EL_HIST		10	/* , hist_fun_t, const char *);	*/
-#define	EL_EDITMODE	11	/* , int);			*/
-#define	EL_RPROMPT	12	/* , el_pfunc_t);		*/
-#define	EL_GETCFN	13	/* , el_rfunc_t);		*/
-#define	EL_CLIENTDATA	14	/* , void *);			*/
-
-#define EL_BUILTIN_GETCFN	(NULL)
-
-/*
- * Source named file or $PWD/.editrc or $HOME/.editrc
- */
-int		el_source(EditLine *, const char *);
-
-/*
- * Must be called when the terminal changes size; If EL_SIGNAL
- * is set this is done automatically otherwise it is the responsibility
- * of the application
- */
-void		 el_resize(EditLine *);
-
-
-/*
- * User-defined function interface.
- */
-const LineInfo	*el_line(EditLine *);
-int		 el_insertstr(EditLine *, const char *);
-void		 el_deletestr(EditLine *, int);
-
-/*
- * ==== History ====
- */
-
-typedef struct history History;
-
-typedef struct HistEvent {
-	int		 num;
-	const char	*str;
-} HistEvent;
-
-/*
- * History access functions.
- */
-History *	history_init(void);
-void		history_end(History *);
-
-int		history(History *, HistEvent *, int, ...);
-
-#define	H_FUNC		 0	/* , UTSL		*/
-#define	H_SETSIZE	 1	/* , const int);	*/
-#define	H_GETSIZE	 2	/* , void);		*/
-#define	H_FIRST		 3	/* , void);		*/
-#define	H_LAST		 4	/* , void);		*/
-#define	H_PREV		 5	/* , void);		*/
-#define	H_NEXT		 6	/* , void);		*/
-#define	H_CURR		 8	/* , const int);	*/
-#define	H_SET		 7	/* , void);		*/
-#define	H_ADD		 9	/* , const char *);	*/
-#define	H_ENTER		10	/* , const char *);	*/
-#define	H_APPEND	11	/* , const char *);	*/
-#define	H_END		12	/* , void);		*/
-#define	H_NEXT_STR	13	/* , const char *);	*/
-#define	H_PREV_STR	14	/* , const char *);	*/
-#define	H_NEXT_EVENT	15	/* , const int);	*/
-#define	H_PREV_EVENT	16	/* , const int);	*/
-#define	H_LOAD		17	/* , const char *);	*/
-#define	H_SAVE		18	/* , const char *);	*/
-#define	H_CLEAR		19	/* , void);		*/
-
-#endif /* _HISTEDIT_H_ */
diff --git a/net/tnftp/files/libedit/key.h b/net/tnftp/files/libedit/key.h
deleted file mode 100644
index 31573d32d40..00000000000
--- a/net/tnftp/files/libedit/key.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: key.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)key.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.key.h: Key macro header
- */
-#ifndef _h_el_key
-#define	_h_el_key
-
-typedef union key_value_t {
-	el_action_t	 cmd;	/* If it is a command the #	*/
-	char		*str;	/* If it is a string...		*/
-} key_value_t;
-
-typedef struct key_node_t key_node_t;
-
-typedef struct el_key_t {
-	char		*buf;	/* Key print buffer		*/
-	key_node_t	*map;	/* Key map			*/
-	key_value_t	 val;	/* Local conversion buffer	*/
-} el_key_t;
-
-#define	XK_CMD	0
-#define	XK_STR	1
-#define	XK_NOD	2
-#define	XK_EXE	3
-
-protected int		 key_init(EditLine *);
-protected void		 key_end(EditLine *);
-protected key_value_t	*key_map_cmd(EditLine *, int);
-protected key_value_t	*key_map_str(EditLine *, char *);
-protected void		 key_reset(EditLine *);
-protected int		 key_get(EditLine *, char *, key_value_t *);
-protected void		 key_add(EditLine *, const char *, key_value_t *, int);
-protected void		 key_clear(EditLine *, el_action_t *, const char *);
-protected int		 key_delete(EditLine *, const char *);
-protected void		 key_print(EditLine *, const char *);
-protected void	         key_kprint(EditLine *, const char *, key_value_t *,
-    int);
-protected char		*key__decode_str(const char *, char *, const char *);
-
-#endif /* _h_el_key */
diff --git a/net/tnftp/files/libedit/makelist.in b/net/tnftp/files/libedit/makelist.in
deleted file mode 100644
index 378a501ced5..00000000000
--- a/net/tnftp/files/libedit/makelist.in
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/sh -
-# @configure_input@
-#
-#	$NetBSD: makelist.in,v 1.1.1.1 2000/09/14 13:33:24 lukem Exp $
-#
-# Copyright (c) 1992, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Christos Zoulas of Cornell University.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)makelist	5.3 (Berkeley) 6/4/93
-
-# makelist.sh: Automatically generate header files...
-
-AWK=@AWK@
-USAGE="Usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
-
-LC_ALL="C"
-export LC_ALL
-
-if [ "x$1" = "x" ]
-then
-    echo $USAGE 1>&2
-    exit 1
-fi
-
-FLAG="$1"
-shift
-
-FILES="$@"
-
-case $FLAG in
-
-#	generate foo.h file from foo.c
-#
--h)
-    set - `echo $FILES | sed -e 's/\\./_/g'`
-    hdr="_h_`basename $1`"
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef %s\n#define %s\n", "'$hdr'", "'$hdr'");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-#
-# XXX:	need a space between name and prototype so that -fc and -fh
-#	parsing is much easier
-#
-		printf("protected el_action_t\t%s (EditLine *, int);\n", name);
-	    }
-	}
-	END {
-	    printf("#endif /* %s */\n", "'$hdr'");
-	}'
-	;;
-
-#	generate help.c from various .c files
-#
--bc)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
-	    printf("private struct el_bindings_t el_func_help[] = {\n");
-	    low = "abcdefghijklmnopqrstuvwxyz_";
-	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-	    for (i = 1; i <= length(low); i++)
-		tr[substr(low, i, 1)] = substr(high, i, 1);
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-		uname = "";
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    uname = uname tr[s];
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf("    { %-30.30s %-30.30s\n","\"" fname "\",", uname ",");
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		printf("      \"");
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-		printf("%s\" },\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf("    { NULL, 0, NULL }\n");
-	    printf("};\n");
-	    printf("\nprotected el_bindings_t* help__get()");
-	    printf("{ return el_func_help; }\n");
-	}'
-	;;
-
-#	generate help.h from various .c files
-#
--bh)
-    $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_help_c\n#define _h_help_c\n");
-	    printf("protected el_bindings_t *help__get(void);\n");
-	    printf("#endif /* _h_help_c */\n");
-	}' /dev/null
-	;;
-
-#	generate fcns.h from various .h files
-#
--fh)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
-    sort | tr '[a-z]' '[A-Z]' | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
-	    count = 0;
-	}
-	{
-	    printf("#define\t%-30.30s\t%3d\n", $1, count++);
-	}
-	END {
-	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
-
-	    printf("typedef el_action_t (*el_func_t)(EditLine *, int);");
-	    printf("\nprotected el_func_t* func__get(void);\n");
-	    printf("#endif /* _h_fcns_c */\n");
-	}'
-	;;
-
-#	generate fcns.c from various .h files
-#
--fc)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
-	    printf("private el_func_t el_func[] = {");
-	    maxlen = 80;
-	    needn = 1;
-	    len = 0;
-	}
-	{
-	    clen = 25 + 2;
-	    len += clen;
-	    if (len >= maxlen)
-		needn = 1;
-	    if (needn) {
-		printf("\n    ");
-		needn = 0;
-		len = 4 + clen;
-	    }
-	    s = $1 ",";
-	    printf("%-26.26s ", s);
-	}
-	END {
-	    printf("\n};\n");
-	    printf("\nprotected el_func_t* func__get() { return el_func; }\n");
-	}'
-	;;
-
-#	generate editline.c from various .c files
-#
--e)
-	echo "$FILES" | tr ' ' '\012' | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#define protected static\n");
-	    printf("#define SCCSID\n");
-	}
-	{
-	    printf("#include \"%s\"\n", $1);
-	}'
-	;;
-
-#	generate man page fragment from various .c files
-#
--m)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf(".\\\" Section automatically generated with makelist\n");
-	    printf(".Bl -tag -width 4n\n");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf(".It Ic %s\n", fname);
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-		printf("%s.\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf(".El\n");
-	    printf(".\\\" End of section automatically generated with makelist\n");
-	}'
-	;;
-
-*)
-    echo $USAGE 1>&2
-    exit 1
-    ;;
-
-esac
diff --git a/net/tnftp/files/libedit/map.h b/net/tnftp/files/libedit/map.h
deleted file mode 100644
index e87bce932d9..00000000000
--- a/net/tnftp/files/libedit/map.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: map.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)map.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.map.h:	Editor maps
- */
-#ifndef _h_el_map
-#define	_h_el_map
-
-typedef struct el_bindings_t {	/* for the "bind" shell command */
-	const char	*name;		/* function name for bind command */
-	int		 func;		/* function numeric value */
-	const char	*description;	/* description of function */
-} el_bindings_t;
-
-
-typedef struct el_map_t {
-	el_action_t	*alt;		/* The current alternate key map */
-	el_action_t	*key;		/* The current normal key map	*/
-	el_action_t	*current;	/* The keymap we are using	*/
-	const el_action_t *emacs;	/* The default emacs key map	*/
-	const el_action_t *vic;		/* The vi command mode key map	*/
-	const el_action_t *vii;		/* The vi insert mode key map	*/
-	int		 type;		/* Emacs or vi			*/
-	el_bindings_t	*help;		/* The help for the editor functions */
-	el_func_t	*func;		/* List of available functions	*/
-	int		 nfunc;		/* The number of functions/help items */
-} el_map_t;
-
-#define	MAP_EMACS	0
-#define	MAP_VI		1
-
-protected int	map_bind(EditLine *, int, const char **);
-protected int	map_init(EditLine *);
-protected void	map_end(EditLine *);
-protected void	map_init_vi(EditLine *);
-protected void	map_init_emacs(EditLine *);
-protected int	map_set_editor(EditLine *, char *);
-protected int	map_get_editor(EditLine *, const char **);
-protected int	map_addfunc(EditLine *, const char *, const char *, el_func_t);
-
-#endif /* _h_el_map */
diff --git a/net/tnftp/files/libedit/parse.h b/net/tnftp/files/libedit/parse.h
deleted file mode 100644
index a86858337dc..00000000000
--- a/net/tnftp/files/libedit/parse.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: parse.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)parse.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.parse.h: Parser functions
- */
-#ifndef _h_el_parse
-#define	_h_el_parse
-
-protected int	 parse_line(EditLine *, const char *);
-protected int	 parse__escape(const char ** const);
-protected char	*parse__string(char *, const char *);
-protected int	 parse_cmd(EditLine *, const char *);
-
-#endif /* _h_el_parse */
diff --git a/net/tnftp/files/libedit/prompt.h b/net/tnftp/files/libedit/prompt.h
deleted file mode 100644
index 926358c448b..00000000000
--- a/net/tnftp/files/libedit/prompt.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: prompt.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.prompt.h: Prompt printing stuff
- */
-#ifndef _h_el_prompt
-#define	_h_el_prompt
-
-#include "histedit.h"
-
-typedef char * (*el_pfunc_t)(EditLine*);
-
-typedef struct el_prompt_t {
-	el_pfunc_t	p_func;	/* Function to return the prompt	*/
-	coord_t		p_pos;	/* position in the line after prompt	*/
-} el_prompt_t;
-
-protected void	prompt_print(EditLine *, int);
-protected int	prompt_set(EditLine *, el_pfunc_t, int);
-protected int	prompt_get(EditLine *, el_pfunc_t *, int);
-protected int	prompt_init(EditLine *);
-protected void	prompt_end(EditLine *);
-
-#endif /* _h_el_prompt */
diff --git a/net/tnftp/files/libedit/read.h b/net/tnftp/files/libedit/read.h
deleted file mode 100644
index 93fcad8bcd1..00000000000
--- a/net/tnftp/files/libedit/read.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: read.h,v 1.1.1.1 2001/09/27 19:29:50 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Anthony Mallet.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * el.read.h: Character reading functions
- */
-#ifndef	_h_el_read
-#define	_h_el_read
-
-typedef int (*el_rfunc_t)(EditLine *, char *);
-
-typedef struct el_read_t {
-	el_rfunc_t	read_char;	/* Function to read a character */
-} el_read_t;
- 
-protected int		read_init(EditLine *);
-protected int		el_read_setfn(EditLine *, el_rfunc_t);
-protected el_rfunc_t	el_read_getfn(EditLine *);
-
-#endif /* _h_el_read */
diff --git a/net/tnftp/files/libedit/readline/Makefile b/net/tnftp/files/libedit/readline/Makefile
deleted file mode 100644
index cea6c4313a3..00000000000
--- a/net/tnftp/files/libedit/readline/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	
-
-.PATH:	${CURDIR}/..
-
-INCS=		readline.h
-INCSDIR=	/usr/include/readline
-SYMLINKS=	readline.h ${INCSDIR}/history.h
-
-NOOBJ=		# defined
-
-incinstall:: linksinstall
-
-.include <bsd.prog.mk>
diff --git a/net/tnftp/files/libedit/readline/readline.h b/net/tnftp/files/libedit/readline/readline.h
deleted file mode 100644
index 498bb8030fb..00000000000
--- a/net/tnftp/files/libedit/readline/readline.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: readline.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _READLINE_H_
-#define	_READLINE_H_
-
-#include <sys/types.h>
-
-/* list of readline stuff supported by editline library's readline wrapper */
-
-/* typedefs */
-typedef int	  Function(const char *, int);
-typedef void	  VFunction(void);
-typedef char	 *CPFunction(const char *, int);
-typedef char	**CPPFunction(const char *, int, int);
-
-typedef struct _hist_entry {
-	const char	*line;
-	const char	*data;
-} HIST_ENTRY;
-
-/* global variables used by readline enabled applications */
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const char	*rl_library_version;
-extern char		*rl_readline_name;
-extern FILE		*rl_instream;
-extern FILE		*rl_outstream;
-extern char		*rl_line_buffer;
-extern int		 rl_point, rl_end;
-extern int		 history_base, history_length;
-extern int		 max_input_history;
-extern char		*rl_basic_word_break_characters;
-extern char		*rl_completer_word_break_characters;
-extern char		*rl_completer_quote_characters;
-extern CPFunction	*rl_completion_entry_function;
-extern CPPFunction	*rl_attempted_completion_function;
-extern int		rl_completion_type;
-extern int		rl_completion_query_items;
-extern char		*rl_special_prefixes;
-extern int		rl_completion_append_character;
-
-/* supported functions */
-char		*readline(const char *);
-int		 rl_initialize(void);
-
-void		 using_history(void);
-int		 add_history(const char *);
-void		 clear_history(void);
-void		 stifle_history(int);
-int		 unstifle_history(void);
-int		 history_is_stifled(void);
-int		 where_history(void);
-HIST_ENTRY	*current_history(void);
-HIST_ENTRY	*history_get(int);
-int		 history_total_bytes(void);
-int		 history_set_pos(int);
-HIST_ENTRY	*previous_history(void);
-HIST_ENTRY	*next_history(void);
-int		 history_search(const char *, int);
-int		 history_search_prefix(const char *, int);
-int		 history_search_pos(const char *, int, int);
-int		 read_history(const char *);
-int		 write_history(const char *);
-int		 history_expand(char *, char **);
-char	       **history_tokenize(const char *);
-
-char		*tilde_expand(char *);
-char		*filename_completion_function(const char *, int);
-char		*username_completion_function(const char *, int);
-int		 rl_complete(int, int);
-int		 rl_read_key(void);
-char	       **completion_matches(const char *, CPFunction *);
-void		 rl_display_match_list(char **, int, int);
-
-int		 rl_insert(int, int);
-void		 rl_reset_terminal(const char *);
-int		 rl_bind_key(int, int (*)(int, int));
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/net/tnftp/files/libedit/refresh.h b/net/tnftp/files/libedit/refresh.h
deleted file mode 100644
index 97f39ac5844..00000000000
--- a/net/tnftp/files/libedit/refresh.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: refresh.h,v 1.1.1.1 2001/04/13 01:49:05 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.refresh.h: Screen refresh functions
- */
-#ifndef _h_el_refresh
-#define	_h_el_refresh
-
-#include "histedit.h"
-
-typedef struct {
-	coord_t	r_cursor;	/* Refresh cursor position	*/
-	int	r_oldcv;	/* Vertical locations		*/
-	int	r_newcv;
-} el_refresh_t;
-
-protected void	re_putc(EditLine *, int, int);
-protected void	re_clear_lines(EditLine *);
-protected void	re_clear_display(EditLine *);
-protected void	re_refresh(EditLine *);
-protected void	re_refresh_cursor(EditLine *);
-protected void	re_fastaddc(EditLine *);
-protected void	re_goto_bottom(EditLine *);
-
-#endif /* _h_el_refresh */
diff --git a/net/tnftp/files/libedit/search.h b/net/tnftp/files/libedit/search.h
deleted file mode 100644
index 2a83e497a02..00000000000
--- a/net/tnftp/files/libedit/search.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: search.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)search.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.search.h: Line and history searching utilities
- */
-#ifndef _h_el_search
-#define	_h_el_search
-
-#include "histedit.h"
-
-typedef struct el_search_t {
-	char	*patbuf;		/* The pattern buffer		*/
-	size_t	 patlen;		/* Length of the pattern buffer	*/
-	int	 patdir;		/* Direction of the last search	*/
-	int	 chadir;		/* Character search direction	*/
-	char	 chacha;		/* Character we are looking for	*/
-} el_search_t;
-
-
-protected int		el_match(const char *, const char *);
-protected int		search_init(EditLine *);
-protected void		search_end(EditLine *);
-protected int		c_hmatch(EditLine *, const char *);
-protected void		c_setpat(EditLine *);
-protected el_action_t	ce_inc_search(EditLine *, int);
-protected el_action_t	cv_search(EditLine *, int);
-protected el_action_t	ce_search_line(EditLine *, char *, int);
-protected el_action_t	cv_repeat_srch(EditLine *, int);
-protected el_action_t	cv_csearch_back(EditLine *, int, int, int);
-protected el_action_t	cv_csearch_fwd(EditLine *, int, int, int);
-
-#endif /* _h_el_search */
diff --git a/net/tnftp/files/libedit/sig.h b/net/tnftp/files/libedit/sig.h
deleted file mode 100644
index 3d4df3cff89..00000000000
--- a/net/tnftp/files/libedit/sig.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: sig.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sig.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.sig.h: Signal handling functions
- */
-#ifndef _h_el_sig
-#define	_h_el_sig
-
-#include <signal.h>
-
-#include "histedit.h"
-
-/*
- * Define here all the signals we are going to handle
- * The _DO macro is used to iterate in the source code
- */
-#define	ALLSIGS		\
-	_DO(SIGINT)	\
-	_DO(SIGTSTP)	\
-	_DO(SIGSTOP)	\
-	_DO(SIGQUIT)	\
-	_DO(SIGHUP)	\
-	_DO(SIGTERM)	\
-	_DO(SIGCONT)	\
-	_DO(SIGWINCH)
-
-typedef void	(*sigfunc)(int);
-
-			/* provided by ../src/util.c */
-sigfunc	xsignal_restart(int, sigfunc, int);
-
-typedef sigfunc	*el_signal_t;
-
-protected void	sig_end(EditLine*);
-protected int	sig_init(EditLine*);
-protected void	sig_set(EditLine*);
-protected void	sig_clr(EditLine*);
-
-#endif /* _h_el_sig */
diff --git a/net/tnftp/files/libedit/sys.h b/net/tnftp/files/libedit/sys.h
deleted file mode 100644
index 049d99d6648..00000000000
--- a/net/tnftp/files/libedit/sys.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: sys.h,v 1.1.1.1 2002/06/10 07:18:19 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sys.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * sys.h: Put all the stupid compiler and system dependencies here...
- */
-#ifndef _h_sys
-#define	_h_sys
-
-#ifndef public
-# define public		/* Externally visible functions/variables */
-#endif
-
-#ifndef private
-# define private	static	/* Always hidden internals */
-#endif
-
-#ifndef protected
-# define protected	/* Redefined from elsewhere to "static" */
-			/* When we want to hide everything	*/
-#endif
-
-#ifndef _PTR_T
-# define _PTR_T
-typedef void	*ptr_t;
-#endif
-
-#ifndef _IOCTL_T
-# define _IOCTL_T
-typedef void	*ioctl_t;
-#endif
-
-#undef	REGEX		/* Use POSIX.2 regular expression functions */
-#undef	REGEXP		/* Use UNIX V8 regular expression functions */
-
-#if HAVE_REGEX_H
-# include <regex.h>
-# define REGEX
-#endif
-
-#endif /* _h_sys */
diff --git a/net/tnftp/files/libedit/term.h b/net/tnftp/files/libedit/term.h
deleted file mode 100644
index dd40759c320..00000000000
--- a/net/tnftp/files/libedit/term.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$NetBSD: term.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)term.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.term.h: Termcap header
- */
-#ifndef _h_el_term
-#define	_h_el_term
-
-#include "histedit.h"
-
-typedef struct {		/* Symbolic function key bindings	*/
-	const char	*name;	/* name of the key			*/
-	int		 key;	/* Index in termcap table		*/
-	key_value_t	 fun;	/* Function bound to it			*/
-	int		 type;	/* Type of function			*/
-} fkey_t;
-
-typedef struct {
-	coord_t	  t_size;		/* # lines and cols	*/
-	int	  t_flags;
-#define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
-#define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
-#define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
-#define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
-#define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
-#define	TERM_CAN_UP		0x020	/* Can move up		*/
-#define	TERM_HAS_META		0x040	/* Has a meta key	*/
-#define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
-#define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
-	char	 *t_buf;		/* Termcap buffer	*/
-	int	  t_loc;		/* location used	*/
-	char	**t_str;		/* termcap strings	*/
-	int	 *t_val;		/* termcap values	*/
-	char	 *t_cap;		/* Termcap buffer	*/
-	fkey_t	 *t_fkey;		/* Array of keys	*/
-} el_term_t;
-
-/*
- * fKey indexes
- */
-#define	A_K_DN		0
-#define	A_K_UP		1
-#define	A_K_LT		2
-#define	A_K_RT		3
-#define	A_K_HO		4
-#define	A_K_EN		5
-#define	A_K_NKEYS	6
-
-protected void	term_move_to_line(EditLine *, int);
-protected void	term_move_to_char(EditLine *, int);
-protected void	term_clear_EOL(EditLine *, int);
-protected void	term_overwrite(EditLine *, const char *, int);
-protected void	term_insertwrite(EditLine *, char *, int);
-protected void	term_deletechars(EditLine *, int);
-protected void	term_clear_screen(EditLine *);
-protected void	term_beep(EditLine *);
-protected int	term_change_size(EditLine *, int, int);
-protected int	term_get_size(EditLine *, int *, int *);
-protected int	term_init(EditLine *);
-protected void	term_bind_arrow(EditLine *);
-protected void	term_print_arrow(EditLine *, const char *);
-protected int	term_clear_arrow(EditLine *, const char *);
-protected int	term_set_arrow(EditLine *, const char *, key_value_t *, int);
-protected void	term_end(EditLine *);
-protected int	term_set(EditLine *, const char *);
-protected int	term_settc(EditLine *, int, const char **);
-protected int	term_telltc(EditLine *, int, const char **);
-protected int	term_echotc(EditLine *, int, const char **);
-protected int	term__putc(int);
-protected void	term__flush(void);
-
-/*
- * Easy access macros
- */
-#define	EL_FLAGS	(el)->el_term.t_flags
-
-#define	EL_CAN_INSERT		(EL_FLAGS & TERM_CAN_INSERT)
-#define	EL_CAN_DELETE		(EL_FLAGS & TERM_CAN_DELETE)
-#define	EL_CAN_CEOL		(EL_FLAGS & TERM_CAN_CEOL)
-#define	EL_CAN_TAB		(EL_FLAGS & TERM_CAN_TAB)
-#define	EL_CAN_ME		(EL_FLAGS & TERM_CAN_ME)
-#define	EL_HAS_META		(EL_FLAGS & TERM_HAS_META)
-#define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
-#define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
-
-#endif /* _h_el_term */
diff --git a/net/tnftp/files/libedit/tokenizer.h b/net/tnftp/files/libedit/tokenizer.h
deleted file mode 100644
index aeaf761b774..00000000000
--- a/net/tnftp/files/libedit/tokenizer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: tokenizer.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tokenizer.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * tokenizer.h: Header file for tokenizer routines
- */
-#ifndef _h_tokenizer
-#define	_h_tokenizer
-
-typedef struct tokenizer Tokenizer;
-
-Tokenizer	*tok_init(const char *);
-void		 tok_reset(Tokenizer *);
-void		 tok_end(Tokenizer *);
-int		 tok_line(Tokenizer *, const char *, int *, const char ***);
-
-#endif /* _h_tokenizer */
diff --git a/net/tnftp/files/libedit/tty.h b/net/tnftp/files/libedit/tty.h
deleted file mode 100644
index 65fb9da1296..00000000000
--- a/net/tnftp/files/libedit/tty.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/*	$NetBSD: tty.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tty.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.tty.h: Local terminal header
- */
-#ifndef _h_el_tty
-#define	_h_el_tty
-
-#include "histedit.h"
-#include <termios.h>
-#include <unistd.h>
-
-/* Define our own since everyone gets it wrong! */
-#define	CONTROL(A)	((A) & 037)
-
-/*
- * Aix compatible names
- */
-# if defined(VWERSE) && !defined(VWERASE)
-#  define VWERASE VWERSE
-# endif /* VWERSE && !VWERASE */
-
-# if defined(VDISCRD) && !defined(VDISCARD)
-#  define VDISCARD VDISCRD
-# endif /* VDISCRD && !VDISCARD */
-
-# if defined(VFLUSHO) && !defined(VDISCARD)
-#  define VDISCARD VFLUSHO
-# endif  /* VFLUSHO && VDISCARD */
-
-# if defined(VSTRT) && !defined(VSTART)
-#  define VSTART VSTRT
-# endif /* VSTRT && ! VSTART */
-
-# if defined(VSTAT) && !defined(VSTATUS)
-#  define VSTATUS VSTAT
-# endif /* VSTAT && ! VSTATUS */
-
-# ifndef ONLRET
-#  define ONLRET 0
-# endif /* ONLRET */
-
-# ifndef TAB3
-#  ifdef OXTABS
-#   define TAB3 OXTABS
-#  else
-#   define TAB3 0
-#  endif /* OXTABS */
-# endif /* !TAB3 */
-
-# if defined(OXTABS) && !defined(XTABS)
-#  define XTABS OXTABS
-# endif /* OXTABS && !XTABS */
-
-# ifndef ONLCR
-#  define ONLCR 0
-# endif /* ONLCR */
-
-# ifndef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN */
-
-# ifndef ECHOCTL
-#  define ECHOCTL 0
-# endif /* ECHOCTL */
-
-# ifndef PARENB
-#  define PARENB 0
-# endif /* PARENB */
-
-# ifndef EXTPROC
-#  define EXTPROC 0
-# endif /* EXTPROC */
-
-# ifndef FLUSHO
-#  define FLUSHO  0
-# endif /* FLUSHO */
-
-
-# if defined(VDISABLE) && !defined(_POSIX_VDISABLE)
-#  define _POSIX_VDISABLE VDISABLE
-# endif /* VDISABLE && ! _POSIX_VDISABLE */
-
-/*
- * Work around ISC's definition of IEXTEN which is
- * XCASE!
- */
-# ifdef ISC
-#  if defined(IEXTEN) && defined(XCASE)
-#   if IEXTEN == XCASE
-#    undef IEXTEN
-#    define IEXTEN 0
-#   endif /* IEXTEN == XCASE */
-#  endif /* IEXTEN && XCASE */
-#  if defined(IEXTEN) && !defined(XCASE)
-#   define XCASE IEXTEN
-#   undef IEXTEN
-#   define IEXTEN 0
-#  endif /* IEXTEN && !XCASE */
-# endif /* ISC */
-
-/*
- * Work around convex weirdness where turning off IEXTEN makes us
- * lose all postprocessing!
- */
-#if defined(convex) || defined(__convex__)
-# if defined(IEXTEN) && IEXTEN != 0
-#  undef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN != 0 */
-#endif /* convex || __convex__ */
-
-/*
- * So that we don't lose job control.
- */
-#ifdef __SVR4
-# undef CSWTCH
-#endif
-
-#ifndef _POSIX_VDISABLE
-# define _POSIX_VDISABLE ((unsigned char) -1)
-#endif /* _POSIX_VDISABLE */
-
-#if !defined(CREPRINT) && defined(CRPRNT)
-# define CREPRINT CRPRNT
-#endif /* !CREPRINT && CRPRNT */
-#if !defined(CDISCARD) && defined(CFLUSH)
-# define CDISCARD CFLUSH
-#endif /* !CDISCARD && CFLUSH */
-
-#ifndef CINTR
-# define CINTR		CONTROL('c')
-#endif /* CINTR */
-#ifndef CQUIT
-# define CQUIT		034	/* ^\ */
-#endif /* CQUIT */
-#ifndef CERASE
-# define CERASE		0177	/* ^? */
-#endif /* CERASE */
-#ifndef CKILL
-# define CKILL		CONTROL('u')
-#endif /* CKILL */
-#ifndef CEOF
-# define CEOF		CONTROL('d')
-#endif /* CEOF */
-#ifndef CEOL
-# define CEOL		_POSIX_VDISABLE
-#endif /* CEOL */
-#ifndef CEOL2
-# define CEOL2		_POSIX_VDISABLE
-#endif /* CEOL2 */
-#ifndef CSWTCH
-# define CSWTCH		_POSIX_VDISABLE
-#endif /* CSWTCH */
-#ifndef CDSWTCH
-# define CDSWTCH	_POSIX_VDISABLE
-#endif /* CDSWTCH */
-#ifndef CERASE2
-# define CERASE2	_POSIX_VDISABLE
-#endif /* CERASE2 */
-#ifndef CSTART
-# define CSTART		CONTROL('q')
-#endif /* CSTART */
-#ifndef CSTOP
-# define CSTOP		CONTROL('s')
-#endif /* CSTOP */
-#ifndef CSUSP
-# define CSUSP		CONTROL('z')
-#endif /* CSUSP */
-#ifndef CDSUSP
-# define CDSUSP		CONTROL('y')
-#endif /* CDSUSP */
-
-#ifdef hpux
-
-# ifndef CREPRINT
-#  define CREPRINT	_POSIX_VDISABLE
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	_POSIX_VDISABLE
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	_POSIX_VDISABLE
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	_POSIX_VDISABLE
-# endif /* CWERASE */
-
-#else /* !hpux */
-
-# ifndef CREPRINT
-#  define CREPRINT	CONTROL('r')
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	CONTROL('o')
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	CONTROL('v')
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	CONTROL('w')
-# endif /* CWERASE */
-
-#endif /* hpux */
-
-#ifndef CSTATUS
-# define CSTATUS	CONTROL('t')
-#endif /* CSTATUS */
-#ifndef CPAGE
-# define CPAGE		' '
-#endif /* CPAGE */
-#ifndef CPGOFF
-# define CPGOFF		CONTROL('m')
-#endif /* CPGOFF */
-#ifndef CKILL2
-# define CKILL2		_POSIX_VDISABLE
-#endif /* CKILL2 */
-#ifndef CBRK
-# ifndef masscomp
-#  define CBRK		0377
-# else
-#  define CBRK		'\0'
-# endif /* masscomp */
-#endif /* CBRK */
-#ifndef CMIN
-# define CMIN		CEOF
-#endif /* CMIN */
-#ifndef CTIME
-# define CTIME		CEOL
-#endif /* CTIME */
-
-/*
- * Fix for sun inconsistency. On termio VSUSP and the rest of the
- * ttychars > NCC are defined. So we undefine them.
- */
-#if defined(TERMIO) || defined(POSIX)
-# if defined(POSIX) && defined(NCCS)
-#  define NUMCC		NCCS
-# else
-#  ifdef NCC
-#   define NUMCC	NCC
-#  endif /* NCC */
-# endif /* POSIX && NCCS */
-# ifdef NUMCC
-#  ifdef VINTR
-#   if NUMCC <= VINTR
-#    undef VINTR
-#   endif /* NUMCC <= VINTR */
-#  endif /* VINTR */
-#  ifdef VQUIT
-#   if NUMCC <= VQUIT
-#    undef VQUIT
-#   endif /* NUMCC <= VQUIT */
-#  endif /* VQUIT */
-#  ifdef VERASE
-#   if NUMCC <= VERASE
-#    undef VERASE
-#   endif /* NUMCC <= VERASE */
-#  endif /* VERASE */
-#  ifdef VKILL
-#   if NUMCC <= VKILL
-#    undef VKILL
-#   endif /* NUMCC <= VKILL */
-#  endif /* VKILL */
-#  ifdef VEOF
-#   if NUMCC <= VEOF
-#    undef VEOF
-#   endif /* NUMCC <= VEOF */
-#  endif /* VEOF */
-#  ifdef VEOL
-#   if NUMCC <= VEOL
-#    undef VEOL
-#   endif /* NUMCC <= VEOL */
-#  endif /* VEOL */
-#  ifdef VEOL2
-#   if NUMCC <= VEOL2
-#    undef VEOL2
-#   endif /* NUMCC <= VEOL2 */
-#  endif /* VEOL2 */
-#  ifdef VSWTCH
-#   if NUMCC <= VSWTCH
-#    undef VSWTCH
-#   endif /* NUMCC <= VSWTCH */
-#  endif /* VSWTCH */
-#  ifdef VDSWTCH
-#   if NUMCC <= VDSWTCH
-#    undef VDSWTCH
-#   endif /* NUMCC <= VDSWTCH */
-#  endif /* VDSWTCH */
-#  ifdef VERASE2
-#   if NUMCC <= VERASE2
-#    undef VERASE2
-#   endif /* NUMCC <= VERASE2 */
-#  endif /* VERASE2 */
-#  ifdef VSTART
-#   if NUMCC <= VSTART
-#    undef VSTART
-#   endif /* NUMCC <= VSTART */
-#  endif /* VSTART */
-#  ifdef VSTOP
-#   if NUMCC <= VSTOP
-#    undef VSTOP
-#   endif /* NUMCC <= VSTOP */
-#  endif /* VSTOP */
-#  ifdef VWERASE
-#   if NUMCC <= VWERASE
-#    undef VWERASE
-#   endif /* NUMCC <= VWERASE */
-#  endif /* VWERASE */
-#  ifdef VSUSP
-#   if NUMCC <= VSUSP
-#    undef VSUSP
-#   endif /* NUMCC <= VSUSP */
-#  endif /* VSUSP */
-#  ifdef VDSUSP
-#   if NUMCC <= VDSUSP
-#    undef VDSUSP
-#   endif /* NUMCC <= VDSUSP */
-#  endif /* VDSUSP */
-#  ifdef VREPRINT
-#   if NUMCC <= VREPRINT
-#    undef VREPRINT
-#   endif /* NUMCC <= VREPRINT */
-#  endif /* VREPRINT */
-#  ifdef VDISCARD
-#   if NUMCC <= VDISCARD
-#    undef VDISCARD
-#   endif /* NUMCC <= VDISCARD */
-#  endif /* VDISCARD */
-#  ifdef VLNEXT
-#   if NUMCC <= VLNEXT
-#    undef VLNEXT
-#   endif /* NUMCC <= VLNEXT */
-#  endif /* VLNEXT */
-#  ifdef VSTATUS
-#   if NUMCC <= VSTATUS
-#    undef VSTATUS
-#   endif /* NUMCC <= VSTATUS */
-#  endif /* VSTATUS */
-#  ifdef VPAGE
-#   if NUMCC <= VPAGE
-#    undef VPAGE
-#   endif /* NUMCC <= VPAGE */
-#  endif /* VPAGE */
-#  ifdef VPGOFF
-#   if NUMCC <= VPGOFF
-#    undef VPGOFF
-#   endif /* NUMCC <= VPGOFF */
-#  endif /* VPGOFF */
-#  ifdef VKILL2
-#   if NUMCC <= VKILL2
-#    undef VKILL2
-#   endif /* NUMCC <= VKILL2 */
-#  endif /* VKILL2 */
-#  ifdef VBRK
-#   if NUMCC <= VBRK
-#    undef VBRK
-#   endif /* NUMCC <= VBRK */
-#  endif /* VBRK */
-#  ifdef VMIN
-#   if NUMCC <= VMIN
-#    undef VMIN
-#   endif /* NUMCC <= VMIN */
-#  endif /* VMIN */
-#  ifdef VTIME
-#   if NUMCC <= VTIME
-#    undef VTIME
-#   endif /* NUMCC <= VTIME */
-#  endif /* VTIME */
-# endif /* NUMCC */
-#endif /* !POSIX */
-
-#define	C_INTR		 0
-#define	C_QUIT		 1
-#define	C_ERASE		 2
-#define	C_KILL		 3
-#define	C_EOF		 4
-#define	C_EOL		 5
-#define	C_EOL2		 6
-#define	C_SWTCH		 7
-#define	C_DSWTCH	 8
-#define	C_ERASE2	 9
-#define	C_START		10
-#define	C_STOP		11
-#define	C_WERASE	12
-#define	C_SUSP		13
-#define	C_DSUSP		14
-#define	C_REPRINT	15
-#define	C_DISCARD	16
-#define	C_LNEXT		17
-#define	C_STATUS	18
-#define	C_PAGE		19
-#define	C_PGOFF		20
-#define	C_KILL2		21
-#define	C_BRK		22
-#define	C_MIN		23
-#define	C_TIME		24
-#define	C_NCC		25
-#define	C_SH(A)		(1 << (A))
-
-/*
- * Terminal dependend data structures
- */
-#define	EX_IO	0	/* while we are executing	*/
-#define	ED_IO	1	/* while we are editing		*/
-#define	TS_IO	2	/* new mode from terminal	*/
-#define	QU_IO	2	/* used only for quoted chars	*/
-#define	NN_IO	3	/* The number of entries	*/
-
-#define	MD_INP	0
-#define	MD_OUT	1
-#define	MD_CTL	2
-#define	MD_LIN	3
-#define	MD_CHAR	4
-#define	MD_NN	5
-
-typedef struct {
-	const char	*t_name;
-	u_int	 t_setmask;
-	u_int	 t_clrmask;
-} ttyperm_t[NN_IO][MD_NN];
-
-typedef unsigned char ttychar_t[NN_IO][C_NCC];
-
-protected int	tty_init(EditLine *);
-protected void	tty_end(EditLine *);
-protected int	tty_stty(EditLine *, int, const char **);
-protected int	tty_rawmode(EditLine *);
-protected int	tty_cookedmode(EditLine *);
-protected int	tty_quotemode(EditLine *);
-protected int	tty_noquotemode(EditLine *);
-protected void	tty_bind_char(EditLine *, int);
-
-typedef struct {
-    ttyperm_t t_t;
-    ttychar_t t_c;
-    struct termios t_ex, t_ed, t_ts;
-    int t_tabs;
-    int t_eight;
-    speed_t t_speed;
-    int t_mode;
-    unsigned char t_vdisable;
-} el_tty_t;
-
-
-#endif /* _h_el_tty */
diff --git a/net/tnftp/files/libnetbsd/ftpglob.h b/net/tnftp/files/libnetbsd/ftpglob.h
deleted file mode 100644
index 9d6136d4532..00000000000
--- a/net/tnftp/files/libnetbsd/ftpglob.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$Id: ftpglob.h,v 1.1.1.1 2001/04/13 15:23:17 lukem Exp $	*/
-/*	$NetBSD: ftpglob.h,v 1.1.1.1 2001/04/13 15:23:17 lukem Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _GLOB_H_
-#define	_GLOB_H_
-
-typedef struct {
-	int gl_pathc;		/* Count of total paths so far. */
-	int gl_matchc;		/* Count of paths matching pattern. */
-	int gl_offs;		/* Reserved at beginning of gl_pathv. */
-	int gl_flags;		/* Copy of flags parameter to glob. */
-	char **gl_pathv;	/* List of paths matching pattern. */
-				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc)(const char *, int);
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir)(void *);
-	struct dirent *(*gl_readdir)(void *);	
-	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, struct stat *);
-	int (*gl_stat)(const char *, struct stat *);
-} glob_t;
-
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
-#define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
-#define	GLOB_NOESCAPE	0x1000	/* Disable backslash escaping. */
-
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABORTED	(-2)	/* Unignored error. */
-#define	GLOB_NOMATCH	(-3)	/* No match, and GLOB_NOCHECK was not set. */
-#define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
-
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
-#define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
-#define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
-#define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define GLOB_LIMIT	0x0400	/* Limit memory used by matches to ARG_MAX */
-#define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-#define	GLOB_QUOTE	0		/* source compatibility */
-
-#define	GLOB_ABEND	GLOB_ABORTED	/* source compatibility */
-
-int	glob(const char *, int, int (*)(const char *, int), glob_t *);
-void	globfree(glob_t *);
-
-#endif /* !_GLOB_H_ */
diff --git a/net/tnftp/files/libnetbsd/ftpvis.h b/net/tnftp/files/libnetbsd/ftpvis.h
deleted file mode 100644
index eda7def0ec4..00000000000
--- a/net/tnftp/files/libnetbsd/ftpvis.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: ftpvis.h,v 1.1.1.1 2000/06/04 14:48:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _VIS_H_
-#define	_VIS_H_
-
-/*
- * to select alternate encoding format
- */
-#define	VIS_OCTAL	0x01	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropiate */
-
-/*
- * to alter set of characters encoded (default is to encode all
- * non-graphic except space, tab, and newline).
- */
-#define	VIS_SP		0x04	/* also encode space */
-#define	VIS_TAB		0x08	/* also encode tab */
-#define	VIS_NL		0x10	/* also encode newline */
-#define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
-#define	VIS_SAFE	0x20	/* only encode "unsafe" characters */
-
-/*
- * other
- */
-#define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
-
-/*
- * unvis return codes
- */
-#define	UNVIS_VALID	 1	/* character valid */
-#define	UNVIS_VALIDPUSH	 2	/* character valid, push back passed char */
-#define	UNVIS_NOCHAR	 3	/* valid sequence, no character produced */
-#define	UNVIS_SYNBAD	-1	/* unrecognized escape sequence */
-#define	UNVIS_ERROR	-2	/* decoder in unknown state (unrecoverable) */
-
-/*
- * unvis flags
- */
-#define	UNVIS_END	1	/* no more characters */
-
-char	*vis(char *, int, int, int);
-int	strvis(char *, const char *, int);
-int	strvisx(char *, const char *, size_t, int);
-int	strunvis(char *, const char *);
-int	unvis(char *, int, int *, int);
-
-#endif /* !_VIS_H_ */
diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh
index 69612516b67..e05a74d4d73 100644
--- a/security/openssh/files/sshd.sh
+++ b/security/openssh/files/sshd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd.sh,v 1.9 2002/08/19 17:30:05 wiz Exp $
+# $NetBSD: sshd.sh,v 1.8 2002/04/02 10:14:42 seb Exp $
 #
 # PROVIDE: sshd
 # REQUIRE: DAEMON LOGIN
@@ -57,7 +57,7 @@ sshd_precmd()
 keygen_cmd=sshd_keygen
 start_precmd=sshd_precmd
 
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6edef48bcd3..f1e350f7b63 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2002/08/19 16:00:06 wiz Exp $
+# $NetBSD: Makefile,v 1.57.4.1 2002/08/20 12:33:49 agc Exp $
 
 DISTNAME=		openssl-0.9.6g
 SVR4_PKGNAME=		ossl
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index c01b87045da..40f27857351 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/08/19 18:34:54 fredb Exp $
+$NetBSD: distinfo,v 1.12 2002/08/15 19:22:10 fredb Exp $
 
 SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
@@ -6,7 +6,7 @@ SHA1 (openssl-0.9.6g-20020810-netbsd.patch.gz) = 37cf5db32ba045b8a23af71ea95ab2f
 Size (openssl-0.9.6g-20020810-netbsd.patch.gz) = 27608 bytes
 SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea
 SHA1 (patch-ab) = 9bdac032996bd97834b00cb661f79c00dc31bac1
-SHA1 (patch-ac) = 078e2c75019b71db89d03ef3f97ea75c67412680
+SHA1 (patch-ac) = 7d63a98d7df20065da443084f41413eb98911b14
 SHA1 (patch-ad) = ee8283d5537edce1bb60470c616ebabfda0aa084
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
 SHA1 (patch-af) = fd470396c5f54ea2d333df44504c03e7c6c8dc96
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 7d4791a7270..cf2e1e25d53 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/08/19 18:34:56 fredb Exp $
+$NetBSD: patch-ac,v 1.6 2002/08/10 04:50:33 fredb Exp $
 
 --- Configure.orig	Thu Aug  8 16:12:40 2002
 +++ Configure
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.7 2002/08/19 18:34:56 fredb Exp $
 +"NetBSD-mipsel", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-powerpc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc",	"gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-sparc",	"gcc:-DTERMIOS -O2 -mv8 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_RISC1::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86",	"gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/sysutils/cdrecord-devel/PLIST b/sysutils/cdrecord-devel/PLIST
deleted file mode 100644
index 546ee7369bd..00000000000
--- a/sysutils/cdrecord-devel/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/10/31 22:52:58 lukem Exp $
-bin/cdda2wav
-bin/cdrecord
-bin/mkisofs
-bin/readcd
-man/man1/cdda2wav.1
-man/man1/cdrecord.1
-man/man1/readcd.1
-man/man8/mkisofs.8
diff --git a/sysutils/cdrecord-devel/patches/patch-ai b/sysutils/cdrecord-devel/patches/patch-ai
deleted file mode 100644
index 8a0a735e026..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-ai
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/08/09 08:16:43 lukem Exp $
-
-I know this patch is an ugly hack. But at least it makes "cdrecord -scanbus"
-more usefull, which in turn makes xcdroast work. Feel free to implement
-this cleanly however...
-
-Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
-
---- libscg/scsi-bsd.c.orig	Sun Mar 18 15:10:21 2001
-+++ libscg/scsi-bsd.c	Mon Aug  6 14:55:09 2001
-@@ -48,7 +48,7 @@
-  *	Choose your name instead of "schily" and make clear that the version
-  *	string is related to a modified source.
-  */
--LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.40";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.40nb1";	/* The version for this transport*/
- 
- #define	MAX_SCG		16	/* Max # of SCSI controllers */
- #define	MAX_TGT		16
-@@ -108,7 +108,7 @@
- 		 * return "schily" for the SCG_AUTHOR request.
- 		 */
- 		case SCG_AUTHOR:
--			return (_scg_auth_schily);
-+			return ("frueauf");
- 		case SCG_SCCS_ID:
- 			return (__sccsid);
- 		}
-@@ -130,6 +130,15 @@
- 	register int	l;
- 	register int	nopen = 0;
- 	char		devname[64];
-+#if defined(__NetBSD__)
-+	struct scsi_addr mysaddr;
-+#if defined(__i386__)
-+	char	slicename[] = "d";	/* i386 is special */
-+#else
-+	char	slicename[] = "c";	/* this is what the rest uses */
-+#endif
-+	char	*myslicename = slicename;
-+#endif
- 
- 	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- 		errno = EINVAL;
-@@ -156,6 +165,60 @@
- 	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
- 		goto openbydev;
- 
-+
-+/*
-+ * I know of no method in NetBSD to probe the scsibus and get the mapping
-+ * busnumber,target,lun --> devicename.
-+ *
-+ * Because of this implement a true bruteforce hack to find
-+ * out what cdroms there are.
-+ *
-+ * Note that this method only finds cd0-cd7. Anything higher
-+ * than this needs additional tweaks.
-+ *
-+ * Feel free to implement this cleanly if you have better knowledge.
-+ * Until then this helps to get -scanbus und thus xcdroast working :-)
-+ *
-+ */
-+#if defined(__NetBSD__)
-+	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-+		for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+			f = open(devname, O_RDWR);
-+			if (f >= 0) {
-+				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
-+					scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
-+					return(1);
-+				}
-+			} else goto openbydev;
-+		}
-+	} else for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+			f = open(devname, O_RDWR);
-+			if (f >= 0) {
-+				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				scg_scsibus(scgp) = busno   = SADDR_BUS(mysaddr);
-+				scg_target(scgp)  = tgt     = SADDR_TARGET(mysaddr);
-+				if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				scg_lun(scgp)     = tlun    = SADDR_LUN(mysaddr);
-+				if (scg_setup(scgp, f, busno, tgt, tlun))
-+					nopen++;
-+			}
-+		}
-+#else /* not __NetBSD__ */
- 	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
- 
- 		js_snprintf(devname, sizeof(devname),
-@@ -192,6 +255,7 @@
- 			}
- 		}
- 	}
-+#endif /* end of not __NetBSD__ */
- 	/*
- 	 * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
- 	 * We do the apropriate tests and try our best.
diff --git a/sysutils/cdrecord-devel/patches/patch-bb b/sysutils/cdrecord-devel/patches/patch-bb
deleted file mode 100644
index 3949d9e450e..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2001/08/07 11:23:57 lukem Exp $
-
---- mkisofs/mkisofs.c.orig	Fri Apr 20 17:45:50 2001
-+++ mkisofs/mkisofs.c	Mon Aug  6 10:46:21 2001
-@@ -2072,11 +2072,11 @@
- 		}
- 	}
- 	/* We don't need root privilleges anymore. */
--#ifdef	HAVE_SETREUID
--	if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef	HAVE_SETEUID
- 	if (seteuid(getuid()) < 0)
-+#else
-+#ifdef	HAVE_SETREUID
-+	if (setreuid(-1, getuid()) < 0)
- #else
- 	if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 5e5d38ba88c..7f9bdc5a76b 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2002/08/19 22:52:24 atatat Exp $
+$NetBSD: distinfo,v 1.16 2002/06/26 20:11:29 atatat Exp $
 
 SHA1 (lsof_4.64.tar.gz) = eacd1d259d136b27f284928574529da0e35fe6b9
 Size (lsof_4.64.tar.gz) = 942463 bytes
 SHA1 (patch-aa) = 1946122860ad68f1c5e07f6ae82a147eb51e01c5
-SHA1 (patch-ab) = c2dd4962c1beffccc54fd13ef4a41bfd4dc608b7
diff --git a/textproc/Makefile b/textproc/Makefile
index 6e40eca1844..42b26d78bb8 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2002/08/19 22:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2002/08/06 03:50:24 jschauma Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -49,7 +49,6 @@ SUBDIR+=	ispell-catalan
 SUBDIR+=	ispell-francais
 SUBDIR+=	ispell-gaeilge
 SUBDIR+=	ispell-german
-SUBDIR+=	ispell-romanian
 SUBDIR+=	ispell-slovak
 SUBDIR+=	ispell-spanish
 SUBDIR+=	ispell-svenska
diff --git a/textproc/ispell-romanian/DESCR b/textproc/ispell-romanian/DESCR
deleted file mode 100644
index 865abfbb55c..00000000000
--- a/textproc/ispell-romanian/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Romanian dictionary for ispell.
diff --git a/textproc/ispell-romanian/Makefile b/textproc/ispell-romanian/Makefile
deleted file mode 100644
index ac9c96c6d93..00000000000
--- a/textproc/ispell-romanian/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/19 21:20:38 jwise Exp $
-#
-
-DISTNAME=	rom-spell
-PKGNAME=	ispell-romanian-20020218
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.cs.cmu.edu/~mihaib/ftp/
-
-MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell-dictionaries.html#Romanian-dicts
-COMMENT=	Romanian dictionary for ispell
-
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/rom.aff ${PREFIX}/lib/romanian.aff
-	${INSTALL_DATA} ${WRKSRC}/rom.hash ${PREFIX}/lib/romanian.hash
-	${INSTALL_DATA} ${WRKSRC}/rom.signs.aff ${PREFIX}/lib/romanian-signs.aff
-	${INSTALL_DATA} ${WRKSRC}/rom.signs.hash ${PREFIX}/lib/romanian-signs.hash
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-romanian/PLIST b/textproc/ispell-romanian/PLIST
deleted file mode 100644
index 3183d200c88..00000000000
--- a/textproc/ispell-romanian/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/19 21:20:38 jwise Exp $
-lib/romanian.aff
-lib/romanian.hash
-lib/romanian-signs.aff
-lib/romanian-signs.hash
diff --git a/textproc/ispell-romanian/distinfo b/textproc/ispell-romanian/distinfo
deleted file mode 100644
index 24f873f7e39..00000000000
--- a/textproc/ispell-romanian/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/19 21:20:38 jwise Exp $
-
-SHA1 (rom-spell.tar.gz) = 59b5763edbbfa12d9266ab1db3224588b92763c8
-Size (rom-spell.tar.gz) = 279077 bytes
diff --git a/www/analog/Makefile b/www/analog/Makefile
index d366898ee7c..2940a63a64e 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2002/08/19 20:13:32 tron Exp $
+# $NetBSD: Makefile,v 1.34 2002/07/11 10:23:13 abs Exp $
 
-DISTNAME=       analog-5.24
+DISTNAME=       analog-5.23
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
diff --git a/www/analog/PLIST b/www/analog/PLIST
index e1fe26b81c4..a3662a7a767 100644
--- a/www/analog/PLIST
+++ b/www/analog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/08/19 20:13:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/07/11 10:23:13 abs Exp $
 bin/analog
 share/examples/analog.cfg
 @exec test -f %D/etc/analog.cfg || cp -p %D/%F %D/etc/analog.cfg
@@ -182,9 +182,7 @@ lib/analog/lang/fiadom.tab
 lib/analog/lang/fidom.tab
 lib/analog/lang/fr.lng
 lib/analog/lang/fra.lng
-lib/analog/lang/fradesc.txt
 lib/analog/lang/fradom.tab
-lib/analog/lang/frdesc.txt
 lib/analog/lang/frdom.tab
 lib/analog/lang/frform.html
 lib/analog/lang/gr.lng
@@ -228,7 +226,6 @@ lib/analog/lang/kr.lng
 lib/analog/lang/lt.lng
 lib/analog/lang/lv.lng
 lib/analog/lang/nl.lng
-lib/analog/lang/nla.lng
 lib/analog/lang/nladesc.txt
 lib/analog/lang/nladom.tab
 lib/analog/lang/nldesc.txt
@@ -279,12 +276,10 @@ lib/analog/lang/ua.lng
 lib/analog/lang/uadesc.txt
 lib/analog/lang/uk.lng
 lib/analog/lang/uk12.lng
-lib/analog/lang/uka.lng
 lib/analog/lang/ukdesc.txt
 lib/analog/lang/ukdom.tab
 lib/analog/lang/us.lng
 lib/analog/lang/us24.lng
-lib/analog/lang/usa.lng
 lib/analog/lang/usdesc.txt
 lib/analog/lang/usdom.tab
 lib/analog/lang/usform.html
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 707af60c0ab..0a63d5094f3 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2002/08/19 20:13:33 tron Exp $
+$NetBSD: distinfo,v 1.13 2002/07/11 10:23:13 abs Exp $
 
-SHA1 (analog-5.24.tar.gz) = 13d2de6206b6a5d0bbd54a0dbb4c0c0d220aecdb
-Size (analog-5.24.tar.gz) = 983415 bytes
+SHA1 (analog-5.23.tar.gz) = 323a6baf050d9e452d481305581338d2483b3b24
+Size (analog-5.23.tar.gz) = 980399 bytes
 SHA1 (patch-aa) = 50134d5f7a35aecdf1704b22126e07df5c0104ef
 SHA1 (patch-ab) = 46e51dbfe117e7ced6ee44321da82d291bebff24
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 5c2f41d394e..f72c2a266d3 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2002/08/19 19:53:22 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2002/08/02 05:40:48 jlam Exp $
 
 MOZ_VER=	1.0
 DISTNAME=	mozilla-source-${MOZ_VER}
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.mozilla.org/
 COMMENT=	Open-source version of the Netscape browser
 
 BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
-BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 
 USE_PERL5=	build
 USE_GMAKE=	yes
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 5a9056f46c5..71656dcc8a2 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2002/08/19 22:03:04 fredb Exp $
+# $NetBSD: Makefile,v 1.41 2002/08/10 17:03:26 fredb Exp $
 
-DISTNAME=	wwwoffle-2.7d
+DISTNAME=	wwwoffle-2.7c
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 2a58e1da354..b1ad5ab2ea7 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2002/08/19 22:03:04 fredb Exp $
+$NetBSD: distinfo,v 1.16 2002/08/10 13:43:09 fredb Exp $
 
-SHA1 (wwwoffle-2.7d.tgz) = 6a7595c4a8f2bd1b4918b3b5118c90b8afd4a3e9
-Size (wwwoffle-2.7d.tgz) = 867987 bytes
+SHA1 (wwwoffle-2.7c.tgz) = 6260ba0f039ad5430f2e9c31d702e3da35b92a44
+Size (wwwoffle-2.7c.tgz) = 867164 bytes
 SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94
+SHA1 (patch-ab) = 0dfd322da2bb9750668319132fc9d0a0a4c035dd
 SHA1 (patch-ac) = 5cfe930c2b6df543ed214f599eda4bab7a1c0a90
diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab
new file mode 100644
index 00000000000..15be8848818
--- /dev/null
+++ b/www/wwwoffle/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.9 2002/07/25 15:56:20 fredb Exp $
+
+--- src/ftp.c.orig	Sun Jun 23 10:04:08 2002
++++ src/ftp.c
+@@ -365,8 +365,6 @@
+     return(msg);
+    }
+ 
+- free(path);
+-
+  /* Change directory again to see if file is a dir. */
+ 
+  if(file)
+@@ -824,6 +822,7 @@
+  nbuffer=buffer?strlen(buffer):0; nread=0;
+  nbuffertail=buffertail?strlen(buffertail):0; nreadtail=0;
+ 
++ free(path);
+  free(str);
+ 
+  return(msg);
diff --git a/x11/xbindkeys/PLIST b/x11/xbindkeys/PLIST
index f3a19528da2..93232bb081d 100644
--- a/x11/xbindkeys/PLIST
+++ b/x11/xbindkeys/PLIST
@@ -1,2 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2002/07/11 14:23:37 tron Exp $
-bin/xbindkeys_config
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/15 23:35:06 cjep Exp $
+bin/xbindkeys
+bin/xbindkeys_show
+man/man1/xbindkeys.1
+man/man1/xbindkeys_show.1
diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo
index 43ae2353074..cc314b96ca3 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.2 2002/07/11 14:23:37 tron Exp $
+$NetBSD: distinfo,v 1.1.1.1 2002/06/15 23:35:06 cjep Exp $
 
-SHA1 (xbindkeys_config-0.1.2.tar.gz) = da6d3a5e5ba00dedad3d5f6dc145989fabacb491
-Size (xbindkeys_config-0.1.2.tar.gz) = 17579 bytes
-SHA1 (patch-aa) = f96cea02e4e630b7f9a2ecedb8219ca2e4bbd683
+SHA1 (xbindkeys-1.5.5.tar.gz) = 56f814ab706a10b7207222b346433306d414a343
+Size (xbindkeys-1.5.5.tar.gz) = 73777 bytes
author	agc <agc>	2002-08-20 12:33:49 +0000
committer	agc <agc>	2002-08-20 12:33:49 +0000
commit	574ab4dfa77a0822f99d67912722afc9e0900b41 (patch)
tree	3ebf3987da8eed6504a9fe0d16356bb9bc9a0edd
parent	8ca51e197d519d2eaedc0758729571fc4ddedb7d (diff)
download	pkgsrc-574ab4dfa77a0822f99d67912722afc9e0900b41.tar.gz