--- ./doc/pine.1 Tue Sep 9 14:50:31 2003 +++ ../pine4.58/./doc/pine.1 Thu Sep 11 11:03:51 2003 @@ -333,11 +333,11 @@ .br /etc/mime.types System-wide file ext. to MIME type mapping .br -/usr/local/lib/pine.info Local pointer to system administrator. +/usr/freeware/lib/pine.info Local pointer to system administrator. .br -/usr/local/lib/pine.conf System-wide configuration file. +/usr/freeware/lib/pine.conf System-wide configuration file. .br -/usr/local/lib/pine.conf.fixed Non-overridable configuration file. +/usr/freeware/lib/pine.conf.fixed Non-overridable configuration file. .br /tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. .br --- ./imap/src/mlock/mlock.c Tue Oct 1 13:58:40 2002 +++ ../pine4.58/./imap/src/mlock/mlock.c Thu Sep 11 11:03:52 2003 @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,12 @@ #include #include #include + +/* EX_OK has conflicting definitions in sysexits.h and unistd.h */ +#ifdef EX_OK +#undef EX_OK +#endif +#include #define LOCKTIMEOUT 5 /* lock timeout in minutes */ #define LOCKPROTECTION 0775 --- ./pico/makefile.sgi Tue Oct 23 15:18:36 2001 +++ ../pine4.58/./pico/makefile.sgi Thu Sep 11 11:45:08 2003 @@ -32,7 +32,7 @@ MAKE= make OPTIMIZE= # -O PROFILE= # -pg -DEBUG= -g -DDEBUG +DEBUG= # -g -DDEBUG STDCFLAGS= -Dsgi -DJOB_CONTROL -DMOUSE CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) --- ./pine/makefile.sgi Tue Oct 23 15:24:09 2001 +++ ../pine4.58/./pine/makefile.sgi Thu Sep 11 11:46:21 2003 @@ -47,7 +47,7 @@ MAKE= make OPTIMIZE= # -O PROFILE= # -pg -DEBUG= -g -DDEBUG +DEBUG= # -g -DDEBUG CCLIENTDIR= ../c-client PICODIR= ../pico --- ./pine/osdep/os-sgi.h Fri May 23 09:05:21 2003 +++ ../pine4.58/./pine/osdep/os-sgi.h Thu Sep 11 11:03:52 2003 @@ -163,10 +163,10 @@ /*----- System-wide config file ----------------------------------------*/ #ifndef SYSTEM_PINERC -#define SYSTEM_PINERC "/usr/local/lib/pine.conf" +#define SYSTEM_PINERC "/usr/freeware/lib/pine.conf" #endif #ifndef SYSTEM_PINERC_FIXED -#define SYSTEM_PINERC_FIXED "/usr/local/lib/pine.conf.fixed" +#define SYSTEM_PINERC_FIXED "/usr/freeware/lib/pine.conf.fixed" #endif --- ./build Mon Dec 9 09:54:38 2002 +++ ../pine4.58/./build Thu Sep 11 11:03:52 2003 @@ -79,7 +79,7 @@ # but this gets overridden if we find the ssl dir SSL=none DEFSSLD=/usr/local/ssl -SSLD= +SSLD=${ROOT}/usr/freeware/lib32 NOCC= LLIBS= LFLAGS=