pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tnftp/files Merge changes between tnftp-20030825 &...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/553e6e337153
branches:  trunk
changeset: 486887:553e6e337153
user:      lukem <lukem%pkgsrc.org@localhost>
date:      Tue Jan 04 23:44:24 2005 +0000

description:
Merge changes between tnftp-20030825 & tnftp-20050103

diffstat:

 net/tnftp/files/COPYING           |    2 +-
 net/tnftp/files/ChangeLog         |    2 +-
 net/tnftp/files/README            |    4 +-
 net/tnftp/files/configure         |  297 ++++++++++++++++++++-----------------
 net/tnftp/files/configure.in      |  137 ++++++++++-------
 net/tnftp/files/src/cmds.c        |   90 ++++++-----
 net/tnftp/files/src/cmdtab.c      |    2 +-
 net/tnftp/files/src/domacro.c     |    2 +-
 net/tnftp/files/src/extern.h      |    2 +-
 net/tnftp/files/src/fetch.c       |  233 ++++++++++++++++-------------
 net/tnftp/files/src/ftp.1         |    2 +-
 net/tnftp/files/src/ftp.c         |   43 ++--
 net/tnftp/files/src/ftp_var.h     |   27 +-
 net/tnftp/files/src/main.c        |   23 +-
 net/tnftp/files/src/progressbar.c |    8 +-
 net/tnftp/files/src/progressbar.h |    2 +-
 net/tnftp/files/src/ruserpass.c   |    2 +-
 net/tnftp/files/src/util.c        |   97 +++++++++---
 net/tnftp/files/src/version.h     |    2 +-
 net/tnftp/files/tnftp.h           |    4 +-
 net/tnftp/files/todo              |    2 +-
 21 files changed, 559 insertions(+), 424 deletions(-)

diffs (truncated from 2479 to 300 lines):

diff -r 91a8007fe2da -r 553e6e337153 net/tnftp/files/COPYING
--- a/net/tnftp/files/COPYING   Tue Jan 04 23:38:31 2005 +0000
+++ b/net/tnftp/files/COPYING   Tue Jan 04 23:44:24 2005 +0000
@@ -1,4 +1,4 @@
-$Id: COPYING,v 1.1.1.2 2005/01/03 10:30:34 lukem Exp $
+$Id: COPYING,v 1.2 2005/01/04 23:44:24 lukem Exp $
 
 Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 All rights reserved.
diff -r 91a8007fe2da -r 553e6e337153 net/tnftp/files/ChangeLog
--- a/net/tnftp/files/ChangeLog Tue Jan 04 23:38:31 2005 +0000
+++ b/net/tnftp/files/ChangeLog Tue Jan 04 23:44:24 2005 +0000
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1.1.2 2005/01/03 10:23:21 lukem Exp $
+$Id: ChangeLog,v 1.2 2005/01/04 23:44:24 lukem Exp $
 
 Mon Jan  3 10:21:57 UTC 2005   lukem
 
diff -r 91a8007fe2da -r 553e6e337153 net/tnftp/files/README
--- a/net/tnftp/files/README    Tue Jan 04 23:38:31 2005 +0000
+++ b/net/tnftp/files/README    Tue Jan 04 23:44:24 2005 +0000
@@ -4,8 +4,8 @@
 `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' and was renamed by Luke Mewburn
-in February 2003.
+tnftp was formerly known as `lukemftp'
+It was renamed to `tnftp' by Luke Mewburn in February 2003.
 
 The enhancements over the standard ftp client in 4.4BSD (and
 derivatives) include:
diff -r 91a8007fe2da -r 553e6e337153 net/tnftp/files/configure
--- a/net/tnftp/files/configure Tue Jan 04 23:38:31 2005 +0000
+++ b/net/tnftp/files/configure Tue Jan 04 23:44:24 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.2 
+# From configure.in Revision: 1.6 
 
 
 
@@ -2547,14 +2547,16 @@
 #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:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2560: \"$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
@@ -2570,11 +2572,12 @@
 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
                :
@@ -2583,22 +2586,23 @@
 
 
        echo $ac_n "checking for in_port_t""... $ac_c" 1>&6
-echo "configure:2587: checking for in_port_t" >&5
+echo "configure:2590: 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 2593 "configure"
+#line 2596 "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:2602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_IN_PORT_T=yes 
 else
@@ -2625,22 +2629,23 @@
 
 
        echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6
-echo "configure:2629: checking for sa_family_t" >&5
+echo "configure:2633: 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 2635 "configure"
+#line 2639 "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:2644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SA_FAMILY_T=yes 
 else
@@ -2667,25 +2672,27 @@
 
 
        echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6
-echo "configure:2671: checking for sockaddr_in.sin_len" >&5
+echo "configure:2676: 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 2677 "configure"
+#line 2682 "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:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKADDR_SA_LEN=yes 
 else
@@ -2712,22 +2719,23 @@
 
 
        echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:2716: checking for socklen_t" >&5
+echo "configure:2723: 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 2722 "configure"
+#line 2729 "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:2731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKLEN_T=yes 
 else
@@ -2756,22 +2764,23 @@
 
        
        echo $ac_n "checking for AF_INET6""... $ac_c" 1>&6
-echo "configure:2760: checking for AF_INET6" >&5
+echo "configure:2768: 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 2766 "configure"
+#line 2774 "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:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_AF_INET6=yes 
 else
@@ -2798,24 +2807,26 @@
 
        
        echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6
-echo "configure:2802: checking for struct sockaddr_in6" >&5
+echo "configure:2811: 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 2808 "configure"
+#line 2817 "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:2819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKADDR_IN6=yes 
 else
@@ -2843,20 +2854,23 @@
        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:2847: checking for IN6ADDRSZ in arpa/nameser.h" >&5
+echo "configure:2858: 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 2853 "configure"
+#line 2864 "configure"
 #include "confdefs.h"
-  #include <arpa/nameser.h>  
+  
+#include <sys/types.h>
+#include <arpa/nameser.h>
+                    
 int main() {
   int X = IN6ADDRSZ ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_IN6ADDRSZ=yes 
 else
@@ -2886,23 +2900,24 @@
 
 
        echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6
-echo "configure:2890: checking for struct addrinfo" >&5
+echo "configure:2904: 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 2896 "configure"
+#line 2910 "configure"
 #include "confdefs.h"
  



Home | Main Index | Thread Index | Old Index