summaryrefslogtreecommitdiff
path: root/net/tnftp
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-03-11 13:01:01 +0000
committergrant <grant@pkgsrc.org>2004-03-11 13:01:01 +0000
commit19aa548dc050dbaf77264e958e3f443d950ee350 (patch)
tree35c516ff4feb2355038a5938258c1cb2056c991f /net/tnftp
parent96a54de0828c358c3ebd65eefe6a75cc93f22c1f (diff)
downloadpkgsrc-19aa548dc050dbaf77264e958e3f443d950ee350.tar.gz
put a copy of the extracted tnftp sources in files/, required for
bootstrap. ok'd by lukem.
Diffstat (limited to 'net/tnftp')
-rw-r--r--net/tnftp/Makefile10
-rw-r--r--net/tnftp/distinfo4
-rw-r--r--net/tnftp/files/COPYING2
-rw-r--r--net/tnftp/files/ChangeLog2
-rw-r--r--net/tnftp/files/Makefile.in2
-rw-r--r--net/tnftp/files/README4
-rw-r--r--net/tnftp/files/acconfig.h2
-rw-r--r--net/tnftp/files/aclocal.m42
-rw-r--r--net/tnftp/files/config.h.in2
-rwxr-xr-xnet/tnftp/files/configure297
-rw-r--r--net/tnftp/files/configure.in137
-rw-r--r--net/tnftp/files/libedit/Makefile.in2
-rw-r--r--net/tnftp/files/libedit/chared.c2
-rw-r--r--net/tnftp/files/libedit/chared.h2
-rw-r--r--net/tnftp/files/libedit/common.c2
-rw-r--r--net/tnftp/files/libedit/editline.32
-rw-r--r--net/tnftp/files/libedit/editrc.52
-rw-r--r--net/tnftp/files/libedit/el.c2
-rw-r--r--net/tnftp/files/libedit/el.h2
-rw-r--r--net/tnftp/files/libedit/emacs.c2
-rw-r--r--net/tnftp/files/libedit/hist.c2
-rw-r--r--net/tnftp/files/libedit/hist.h2
-rw-r--r--net/tnftp/files/libedit/histedit.h2
-rw-r--r--net/tnftp/files/libedit/history.c2
-rw-r--r--net/tnftp/files/libedit/key.c2
-rw-r--r--net/tnftp/files/libedit/key.h2
-rw-r--r--net/tnftp/files/libedit/makelist.in2
-rw-r--r--net/tnftp/files/libedit/map.c2
-rw-r--r--net/tnftp/files/libedit/map.h2
-rw-r--r--net/tnftp/files/libedit/parse.c2
-rw-r--r--net/tnftp/files/libedit/parse.h2
-rw-r--r--net/tnftp/files/libedit/prompt.c2
-rw-r--r--net/tnftp/files/libedit/prompt.h2
-rw-r--r--net/tnftp/files/libedit/read.c2
-rw-r--r--net/tnftp/files/libedit/read.h2
-rw-r--r--net/tnftp/files/libedit/readline/Makefile2
-rw-r--r--net/tnftp/files/libedit/readline/readline.h2
-rw-r--r--net/tnftp/files/libedit/refresh.c2
-rw-r--r--net/tnftp/files/libedit/refresh.h2
-rw-r--r--net/tnftp/files/libedit/search.c2
-rw-r--r--net/tnftp/files/libedit/search.h2
-rw-r--r--net/tnftp/files/libedit/sig.c2
-rw-r--r--net/tnftp/files/libedit/sig.h2
-rw-r--r--net/tnftp/files/libedit/sys.h2
-rw-r--r--net/tnftp/files/libedit/term.c2
-rw-r--r--net/tnftp/files/libedit/term.h2
-rw-r--r--net/tnftp/files/libedit/tokenizer.c2
-rw-r--r--net/tnftp/files/libedit/tokenizer.h2
-rw-r--r--net/tnftp/files/libedit/tty.c2
-rw-r--r--net/tnftp/files/libedit/tty.h2
-rw-r--r--net/tnftp/files/libedit/vi.c2
-rw-r--r--net/tnftp/files/libnetbsd/Makefile.in2
-rw-r--r--net/tnftp/files/libnetbsd/err.c2
-rw-r--r--net/tnftp/files/libnetbsd/fgetln.c2
-rw-r--r--net/tnftp/files/libnetbsd/fparseln.c4
-rw-r--r--net/tnftp/files/libnetbsd/fseeko.c2
-rw-r--r--net/tnftp/files/libnetbsd/ftpglob.h4
-rw-r--r--net/tnftp/files/libnetbsd/ftpvis.h2
-rw-r--r--net/tnftp/files/libnetbsd/getaddrinfo.c2
-rw-r--r--net/tnftp/files/libnetbsd/getnameinfo.c4
-rw-r--r--net/tnftp/files/libnetbsd/glob.c4
-rw-r--r--net/tnftp/files/libnetbsd/inet_ntop.c4
-rw-r--r--net/tnftp/files/libnetbsd/inet_pton.c4
-rw-r--r--net/tnftp/files/libnetbsd/mkstemp.c4
-rw-r--r--net/tnftp/files/libnetbsd/setprogname.c4
-rw-r--r--net/tnftp/files/libnetbsd/sl_init.c4
-rw-r--r--net/tnftp/files/libnetbsd/snprintf.c2
-rw-r--r--net/tnftp/files/libnetbsd/strdup.c4
-rw-r--r--net/tnftp/files/libnetbsd/strerror.c2
-rw-r--r--net/tnftp/files/libnetbsd/strlcat.c4
-rw-r--r--net/tnftp/files/libnetbsd/strlcpy.c4
-rw-r--r--net/tnftp/files/libnetbsd/strptime.c4
-rw-r--r--net/tnftp/files/libnetbsd/strsep.c4
-rw-r--r--net/tnftp/files/libnetbsd/strtoll.c4
-rw-r--r--net/tnftp/files/libnetbsd/strunvis.c4
-rw-r--r--net/tnftp/files/libnetbsd/strvis.c4
-rw-r--r--net/tnftp/files/libnetbsd/timegm.c2
-rw-r--r--net/tnftp/files/libnetbsd/usleep.c2
-rw-r--r--net/tnftp/files/src/Makefile.in2
-rw-r--r--net/tnftp/files/src/cmds.c4
-rw-r--r--net/tnftp/files/src/cmdtab.c2
-rw-r--r--net/tnftp/files/src/complete.c2
-rw-r--r--net/tnftp/files/src/domacro.c2
-rw-r--r--net/tnftp/files/src/extern.h2
-rw-r--r--net/tnftp/files/src/fetch.c4
-rw-r--r--net/tnftp/files/src/ftp.12
-rw-r--r--net/tnftp/files/src/ftp.c4
-rw-r--r--net/tnftp/files/src/ftp_var.h2
-rw-r--r--net/tnftp/files/src/main.c4
-rw-r--r--net/tnftp/files/src/progressbar.c4
-rw-r--r--net/tnftp/files/src/progressbar.h2
-rw-r--r--net/tnftp/files/src/ruserpass.c2
-rw-r--r--net/tnftp/files/src/util.c4
-rw-r--r--net/tnftp/files/src/version.h2
-rw-r--r--net/tnftp/files/tnftp.h2
-rw-r--r--net/tnftp/files/todo2
96 files changed, 314 insertions, 366 deletions
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index 8c9bd18762c..1bdc178345f 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2004/01/15 10:35:49 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/11 13:01:01 grant Exp $
#
DISTNAME= tnftp-20030825
SVR4_PKGNAME= tnftp
CATEGORIES= net
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= lukem@NetBSD.org
COMMENT= The enhanced FTP client in NetBSD
@@ -14,6 +15,8 @@ GNU_CONFIGURE= YES
CONFLICTS+= kth-krb4-[0-9]*
CONFLICTS+= lukemftp-[0-9]*
+NO_CHECKSUM= # defined
+
.include "../../mk/bsd.prefs.mk"
# Include SOCKS firewall support
@@ -36,4 +39,7 @@ CONFIGURE_ARGS+= --disable-ipv6
OPSYSVARS+= MAKE_ENV
MAKE_ENV.SunOS+= CPPFLAGS=""
+do-extract:
+ @${CP} -Rp ${FILESDIR} ${WRKSRC}
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tnftp/distinfo b/net/tnftp/distinfo
deleted file mode 100644
index 0acf1fb9f17..00000000000
--- a/net/tnftp/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/08/25 12:24:04 lukem Exp $
-
-SHA1 (tnftp-20030825.tar.gz) = 32bc3ad3126756cac7dc50cf311d824a571e29e0
-Size (tnftp-20030825.tar.gz) = 277885 bytes
diff --git a/net/tnftp/files/COPYING b/net/tnftp/files/COPYING
index a604bf591b8..7fb4d668b5e 100644
--- a/net/tnftp/files/COPYING
+++ b/net/tnftp/files/COPYING
@@ -1,4 +1,4 @@
-$Id: COPYING,v 1.1.1.1 2003/02/28 10:54:42 lukem Exp $
+$Id: COPYING,v 1.1 2004/03/11 13:01:01 grant Exp $
Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
All rights reserved.
diff --git a/net/tnftp/files/ChangeLog b/net/tnftp/files/ChangeLog
index f5395ab2ace..34b38844694 100644
--- a/net/tnftp/files/ChangeLog
+++ b/net/tnftp/files/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1.1.1 2003/08/25 11:52:55 lukem Exp $
+$Id: ChangeLog,v 1.1 2004/03/11 13:01:01 grant Exp $
Mon Aug 25 11:45:45 UTC 2003 lukem
diff --git a/net/tnftp/files/Makefile.in b/net/tnftp/files/Makefile.in
index 52a728fdfe9..50a5103ae09 100644
--- a/net/tnftp/files/Makefile.in
+++ b/net/tnftp/files/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.1.1.1 2003/02/28 10:44:39 lukem Exp $
+# $Id: Makefile.in,v 1.1 2004/03/11 13:01:01 grant Exp $
#
srcdir = @srcdir@
diff --git a/net/tnftp/files/README b/net/tnftp/files/README
index 84294e3f857..74e67c9794d 100644
--- a/net/tnftp/files/README
+++ b/net/tnftp/files/README
@@ -4,8 +4,8 @@ WHAT IS TNFTP?
`tnftp' is a `port' of the NetBSD FTP client to other systems.
See http://www.NetBSD.org/ for more details about NetBSD.
-tnftp was formerly known as `lukemftp'
-It was renamed to `tnftp' by Luke Mewburn in February 2003.
+tnftp was formerly known as `lukemftp' and was renamed by Luke Mewburn
+in February 2003.
The enhancements over the standard ftp client in 4.4BSD (and
derivatives) include:
diff --git a/net/tnftp/files/acconfig.h b/net/tnftp/files/acconfig.h
index 1423fd5cb27..13af2a0e66e 100644
--- a/net/tnftp/files/acconfig.h
+++ b/net/tnftp/files/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.1.1.1 2003/07/31 04:22:54 lukem Exp $ */
+/* $Id: acconfig.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
@TOP@
@BOTTOM@
diff --git a/net/tnftp/files/aclocal.m4 b/net/tnftp/files/aclocal.m4
index bce1afc209e..e38bebe4738 100644
--- a/net/tnftp/files/aclocal.m4
+++ b/net/tnftp/files/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.1.1.1 2003/07/26 20:39:04 lukem Exp $
+dnl $Id: aclocal.m4,v 1.1 2004/03/11 13:01:01 grant Exp $
dnl
dnl
diff --git a/net/tnftp/files/config.h.in b/net/tnftp/files/config.h.in
index bb3e6e200c7..fcb574887bd 100644
--- a/net/tnftp/files/config.h.in
+++ b/net/tnftp/files/config.h.in
@@ -1,5 +1,5 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* $Id: config.h.in,v 1.1.1.1 2003/08/25 11:52:56 lukem Exp $ */
+/* $Id: config.h.in,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* Define if on AIX 3.
diff --git a/net/tnftp/files/configure b/net/tnftp/files/configure
index 51ec63e2f7e..5154cf190cf 100755
--- a/net/tnftp/files/configure
+++ b/net/tnftp/files/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.6
+# From configure.in Revision: 1.5
@@ -2547,16 +2547,14 @@ else
#line 2548 "configure"
#include "confdefs.h"
-#include <sys/types.h>
-
+#include <sys/types.h>
int main() {
- long long X = 2, Y = 1, Z;
- Z = X / Y;
- ;
+long long X = 2, Y = 1, Z;
+Z = X / Y; ;
; return 0; }
EOF
-if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ftp_cv_HAVE_LONG_LONG=yes
else
@@ -2572,12 +2570,11 @@ fi
echo "$ac_t""$ftp_cv_HAVE_LONG_LONG" 1>&6
if test "x$ftp_cv_HAVE_LONG_LONG" = "xyes"; then
- cat >> confdefs.h <<\EOF
+cat >> confdefs.h <<\EOF
#define HAVE_LONG_LONG 1
EOF
- have_long_long=yes
-
+have_long_long=yes
else
have_long_long=no
:
@@ -2586,23 +2583,22 @@ EOF
echo $ac_n "checking for in_port_t""... $ac_c" 1>&6
-echo "configure:2590: checking for in_port_t" >&5
+echo "configure:2587: checking for in_port_t" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_IN_PORT_T'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2596 "configure"
+#line 2593 "configure"
#include "confdefs.h"
#include <sys/types.h>
-#include <netinet/in.h>
-
+#include <netinet/in.h>
int main() {
in_port_t X ;
; return 0; }
EOF
-if { (eval echo configure:2606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_IN_PORT_T=yes
else
@@ -2629,23 +2625,22 @@ EOF
echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6
-echo "configure:2633: checking for sa_family_t" >&5
+echo "configure:2629: checking for sa_family_t" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_SA_FAMILY_T'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2639 "configure"
+#line 2635 "configure"
#include "confdefs.h"
#include <sys/types.h>
-#include <sys/socket.h>
-
+#include <sys/socket.h>
int main() {
sa_family_t X ;
; return 0; }
EOF
-if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_SA_FAMILY_T=yes
else
@@ -2672,27 +2667,25 @@ EOF
echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6
-echo "configure:2676: checking for sockaddr_in.sin_len" >&5
+echo "configure:2671: checking for sockaddr_in.sin_len" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKADDR_SA_LEN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2682 "configure"
+#line 2677 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-
+#include <netinet/in.h>
int main() {
struct sockaddr_in sin;
- int X = sin.sin_len
- ;
+ int X = sin.sin_len ;
; return 0; }
EOF
-if { (eval echo configure:2696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_SOCKADDR_SA_LEN=yes
else
@@ -2719,23 +2712,22 @@ EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:2723: checking for socklen_t" >&5
+echo "configure:2716: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKLEN_T'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2729 "configure"
+#line 2722 "configure"
#include "confdefs.h"
#include <sys/types.h>
-#include <sys/socket.h>
-
+#include <sys/socket.h>
int main() {
socklen_t X ;
; return 0; }
EOF
-if { (eval echo configure:2739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_SOCKLEN_T=yes
else
@@ -2764,23 +2756,22 @@ if test $opt_ipv6 = yes; then
echo $ac_n "checking for AF_INET6""... $ac_c" 1>&6
-echo "configure:2768: checking for AF_INET6" >&5
+echo "configure:2760: checking for AF_INET6" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_AF_INET6'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2774 "configure"
+#line 2766 "configure"
#include "confdefs.h"
#include <sys/types.h>
-#include <sys/socket.h>
-
+#include <sys/socket.h>
int main() {
int X = AF_INET6 ;
; return 0; }
EOF
-if { (eval echo configure:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_AF_INET6=yes
else
@@ -2807,26 +2798,24 @@ EOF
echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6
-echo "configure:2811: checking for struct sockaddr_in6" >&5
+echo "configure:2802: checking for struct sockaddr_in6" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKADDR_IN6'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2817 "configure"
+#line 2808 "configure"
#include "confdefs.h"
#include <sys/types.h>
-#include <netinet/in.h>
-
+#include <netinet/in.h>
int main() {
- struct sockaddr_in6 X;
- int Y = X.sin6_scope_id
- ;
+ struct sockaddr_in6 X;
+ int Y = X.sin6_scope_id ;
; return 0; }
EOF
-if { (eval echo configure:2830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_SOCKADDR_IN6=yes
else
@@ -2854,23 +2843,20 @@ EOF
if test $ac_cv_header_arpa_nameser_h = yes; then
echo $ac_n "checking for IN6ADDRSZ in arpa/nameser.h""... $ac_c" 1>&6
-echo "configure:2858: checking for IN6ADDRSZ in arpa/nameser.h" >&5
+echo "configure:2847: checking for IN6ADDRSZ in arpa/nameser.h" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_IN6ADDRSZ'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
+#line 2853 "configure"
#include "confdefs.h"
-
-#include <sys/types.h>
-#include <arpa/nameser.h>
-
+ #include <arpa/nameser.h>
int main() {
int X = IN6ADDRSZ ;
; return 0; }
EOF
-if { (eval echo configure:2874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_IN6ADDRSZ=yes
else
@@ -2900,24 +2886,23 @@ fi
echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6
-echo "configure:2904: checking for struct addrinfo" >&5
+echo "configure:2890: checking for struct addrinfo" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_ADDRINFO'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2910 "configure"
+#line 2896 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
-#include <netdb.h>
-
+#include <netdb.h>
int main() {
struct addrinfo X ;
; return 0; }
EOF
-if { (eval echo configure:2921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_ADDRINFO=yes
else
@@ -2944,13 +2929,13 @@ EOF
echo $ac_n "checking for d_namlen in struct dirent""... $ac_c" 1>&6
-echo "configure:2948: checking for d_namlen in struct dirent" >&5
+echo "configure:2933: checking for d_namlen in struct dirent" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_D_NAMLEN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2954 "configure"
+#line 2939 "configure"
#include "confdefs.h"
#if HAVE_DIRENT_H
@@ -2966,16 +2951,14 @@ else
# if HAVE_NDIR_H
# include <ndir.h>
# endif
-#endif
-
+#endif
int main() {
struct dirent dp;
- int X = dp.d_namlen;
- ;
+ int X = dp.d_namlen; ;
; return 0; }
EOF
-if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_D_NAMLEN=yes
else
@@ -3002,22 +2985,21 @@ EOF
echo $ac_n "checking for h_errno declaration""... $ac_c" 1>&6
-echo "configure:3006: checking for h_errno declaration" >&5
+echo "configure:2989: checking for h_errno declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_H_ERRNO_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3012 "configure"
+#line 2995 "configure"
#include "confdefs.h"
-#include <netdb.h>
-
+#include <netdb.h>
int main() {
int X = h_errno ;
; return 0; }
EOF
-if { (eval echo configure:3021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_H_ERRNO_D=yes
else
@@ -3044,22 +3026,21 @@ EOF
echo $ac_n "checking for fclose() declaration""... $ac_c" 1>&6
-echo "configure:3048: checking for fclose() declaration" >&5
+echo "configure:3030: checking for fclose() declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_FCLOSE_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3054 "configure"
+#line 3036 "configure"
#include "confdefs.h"
-#include <stdio.h>
-
+#include <stdio.h>
int main() {
int (*X)() = fclose ;
; return 0; }
EOF
-if { (eval echo configure:3063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_FCLOSE_D=yes
else
@@ -3086,23 +3067,22 @@ EOF
echo $ac_n "checking for getpass() declaration""... $ac_c" 1>&6
-echo "configure:3090: checking for getpass() declaration" >&5
+echo "configure:3071: checking for getpass() declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_GETPASS_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3096 "configure"
+#line 3077 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <unistd.h>
-
+#include <unistd.h>
int main() {
char *(*X)() = getpass ;
; return 0; }
EOF
-if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_GETPASS_D=yes
else
@@ -3117,7 +3097,8 @@ fi
echo "$ac_t""$ftp_cv_HAVE_GETPASS_D" 1>&6
if test "x$ftp_cv_HAVE_GETPASS_D" = "xyes"; then
- cat >> confdefs.h <<\EOF
+
+ cat >> confdefs.h <<\EOF
#define HAVE_GETPASS_D 1
EOF
@@ -3129,23 +3110,22 @@ EOF
echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6
-echo "configure:3133: checking for optarg declaration" >&5
+echo "configure:3114: checking for optarg declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3120 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <unistd.h>
-
+#include <unistd.h>
int main() {
char *X = optarg ;
; return 0; }
EOF
-if { (eval echo configure:3149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_OPTARG_D=yes
else
@@ -3172,23 +3152,22 @@ EOF
echo $ac_n "checking for optind declaration""... $ac_c" 1>&6
-echo "configure:3176: checking for optind declaration" >&5
+echo "configure:3156: checking for optind declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3182 "configure"
+#line 3162 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <unistd.h>
-
+#include <unistd.h>
int main() {
int X = optind ;
; return 0; }
EOF
-if { (eval echo configure:3192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_OPTIND_D=yes
else
@@ -3215,22 +3194,21 @@ EOF
echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6
-echo "configure:3219: checking for pclose() declaration" >&5
+echo "configure:3198: checking for pclose() declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3225 "configure"
+#line 3204 "configure"
#include "confdefs.h"
-#include <stdio.h>
-
+#include <stdio.h>
int main() {
int (*X)() = pclose ;
; return 0; }
EOF
-if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_PCLOSE_D=yes
else
@@ -3261,12 +3239,12 @@ for ac_func in err fgetln fseeko getaddrinfo getnameinfo inet_ntop inet_pton \
strlcpy strptime strsep strunvis strvis timegm usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3265: checking for $ac_func" >&5
+echo "configure:3243: 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 3270 "configure"
+#line 3248 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3289,7 +3267,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3271: \"$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
@@ -3318,12 +3296,12 @@ done
for ac_func in gethostbyname2 getpassphrase getpgrp memmove poll select
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3322: checking for $ac_func" >&5
+echo "configure:3300: 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 3327 "configure"
+#line 3305 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3346,7 +3324,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3328: \"$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
@@ -3372,7 +3350,7 @@ done
if test $ac_cv_func_getpgrp = yes; then
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3376: checking whether getpgrp takes no argument" >&5
+echo "configure:3354: checking whether getpgrp takes no argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3380,7 +3358,7 @@ else
{ echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3384 "configure"
+#line 3362 "configure"
#include "confdefs.h"
/*
@@ -3435,7 +3413,7 @@ main()
}
EOF
-if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_getpgrp_void=yes
else
@@ -3463,12 +3441,12 @@ if test $ac_cv_lib_util_fparseln != yes; then
for ac_func in fparseln
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3467: checking for $ac_func" >&5
+echo "configure:3445: 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 3472 "configure"
+#line 3450 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3491,7 +3469,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3473: \"$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
@@ -3524,24 +3502,21 @@ LIBOBJS="$LIBOBJS glob.o"
if test $ac_cv_func_strptime = yes; then
echo $ac_n "checking for strptime() declaration""... $ac_c" 1>&6
-echo "configure:3528: checking for strptime() declaration" >&5
+echo "configure:3506: checking for strptime() declaration" >&5
if eval "test \"`echo '$''{'ftp_cv_HAVE_STRPTIME_D'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3534 "configure"
+#line 3512 "configure"
#include "confdefs.h"
-#include <time.h>
-
+ #include <time.h>
int main() {
-
- char *X = strptime("", "", NULL)
- ;
+ char *X = strptime("", "", NULL) ;
; return 0; }
EOF
-if { (eval echo configure:3545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_HAVE_STRPTIME_D=yes
else
@@ -3571,24 +3546,24 @@ if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6
-echo "configure:3575: checking *printf() support for %lld" >&5
+echo "configure:3550: checking *printf() support for %lld" >&5
can_printf_longlong=no
if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 3581 "configure"
+#line 3556 "configure"
#include "confdefs.h"
-#include <stdio.h>
-int main() {
- char buf[100];
- sprintf(buf, "%lld", 4294967300LL);
- return (strcmp(buf, "4294967300"));
-}
+ #include <stdio.h>
+ int main() {
+ char buf[100];
+ sprintf(buf, "%lld", 4294967300LL);
+ return (strcmp(buf, "4294967300"));
+ }
EOF
-if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -3608,23 +3583,23 @@ fi
if test $can_printf_longlong != yes; then
echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6
-echo "configure:3612: checking *printf() support for %qd" >&5
+echo "configure:3587: checking *printf() support for %qd" >&5
if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 3617 "configure"
+#line 3592 "configure"
#include "confdefs.h"
-#include <stdio.h>
-int main() {
- char buf[100];
- sprintf(buf, "%qd", 4294967300LL);
- return (strcmp(buf, "4294967300"));
-}
+ #include <stdio.h>
+ int main() {
+ char buf[100];
+ sprintf(buf, "%qd", 4294967300LL);
+ return (strcmp(buf, "4294967300"));
+ }
EOF
-if { (eval echo configure:3628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -3655,12 +3630,12 @@ EOF
for ac_func in strtoll
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3659: checking for $ac_func" >&5
+echo "configure:3634: 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 3664 "configure"
+#line 3639 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3683,7 +3658,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3662: \"$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
@@ -3718,22 +3693,21 @@ if test $opt_editcomplete = yes; then
if test $have_libedit = yes; then
echo $ac_n "checking for EL_RPROMPT in libedit""... $ac_c" 1>&6
-echo "configure:3722: checking for EL_RPROMPT in libedit" >&5
+echo "configure:3697: checking for EL_RPROMPT in libedit" >&5
if eval "test \"`echo '$''{'ftp_cv_have_libedit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3728 "configure"
+#line 3703 "configure"
#include "confdefs.h"
-#include <histedit.h>
-
+ #include <histedit.h>
int main() {
int X = EL_RPROMPT ;
; return 0; }
EOF
-if { (eval echo configure:3737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_have_libedit=yes
else
@@ -3757,7 +3731,7 @@ echo "$ac_t""$ftp_cv_have_libedit" 1>&6
fi
echo $ac_n "checking for working libedit""... $ac_c" 1>&6
-echo "configure:3761: checking for working libedit" >&5
+echo "configure:3735: checking for working libedit" >&5
if test $have_libedit = no; then
echo "$ac_t""no - using my own" 1>&6
INCLUDES="-I\${srcdir}/../libedit $INCLUDES"
@@ -3775,24 +3749,21 @@ fi
if test $ac_cv_func_sl_init = yes; then
echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6
-echo "configure:3779: checking if sl_add() returns int" >&5
+echo "configure:3753: checking if sl_add() returns int" >&5
if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3785 "configure"
+#line 3759 "configure"
#include "confdefs.h"
-#include <stringlist.h>
-
+ #include <stringlist.h>
int main() {
-
- int f = sl_add((StringList *)0, "foo")
- ;
+ int f = sl_add((StringList *)0, "foo") ;
; return 0; }
EOF
-if { (eval echo configure:3796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_INT_SL_ADD=yes
else
@@ -3820,24 +3791,23 @@ have_rfc2553_netdb=no
if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then
echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6
-echo "configure:3824: checking for AI_NUMERICHOST" >&5
+echo "configure:3795: checking for AI_NUMERICHOST" >&5
if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3830 "configure"
+#line 3801 "configure"
#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
int main() {
int X = AI_NUMERICHOST ;
; return 0; }
EOF
-if { (eval echo configure:3841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_have_ai_numerichost=yes
else
@@ -3860,7 +3830,7 @@ echo "$ac_t""$ftp_cv_have_ai_numerichost" 1>&6
fi
echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6
-echo "configure:3864: checking for working getaddrinfo()" >&5
+echo "configure:3834: checking for working getaddrinfo()" >&5
if test $have_rfc2553_netdb = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_RFC2553_NETDB 1
@@ -3880,23 +3850,22 @@ fi
if test $ac_cv_header_vis_h = yes; then
echo $ac_n "checking for VIS_WHITE in vis.h""... $ac_c" 1>&6
-echo "configure:3884: checking for VIS_WHITE in vis.h" >&5
+echo "configure:3854: checking for VIS_WHITE in vis.h" >&5
if eval "test \"`echo '$''{'ftp_cv_have_vis_white'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3890 "configure"
+#line 3860 "configure"
#include "confdefs.h"
-#include <sys/types.h>
-#include <vis.h>
-
+ #include <sys/types.h>
+ #include <vis.h>
int main() {
int X = VIS_WHITE ;
; return 0; }
EOF
-if { (eval echo configure:3900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ftp_cv_have_vis_white=yes
else
diff --git a/net/tnftp/files/configure.in b/net/tnftp/files/configure.in
index 8fa9a2cf8c3..7887ce357fb 100644
--- a/net/tnftp/files/configure.in
+++ b/net/tnftp/files/configure.in
@@ -1,10 +1,10 @@
-dnl $Id: configure.in,v 1.1.1.2 2003/10/06 01:09:12 lukem Exp $
+dnl $Id: configure.in,v 1.1 2004/03/11 13:01:01 grant Exp $
dnl
dnl configure.in --
dnl process this file with autoconf to produce a configure script.
dnl
-AC_REVISION($Revision: 1.1.1.2 $)dnl
+AC_REVISION($Revision: 1.1 $)dnl
AC_INIT(tnftp.h)
@@ -70,60 +70,49 @@ AC_HEADER_TIME
AC_TYPE_OFF_T
AC_CHECK_SIZEOF(off_t, 0)
AC_MSG_TRY_LINK(for long long, ftp_cv_HAVE_LONG_LONG, [
-#include <sys/types.h>
- ] , [
- long long X = 2, Y = 1, Z;
- Z = X / Y;
- ], [
- AC_DEFINE(HAVE_LONG_LONG, 1)
- have_long_long=yes
- ], [have_long_long=no])
+#include <sys/types.h>] , [
+long long X = 2, Y = 1, Z;
+Z = X / Y; ], [
+AC_DEFINE(HAVE_LONG_LONG, 1)
+have_long_long=yes], [have_long_long=no])
AC_MSG_TRY_COMPILE(for in_port_t, ftp_cv_HAVE_IN_PORT_T, [
#include <sys/types.h>
-#include <netinet/in.h>
- ], [ in_port_t X ], [AC_DEFINE(HAVE_IN_PORT_T, 1)])
+#include <netinet/in.h> ], [ in_port_t X ], [AC_DEFINE(HAVE_IN_PORT_T, 1)])
AC_MSG_TRY_COMPILE(for sa_family_t, ftp_cv_HAVE_SA_FAMILY_T, [
#include <sys/types.h>
-#include <sys/socket.h>
- ], [ sa_family_t X ], [AC_DEFINE(HAVE_SA_FAMILY_T, 1)])
+#include <sys/socket.h> ], [ sa_family_t X ], [AC_DEFINE(HAVE_SA_FAMILY_T, 1)])
AC_MSG_TRY_COMPILE(for sockaddr_in.sin_len, ftp_cv_HAVE_SOCKADDR_SA_LEN, [
#include <sys/types.h>
#include <sys/socket.h>
-#include <netinet/in.h>
- ], [
+#include <netinet/in.h> ], [
struct sockaddr_in sin;
- int X = sin.sin_len
- ], [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1)])
+ int X = sin.sin_len ], [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1)])
AC_MSG_TRY_COMPILE(for socklen_t, ftp_cv_HAVE_SOCKLEN_T, [
#include <sys/types.h>
-#include <sys/socket.h>
- ], [ socklen_t X ], [AC_DEFINE(HAVE_SOCKLEN_T, 1)])
+#include <sys/socket.h> ], [ socklen_t X ], [AC_DEFINE(HAVE_SOCKLEN_T, 1)])
if test $opt_ipv6 = yes; then
AC_MSG_TRY_COMPILE(for AF_INET6, ftp_cv_HAVE_AF_INET6, [
#include <sys/types.h>
-#include <sys/socket.h>
- ], [ int X = AF_INET6 ], [AC_DEFINE(HAVE_AF_INET6, 1)])
+#include <sys/socket.h> ],
+ [ int X = AF_INET6 ], [AC_DEFINE(HAVE_AF_INET6, 1)])
AC_MSG_TRY_COMPILE(for struct sockaddr_in6, ftp_cv_HAVE_SOCKADDR_IN6, [
#include <sys/types.h>
-#include <netinet/in.h>
- ], [
- struct sockaddr_in6 X;
- int Y = X.sin6_scope_id
- ], [AC_DEFINE(HAVE_SOCKADDR_IN6, 1)])
+#include <netinet/in.h> ], [
+ struct sockaddr_in6 X;
+ int Y = X.sin6_scope_id ], [AC_DEFINE(HAVE_SOCKADDR_IN6, 1)])
if test $ac_cv_header_arpa_nameser_h = yes; then
AC_MSG_TRY_COMPILE(for IN6ADDRSZ in arpa/nameser.h,
- ftp_cv_HAVE_IN6ADDRSZ, [
-#include <sys/types.h>
-#include <arpa/nameser.h>
- ], [ int X = IN6ADDRSZ ], [AC_DEFINE(HAVE_IN6ADDRSZ, 1)])
+ ftp_cv_HAVE_IN6ADDRSZ,
+ [ #include <arpa/nameser.h> ],
+ [ int X = IN6ADDRSZ ], [AC_DEFINE(HAVE_IN6ADDRSZ, 1)])
fi
fi
@@ -131,8 +120,8 @@ fi
AC_MSG_TRY_COMPILE(for struct addrinfo, ftp_cv_HAVE_ADDRINFO, [
#include <sys/types.h>
#include <sys/socket.h>
-#include <netdb.h>
- ], [ struct addrinfo X ], [AC_DEFINE(HAVE_ADDRINFO, 1)])
+#include <netdb.h> ],
+ [ struct addrinfo X ], [AC_DEFINE(HAVE_ADDRINFO, 1)])
AC_MSG_TRY_COMPILE(for d_namlen in struct dirent, ftp_cv_HAVE_D_NAMLEN, [
#if HAVE_DIRENT_H
@@ -148,38 +137,31 @@ AC_MSG_TRY_COMPILE(for d_namlen in struct dirent, ftp_cv_HAVE_D_NAMLEN, [
# if HAVE_NDIR_H
# include <ndir.h>
# endif
-#endif
- ], [
+#endif ], [
struct dirent dp;
- int X = dp.d_namlen;
- ], [AC_DEFINE(HAVE_D_NAMLEN, 1)])
+ int X = dp.d_namlen; ], [AC_DEFINE(HAVE_D_NAMLEN, 1)])
AC_MSG_TRY_COMPILE(for h_errno declaration, ftp_cv_HAVE_H_ERRNO_D, [
-#include <netdb.h>
- ], [ int X = h_errno ], [AC_DEFINE(HAVE_H_ERRNO_D, 1)])
+#include <netdb.h> ], [ int X = h_errno ], [AC_DEFINE(HAVE_H_ERRNO_D, 1)])
AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [
-#include <stdio.h>
- ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)])
+#include <stdio.h> ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)])
AC_MSG_TRY_COMPILE(for getpass() declaration, ftp_cv_HAVE_GETPASS_D, [
#include <stdlib.h>
-#include <unistd.h>
- ], [ char *(*X)() = getpass ], [ AC_DEFINE(HAVE_GETPASS_D, 1)])
+#include <unistd.h> ], [ char *(*X)() = getpass ], [
+ AC_DEFINE(HAVE_GETPASS_D, 1)])
AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [
#include <stdlib.h>
-#include <unistd.h>
- ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)])
+#include <unistd.h> ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)])
AC_MSG_TRY_COMPILE(for optind declaration, ftp_cv_HAVE_OPTIND_D, [
#include <stdlib.h>
-#include <unistd.h>
- ], [ int X = optind ], [AC_DEFINE(HAVE_OPTIND_D, 1)])
+#include <unistd.h> ], [ int X = optind ], [AC_DEFINE(HAVE_OPTIND_D, 1)])
AC_MSG_TRY_COMPILE(for pclose() declaration, ftp_cv_HAVE_PCLOSE_D, [
-#include <stdio.h>
- ], [ int (*X)() = pclose ], [AC_DEFINE(HAVE_PCLOSE_D, 1)])
+#include <stdio.h> ], [ int (*X)() = pclose ], [AC_DEFINE(HAVE_PCLOSE_D, 1)])
dnl Checks for library functions.
@@ -199,10 +181,8 @@ LIBOBJS="$LIBOBJS glob.o"
if test $ac_cv_func_strptime = yes; then
AC_MSG_TRY_COMPILE(for strptime() declaration, ftp_cv_HAVE_STRPTIME_D, [
-#include <time.h>
- ], [
- char *X = strptime("", "", NULL)
- ], [AC_DEFINE(HAVE_STRPTIME_D, 1)])
+ #include <time.h> ], [ char *X = strptime("", "", NULL) ],
+ [AC_DEFINE(HAVE_STRPTIME_D, 1)])
fi
if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
@@ -214,12 +194,12 @@ dnl support because we don't know how to display it.
AC_MSG_CHECKING(*printf() support for %lld)
can_printf_longlong=no
AC_TRY_RUN([
-#include <stdio.h>
-int main() {
- char buf[100];
- sprintf(buf, "%lld", 4294967300LL);
- return (strcmp(buf, "4294967300"));
-}
+ #include <stdio.h>
+ int main() {
+ char buf[100];
+ sprintf(buf, "%lld", 4294967300LL);
+ return (strcmp(buf, "4294967300"));
+ }
], [
AC_MSG_RESULT(yes)
can_printf_longlong=yes
@@ -230,12 +210,12 @@ int main() {
if test $can_printf_longlong != yes; then
AC_MSG_CHECKING(*printf() support for %qd)
AC_TRY_RUN([
-#include <stdio.h>
-int main() {
- char buf[100];
- sprintf(buf, "%qd", 4294967300LL);
- return (strcmp(buf, "4294967300"));
-}
+ #include <stdio.h>
+ int main() {
+ char buf[100];
+ sprintf(buf, "%qd", 4294967300LL);
+ return (strcmp(buf, "4294967300"));
+ }
], [
AC_MSG_RESULT(yes)
can_printf_longlong=yes
@@ -256,9 +236,8 @@ fi
if test $opt_editcomplete = yes; then
if test $have_libedit = yes; then
AC_MSG_TRY_COMPILE(for EL_RPROMPT in libedit,
- ftp_cv_have_libedit, [
-#include <histedit.h>
- ], [ int X = EL_RPROMPT ], [:],
+ ftp_cv_have_libedit, [
+ #include <histedit.h> ], [ int X = EL_RPROMPT ], [:],
have_libedit=no )
fi
@@ -279,10 +258,8 @@ fi
if test $ac_cv_func_sl_init = yes; then
AC_MSG_TRY_COMPILE(if sl_add() returns int, ftp_cv_INT_SL_ADD, [
-#include <stringlist.h>
- ], [
- int f = sl_add((StringList *)0, "foo")
- ], [:] , [LIBOBJS="$LIBOBJS sl_init.o"])
+ #include <stringlist.h> ], [ int f = sl_add((StringList *)0, "foo") ],
+ [:] , [LIBOBJS="$LIBOBJS sl_init.o"])
fi
@@ -290,10 +267,10 @@ have_rfc2553_netdb=no
if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then
AC_MSG_TRY_COMPILE(for AI_NUMERICHOST,
ftp_cv_have_ai_numerichost, [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
- ], [ int X = AI_NUMERICHOST ], [ have_rfc2553_netdb=yes ])
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h> ],
+ [ int X = AI_NUMERICHOST ], [ have_rfc2553_netdb=yes ])
fi
AC_MSG_CHECKING(for working getaddrinfo())
if test $have_rfc2553_netdb = yes; then
@@ -311,10 +288,10 @@ fi
if test $ac_cv_header_vis_h = yes; then
AC_MSG_TRY_COMPILE(for VIS_WHITE in vis.h,
- ftp_cv_have_vis_white, [
-#include <sys/types.h>
-#include <vis.h>
- ], [ int X = VIS_WHITE ], [:], ac_cv_header_vis_h=no )
+ ftp_cv_have_vis_white, [
+ #include <sys/types.h>
+ #include <vis.h> ], [ int X = VIS_WHITE ], [:],
+ ac_cv_header_vis_h=no )
fi
diff --git a/net/tnftp/files/libedit/Makefile.in b/net/tnftp/files/libedit/Makefile.in
index 65304b33245..4a334a53b36 100644
--- a/net/tnftp/files/libedit/Makefile.in
+++ b/net/tnftp/files/libedit/Makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.1.1.1 1999/10/11 07:02:45 lukem Exp $
+# $Id: Makefile.in,v 1.1 2004/03/11 13:01:01 grant Exp $
#
srcdir = @srcdir@
diff --git a/net/tnftp/files/libedit/chared.c b/net/tnftp/files/libedit/chared.c
index 314aee9dd33..e04f2c359a7 100644
--- a/net/tnftp/files/libedit/chared.c
+++ b/net/tnftp/files/libedit/chared.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.1.1.1 2003/02/28 10:44:42 lukem Exp $ */
+/* $NetBSD: chared.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/chared.h b/net/tnftp/files/libedit/chared.h
index fbc14914c87..0c9a65e95b5 100644
--- a/net/tnftp/files/libedit/chared.h
+++ b/net/tnftp/files/libedit/chared.h
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: chared.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/common.c b/net/tnftp/files/libedit/common.c
index 3baf6a1ee93..0fdf7cf805e 100644
--- a/net/tnftp/files/libedit/common.c
+++ b/net/tnftp/files/libedit/common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.1.1.1 2003/02/28 10:44:42 lukem Exp $ */
+/* $NetBSD: common.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/editline.3 b/net/tnftp/files/libedit/editline.3
index b9463ee5a23..46e9dd5669c 100644
--- a/net/tnftp/files/libedit/editline.3
+++ b/net/tnftp/files/libedit/editline.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $
+.\" $NetBSD: editline.3,v 1.1 2004/03/11 13:01:01 grant Exp $
.\"
.\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
diff --git a/net/tnftp/files/libedit/editrc.5 b/net/tnftp/files/libedit/editrc.5
index 58686683d4c..c0338e06b73 100644
--- a/net/tnftp/files/libedit/editrc.5
+++ b/net/tnftp/files/libedit/editrc.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: editrc.5,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $
+.\" $NetBSD: editrc.5,v 1.1 2004/03/11 13:01:01 grant Exp $
.\"
.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
diff --git a/net/tnftp/files/libedit/el.c b/net/tnftp/files/libedit/el.c
index 67b5e97b758..bb5f5dd035e 100644
--- a/net/tnftp/files/libedit/el.c
+++ b/net/tnftp/files/libedit/el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: el.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/el.h b/net/tnftp/files/libedit/el.h
index a22106e7471..bd3f9f966bd 100644
--- a/net/tnftp/files/libedit/el.h
+++ b/net/tnftp/files/libedit/el.h
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: el.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/emacs.c b/net/tnftp/files/libedit/emacs.c
index 33349993963..155c9192137 100644
--- a/net/tnftp/files/libedit/emacs.c
+++ b/net/tnftp/files/libedit/emacs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: emacs.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: emacs.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/hist.c b/net/tnftp/files/libedit/hist.c
index 4e998ffa80a..657bb19dbc4 100644
--- a/net/tnftp/files/libedit/hist.c
+++ b/net/tnftp/files/libedit/hist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: hist.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/hist.h b/net/tnftp/files/libedit/hist.h
index efe3431ead2..f44f3286fb0 100644
--- a/net/tnftp/files/libedit/hist.h
+++ b/net/tnftp/files/libedit/hist.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: hist.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/histedit.h b/net/tnftp/files/libedit/histedit.h
index 7ba31694090..6a2cb78bab2 100644
--- a/net/tnftp/files/libedit/histedit.h
+++ b/net/tnftp/files/libedit/histedit.h
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: histedit.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/history.c b/net/tnftp/files/libedit/history.c
index 26c79e3d1ef..594d3a76f65 100644
--- a/net/tnftp/files/libedit/history.c
+++ b/net/tnftp/files/libedit/history.c
@@ -1,4 +1,4 @@
-/* $NetBSD: history.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: history.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/key.c b/net/tnftp/files/libedit/key.c
index 8c7119fa209..09641f84642 100644
--- a/net/tnftp/files/libedit/key.c
+++ b/net/tnftp/files/libedit/key.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: key.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/key.h b/net/tnftp/files/libedit/key.h
index 31573d32d40..1c4764096a7 100644
--- a/net/tnftp/files/libedit/key.h
+++ b/net/tnftp/files/libedit/key.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: key.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/makelist.in b/net/tnftp/files/libedit/makelist.in
index 378a501ced5..7a7acafea5c 100644
--- a/net/tnftp/files/libedit/makelist.in
+++ b/net/tnftp/files/libedit/makelist.in
@@ -1,7 +1,7 @@
#!/bin/sh -
# @configure_input@
#
-# $NetBSD: makelist.in,v 1.1.1.1 2000/09/14 13:33:24 lukem Exp $
+# $NetBSD: makelist.in,v 1.1 2004/03/11 13:01:01 grant Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/net/tnftp/files/libedit/map.c b/net/tnftp/files/libedit/map.c
index 6cc978f4473..764fa7280f1 100644
--- a/net/tnftp/files/libedit/map.c
+++ b/net/tnftp/files/libedit/map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.1.1.1 2003/02/28 10:44:43 lukem Exp $ */
+/* $NetBSD: map.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/map.h b/net/tnftp/files/libedit/map.h
index e87bce932d9..1b4113d8e7d 100644
--- a/net/tnftp/files/libedit/map.h
+++ b/net/tnftp/files/libedit/map.h
@@ -1,4 +1,4 @@
-/* $NetBSD: map.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: map.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/parse.c b/net/tnftp/files/libedit/parse.c
index ac8d12b5f53..5bd31e49e2b 100644
--- a/net/tnftp/files/libedit/parse.c
+++ b/net/tnftp/files/libedit/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: parse.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/parse.h b/net/tnftp/files/libedit/parse.h
index a86858337dc..bf6c172da9d 100644
--- a/net/tnftp/files/libedit/parse.h
+++ b/net/tnftp/files/libedit/parse.h
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $ */
+/* $NetBSD: parse.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/prompt.c b/net/tnftp/files/libedit/prompt.c
index ad296c6a63d..a8492c04a85 100644
--- a/net/tnftp/files/libedit/prompt.c
+++ b/net/tnftp/files/libedit/prompt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: prompt.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/prompt.h b/net/tnftp/files/libedit/prompt.h
index 926358c448b..5ac87629984 100644
--- a/net/tnftp/files/libedit/prompt.h
+++ b/net/tnftp/files/libedit/prompt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $ */
+/* $NetBSD: prompt.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/read.c b/net/tnftp/files/libedit/read.c
index a0b6f4948c8..237cfa5d09e 100644
--- a/net/tnftp/files/libedit/read.c
+++ b/net/tnftp/files/libedit/read.c
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: read.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/read.h b/net/tnftp/files/libedit/read.h
index 93fcad8bcd1..2d9a76ade36 100644
--- a/net/tnftp/files/libedit/read.h
+++ b/net/tnftp/files/libedit/read.h
@@ -1,4 +1,4 @@
-/* $NetBSD: read.h,v 1.1.1.1 2001/09/27 19:29:50 lukem Exp $ */
+/* $NetBSD: read.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libedit/readline/Makefile b/net/tnftp/files/libedit/readline/Makefile
index cea6c4313a3..f5e52005f9b 100644
--- a/net/tnftp/files/libedit/readline/Makefile
+++ b/net/tnftp/files/libedit/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $
+# $NetBSD: Makefile,v 1.1 2004/03/11 13:01:01 grant Exp $
.PATH: ${CURDIR}/..
diff --git a/net/tnftp/files/libedit/readline/readline.h b/net/tnftp/files/libedit/readline/readline.h
index 498bb8030fb..64247b0f362 100644
--- a/net/tnftp/files/libedit/readline/readline.h
+++ b/net/tnftp/files/libedit/readline/readline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: readline.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libedit/refresh.c b/net/tnftp/files/libedit/refresh.c
index 725ed6ad0dc..719cfa0c827 100644
--- a/net/tnftp/files/libedit/refresh.c
+++ b/net/tnftp/files/libedit/refresh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: refresh.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/refresh.h b/net/tnftp/files/libedit/refresh.h
index 97f39ac5844..8481f171540 100644
--- a/net/tnftp/files/libedit/refresh.h
+++ b/net/tnftp/files/libedit/refresh.h
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.h,v 1.1.1.1 2001/04/13 01:49:05 lukem Exp $ */
+/* $NetBSD: refresh.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/search.c b/net/tnftp/files/libedit/search.c
index 2f63c9d91e3..62d639a201b 100644
--- a/net/tnftp/files/libedit/search.c
+++ b/net/tnftp/files/libedit/search.c
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: search.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/search.h b/net/tnftp/files/libedit/search.h
index 2a83e497a02..e0ed88ae2c7 100644
--- a/net/tnftp/files/libedit/search.h
+++ b/net/tnftp/files/libedit/search.h
@@ -1,4 +1,4 @@
-/* $NetBSD: search.h,v 1.1.1.1 2000/09/14 13:28:09 lukem Exp $ */
+/* $NetBSD: search.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/sig.c b/net/tnftp/files/libedit/sig.c
index 794362a2d30..156cc492425 100644
--- a/net/tnftp/files/libedit/sig.c
+++ b/net/tnftp/files/libedit/sig.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.c,v 1.1.1.1 2003/02/28 10:44:44 lukem Exp $ */
+/* $NetBSD: sig.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/sig.h b/net/tnftp/files/libedit/sig.h
index 3d4df3cff89..52f421b4be6 100644
--- a/net/tnftp/files/libedit/sig.h
+++ b/net/tnftp/files/libedit/sig.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: sig.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/sys.h b/net/tnftp/files/libedit/sys.h
index 049d99d6648..598addbbd5b 100644
--- a/net/tnftp/files/libedit/sys.h
+++ b/net/tnftp/files/libedit/sys.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.1.1.1 2002/06/10 07:18:19 lukem Exp $ */
+/* $NetBSD: sys.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/term.c b/net/tnftp/files/libedit/term.c
index 4444c4c024a..4705a538bfb 100644
--- a/net/tnftp/files/libedit/term.c
+++ b/net/tnftp/files/libedit/term.c
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.1.1.1 2003/02/28 10:44:45 lukem Exp $ */
+/* $NetBSD: term.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/term.h b/net/tnftp/files/libedit/term.h
index dd40759c320..54076974cb2 100644
--- a/net/tnftp/files/libedit/term.h
+++ b/net/tnftp/files/libedit/term.h
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: term.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/tokenizer.c b/net/tnftp/files/libedit/tokenizer.c
index 746a62bb267..202d8904133 100644
--- a/net/tnftp/files/libedit/tokenizer.c
+++ b/net/tnftp/files/libedit/tokenizer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tokenizer.c,v 1.1.1.1 2003/02/28 10:44:45 lukem Exp $ */
+/* $NetBSD: tokenizer.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/tokenizer.h b/net/tnftp/files/libedit/tokenizer.h
index aeaf761b774..e20c79af68f 100644
--- a/net/tnftp/files/libedit/tokenizer.h
+++ b/net/tnftp/files/libedit/tokenizer.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tokenizer.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: tokenizer.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/tty.c b/net/tnftp/files/libedit/tty.c
index d65a67a240f..719e129f6d3 100644
--- a/net/tnftp/files/libedit/tty.c
+++ b/net/tnftp/files/libedit/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.1.1.1 2003/02/28 10:44:45 lukem Exp $ */
+/* $NetBSD: tty.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/tty.h b/net/tnftp/files/libedit/tty.h
index 65fb9da1296..cc72c8eb7e3 100644
--- a/net/tnftp/files/libedit/tty.h
+++ b/net/tnftp/files/libedit/tty.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.1.1.1 2002/06/05 12:44:29 lukem Exp $ */
+/* $NetBSD: tty.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libedit/vi.c b/net/tnftp/files/libedit/vi.c
index c8889b89c89..6ce4ac6ee14 100644
--- a/net/tnftp/files/libedit/vi.c
+++ b/net/tnftp/files/libedit/vi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.1.1.1 2003/02/28 10:44:45 lukem Exp $ */
+/* $NetBSD: vi.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libnetbsd/Makefile.in b/net/tnftp/files/libnetbsd/Makefile.in
index 0ec50b6d084..65ccea5e0e5 100644
--- a/net/tnftp/files/libnetbsd/Makefile.in
+++ b/net/tnftp/files/libnetbsd/Makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.1.1.1 2003/02/28 10:44:45 lukem Exp $
+# $Id: Makefile.in,v 1.1 2004/03/11 13:01:01 grant Exp $
#
srcdir = @srcdir@
diff --git a/net/tnftp/files/libnetbsd/err.c b/net/tnftp/files/libnetbsd/err.c
index 640d6092df6..121fcb13467 100644
--- a/net/tnftp/files/libnetbsd/err.c
+++ b/net/tnftp/files/libnetbsd/err.c
@@ -1,4 +1,4 @@
-/* $Id: err.c,v 1.1.1.1 2003/07/26 20:39:05 lukem Exp $ */
+/* $Id: err.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright 1997-2000 Luke Mewburn <lukem@NetBSD.org>.
diff --git a/net/tnftp/files/libnetbsd/fgetln.c b/net/tnftp/files/libnetbsd/fgetln.c
index 99e5f9c042d..15c4032b036 100644
--- a/net/tnftp/files/libnetbsd/fgetln.c
+++ b/net/tnftp/files/libnetbsd/fgetln.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetln.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
+/* $NetBSD: fgetln.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libnetbsd/fparseln.c b/net/tnftp/files/libnetbsd/fparseln.c
index ab92e2f2a86..a29ac8eef8a 100644
--- a/net/tnftp/files/libnetbsd/fparseln.c
+++ b/net/tnftp/files/libnetbsd/fparseln.c
@@ -1,5 +1,5 @@
-/* $Id: fparseln.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
-/* $NetBSD: fparseln.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
+/* $Id: fparseln.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: fparseln.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
diff --git a/net/tnftp/files/libnetbsd/fseeko.c b/net/tnftp/files/libnetbsd/fseeko.c
index be0fba1eb7e..8a6ae2a6b82 100644
--- a/net/tnftp/files/libnetbsd/fseeko.c
+++ b/net/tnftp/files/libnetbsd/fseeko.c
@@ -1,4 +1,4 @@
-/* $Id: fseeko.c,v 1.1.1.1 2003/07/26 20:39:05 lukem Exp $ */
+/* $Id: fseeko.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright 2002 Luke Mewburn <lukem@NetBSD.org>.
diff --git a/net/tnftp/files/libnetbsd/ftpglob.h b/net/tnftp/files/libnetbsd/ftpglob.h
index 9d6136d4532..308056e94be 100644
--- a/net/tnftp/files/libnetbsd/ftpglob.h
+++ b/net/tnftp/files/libnetbsd/ftpglob.h
@@ -1,5 +1,5 @@
-/* $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 $ */
+/* $Id: ftpglob.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: ftpglob.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1989, 1993
diff --git a/net/tnftp/files/libnetbsd/ftpvis.h b/net/tnftp/files/libnetbsd/ftpvis.h
index eda7def0ec4..fcf9e23417e 100644
--- a/net/tnftp/files/libnetbsd/ftpvis.h
+++ b/net/tnftp/files/libnetbsd/ftpvis.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpvis.h,v 1.1.1.1 2000/06/04 14:48:18 lukem Exp $ */
+/* $NetBSD: ftpvis.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1990, 1993
diff --git a/net/tnftp/files/libnetbsd/getaddrinfo.c b/net/tnftp/files/libnetbsd/getaddrinfo.c
index 442d4227b15..f24f9774a9f 100644
--- a/net/tnftp/files/libnetbsd/getaddrinfo.c
+++ b/net/tnftp/files/libnetbsd/getaddrinfo.c
@@ -1,4 +1,4 @@
-/* $Id: getaddrinfo.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
+/* $Id: getaddrinfo.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* $KAME: getaddrinfo.c,v 1.77 2000/07/09 04:35:14 itojun Exp $ */
/*
diff --git a/net/tnftp/files/libnetbsd/getnameinfo.c b/net/tnftp/files/libnetbsd/getnameinfo.c
index 385bcfbea2a..5bd5f96cb9f 100644
--- a/net/tnftp/files/libnetbsd/getnameinfo.c
+++ b/net/tnftp/files/libnetbsd/getnameinfo.c
@@ -1,5 +1,5 @@
-/* $Id: getnameinfo.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
-/* $NetBSD: getnameinfo.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
+/* $Id: getnameinfo.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* $KAME: getnameinfo.c,v 1.43 2000/06/12 04:27:03 itojun Exp $ */
/*
diff --git a/net/tnftp/files/libnetbsd/glob.c b/net/tnftp/files/libnetbsd/glob.c
index 85679545952..d43f2a58421 100644
--- a/net/tnftp/files/libnetbsd/glob.c
+++ b/net/tnftp/files/libnetbsd/glob.c
@@ -1,5 +1,5 @@
-/* $Id: glob.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
-/* $NetBSD: glob.c,v 1.1.1.1 2003/02/28 10:44:46 lukem Exp $ */
+/* $Id: glob.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: glob.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1989, 1993
diff --git a/net/tnftp/files/libnetbsd/inet_ntop.c b/net/tnftp/files/libnetbsd/inet_ntop.c
index d8c76867ea4..ad13e54cb03 100644
--- a/net/tnftp/files/libnetbsd/inet_ntop.c
+++ b/net/tnftp/files/libnetbsd/inet_ntop.c
@@ -1,5 +1,5 @@
-/* $Id: inet_ntop.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
-/* $NetBSD: inet_ntop.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
+/* $Id: inet_ntop.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: inet_ntop.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
diff --git a/net/tnftp/files/libnetbsd/inet_pton.c b/net/tnftp/files/libnetbsd/inet_pton.c
index e291e478f8a..cecafc485fb 100644
--- a/net/tnftp/files/libnetbsd/inet_pton.c
+++ b/net/tnftp/files/libnetbsd/inet_pton.c
@@ -1,5 +1,5 @@
-/* $Id: inet_pton.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
-/* $NetBSD: inet_pton.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
+/* $Id: inet_pton.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: inet_pton.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
diff --git a/net/tnftp/files/libnetbsd/mkstemp.c b/net/tnftp/files/libnetbsd/mkstemp.c
index 94c3f863c00..f9adbe95593 100644
--- a/net/tnftp/files/libnetbsd/mkstemp.c
+++ b/net/tnftp/files/libnetbsd/mkstemp.c
@@ -1,5 +1,5 @@
-/* $Id: mkstemp.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
-/* $NetBSD: mkstemp.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
+/* $Id: mkstemp.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: mkstemp.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1987, 1993
diff --git a/net/tnftp/files/libnetbsd/setprogname.c b/net/tnftp/files/libnetbsd/setprogname.c
index c5ea369fd50..856b8d0f129 100644
--- a/net/tnftp/files/libnetbsd/setprogname.c
+++ b/net/tnftp/files/libnetbsd/setprogname.c
@@ -1,5 +1,5 @@
-/* $Id: setprogname.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
-/* $NetBSD: setprogname.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
+/* $Id: setprogname.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: setprogname.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libnetbsd/sl_init.c b/net/tnftp/files/libnetbsd/sl_init.c
index 101e9f66619..591d78ef00a 100644
--- a/net/tnftp/files/libnetbsd/sl_init.c
+++ b/net/tnftp/files/libnetbsd/sl_init.c
@@ -1,5 +1,5 @@
-/* $Id: sl_init.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
-/* $NetBSD: sl_init.c,v 1.1.1.1 2003/02/28 10:44:47 lukem Exp $ */
+/* $Id: sl_init.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: sl_init.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1994, 1999 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libnetbsd/snprintf.c b/net/tnftp/files/libnetbsd/snprintf.c
index 01c3c773800..ad2cae886b5 100644
--- a/net/tnftp/files/libnetbsd/snprintf.c
+++ b/net/tnftp/files/libnetbsd/snprintf.c
@@ -1,4 +1,4 @@
-/* $Id: snprintf.c,v 1.1.1.1 2003/07/26 20:39:05 lukem Exp $ */
+/* $Id: snprintf.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright Patrick Powell 1995
diff --git a/net/tnftp/files/libnetbsd/strdup.c b/net/tnftp/files/libnetbsd/strdup.c
index d118f161a3e..9e4d145b195 100644
--- a/net/tnftp/files/libnetbsd/strdup.c
+++ b/net/tnftp/files/libnetbsd/strdup.c
@@ -1,5 +1,5 @@
-/* $Id: strdup.c,v 1.1.1.1 2003/02/28 10:44:48 lukem Exp $ */
-/* $NetBSD: strdup.c,v 1.1.1.1 2003/02/28 10:44:48 lukem Exp $ */
+/* $Id: strdup.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strdup.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1988, 1993
diff --git a/net/tnftp/files/libnetbsd/strerror.c b/net/tnftp/files/libnetbsd/strerror.c
index 4846a520e1f..a835a3be37d 100644
--- a/net/tnftp/files/libnetbsd/strerror.c
+++ b/net/tnftp/files/libnetbsd/strerror.c
@@ -1,4 +1,4 @@
-/* $Id: strerror.c,v 1.1.1.1 2003/02/28 10:44:48 lukem Exp $ */
+/* $Id: strerror.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
#include "tnftp.h"
diff --git a/net/tnftp/files/libnetbsd/strlcat.c b/net/tnftp/files/libnetbsd/strlcat.c
index eb77f64c8a4..b8ec6721321 100644
--- a/net/tnftp/files/libnetbsd/strlcat.c
+++ b/net/tnftp/files/libnetbsd/strlcat.c
@@ -1,5 +1,5 @@
-/* $Id: strlcat.c,v 1.1.1.1 2003/02/28 10:44:48 lukem Exp $ */
-/* $NetBSD: strlcat.c,v 1.1.1.1 2003/02/28 10:44:48 lukem Exp $ */
+/* $Id: strlcat.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strlcat.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* from OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp */
/*
diff --git a/net/tnftp/files/libnetbsd/strlcpy.c b/net/tnftp/files/libnetbsd/strlcpy.c
index fd5328b684b..b7eec08827b 100644
--- a/net/tnftp/files/libnetbsd/strlcpy.c
+++ b/net/tnftp/files/libnetbsd/strlcpy.c
@@ -1,5 +1,5 @@
-/* $Id: strlcpy.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
-/* $NetBSD: strlcpy.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
+/* $Id: strlcpy.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strlcpy.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/* from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */
/*
diff --git a/net/tnftp/files/libnetbsd/strptime.c b/net/tnftp/files/libnetbsd/strptime.c
index 56ed09fbd5f..053ddbd4100 100644
--- a/net/tnftp/files/libnetbsd/strptime.c
+++ b/net/tnftp/files/libnetbsd/strptime.c
@@ -1,5 +1,5 @@
-/* $Id: strptime.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
-/* $NetBSD: strptime.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
+/* $Id: strptime.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strptime.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/libnetbsd/strsep.c b/net/tnftp/files/libnetbsd/strsep.c
index c43b44d83c1..1074129173d 100644
--- a/net/tnftp/files/libnetbsd/strsep.c
+++ b/net/tnftp/files/libnetbsd/strsep.c
@@ -1,5 +1,5 @@
-/* $Id: strsep.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
-/* $NetBSD: strsep.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
+/* $Id: strsep.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strsep.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1990, 1993
diff --git a/net/tnftp/files/libnetbsd/strtoll.c b/net/tnftp/files/libnetbsd/strtoll.c
index 6d6730b1da3..07066625da9 100644
--- a/net/tnftp/files/libnetbsd/strtoll.c
+++ b/net/tnftp/files/libnetbsd/strtoll.c
@@ -1,5 +1,5 @@
-/* $Id: strtoll.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
-/* $NetBSD: strtoll.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
+/* $Id: strtoll.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strtoll.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/net/tnftp/files/libnetbsd/strunvis.c b/net/tnftp/files/libnetbsd/strunvis.c
index 1cd1d8be7c3..2a1a6eeb535 100644
--- a/net/tnftp/files/libnetbsd/strunvis.c
+++ b/net/tnftp/files/libnetbsd/strunvis.c
@@ -1,5 +1,5 @@
-/* $Id: strunvis.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
-/* $NetBSD: strunvis.c,v 1.1.1.1 2003/02/28 10:44:49 lukem Exp $ */
+/* $Id: strunvis.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strunvis.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1989, 1993
diff --git a/net/tnftp/files/libnetbsd/strvis.c b/net/tnftp/files/libnetbsd/strvis.c
index af94f83738d..0475c563444 100644
--- a/net/tnftp/files/libnetbsd/strvis.c
+++ b/net/tnftp/files/libnetbsd/strvis.c
@@ -1,5 +1,5 @@
-/* $Id: strvis.c,v 1.1.1.1 2003/02/28 10:44:50 lukem Exp $ */
-/* $NetBSD: strvis.c,v 1.1.1.1 2003/02/28 10:44:50 lukem Exp $ */
+/* $Id: strvis.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
+/* $NetBSD: strvis.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1989, 1993
diff --git a/net/tnftp/files/libnetbsd/timegm.c b/net/tnftp/files/libnetbsd/timegm.c
index 017eee9c463..126db278e00 100644
--- a/net/tnftp/files/libnetbsd/timegm.c
+++ b/net/tnftp/files/libnetbsd/timegm.c
@@ -1,4 +1,4 @@
-/* $Id: timegm.c,v 1.1.1.1 2003/02/28 10:44:50 lukem Exp $ */
+/* $Id: timegm.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
#include "tnftp.h"
diff --git a/net/tnftp/files/libnetbsd/usleep.c b/net/tnftp/files/libnetbsd/usleep.c
index f77c680ab71..4f8d1986280 100644
--- a/net/tnftp/files/libnetbsd/usleep.c
+++ b/net/tnftp/files/libnetbsd/usleep.c
@@ -1,4 +1,4 @@
-/* $Id: usleep.c,v 1.1.1.1 2003/02/28 10:44:50 lukem Exp $ */
+/* $Id: usleep.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1999-2000 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/net/tnftp/files/src/Makefile.in b/net/tnftp/files/src/Makefile.in
index 627310e4ca7..b9d6d7df583 100644
--- a/net/tnftp/files/src/Makefile.in
+++ b/net/tnftp/files/src/Makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.1.1.1 2003/03/01 00:02:21 lukem Exp $
+# $Id: Makefile.in,v 1.1 2004/03/11 13:01:01 grant Exp $
#
srcdir = @srcdir@
diff --git a/net/tnftp/files/src/cmds.c b/net/tnftp/files/src/cmds.c
index 5bc10ea6ac2..e588093b053 100644
--- a/net/tnftp/files/src/cmds.c
+++ b/net/tnftp/files/src/cmds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.1.1.1 2003/07/31 07:18:23 lukem Exp $ */
+/* $NetBSD: cmds.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.1.1.1 2003/07/31 07:18:23 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/cmdtab.c b/net/tnftp/files/src/cmdtab.c
index 32d2b6df690..dd41e40144f 100644
--- a/net/tnftp/files/src/cmdtab.c
+++ b/net/tnftp/files/src/cmdtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.1.1.1 2003/02/28 10:44:52 lukem Exp $ */
+/* $NetBSD: cmdtab.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/src/complete.c b/net/tnftp/files/src/complete.c
index fb8def2ac8f..d911ab271fd 100644
--- a/net/tnftp/files/src/complete.c
+++ b/net/tnftp/files/src/complete.c
@@ -1,4 +1,4 @@
-/* $NetBSD: complete.c,v 1.1.1.1 2003/02/28 10:44:52 lukem Exp $ */
+/* $NetBSD: complete.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/src/domacro.c b/net/tnftp/files/src/domacro.c
index ad6956cd0f8..073f65cd04f 100644
--- a/net/tnftp/files/src/domacro.c
+++ b/net/tnftp/files/src/domacro.c
@@ -1,4 +1,4 @@
-/* $NetBSD: domacro.c,v 1.1.1.1 2003/02/28 10:44:53 lukem Exp $ */
+/* $NetBSD: domacro.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
diff --git a/net/tnftp/files/src/extern.h b/net/tnftp/files/src/extern.h
index 3a85055990d..703c7faff27 100644
--- a/net/tnftp/files/src/extern.h
+++ b/net/tnftp/files/src/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.1.1.1 2003/02/28 10:44:53 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/src/fetch.c b/net/tnftp/files/src/fetch.c
index 845bd189631..e4848c16463 100644
--- a/net/tnftp/files/src/fetch.c
+++ b/net/tnftp/files/src/fetch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.1.1.1 2003/07/31 06:18:43 lukem Exp $ */
+/* $NetBSD: fetch.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#if 0
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.1.1.1 2003/07/31 06:18:43 lukem Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/ftp.1 b/net/tnftp/files/src/ftp.1
index 11bed2d9eb2..f3a60ad5ba9 100644
--- a/net/tnftp/files/src/ftp.1
+++ b/net/tnftp/files/src/ftp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.1.1.1 2003/07/31 06:18:44 lukem Exp $
+.\" $NetBSD: ftp.1,v 1.1 2004/03/11 13:01:01 grant Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
diff --git a/net/tnftp/files/src/ftp.c b/net/tnftp/files/src/ftp.c
index 12f58f92d56..37cda5a7f67 100644
--- a/net/tnftp/files/src/ftp.c
+++ b/net/tnftp/files/src/ftp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.1.1.1 2003/07/31 07:18:24 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.1.1.1 2003/07/31 07:18:24 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/ftp_var.h b/net/tnftp/files/src/ftp_var.h
index a99c9728b87..ae2b7657fd6 100644
--- a/net/tnftp/files/src/ftp_var.h
+++ b/net/tnftp/files/src/ftp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp_var.h,v 1.1.1.1 2003/02/28 10:44:54 lukem Exp $ */
+/* $NetBSD: ftp_var.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/src/main.c b/net/tnftp/files/src/main.c
index 5823130dc4b..f17f8fe87d2 100644
--- a/net/tnftp/files/src/main.c
+++ b/net/tnftp/files/src/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1.1.1 2003/07/31 06:18:44 lukem Exp $ */
+/* $NetBSD: main.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.1.1.1 2003/07/31 06:18:44 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/progressbar.c b/net/tnftp/files/src/progressbar.c
index 980ab6f6514..b33ce7c4eec 100644
--- a/net/tnftp/files/src/progressbar.c
+++ b/net/tnftp/files/src/progressbar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.1.1.1 2003/07/31 06:18:44 lukem Exp $ */
+/* $NetBSD: progressbar.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#if 0
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.1.1.1 2003/07/31 06:18:44 lukem Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/progressbar.h b/net/tnftp/files/src/progressbar.h
index f696da893be..d5f8bba1c01 100644
--- a/net/tnftp/files/src/progressbar.h
+++ b/net/tnftp/files/src/progressbar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.h,v 1.1.1.1 2003/02/28 10:44:54 lukem Exp $ */
+/* $NetBSD: progressbar.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
diff --git a/net/tnftp/files/src/ruserpass.c b/net/tnftp/files/src/ruserpass.c
index 625b566ee56..9afa5faffaf 100644
--- a/net/tnftp/files/src/ruserpass.c
+++ b/net/tnftp/files/src/ruserpass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.1.1.1 2003/02/28 10:44:55 lukem Exp $ */
+/* $NetBSD: ruserpass.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
diff --git a/net/tnftp/files/src/util.c b/net/tnftp/files/src/util.c
index 9b0a9aa11dd..63f1e91f0fa 100644
--- a/net/tnftp/files/src/util.c
+++ b/net/tnftp/files/src/util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.1.1.1 2003/07/31 07:18:24 lukem Exp $ */
+/* $NetBSD: util.c,v 1.1 2004/03/11 13:01:01 grant Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
#if 0
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.1.1.1 2003/07/31 07:18:24 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.1 2004/03/11 13:01:01 grant Exp $");
#endif /* not lint */
#endif
diff --git a/net/tnftp/files/src/version.h b/net/tnftp/files/src/version.h
index 32dc885e7cb..99a5a3c8340 100644
--- a/net/tnftp/files/src/version.h
+++ b/net/tnftp/files/src/version.h
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.1.1.1 2003/07/31 07:13:01 lukem Exp $ */
+/* $NetBSD: version.h,v 1.1 2004/03/11 13:01:02 grant Exp $ */
/*-
* Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/net/tnftp/files/tnftp.h b/net/tnftp/files/tnftp.h
index 3fdb79c3165..bb36e716102 100644
--- a/net/tnftp/files/tnftp.h
+++ b/net/tnftp/files/tnftp.h
@@ -1,4 +1,4 @@
-/* $Id: tnftp.h,v 1.1.1.1 2003/08/25 11:52:56 lukem Exp $ */
+/* $Id: tnftp.h,v 1.1 2004/03/11 13:01:01 grant Exp $ */
#define FTP_PRODUCT "tnftp"
#define FTP_VERSION "20030825"
diff --git a/net/tnftp/files/todo b/net/tnftp/files/todo
index 6f094896d99..ed43382c9de 100644
--- a/net/tnftp/files/todo
+++ b/net/tnftp/files/todo
@@ -1,4 +1,4 @@
-$Id: todo,v 1.1.1.1 2003/08/25 11:49:33 lukem Exp $
+$Id: todo,v 1.1 2004/03/11 13:01:01 grant Exp $
Current Items
-------------