diff -ruNd ftp/ncftp3/patches/patch-ba ftp/ncftp3/patches/patch-ba --- ftp/ncftp3/patches/patch-ba Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-ba Sat Apr 29 23:36:09 2000 @@ -0,0 +1,125 @@ +--- doc/man/ncftp.1.orig Mon Oct 4 05:00:49 1999 ++++ doc/man/ncftp.1 Sat Apr 29 23:27:39 2000 +@@ -225,7 +225,7 @@ + You can use the + .IR bookmark + command to save an entry into your +-$HOME/.ncftp/bookmarks ++$HOME/.desk/ncftp/bookmarks + file. When you use the + .I bookmark + command, you also specify a bookmark name, so the next time instead of +@@ -288,7 +288,7 @@ + The daemon will also automatically continue to retry the transfers + until they finish. + To tell when background jobs have finished, you have to examine the +-.I $HOME/.ncftp/batchlog ++.I $HOME/.desk/ncftp/batchlog + file, or run the + .I jobs + command from within +@@ -340,13 +340,13 @@ + This is useful to save the remote system and remote working directory + so you can quickly resume where you left off some other time. + The bookmark data is stored in your +-.I $HOME/.ncftp/bookmarks ++.I $HOME/.desk/ncftp/bookmarks + file. + .\"------- + .IP bookmarks + .\"------- + Lists the contents of your +-.I $HOME/.ncftp/bookmarks ++.I $HOME/.desk/ncftp/bookmarks + file in a human-readable format. + You can use this command to recall the bookmark name of a previously + saved bookmark, so that you can use the +@@ -422,7 +422,7 @@ + Then you could see all messages between the program and the remote + server, and things that are only printed in debugging mode. + However, this information is also available in the +-.I $HOME/.ncftp/trace ++.I $HOME/.desk/ncftp/trace + file, which is created each time you run + .IR ncftp "." + If you need to report a bug, send a +@@ -803,7 +803,7 @@ + .\"------- + This lets you configure some program variables, which are saved + between runs in the +-.I $HOME/.ncftp/prefs ++.I $HOME/.desk/ncftp/prefs + file. + The basic syntax is: + .Xs +@@ -938,7 +938,7 @@ + .IP "logsize" + .\"------- + This is controls how large the transfer log +-($HOME/.ncftp/log) can grow to, in kilobytes. ++($HOME/.desk/ncftp/log) can grow to, in kilobytes. + The default is 200, for 200kB; + if you don't want a log, set this to 0. + .\"------- +@@ -983,7 +983,7 @@ + While this makes non-anonymous logins more convenient, this can + be very dangerous since your account information is now sitting + in the +-$HOME/.ncftp/bookmarks ++$HOME/.desk/ncftp/bookmarks + file. + The passwords aren't in clear text, but it is still trivial to + decode them if someone wants to make a modest effort. +@@ -1033,7 +1033,7 @@ + .I ncftp + communicate directly with a firewall or proxy, you can try + editing the separate +-.I $HOME/\.ncftp/firewall ++.I $HOME/\.desk/ncftp/firewall + configuration file. + This file is created automatically the first time you run the + program, and contains all the information you need to get +@@ -1048,20 +1048,20 @@ + .\"------- + .SH "FILES" + .\"------- +-.IP $HOME/\.ncftp/batchlog ++.IP $HOME/\.desk/ncftp/batchlog + Information for background data transfer processes. +-.IP $HOME/\.ncftp/bookmarks ++.IP $HOME/\.desk/ncftp/bookmarks + Saves bookmark and host information. +-.IP $HOME/\.ncftp/firewall ++.IP $HOME/\.desk/ncftp/firewall + Firewall access configuration file. +-.IP $HOME/\.ncftp/prefs ++.IP $HOME/\.desk/ncftp/prefs + Program preferences. +-.IP $HOME/\.ncftp/spool/ ++.IP $HOME/\.desk/ncftp/spool/ + Directory where background jobs are stored in the form of + spool configuration files. +-.IP $HOME/\.ncftp/trace ++.IP $HOME/\.desk/ncftp/trace + Debugging output for entire program run. +-.IP $HOME/\.ncftp/v3init ++.IP $HOME/\.desk/ncftp/v3init + Used to tell if this version of the program has run before. + .\"------- + .SH "ENVIRONMENT" +@@ -1080,13 +1080,13 @@ + The pager program will also take advantage of this setting. + .IP HOME + By default, the program writes its configuration data in a +-.I "\.ncftp" ++.I "\.desk/ncftp" + subdirectory of the + .I HOME + directory. + .IP NCFTPDIR + If set, the program will use this directory instead of +-.IR "$HOME/.ncftp" "." ++.IR "$HOME/.desk/ncftp" "." + This variable is optional except for those users whose home directory is + the root directory. + .IP COLUMNS diff -ruNd ftp/ncftp3/patches/patch-bb ftp/ncftp3/patches/patch-bb --- ftp/ncftp3/patches/patch-bb Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bb Sat Apr 29 23:36:39 2000 @@ -0,0 +1,29 @@ +--- doc/man/ncftpbatch.1.orig Mon Oct 4 04:13:51 1999 ++++ doc/man/ncftpbatch.1 Sat Apr 29 23:28:20 2000 +@@ -19,7 +19,7 @@ + .TP 8 + .RI "-d" + Begin background processing of FTP jobs in the current user's +-$HOME/.ncftp/spool directory. ++$HOME/.desk/ncftp/spool directory. + This returns immediately, because a daemon process is spawned + and ran in the background. + .TP 8 +@@ -40,7 +40,7 @@ + process the FTP job queue. + .PP + The jobs are spool files written to a user's +-$HOME/.ncftp/spool directory and have a special format and file-naming ++$HOME/.desk/ncftp/spool directory and have a special format and file-naming + convention (which contains when the job is to be run). + .I ncftp + runs this program when it needs to, but if the +@@ -55,7 +55,7 @@ + .PP + .I ncftpbatch + writes to its own log file, the +-$HOME/.ncftp/batchlog file. ++$HOME/.desk/ncftp/batchlog file. + This file should be examined to determine if any + .I ncftpbatch + processes are actively working on jobs. diff -ruNd ftp/ncftp3/patches/patch-bc ftp/ncftp3/patches/patch-bc --- ftp/ncftp3/patches/patch-bc Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bc Sat Apr 29 23:37:28 2000 @@ -0,0 +1,135 @@ +--- doc/html/ncftp.html.orig Mon Oct 4 07:23:08 1999 ++++ doc/html/ncftp.html Sat Apr 29 23:31:50 2000 +@@ -106,7 +106,7 @@ + or use the quit

