Use /var/spool instead of /usr/spool and /var/mail instead of /usr/mail

cde/programs/dtcm/server/log.h

@@ -41,11 +41,7 @@
 #define _DtCMS_DEFAULT_BAK	".calbak"
 #define _DtCMS_DEFAULT_TMP	".caltmp"
 #define _DtCMS_DEFAULT_DEL	".caldel"
-#if defined(CSRG_BASED) || defined (linux)
 #define	_DtCMS_DEFAULT_DIR	"/var/spool/calendar"
-#else
-#define	_DtCMS_DEFAULT_DIR	"/usr/spool/calendar"
-#endif
 #define	_DtCMS_DEFAULT_MODE	(S_IRUSR|S_IRGRP|S_IWGRP)
 
 typedef enum {

cde/programs/dtksh/ksh93/ship/README

@@ -1,7 +1,7 @@
 /* $XConsortium: README /main/2 1996/07/15 14:13:29 drk $ */
 Software shipment information.  [better documentation forthcoming ...]
 
-All files and directories, except for those in /usr/spool/uucppublic,
+All files and directories, except for those in /var/spool/uucppublic,
 are rooted at the shipment/installation directory named by
 $INSTALLROOT.  The $INSTALLROOT hierarchy is similar to the System V
 /usr hierarchy.
@@ -25,7 +25,7 @@ After each shipment:
 	ship/shipin
 
 `ship/shipin -n' shows actions but does not unbundle or build.
-`ship/shipin -s <dir>' unbundles from <dir> rather than /usr/spool/uucppublic.
+`ship/shipin -s <dir>' unbundles from <dir> rather than /var/spool/uucppublic.
 `ship/shipin -u' unbundles the shipment but does not build.
 `ship/shipin -i' copies from spool area but does not unbundle or build.
 `ship/shipin -E' rebuild components that failed last time (use after fixes).
@@ -72,7 +72,7 @@ Each shipment is identified by a two part version number [R]YYMMDD
 	R	release -- if specified then it must match for compatibility
 	YYMMDD	shipment year, month and day number
 
-/usr/spool/uucppublic/<installer-login>/<shipper-system> directory hierarchy:
+/var/spool/uucppublic/<installer-login>/<shipper-system> directory hierarchy:
 
 	<shipper-login>.<YYMMDD>	shipment control directory
 	<shipper-login>.<YYMMDD>/manifest list of all files in shipment

cde/programs/dtksh/ksh93/ship/shipin

@@ -216,7 +216,7 @@ done
 export RECIPIENT
 case $_uuspool_ in
 "")	case $SHIPSPOOL in
-	"")	SHIPSPOOL="/usr/spool/uucppublic/$RECIPIENT/* /usr/spool/uucppublic/receive/$RECIPIENT/*" ;;
+	"")	SHIPSPOOL="/var/spool/uucppublic/$RECIPIENT/* /var/spool/uucppublic/receive/$RECIPIENT/*" ;;
 	esac
 	;;
 *)	SHIPSPOOL=$_uuspool_ ;;

cde/programs/dtksh/ksh93/ship/shipout

@@ -56,7 +56,7 @@ SHIPFILES="README shipin shipout"
 SHIPAUX="shipiffe.sh shipop.c shipproto.c"
 SHIPMENT=*[0-9][0-9][0-9][0-9][0-9][0-9]
 SHIPPER=${SHIPPER:-${USER:-${LOGNAME:-${HOME##*/}}}}
-SHIPSPOOL=${SHIPSPOOL:-/usr/spool/uucppublic}
+SHIPSPOOL=${SHIPSPOOL:-/var/spool/uucppublic}
 SHIPORG=${SHIPORG:-"Software and Systems Research"}
 SHIPLOGO=${SHIPLOGO:-"http://www1126.research.att.com/logos/attbllogo.gif align=middle"}
 SHIPMM2HTML=${SHIPMM2HTML:-mm2html}

cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c

@@ -238,7 +238,7 @@ const char e_stdprompt[]	= "$ ";
 const char e_profile[]		= "${HOME:-.}/.profile";
 const char e_sysprofile[]	= PROFILEPATH;
 const char e_suidprofile[]	= SUIDPROFILEPATH;
-const char e_crondir[]		= "/usr/spool/cron/atjobs";
+const char e_crondir[]		= "/var/spool/cron/atjobs";
 const char e_prohibited[]	= "login setuid/setgid shells prohibited";
 #ifdef SHOPT_SUID_EXEC
    const char e_suidexec[]	= SUIDEXECPATH;

cde/programs/dtlogin/config/Xsession.src

@@ -63,11 +63,6 @@ XCOMM ##########################################################################
 #  define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
 #endif
 
-#ifdef __osf__
-#  undef cpp_MAIL
-#  define cpp_MAIL "/usr/spool/mail/$USER"
-#endif
-
 #if defined (__hpux) && defined (BLS)
 #  undef cpp_HELLO
 #  define cpp_HELLO "$DT_BINPATH/dthello -file /etc/copyright -file $HOME/.dtlogininfo &"
@@ -118,7 +113,7 @@ XCOMM ##########################################################################
 #endif
 
 #if !defined (cpp_MAIL)
-#  define cpp_MAIL "/usr/mail/$USER"
+#  define cpp_MAIL "/var/mail/$USER"
 #endif
 
 #if !defined (cpp_HELLO)

cde/programs/dtlogin/dtlogin.man

@@ -176,7 +176,7 @@ environment:
 	LC_ALL	is set to the current NLS language (if any)
 	LC_MESSAGES	is set to the current NLS language (if any)
 	LOGNAME	is set to the user name
-	MAIL	is set to /usr/mail/$USER
+	MAIL	is set to /var/mail/$USER
 	PATH	is set to the value of the \fBuserPath\fP resource
 	USER	is set to the user name
 	SHELL	is set to the user's default shell (from /etc/passwd)
@@ -225,7 +225,7 @@ For example.
 .nf
 .ta .5i 3i
 
-	MAIL=/usr/mail/$USER
+	MAIL=/var/mail/$USER
 .fi
 .sp 1
 Finally, personal environment variables can be set on a per-user basis

cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C

@@ -345,8 +345,8 @@ typedef struct
    char *line;
 } StatusLineStruct, *StatusLine, **StatusLineList;
 
-#define TMP_DIR "/usr/spool/lp/tmp"
-#define REQ_DIR "/usr/spool/lp/requests/%s/"
+#define TMP_DIR "/var/spool/lp/tmp"
+#define REQ_DIR "/var/spool/lp/requests/%s/"
 #define SPOOL_DIR "/var/spool/lp/tmp/%s/"
 
 static void check_dir(char *printer, char *tmp_dir, StatusLineList *job_list,

cde/programs/dtwm/Dtwm.defs.src

@@ -181,16 +181,10 @@ Dtwm*VersionDialog_popup*columns:	%|nls-6-40^columns|
 !#
 !# Specify the file name to use to check the mail indicator
 !#
-!# Default is /usr/mail/$LOGNAME.
+!# Default is /var/mail/$LOGNAME.
 !#
 !####
-#ifdef __osf__
-Dtwm*Mail*fileName:	     			/usr/spool/mail/$LOGNAME
-#elif defined(linux)
 Dtwm*Mail*fileName:	     			/var/mail/$LOGNAME
-#else
-!# Dtwm*Mail*fileName:	     			/usr/mail/$LOGNAME
-#endif
 
 !####
 !#