Module Name:	pkgsrc
Committed By:	lukem
Date:		Wed May 11 09:58:55 UTC 2005

Modified Files:
	pkgsrc/net/tnftp/files: COPYING ChangeLog Makefile.in README THANKS
	    acconfig.h aclocal.m4 config.h.in configure configure.in tnftp.h
	    todo
	pkgsrc/net/tnftp/files/libedit: Makefile.in chared.c chared.h common.c
	    editline.3 editrc.5 el.c el.h emacs.c hist.c hist.h histedit.h
	    history.c key.c key.h makelist.in map.c map.h parse.c parse.h
	    prompt.c prompt.h read.c read.h refresh.c refresh.h search.c
	    search.h sig.c sig.h sys.h term.c term.h tokenizer.c tty.c tty.h
	    vi.c
	pkgsrc/net/tnftp/files/libedit/readline: readline.h
	pkgsrc/net/tnftp/files/libnetbsd: Makefile.in err.c fgetln.c fparseln.c
	    fseeko.c ftpglob.h ftpvis.h getaddrinfo.c getnameinfo.c glob.c
	    inet_ntop.c inet_pton.c mkstemp.c setprogname.c sl_init.c
	    snprintf.c strdup.c strerror.c strlcat.c strlcpy.c strptime.c
	    strsep.c strtoll.c strunvis.c strvis.c timegm.c usleep.c utimes.c
	pkgsrc/net/tnftp/files/src: Makefile.in cmds.c cmdtab.c complete.c
	    domacro.c extern.h fetch.c ftp.1 ftp.c ftp.cat1 ftp_var.h main.c
	    progressbar.c progressbar.h ruserpass.c util.c version.h
Removed Files:
	pkgsrc/net/tnftp/files/libedit: tokenizer.h
	pkgsrc/net/tnftp/files/libedit/readline: Makefile

Log Message:
Merge tnftp 20050511.
(Future merges should be easier as this time I froze the vendor RCSIDs)


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/net/tnftp/files/COPYING \
    pkgsrc/net/tnftp/files/ChangeLog pkgsrc/net/tnftp/files/README \
    pkgsrc/net/tnftp/files/acconfig.h pkgsrc/net/tnftp/files/todo
cvs rdiff -r1.1 -r1.2 pkgsrc/net/tnftp/files/Makefile.in \
    pkgsrc/net/tnftp/files/THANKS pkgsrc/net/tnftp/files/aclocal.m4
cvs rdiff -r1.4 -r1.5 pkgsrc/net/tnftp/files/config.h.in \
    pkgsrc/net/tnftp/files/configure.in pkgsrc/net/tnftp/files/tnftp.h
cvs rdiff -r1.5 -r1.6 pkgsrc/net/tnftp/files/configure
cvs rdiff -r1.1 -r1.2 pkgsrc/net/tnftp/files/libedit/Makefile.in \
    pkgsrc/net/tnftp/files/libedit/chared.c \
    pkgsrc/net/tnftp/files/libedit/chared.h \
    pkgsrc/net/tnftp/files/libedit/common.c \
    pkgsrc/net/tnftp/files/libedit/editline.3 \
    pkgsrc/net/tnftp/files/libedit/editrc.5 \
    pkgsrc/net/tnftp/files/libedit/el.c pkgsrc/net/tnftp/files/libedit/el.h \
    pkgsrc/net/tnftp/files/libedit/emacs.c \
    pkgsrc/net/tnftp/files/libedit/hist.c \
    pkgsrc/net/tnftp/files/libedit/hist.h \
    pkgsrc/net/tnftp/files/libedit/histedit.h \
    pkgsrc/net/tnftp/files/libedit/history.c \
    pkgsrc/net/tnftp/files/libedit/key.c pkgsrc/net/tnftp/files/libedit/key.h \
    pkgsrc/net/tnftp/files/libedit/makelist.in \
    pkgsrc/net/tnftp/files/libedit/map.c pkgsrc/net/tnftp/files/libedit/map.h \
    pkgsrc/net/tnftp/files/libedit/parse.c \
    pkgsrc/net/tnftp/files/libedit/parse.h \
    pkgsrc/net/tnftp/files/libedit/prompt.c \
    pkgsrc/net/tnftp/files/libedit/prompt.h \
    pkgsrc/net/tnftp/files/libedit/read.c \
    pkgsrc/net/tnftp/files/libedit/read.h \
    pkgsrc/net/tnftp/files/libedit/refresh.c \
    pkgsrc/net/tnftp/files/libedit/refresh.h \
    pkgsrc/net/tnftp/files/libedit/search.c \
    pkgsrc/net/tnftp/files/libedit/search.h \
    pkgsrc/net/tnftp/files/libedit/sig.c pkgsrc/net/tnftp/files/libedit/sig.h \
    pkgsrc/net/tnftp/files/libedit/sys.h \
    pkgsrc/net/tnftp/files/libedit/term.c \
    pkgsrc/net/tnftp/files/libedit/term.h \
    pkgsrc/net/tnftp/files/libedit/tokenizer.c \
    pkgsrc/net/tnftp/files/libedit/tty.c pkgsrc/net/tnftp/files/libedit/tty.h \
    pkgsrc/net/tnftp/files/libedit/vi.c