+ Before quitting, you may want to save the current FTP session's + settings for later. You can use the bookmark command to save an entry into +-your $HOME/.ncftp/bookmarks file. When you use the bookmark command, you ++your $HOME/.desk/ncftp/bookmarks file. When you use the bookmark command, you + also specify a bookmark name, so the next time instead of opening the full + hostname you can use the name of the bookmark. A bookmark acts just like + one for your web browser, so it saves the remote directory you were in, +@@ -188,7 +188,7 @@ + fact, they are done by a daemon process, so even if you log off your UNIX + host the daemon should still do your transfers. The daemon will also automatically + continue to retry the transfers until they finish. To tell when background +-jobs have finished, you have to examine the $HOME/.ncftp/batchlog file, ++jobs have finished, you have to examine the $HOME/.desk/ncftp/batchlog file, + or run the jobs command from within NcFTP. + +

 
+@@ -244,7 +244,7 @@ +
Saves the current session settings + for later use. This is useful to save the remote system and remote working + directory so you can quickly resume where you left off some other time. +-The bookmark data is stored in your $HOME/.ncftp/bookmarks file.
++The bookmark data is stored in your $HOME/.desk/ncftp/bookmarks file. + +
 
+ +@@ -254,7 +254,7 @@ +
+ +
+-Lists the contents of your $HOME/.ncftp/bookmarks file in a human-readable ++Lists the contents of your $HOME/.desk/ncftp/bookmarks file in a human-readable + format. You can use this command to recall the bookmark name of a previously + saved bookmark, so that you can use the open command with it.
+ +@@ -372,7 +372,7 @@ + +
to turn debugging mode on.  Then you could see all messages between + the program and the remote server, and things that are only printed in +-debugging mode. However, this information is also available in the $HOME/.ncftp/trace ++debugging mode. However, this information is also available in the $HOME/.desk/ncftp/trace + file, which is created each time you run ncftp. If you need to report a + bug, send a trace file if you can.
+ +@@ -1004,7 +1004,7 @@ +
+ +
This lets you configure some program variables, which are +-saved between runs in the $HOME/.ncftp/prefs file. The basic syntax is:
++saved between runs in the $HOME/.desk/ncftp/prefs file. The basic syntax is: + +
+ +@@ -1241,7 +1241,7 @@ + +
+ +-
This is controls how large the transfer log ($HOME/.ncftp/log) ++
This is controls how large the transfer log ($HOME/.desk/ncftp/log) + can grow to, in kilobytes. The default is 200, for 200kB; if you don't want + a log, set this to 0.
+ +@@ -1292,7 +1292,7 @@ + this variable to yes, the program will save passwords along with the bookmarks + you save. While this makes non-anonymous logins more convenient, this can + be very dangerous since your account information is now sitting in the +-$HOME/.ncftp/bookmarks file. The passwords aren't in clear text, but it is ++$HOME/.desk/ncftp/bookmarks file. The passwords aren't in clear text, but it is + still trivial to decode them if someone wants to make a modest effort. + + +@@ -1341,7 +1341,7 @@ + whose primitive FTP servers do not support passive mode.

