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

diff -urN xc.orig/lib/dps/csconndi.c xc/lib/dps/csconndi.c
--- xc.orig/lib/dps/csconndi.c	2004-08-08 14:23:31.000000000 +0200
+++ xc/lib/dps/csconndi.c	2004-08-08 14:52:18.313430392 +0200
@@ -480,8 +480,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"
diff -urN xc.orig/lib/dps/Xlibnet.h xc/lib/dps/Xlibnet.h
--- xc.orig/lib/dps/Xlibnet.h	2004-08-08 14:23:32.000000000 +0200
+++ xc/lib/dps/Xlibnet.h	2004-08-08 14:52:18.295433128 +0200
@@ -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"
diff -urN xc.orig/lib/xtrans/Xtranssock.c xc/lib/xtrans/Xtranssock.c
--- xc.orig/lib/xtrans/Xtranssock.c	2004-08-08 14:23:28.000000000 +0200
+++ xc/lib/xtrans/Xtranssock.c	2004-08-08 14:52:18.316429936 +0200
@@ -216,30 +216,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 */
diff -urN xc.orig/programs/rstart/Imakefile xc/programs/rstart/Imakefile
--- xc.orig/programs/rstart/Imakefile	2004-08-08 14:22:59.000000000 +0200
+++ xc/programs/rstart/Imakefile	2004-08-08 14:52:18.317429784 +0200
@@ -37,7 +37,7 @@
 OS=
 CLIENTNAME=rstart
 
-MYLIBDIR=$(LIBDIR)/rstart
+MYLIBDIR=/etc/X11/rstart
 ENVPREFIX=RSTART
 PACKAGEname=rstart
 
diff -urN xc.orig/programs/xbiff/MailboxP.h xc/programs/xbiff/MailboxP.h
--- xc.orig/programs/xbiff/MailboxP.h	2004-08-08 14:23:00.000000000 +0200
+++ xc/programs/xbiff/MailboxP.h	2004-08-08 14:52:18.317429784 +0200
@@ -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 */
diff -urN xc.orig/programs/xmh/xmh.man xc/programs/xmh/xmh.man
--- xc.orig/programs/xmh/xmh.man	2004-08-08 14:22:57.000000000 +0200
+++ xc/programs/xmh/xmh.man	2004-08-08 14:52:18.353424312 +0200
@@ -1316,7 +1316,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
37f44e2a	1	diff -urN xc.orig/lib/dps/csconndi.c xc/lib/dps/csconndi.c
	2	--- xc.orig/lib/dps/csconndi.c 2004-08-08 14:23:31.000000000 +0200
	3	+++ xc/lib/dps/csconndi.c 2004-08-08 14:52:18.313430392 +0200
	4	@@ -480,8 +480,8 @@
	5
	6	#ifndef CSDPS_UNIX_PATH
	7	#ifdef hpux
	8	-#define CSDPS_UNIX_DIR "/usr/spool/sockets/DPSNX"
	9	-#define CSDPS_UNIX_PATH "/usr/spool/sockets/DPSNX/"
	10	+#define CSDPS_UNIX_DIR "/var/spool/sockets/DPSNX"
	11	+#define CSDPS_UNIX_PATH "/var/spool/sockets/DPSNX/"
	12	#else
	13	#define CSDPS_UNIX_DIR "/tmp/.DPSNX-unix"
	14	#define CSDPS_UNIX_PATH "/tmp/.DPSNX-unix/AGENT"
	15	diff -urN xc.orig/lib/dps/Xlibnet.h xc/lib/dps/Xlibnet.h
	16	--- xc.orig/lib/dps/Xlibnet.h 2004-08-08 14:23:32.000000000 +0200
	17	+++ xc/lib/dps/Xlibnet.h 2004-08-08 14:52:18.295433128 +0200
	18	@@ -20,7 +20,7 @@
	19
	20	#ifndef X_UNIX_PATH
	21	#ifdef hpux
	22	-#define X_UNIX_PATH "/usr/spool/sockets/X11/"
	23	+#define X_UNIX_PATH "/var/spool/sockets/X11/"
	24	#define OLD_UNIX_PATH "/tmp/.X11-unix/X"
	25	#else
	26	#define X_UNIX_PATH "/tmp/.X11-unix/X"
	27	diff -urN xc.orig/lib/xtrans/Xtranssock.c xc/lib/xtrans/Xtranssock.c
	28	--- xc.orig/lib/xtrans/Xtranssock.c 2004-08-08 14:23:28.000000000 +0200
	29	+++ xc/lib/xtrans/Xtranssock.c 2004-08-08 14:52:18.316429936 +0200
	30	@@ -216,30 +216,30 @@
	31	#ifdef hpux
	32
	33	#if defined(X11_t)
	34	-#define UNIX_PATH "/usr/spool/sockets/X11/"
	35	-#define UNIX_DIR "/usr/spool/sockets/X11"
	36	+#define UNIX_PATH "/var/spool/sockets/X11/"
	37	+#define UNIX_DIR "/var/spool/sockets/X11"
	38	#define OLD_UNIX_PATH "/tmp/.X11-unix/X"
	39	#endif /* X11_t */
	40	#if defined(XIM_t)
	41	-#define UNIX_PATH "/usr/spool/sockets/XIM/"
	42	-#define UNIX_DIR "/usr/spool/sockets/XIM"
	43	+#define UNIX_PATH "/var/spool/sockets/XIM/"
	44	+#define UNIX_DIR "/var/spool/sockets/XIM"
	45	#define OLD_UNIX_PATH "/tmp/.XIM-unix/XIM"
	46	#endif /* XIM_t */
	47	#if defined(FS_t) \|\| defined(FONT_t)
	48	-#define UNIX_PATH "/usr/spool/sockets/fontserv/"
	49	-#define UNIX_DIR "/usr/spool/sockets/fontserv"
	50	+#define UNIX_PATH "/var/spool/sockets/fontserv/"
	51	+#define UNIX_DIR "/var/spool/sockets/fontserv"
	52	#endif /* FS_t \|\| FONT_t */
	53	#if defined(ICE_t)
	54	-#define UNIX_PATH "/usr/spool/sockets/ICE/"
	55	-#define UNIX_DIR "/usr/spool/sockets/ICE"
	56	+#define UNIX_PATH "/var/spool/sockets/ICE/"
	57	+#define UNIX_DIR "/var/spool/sockets/ICE"
	58	#endif /* ICE_t */
	59	#if defined(TEST_t)
	60	-#define UNIX_PATH "/usr/spool/sockets/xtrans_test/"
	61	-#define UNIX_DIR "/usr/spool/sockets/xtrans_test"
	62	+#define UNIX_PATH "/var/spool/sockets/xtrans_test/"
	63	+#define UNIX_DIR "/var/spool/sockets/xtrans_test"
	64	#endif
