diff -ruNd ftp/ncftp2/patches/patch-ab ftp/ncftp2/patches/patch-ab --- ftp/ncftp2/patches/patch-ab Thu Jan 9 15:41:39 1997 +++ ftp/ncftp2/patches/patch-ab Sat Apr 29 21:09:20 2000 @@ -14,29 +14,4 @@ } 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 - #include - #include -+ #ifdef __FreeBSD__ -+ #include -+ #endif - #include - #include - #include -*************** -*** 866,871 **** ---- 869,877 ---- - int opt, result; - OpenOptions openopt; - -+ #ifdef __FreeBSD__ -+ setlocale(LC_ALL, ""); -+ #endif - Init(); - RunStartupScript(); diff -ruNd ftp/ncftp2/patches/patch-ba ftp/ncftp2/patches/patch-ba --- ftp/ncftp2/patches/patch-ba Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-ba Sat Apr 29 21:07:25 2000 @@ -0,0 +1,20 @@ +--- Config.h.in.orig Thu Oct 17 03:10:21 1996 ++++ Config.h.in Sat Apr 29 21:01:53 2000 +@@ -15,7 +15,7 @@ + * you almost always need to open with a user name and password, you + * might consider turning off anonymous by default. + * +- * Note: this won't override whatever is in your ~/.ncftp/prefs. ++ * Note: this won't override whatever is in your ~/.desk/ncftp/prefs. + * When you run the program the first time, that file is created, so + * changing this may not seem to work until you edit your prefs. + */ +@@ -26,7 +26,7 @@ + * If visual mode doesn't do a good job, you can have visual mode off + * by default. + * +- * Note: this won't override whatever is in your ~/.ncftp/prefs. ++ * Note: this won't override whatever is in your ~/.desk/ncftp/prefs. + * When you run the program the first time, that file is created, so + * changing this may not seem to work until you edit your prefs. + */ diff -ruNd ftp/ncftp2/patches/patch-bb ftp/ncftp2/patches/patch-bb --- ftp/ncftp2/patches/patch-bb Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-bb Sat Apr 29 21:07:40 2000 @@ -0,0 +1,20 @@ +--- Config.h.top.orig Mon Nov 27 07:48:30 1995 ++++ Config.h.top Sat Apr 29 21:02:56 2000 +@@ -14,7 +14,7 @@ + * you almost always need to open with a user name and password, you + * might consider turning off anonymous by default. + * +- * Note: this won't override whatever is in your ~/.ncftp/prefs. ++ * Note: this won't override whatever is in your ~/.desk/ncftp/prefs. + * When you run the program the first time, that file is created, so + * changing this may not seem to work until you edit your prefs. + */ +@@ -25,7 +25,7 @@ + * If visual mode doesn't do a good job, you can have visual mode off + * by default. + * +- * Note: this won't override whatever is in your ~/.ncftp/prefs. ++ * Note: this won't override whatever is in your ~/.desk/ncftp/prefs. + * When you run the program the first time, that file is created, so + * changing this may not seem to work until you edit your prefs. + */ diff -ruNd ftp/ncftp2/patches/patch-bc ftp/ncftp2/patches/patch-bc --- ftp/ncftp2/patches/patch-bc Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-bc Sat Apr 29 21:08:53 2000 @@ -0,0 +1,31 @@ +--- Main.c.orig Fri Mar 20 06:21:09 1998 ++++ Main.c Sat Apr 29 21:03:29 2000 +@@ -19,6 +19,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include + #include +@@ -457,7 +460,7 @@ + + + /* There would be problems if we had multiple ncftp's going. They would +- * each try to update the files in ~/.ncftp. Whichever program exited ++ * each try to update the files in ~/.desk/ncftp. Whichever program exited + * last would have its stuff written, and the others which may have made + * changes, would lose the changes they made. + * +@@ -877,6 +880,9 @@ + int opt, result; + OpenOptions openopt; + ++#ifdef __FreeBSD__ ++ setlocale(LC_ALL, ""); ++#endif + Init(); + RunStartupScript(); + diff -ruNd ftp/ncftp2/patches/patch-bd ftp/ncftp2/patches/patch-bd --- ftp/ncftp2/patches/patch-bd Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-bd Sat Apr 29 21:09:44 2000 @@ -0,0 +1,11 @@ +--- Main.h.orig Mon Oct 30 03:13:42 1995 ++++ Main.h Sat Apr 29 21:04:09 2000 +@@ -6,7 +6,7 @@ + int uid; + } UserInfo; + +-#define kOurDirectoryName ".ncftp" ++#define kOurDirectoryName ".desk/ncftp" + #define kLogName "log" + #define kTmpLogName "log.copy" + #define kHistoryName "history" diff -ruNd ftp/ncftp2/patches/patch-be ftp/ncftp2/patches/patch-be --- ftp/ncftp2/patches/patch-be Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-be Sat Apr 29 21:10:51 2000 @@ -0,0 +1,27 @@ +--- Tips.c.orig Fri Mar 20 05:04:35 1998 ++++ Tips.c Sat Apr 29 21:05:54 2000 +@@ -27,7 +27,7 @@ + within the program.", + + "If you don't like visual mode, you can still edit the \"bookmarks\" and \"prefs\" \ +-files by hand. Use your editor on the files in ~/.ncftp.", ++files by hand. Use your editor on the files in ~/.desk/ncftp.", + + "Don't /add sites by hand using the Bookmark Editor. It's easier to just open a \ + new site from the command line, and let the program add a new entry \ +@@ -110,13 +110,13 @@ + "Thank you for using NcFTP. Ask your system administrator to try NcFTPd \ + Server as an alternative to your ftpd or wu-ftpd! ", + +-"If you need to report a bug, send me a ~/.ncftp/trace file too. To enable \ ++"If you need to report a bug, send me a ~/.desk/ncftp/trace file too. To enable \ + tracing, turn on trace logging from the Prefs window, or type \"set trace 1\" \ + from the command line. Then re-create your bug, quit the program, and \ + send the trace file to ncftp@NcFTP.com.", + + "NcFTP will write all sorts of cool debugging information to a file named \ +-\"trace\" in your .ncftp directory if you do a \"set trace 1\" at the start.", ++\"trace\" in your .desk/ncftp directory if you do a \"set trace 1\" at the start.", + + "Sick and tired of these tips? Type \"set tips 0\" any time." + }; diff -ruNd ftp/ncftp2/patches/patch-bf ftp/ncftp2/patches/patch-bf --- ftp/ncftp2/patches/patch-bf Thu Jan 1 03:00:00 1970 +++ ftp/ncftp2/patches/patch-bf Sat Apr 29 21:14:39 2000 @@ -0,0 +1,69 @@ +--- ncftp.1.orig Fri Mar 20 05:03:34 1998 ++++ ncftp.1 Sat Apr 29 21:13:57 2000 +@@ -501,7 +501,7 @@ + The program can log the transfers you do to a file so you can refer to the + log if you can't remember where you got something. + To turn on the log, which is saved as +-.IR "~/.ncftp/log" "," ++.IR "~/.desk/ncftp/log" "," + you can set the + .I User log size + field to a number greater than zero. +@@ -719,7 +719,7 @@ + .PP + After you quit the program, you could then send me an email with the + contents of the +-.I "~/\.ncftp/trace" ++.I "~/\.desk/ncftp/trace" + file, which would also have the version information in it. + .PP + The +@@ -876,7 +876,7 @@ + You can choose to use the built-in pager by using the ``\-b'' flag. + Example: + .Ds +-lpage -b ~/.ncftp/bookmarks ++lpage -b ~/.desk/ncftp/bookmarks + .De + .PP + The +@@ -1135,7 +1135,7 @@ + .I Preferences + screen. + The short names of the preferences fields can be found by browsing your +-.I ~/.ncftp/prefs ++.I ~/.desk/ncftp/prefs + file. + This command is mainly for use with + .IR "line mode" "," +@@ -1336,10 +1336,10 @@ + To use macros, you will need to create and edit the + .I macros + file in your +-.I ".ncftp" ++.I ".desk/ncftp" + subdirectory of your home directory. + Your +-.I "~/.ncftp" ++.I "~/.desk/ncftp" + directory is created for you automatically the first time you run the + program, but you have to make the + .I macros +@@ -1571,7 +1571,7 @@ + such as the + .IR "Preferences" " screen and the " "Bookmark Editor" "." + You will have to edit the +-.IR "~/.ncftp/prefs" " and " "~/.ncftp/bookmarks" ++.IR "~/.desk/ncftp/prefs" " and " "~/.desk/ncftp/bookmarks" + file manually, with a text editor. + .PP + As a small consolation, you get to use the full-powered line-editing +@@ -1600,7 +1600,7 @@ + to a file called + .I "trace" + in your +-.I ".ncftp" ++.I ".desk/ncftp" + subdirectory of your home directory. + If you need to report a bug, it would be helpful to mail me the + .I trace