[packages/X11.git] / XFree86-fhs.patch

--- XFree86-4.0/xc/lib/dps/Xlibnet.h.fhs	Thu May 18 19:46:12 2000
+++ XFree86-4.0/xc/lib/dps/Xlibnet.h	Wed Jun 28 19:17:19 2000
@@ -20,7 +20,7 @@
 
 #ifndef X_UNIX_PATH
 #ifdef hpux
-#define X_UNIX_PATH "/usr/spool/sockets/X11/"
+#define X_UNIX_PATH "/var/spool/sockets/X11/"
 #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
 #else
 #define X_UNIX_PATH "/tmp/.X11-unix/X"
--- XFree86-4.0/xc/lib/dps/csconndi.c.fhs	Thu May 18 19:46:12 2000
+++ XFree86-4.0/xc/lib/dps/csconndi.c	Wed Jun 28 19:17:19 2000
@@ -483,8 +483,8 @@
 
 #ifndef CSDPS_UNIX_PATH
 #ifdef hpux
-#define CSDPS_UNIX_DIR      "/usr/spool/sockets/DPSNX"
-#define CSDPS_UNIX_PATH     "/usr/spool/sockets/DPSNX/"
+#define CSDPS_UNIX_DIR      "/var/spool/sockets/DPSNX"
+#define CSDPS_UNIX_PATH     "/var/spool/sockets/DPSNX/"
 #else
 #define CSDPS_UNIX_DIR      "/tmp/.DPSNX-unix"
 #define CSDPS_UNIX_PATH     "/tmp/.DPSNX-unix/AGENT"
--- XFree86-4.0/xc/lib/xtrans/Xtranssock.c.fhs	Thu May 11 14:14:10 2000
+++ XFree86-4.0/xc/lib/xtrans/Xtranssock.c	Wed Jun 28 19:17:19 2000
@@ -203,30 +203,30 @@
 #ifdef hpux
 
 #if defined(X11_t)
-#define UNIX_PATH "/usr/spool/sockets/X11/"
-#define UNIX_DIR "/usr/spool/sockets/X11"
+#define UNIX_PATH "/var/spool/sockets/X11/"
+#define UNIX_DIR "/var/spool/sockets/X11"
 #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
 #endif /* X11_t */
 #if defined(XIM_t)
-#define UNIX_PATH "/usr/spool/sockets/XIM/"
-#define UNIX_DIR "/usr/spool/sockets/XIM"
+#define UNIX_PATH "/var/spool/sockets/XIM/"
+#define UNIX_DIR "/var/spool/sockets/XIM"
 #define OLD_UNIX_PATH "/tmp/.XIM-unix/XIM"
 #endif /* XIM_t */
 #if defined(FS_t) || defined(FONT_t)
-#define UNIX_PATH "/usr/spool/sockets/fontserv/"
-#define UNIX_DIR "/usr/spool/sockets/fontserv"
+#define UNIX_PATH "/var/spool/sockets/fontserv/"
+#define UNIX_DIR "/var/spool/sockets/fontserv"
 #endif /* FS_t || FONT_t */
 #if defined(ICE_t)
-#define UNIX_PATH "/usr/spool/sockets/ICE/"
-#define UNIX_DIR "/usr/spool/sockets/ICE"
+#define UNIX_PATH "/var/spool/sockets/ICE/"
+#define UNIX_DIR "/var/spool/sockets/ICE"
 #endif /* ICE_t */
 #if defined(TEST_t)
-#define UNIX_PATH "/usr/spool/sockets/xtrans_test/"
-#define UNIX_DIR "/usr/spool/sockets/xtrans_test"
+#define UNIX_PATH "/var/spool/sockets/xtrans_test/"
+#define UNIX_DIR "/var/spool/sockets/xtrans_test"
 #endif
 #if defined(LBXPROXY_t)
-#define UNIX_PATH "/usr/spool/sockets/X11/"
-#define UNIX_DIR  "/usr/spool/sockets/X11"
+#define UNIX_PATH "/var/spool/sockets/X11/"
+#define UNIX_DIR  "/var/spool/sockets/X11"
 #endif
 
 #else /* !hpux */
--- XFree86-4.0/xc/programs/rstart/Imakefile.fhs	Wed Jun 28 19:34:12 2000
+++ XFree86-4.0/xc/programs/rstart/Imakefile	Wed Jun 28 19:34:32 2000
@@ -39,7 +39,7 @@
 CLIENTNAME=rstart.cmd
 #endif
 