+ Otherwise, if you + know you need to have ncftp communicate directly with a firewall or proxy, +-you can try editing the separate $HOME/.ncftp/firewall configuration file. ++you can try editing the separate $HOME/.desk/ncftp/firewall configuration file. + This file is created automatically the first time you run the program, + and contains all the information you need to get the program to work in + this setup.

+@@ -1357,30 +1357,30 @@ + +

+ +-
$HOME/.ncftp/batchlog
++
$HOME/.desk/ncftp/batchlog
+
Information for background data + transfer processes.
+ +-
$HOME/.ncftp/bookmarks
++
$HOME/.desk/ncftp/bookmarks
+
Saves bookmark and host information. +
+ +-
$HOME/.ncftp/firewall
++
$HOME/.desk/ncftp/firewall
+
Firewall access configuration file.
+ +-
$HOME/.ncftp/prefs
++
$HOME/.desk/ncftp/prefs
+
Program + preferences.
+ +-
$HOME/.ncftp/spool/
++
$HOME/.desk/ncftp/spool/
+
Directory where background jobs are stored + in the form of spool configuration files.
+ +-
$HOME/.ncftp/trace
++
$HOME/.desk/ncftp/trace
+
Debugging output + for entire program run.
+ +-
$HOME/.ncftp/v3init
++
$HOME/.desk/ncftp/v3init
+
Used to tell if this version of + the program has run before.
+
+@@ -1409,11 +1409,11 @@ + +
HOME
+
By default, the program writes its configuration +-data in a .ncftp subdirectory of the HOME directory.
++data in a .desk/ncftp subdirectory of the HOME directory. + +
NCFTPDIR
+
If set, the +-program will use this directory instead of $HOME/.ncftp. This variable is ++program will use this directory instead of $HOME/.desk/ncftp. This variable is + optional except for those users whose home directory is the root directory. +
+ diff -ruNd ftp/ncftp3/patches/patch-bd ftp/ncftp3/patches/patch-bd --- ftp/ncftp3/patches/patch-bd Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bd Sat Apr 29 23:38:46 2000 @@ -0,0 +1,11 @@ +--- ncftp/bookmark.c.orig Thu Sep 30 06:22:31 1999 ++++ ncftp/bookmark.c Sat Apr 29 23:38:07 2000 +@@ -11,7 +11,7 @@ + #include "util.h" + + /* +- * The ~/.ncftp/bookmarks file contains a list of sites ++ * The ~/.desk/ncftp/bookmarks file contains a list of sites + * the user wants to remember. + * + * Unlike previous versions of the program, we now open/close diff -ruNd ftp/ncftp3/patches/patch-be ftp/ncftp3/patches/patch-be --- ftp/ncftp3/patches/patch-be Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-be Sat Apr 29 23:42:34 2000 @@ -0,0 +1,11 @@ +--- ncftp/util.h.orig Thu Sep 30 06:22:31 1999 ++++ ncftp/util.h Sat Apr 29 23:40:05 2000 +@@ -42,7 +42,7 @@ + # define F_OK 0 + #endif + +-#define kOurDirectoryName ".ncftp" ++#define kOurDirectoryName ".desk/ncftp" + + #define kPasswordMagic "*encoded*" + #define kPasswordMagicLen 9 diff -ruNd ftp/ncftp3/patches/patch-bf ftp/ncftp3/patches/patch-bf --- ftp/ncftp3/patches/patch-bf Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bf Sat Apr 29 23:43:07 2000 @@ -0,0 +1,11 @@ +--- ncftp/trace.c.orig Thu Sep 30 06:22:31 1999 ++++ ncftp/trace.c Sat Apr 29 23:41:53 2000 +@@ -10,7 +10,7 @@ + #include "trace.h" + #include "util.h" + +-/* Saves their session in a ~/.ncftp/trace file. ++/* Saves their session in a ~/.desk/ncftp/trace file. + * This is nice for me when I need to diagnose problems. + */ + time_t gTraceTime; diff -ruNd ftp/ncftp3/patches/patch-bg ftp/ncftp3/patches/patch-bg --- ftp/ncftp3/patches/patch-bg Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bg Sat Apr 29 23:44:24 2000 @@ -0,0 +1,11 @@ +--- ncftp/preffw.c.orig Thu Sep 30 06:22:31 1999 ++++ ncftp/preffw.c Sat Apr 29 23:43:58 2000 +@@ -181,7 +181,7 @@ + #\n\ + #\n\ + # You may also specify passive mode here. Normally this is set in the\n\ +-# regular $HOME/.ncftp/prefs file. This must be set to one of\n\ ++# regular $HOME/.desk/ncftp/prefs file. This must be set to one of\n\ + # \"on\", \"off\", or \"optional\", which mean always use PASV,\n\ + # always use PORT, and try PASV then PORT, respectively.\n\ + #\n\ diff -ruNd ftp/ncftp3/patches/patch-bh ftp/ncftp3/patches/patch-bh --- ftp/ncftp3/patches/patch-bh Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bh Sat Apr 29 23:47:22 2000 @@ -0,0 +1,11 @@ +--- sh_util/ncftpbatch.c.orig Thu Sep 30 06:22:31 1999 ++++ sh_util/ncftpbatch.c Sat Apr 29 23:46:56 2000 +@@ -73,7 +73,7 @@ + char gLFile[256]; + char gRStartDir[256]; + +-/* Writes logging data to a ~/.ncftp/batchlog file. ++/* Writes logging data to a ~/.desk/ncftp/batchlog file. + * This is nice for me when I need to diagnose problems. + */ + time_t gLogTime; diff -ruNd ftp/ncftp3/patches/patch-bi ftp/ncftp3/patches/patch-bi --- ftp/ncftp3/patches/patch-bi Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bi Sat Apr 29 23:50:02 2000 @@ -0,0 +1,11 @@ +--- win/bmed/bookmark.c.orig Thu Sep 30 06:22:31 1999 ++++ win/bmed/bookmark.c Sat Apr 29 23:49:32 2000 +@@ -13,7 +13,7 @@ + #include "util.h" + + /* +- * The ~/.ncftp/bookmarks file contains a list of sites ++ * The ~/.desk/ncftp/bookmarks file contains a list of sites + * the user wants to remember. + * + * Unlike previous versions of the program, we now open/close diff -ruNd ftp/ncftp3/patches/patch-bj ftp/ncftp3/patches/patch-bj --- ftp/ncftp3/patches/patch-bj Thu Jan 1 03:00:00 1970 +++ ftp/ncftp3/patches/patch-bj Sat Apr 29 23:51:11 2000 @@ -0,0 +1,11 @@ +--- win/bmed/util.h.orig Thu Sep 30 06:22:31 1999 ++++ win/bmed/util.h Sat Apr 29 23:50:40 2000 +@@ -42,7 +42,7 @@ + # define F_OK 0 + #endif + +-#define kOurDirectoryName ".ncftp" ++#define kOurDirectoryName ".desk/ncftp" + + #define kPasswordMagic "*encoded*" + #define kPasswordMagicLen 9