1 --- XFree86-4.0/xc/lib/dps/Xlibnet.h.fhs Thu May 18 19:46:12 2000
2 +++ XFree86-4.0/xc/lib/dps/Xlibnet.h Wed Jun 28 19:17:19 2000
7 -#define X_UNIX_PATH "/usr/spool/sockets/X11/"
8 +#define X_UNIX_PATH "/var/spool/sockets/X11/"
9 #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
11 #define X_UNIX_PATH "/tmp/.X11-unix/X"
12 --- XFree86-4.0/xc/lib/dps/csconndi.c.fhs Thu May 18 19:46:12 2000
13 +++ XFree86-4.0/xc/lib/dps/csconndi.c Wed Jun 28 19:17:19 2000
16 #ifndef CSDPS_UNIX_PATH
18 -#define CSDPS_UNIX_DIR "/usr/spool/sockets/DPSNX"
19 -#define CSDPS_UNIX_PATH "/usr/spool/sockets/DPSNX/"
20 +#define CSDPS_UNIX_DIR "/var/spool/sockets/DPSNX"
21 +#define CSDPS_UNIX_PATH "/var/spool/sockets/DPSNX/"
23 #define CSDPS_UNIX_DIR "/tmp/.DPSNX-unix"
24 #define CSDPS_UNIX_PATH "/tmp/.DPSNX-unix/AGENT"
25 --- XFree86-4.0/xc/lib/xtrans/Xtranssock.c.fhs Thu May 11 14:14:10 2000
26 +++ XFree86-4.0/xc/lib/xtrans/Xtranssock.c Wed Jun 28 19:17:19 2000
31 -#define UNIX_PATH "/usr/spool/sockets/X11/"
32 -#define UNIX_DIR "/usr/spool/sockets/X11"
33 +#define UNIX_PATH "/var/spool/sockets/X11/"
34 +#define UNIX_DIR "/var/spool/sockets/X11"
35 #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
38 -#define UNIX_PATH "/usr/spool/sockets/XIM/"
39 -#define UNIX_DIR "/usr/spool/sockets/XIM"
40 +#define UNIX_PATH "/var/spool/sockets/XIM/"
41 +#define UNIX_DIR "/var/spool/sockets/XIM"
42 #define OLD_UNIX_PATH "/tmp/.XIM-unix/XIM"
44 #if defined(FS_t) || defined(FONT_t)
45 -#define UNIX_PATH "/usr/spool/sockets/fontserv/"
46 -#define UNIX_DIR "/usr/spool/sockets/fontserv"
47 +#define UNIX_PATH "/var/spool/sockets/fontserv/"
48 +#define UNIX_DIR "/var/spool/sockets/fontserv"
49 #endif /* FS_t || FONT_t */
51 -#define UNIX_PATH "/usr/spool/sockets/ICE/"
52 -#define UNIX_DIR "/usr/spool/sockets/ICE"
53 +#define UNIX_PATH "/var/spool/sockets/ICE/"
54 +#define UNIX_DIR "/var/spool/sockets/ICE"
57 -#define UNIX_PATH "/usr/spool/sockets/xtrans_test/"
58 -#define UNIX_DIR "/usr/spool/sockets/xtrans_test"
59 +#define UNIX_PATH "/var/spool/sockets/xtrans_test/"
60 +#define UNIX_DIR "/var/spool/sockets/xtrans_test"
62 #if defined(LBXPROXY_t)
63 -#define UNIX_PATH "/usr/spool/sockets/X11/"
64 -#define UNIX_DIR "/usr/spool/sockets/X11"
65 +#define UNIX_PATH "/var/spool/sockets/X11/"
66 +#define UNIX_DIR "/var/spool/sockets/X11"
70 --- XFree86-4.0/xc/programs/rstart/Imakefile.fhs Wed Jun 28 19:34:12 2000
71 +++ XFree86-4.0/xc/programs/rstart/Imakefile Wed Jun 28 19:34:32 2000
76 -MYLIBDIR=$(LIBDIR)/rstart
77 +MYLIBDIR=/etc/X11/rstart
81 --- XFree86-4.0/xc/programs/xbiff/xbiff.man.fhs Sat Feb 12 22:56:13 2000
82 +++ XFree86-4.0/xc/programs/xbiff/xbiff.man Wed Jun 28 19:17:19 2000
85 .B \-file \fIfilename\fP
86 This option specifies the name of the file which should be monitored. By
87 -default, it watches /usr/spool/mail/\fIusername\fP, where \fIusername\fP
88 +default, it watches /var/mail/\fIusername\fP, where \fIusername\fP
91 .B \-volume \fIpercentage\fP
94 .B file (\fPclass\fB File)
95 Specifies the name of the file to monitor. The default is to watch
96 -/usr/spool/mail/\fIusername\fP, where \fIusername\fP is your login name.
97 +/var/mail/\fIusername\fP, where \fIusername\fP is your login name.
99 .B onceOnly (\fPclass\fB Boolean)
100 Specifies that the bell is only rung the first time new mail is found
101 --- XFree86-4.0/xc/programs/xbiff/MailboxP.h.fhs Sat Feb 12 22:56:12 2000
102 +++ XFree86-4.0/xc/programs/xbiff/MailboxP.h Wed Jun 28 19:17:19 2000
106 #ifndef MAILBOX_DIRECTORY
107 -#define MAILBOX_DIRECTORY "/usr/spool/mail"
108 +#define MAILBOX_DIRECTORY "/var/mail"
111 typedef struct { /* new fields for mailbox widget */
112 --- XFree86-4.0/xc/programs/xmh/xmh.man.fhs Sat Dec 21 22:31:12 1996
113 +++ XFree86-4.0/xc/programs/xmh/xmh.man Wed Jun 28 19:17:19 2000
114 @@ -1313,7 +1313,7 @@
115 An example of \fI.xmhcheck\fP file format, for the folders ``inbox'' and
118 -inbox /usr/spool/mail/converse
119 +inbox /var/mail/converse
120 xpert /users/converse/maildrops/xpert