-MYLIBDIR=$(LIBDIR)/rstart
+MYLIBDIR=/etc/X11/rstart
 ENVPREFIX=RSTART
 PACKAGEname=rstart
 
--- XFree86-4.0/xc/programs/xbiff/xbiff.man.fhs	Sat Feb 12 22:56:13 2000
+++ XFree86-4.0/xc/programs/xbiff/xbiff.man	Wed Jun 28 19:17:19 2000
@@ -55,7 +55,7 @@
 .TP 8
 .B \-file \fIfilename\fP
 This option specifies the name of the file which should be monitored.  By
-default, it watches /usr/spool/mail/\fIusername\fP, where \fIusername\fP
+default, it watches /var/mail/\fIusername\fP, where \fIusername\fP
 is your login name.
 .TP 8
 .B \-volume \fIpercentage\fP
@@ -114,7 +114,7 @@
 .TP 8
 .B file (\fPclass\fB File)
 Specifies the name of the file to monitor.  The default is to watch
-/usr/spool/mail/\fIusername\fP, where \fIusername\fP is your login name.
+/var/mail/\fIusername\fP, where \fIusername\fP is your login name.
 .TP 8
 .B onceOnly (\fPclass\fB Boolean)
 Specifies that the bell is only rung the first time new mail is found
--- XFree86-4.0/xc/programs/xbiff/MailboxP.h.fhs	Sat Feb 12 22:56:12 2000
+++ XFree86-4.0/xc/programs/xbiff/MailboxP.h	Wed Jun 28 19:17:19 2000
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef MAILBOX_DIRECTORY
-#define MAILBOX_DIRECTORY "/usr/spool/mail"
+#define MAILBOX_DIRECTORY "/var/mail"
 #endif
 
 typedef struct {			/* new fields for mailbox widget */
--- XFree86-4.0/xc/programs/xmh/xmh.man.fhs	Sat Dec 21 22:31:12 1996
+++ XFree86-4.0/xc/programs/xmh/xmh.man	Wed Jun 28 19:17:19 2000
@@ -1313,7 +1313,7 @@
 An example of \fI.xmhcheck\fP file format, for the folders ``inbox'' and
 ``xpert'':
 .nf
-inbox	/usr/spool/mail/converse
+inbox	/var/mail/converse
 xpert	/users/converse/maildrops/xpert
 .fi
 .sp
Commit	Line	Data
969c5bdc JR	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
	3	@@ -20,7 +20,7 @@
	4
	5	#ifndef X_UNIX_PATH
	6	#ifdef hpux
	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"
	10	#else
	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
	14	@@ -483,8 +483,8 @@
	15
	16	#ifndef CSDPS_UNIX_PATH
	17	#ifdef hpux
	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/"
	22	#else
	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
	27	@@ -203,30 +203,30 @@
	28	#ifdef hpux
	29
	30	#if defined(X11_t)
	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"
	36	#endif /* X11_t */
	37	#if defined(XIM_t)
	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"
	43	#endif /* XIM_t */
	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 */
	50	#if defined(ICE_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"
	55	#endif /* ICE_t */
	56	#if defined(TEST_t)
	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"
	61	#endif
	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"
67	#endif
68
69	#else /* !hpux */
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
72	@@ -39,7 +39,7 @@
73	CLIENTNAME=rstart.cmd
74	#endif
75
76	-MYLIBDIR=$(LIBDIR)/rstart
77	+MYLIBDIR=/etc/X11/rstart
78	ENVPREFIX=RSTART
79	PACKAGEname=rstart
80
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
83	@@ -55,7 +55,7 @@
84	.TP 8
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
89	is your login name.
90	.TP 8
91	.B \-volume \fIpercentage\fP
92	@@ -114,7 +114,7 @@
93	.TP 8
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.
98	.TP 8
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
103	@@ -50,7 +50,7 @@
104	#endif
105
106	#ifndef MAILBOX_DIRECTORY
107	-#define MAILBOX_DIRECTORY "/usr/spool/mail"
108	+#define MAILBOX_DIRECTORY "/var/mail"
109	#endif
110
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
116	``xpert'':
117	.nf
118	-inbox /usr/spool/mail/converse
119	+inbox /var/mail/converse
120	xpert /users/converse/maildrops/xpert
121	.fi
122	.sp