65	#if defined(LBXPROXY_t)
66	-#define UNIX_PATH "/usr/spool/sockets/X11/"
67	-#define UNIX_DIR "/usr/spool/sockets/X11"
68	+#define UNIX_PATH "/var/spool/sockets/X11/"
69	+#define UNIX_DIR "/var/spool/sockets/X11"
70	#endif
71
72	#else /* !hpux */
73	diff -urN xc.orig/programs/rstart/Imakefile xc/programs/rstart/Imakefile
74	--- xc.orig/programs/rstart/Imakefile 2004-08-08 14:22:59.000000000 +0200
75	+++ xc/programs/rstart/Imakefile 2004-08-08 14:52:18.317429784 +0200
76	@@ -37,7 +37,7 @@
77	OS=
78	CLIENTNAME=rstart
79
80	-MYLIBDIR=$(LIBDIR)/rstart
81	+MYLIBDIR=/etc/X11/rstart
82	ENVPREFIX=RSTART
83	PACKAGEname=rstart
84
85	diff -urN xc.orig/programs/xbiff/MailboxP.h xc/programs/xbiff/MailboxP.h
86	--- xc.orig/programs/xbiff/MailboxP.h 2004-08-08 14:23:00.000000000 +0200
87	+++ xc/programs/xbiff/MailboxP.h 2004-08-08 14:52:18.317429784 +0200
88	@@ -50,7 +50,7 @@
89	#endif
90
91	#ifndef MAILBOX_DIRECTORY
92	-#define MAILBOX_DIRECTORY "/usr/spool/mail"
93	+#define MAILBOX_DIRECTORY "/var/mail"
94	#endif
95
96	typedef struct { /* new fields for mailbox widget */
97	diff -urN xc.orig/programs/xmh/xmh.man xc/programs/xmh/xmh.man
98	--- xc.orig/programs/xmh/xmh.man 2004-08-08 14:22:57.000000000 +0200
99	+++ xc/programs/xmh/xmh.man 2004-08-08 14:52:18.353424312 +0200
100	@@ -1316,7 +1316,7 @@
101	An example of \fI.xmhcheck\fP file format, for the folders ``inbox'' and
102	``xpert'':
103	.nf
104	-inbox /usr/spool/mail/converse
105	+inbox /var/mail/converse
106	xpert /users/converse/maildrops/xpert
107	.fi
108	.sp