Fix clang compile issue.

5 files changed, 55 insertions, 45 deletions

diff --git a/ftp/ncftp2/files/patch-Complete.c b/ftp/ncftp2/files/patch-Complete.c
new file mode 100644
index 000000000000..a5a9694a59c7
--- /dev/null
+++ b/ftp/ncftp2/files/patch-Complete.c
@@ -0,0 +1,14 @@
+--- Complete.c.orig	1996-10-18 13:10:31.000000000 +0800
++++ Complete.c	2011-12-22 00:11:03.000000000 +0800
+@@ -241,7 +241,11 @@ FileListAdd(FileList *f, char *s)
+ static int
+ CompareStrings(char **a, char **b)
+ {
++#ifdef __FreeBSD__
++	return strcoll(*a, *b);
++#else
+ 	return strcmp(*a, *b);
++#endif
+ }
+ 
+ static void
diff --git a/ftp/ncftp2/files/patch-Main.c b/ftp/ncftp2/files/patch-Main.c
new file mode 100644
index 000000000000..ab49d540b72f
--- /dev/null
+++ b/ftp/ncftp2/files/patch-Main.c
@@ -0,0 +1,28 @@
+--- Main.c.orig	1998-03-20 11:21:09.000000000 +0800
++++ Main.c	2011-12-22 00:11:54.000000000 +0800
+@@ -19,6 +19,9 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <ctype.h>
++#ifdef __FreeBSD__
++#include <locale.h>
++#endif
+ #include <signal.h>
+ #include <setjmp.h>
+ #include <stdlib.h>
+@@ -872,11 +875,14 @@ SigIntMain(/* int sigNum */ void)
+ 
+ 
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	int opt, result;
+ 	OpenOptions openopt;
+ 
++#ifdef __FreeBSD__
++	setlocale(LC_ALL, "");
++#endif
+ 	Init();
+ 	RunStartupScript();
+ 
diff --git a/ftp/ncftp2/files/patch-Main.h b/ftp/ncftp2/files/patch-Main.h
new file mode 100644
index 000000000000..0b1c57e24a9d
--- /dev/null
+++ b/ftp/ncftp2/files/patch-Main.h
@@ -0,0 +1,10 @@
+--- Main.h.orig	2011-12-22 00:11:25.000000000 +0800
++++ Main.h	2011-12-22 00:11:41.000000000 +0800
+@@ -45,6 +45,6 @@ void CloseTraceLog(void);
+ void CloseLogs(void);
+ void StartupMsgs(void);
+ void Startup(void);
+-void main(int, char **);
++int main(int, char **);
+ void SaveHistory(void);
+ void LoadHistory(void);
diff --git a/ftp/ncftp2/files/patch-ab b/ftp/ncftp2/files/patch-ab
deleted file mode 100644
index cf312ee71936..000000000000
--- a/ftp/ncftp2/files/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-*** Complete.c.bak	Fri Oct 18 09:10:31 1996
---- Complete.c	Thu Jan  9 15:17:48 1997
-***************
-*** 241,247 ****
---- 241,251 ----
-  static int
-  CompareStrings(char **a, char **b)
-  {
-+ #ifdef __FreeBSD__
-+ 	return strcoll(*a, *b);
-+ #else
-  	return strcmp(*a, *b);
-+ #endif
-  }
-  
-  static void
-*** Main.c.bak	Fri Oct 18 09:01:58 1996
---- Main.c	Thu Jan  9 15:24:22 1997
-***************
-*** 22,27 ****
---- 22,30 ----
-  #include <pwd.h>
-  #include <errno.h>
-  #include <ctype.h>
-+ #ifdef __FreeBSD__
-+ #include <locale.h>
-+ #endif
-  #include <signal.h>
-  #include <setjmp.h>
-  #include <stdlib.h>
-***************
-*** 866,871 ****
---- 869,877 ----
-  	int opt, result;
-  	OpenOptions openopt;
-  
-+ #ifdef __FreeBSD__
-+ 	setlocale(LC_ALL, "");
-+ #endif
-  	Init();
-  	RunStartupScript();
-  
diff --git a/ftp/ncftp2/files/patch-ac b/ftp/ncftp2/files/patch-configure
index 81ead5f4ae12..5bb66fe12ce3 100644
--- a/ftp/ncftp2/files/patch-ac
+++ b/ftp/ncftp2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bak	Sun Jun  8 14:25:04 1997
-+++ configure	Wed Aug 28 11:40:19 2002
-@@ -1766,7 +1766,7 @@
+--- configure.orig	1997-06-08 13:25:04.000000000 +0800
++++ configure	2011-12-22 00:11:03.000000000 +0800
+@@ -1766,7 +1766,7 @@ else
    echo "$ac_t""no" 1>&6
  fi