cvs rdiff -r1.1 -r0 pkgsrc/net/tnftp/files/libedit/tokenizer.h
cvs rdiff -r1.1 -r0 pkgsrc/net/tnftp/files/libedit/readline/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/net/tnftp/files/libedit/readline/readline.h
cvs rdiff -r1.1 -r1.2 pkgsrc/net/tnftp/files/libnetbsd/Makefile.in \
    pkgsrc/net/tnftp/files/libnetbsd/err.c \
    pkgsrc/net/tnftp/files/libnetbsd/fgetln.c \
    pkgsrc/net/tnftp/files/libnetbsd/fparseln.c \
    pkgsrc/net/tnftp/files/libnetbsd/fseeko.c \
    pkgsrc/net/tnftp/files/libnetbsd/ftpglob.h \
    pkgsrc/net/tnftp/files/libnetbsd/ftpvis.h \
    pkgsrc/net/tnftp/files/libnetbsd/getaddrinfo.c \
    pkgsrc/net/tnftp/files/libnetbsd/getnameinfo.c \
    pkgsrc/net/tnftp/files/libnetbsd/glob.c \
    pkgsrc/net/tnftp/files/libnetbsd/inet_ntop.c \
    pkgsrc/net/tnftp/files/libnetbsd/inet_pton.c \
    pkgsrc/net/tnftp/files/libnetbsd/mkstemp.c \
    pkgsrc/net/tnftp/files/libnetbsd/setprogname.c \
    pkgsrc/net/tnftp/files/libnetbsd/sl_init.c \
    pkgsrc/net/tnftp/files/libnetbsd/snprintf.c \
    pkgsrc/net/tnftp/files/libnetbsd/strdup.c \
    pkgsrc/net/tnftp/files/libnetbsd/strerror.c \
    pkgsrc/net/tnftp/files/libnetbsd/strlcat.c \
    pkgsrc/net/tnftp/files/libnetbsd/strlcpy.c \
    pkgsrc/net/tnftp/files/libnetbsd/strptime.c \
    pkgsrc/net/tnftp/files/libnetbsd/strsep.c \
    pkgsrc/net/tnftp/files/libnetbsd/strtoll.c \
    pkgsrc/net/tnftp/files/libnetbsd/strunvis.c \
    pkgsrc/net/tnftp/files/libnetbsd/strvis.c \
    pkgsrc/net/tnftp/files/libnetbsd/timegm.c \
    pkgsrc/net/tnftp/files/libnetbsd/usleep.c
cvs rdiff -r1.2 -r1.3 pkgsrc/net/tnftp/files/libnetbsd/utimes.c
cvs rdiff -r1.1 -r1.2 pkgsrc/net/tnftp/files/src/Makefile.in \
    pkgsrc/net/tnftp/files/src/complete.c
cvs rdiff -r1.3 -r1.4 pkgsrc/net/tnftp/files/src/cmds.c \
    pkgsrc/net/tnftp/files/src/fetch.c pkgsrc/net/tnftp/files/src/ftp.c \
    pkgsrc/net/tnftp/files/src/ftp_var.h pkgsrc/net/tnftp/files/src/main.c \
    pkgsrc/net/tnftp/files/src/progressbar.c \
    pkgsrc/net/tnftp/files/src/util.c
cvs rdiff -r1.2 -r1.3 pkgsrc/net/tnftp/files/src/cmdtab.c \
    pkgsrc/net/tnftp/files/src/domacro.c pkgsrc/net/tnftp/files/src/extern.h \
    pkgsrc/net/tnftp/files/src/ftp.1 pkgsrc/net/tnftp/files/src/ftp.cat1 \
    pkgsrc/net/tnftp/files/src/progressbar.h \
    pkgsrc/net/tnftp/files/src/ruserpass.c \
    pkgsrc/net/tnftp/files/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.