diff -urX /etc/diff.exludes pine4.10-orig/build pine4.10/build --- pine4.10-orig/build Wed Dec 16 03:53:28 1998 +++ pine4.10/build Sat Feb 6 22:12:24 1999 @@ -177,6 +177,7 @@ gs5) makeargs="CC=gcc $makeargs" ;; gsu) makeargs="CC=gcc $makeargs" ;; gul) makeargs="CC=gcc $makeargs" ;; + mnt) makeargs="CC=gcc $makeargs" ;; bs3) makeargs="CC=shlicc $makeargs" ;; lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;; *) makeargs="CC=cc $makeargs" ;; @@ -310,6 +311,10 @@ echo '' echo "Links to executables are in bin directory:" size bin/pine bin/mtest bin/imapd bin/pico bin/pilot + case $maketarg in + mnt) echo "Fixing stacksizes ..." + fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pico bin/pilot + esac echo "Done" ;; diff -urX /etc/diff.exludes pine4.10-orig/imap/src/imapd/Makefile pine4.10/imap/src/imapd/Makefile --- pine4.10-orig/imap/src/imapd/Makefile Sat Nov 21 07:44:10 1998 +++ pine4.10/imap/src/imapd/Makefile Sat Feb 6 21:07:22 1999 @@ -61,7 +61,7 @@ all: imapd imapd: $(CCLIENTLIB) imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) + $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) $(EXTRALIBES) imapd.o: $C/mail.h $C/misc.h $C/osdep.h diff -urX /etc/diff.exludes pine4.10-orig/imap/src/ipopd/Makefile pine4.10/imap/src/ipopd/Makefile --- pine4.10-orig/imap/src/ipopd/Makefile Thu Sep 17 05:00:56 1998 +++ pine4.10/imap/src/ipopd/Makefile Sat Feb 6 20:54:50 1999 @@ -44,10 +44,10 @@ ipopd: ipop2d ipop3d ipop2d: $(CCLIENTLIB) ipop2d.o - $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS) + $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS) $(EXTRALIBES) ipop3d: $(CCLIENTLIB) ipop3d.o - $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS) + $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS) $(EXTRALIBES) ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h diff -urX /etc/diff.exludes pine4.10-orig/imap/src/mtest/Makefile pine4.10/imap/src/mtest/Makefile --- pine4.10-orig/imap/src/mtest/Makefile Thu Sep 17 05:01:16 1998 +++ pine4.10/imap/src/mtest/Makefile Sat Feb 6 20:50:14 1999 @@ -44,7 +44,7 @@ all: mtest mtest: $(CCLIENTLIB) mtest.o - $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) + $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) $(EXTRALIBES) mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h diff -urX /etc/diff.exludes pine4.10-orig/imap/src/osdep/unix/Makefile pine4.10/imap/src/osdep/unix/Makefile --- pine4.10-orig/imap/src/osdep/unix/Makefile Wed Jan 27 03:19:18 1999 +++ pine4.10/imap/src/osdep/unix/Makefile Sat Feb 6 17:41:36 1999 @@ -368,10 +368,12 @@ BASECFLAGS="-g -O -pipe" mnt: # Mint - $(BUILD) `cat EXTRASPECIALS` OS=$@ \ - BASECFLAGS="-g -O -Dunix=1 -D__atarist__ -D_POSIX_SOURCE -pipe" \ + $(BUILD) `cat EXTRASPECIALS` OS=$@ SIGTYPE=psx \ + BASECFLAGS="-g -O -DNFSKLUDGE" \ + SPOOLDIR=/var/spool \ + RSHPATH=/usr/bin/rsh \ + ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - RANLIB=true CC=gcc ARRC="gcc-ar rc" neb: # NetBSD $(BUILD) `cat EXTRASPECIALS` OS=bsi \ diff -urX /etc/diff.exludes pine4.10-orig/imap/src/osdep/unix/os_mnt.c pine4.10/imap/src/osdep/unix/os_mnt.c --- pine4.10-orig/imap/src/osdep/unix/os_mnt.c Thu Sep 17 05:03:30 1998 +++ pine4.10/imap/src/osdep/unix/os_mnt.c Sat Feb 6 15:36:36 1999 @@ -49,7 +49,6 @@ #include #include "misc.h" -char *crypt (char *key,char *salt); #include "fs_unix.c" #include "ftl_unix.c" Only in pine4.10/imap/src/osdep/unix: os_mnt.c.ORIG diff -urX /etc/diff.exludes pine4.10-orig/imap/src/osdep/unix/os_mnt.h pine4.10/imap/src/osdep/unix/os_mnt.h --- pine4.10-orig/imap/src/osdep/unix/os_mnt.h Thu Sep 17 05:03:30 1998 +++ pine4.10/imap/src/osdep/unix/os_mnt.h Sat Feb 6 15:28:54 1999 @@ -42,32 +42,14 @@ #include #include #include +#include - -/* Different names, equivalent things in BSD and MiNT */ - -#define L_SET SEEK_SET -#define L_INCR SEEK_CUR -#define L_XTND SEEK_END - - -/* Kludge for EAGAIN */ - -#include -#define EAGAIN TRY_AGAIN -#define EFBIG EERROR - +#define EAGAIN EWOULDBLOCK #define FNDELAY O_NDELAY -typedef unsigned long fd_set; -#define FD_ZERO(set) (*(set) = 0L) -#define FD_CLR(fd,set) (*(set) &= ~(1L << (fd))) -#define FD_SET(fd,set) (*(set) |= (1L << (fd))) -#define FD_ISSET(fd,set) (*(set) & (1L << (fd))) -#define FD_SETSIZE 32 - +/* MiNT gets this wrong */ -char *strerror (int n); +#define setpgrp setpgid #include "env_unix.h" #include "fs.h" diff -urX /etc/diff.exludes pine4.10-orig/pico/makefile.mnt pine4.10/pico/makefile.mnt --- pine4.10-orig/pico/makefile.mnt Sat Feb 28 04:10:48 1998 +++ pine4.10/pico/makefile.mnt Sat Feb 6 21:32:18 1999 @@ -36,14 +36,13 @@ RM= rm -f LN= ln -s MAKE= make +OPTIMIZE= # -O +PROFILE= # -pg +DEBUG= -g -DDEBUG -#includes symbol info for debugging -DASHO= -g -#for normal build -#DASHO= -O2 -STDCFLAGS= -Dlnx -DJOB_CONTROL -DPOSIX -DMOUSE -CFLAGS= $(EXTRACFLAGS) $(DASHO) $(STDCFLAGS) +STDCFLAGS= -Dmnt -DJOB_CONTROL -DPOSIX +CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) # switches for library building LIBCMD= ar @@ -79,18 +78,18 @@ rm -f *.a *.o *~ pico_os.c os.h pico pilot cd osdep; $(MAKE) clean; cd .. -os.h: osdep/os-lnx.h +os.h: osdep/os-mnt.h $(RM) os.h - $(LN) osdep/os-lnx.h os.h + $(LN) osdep/os-mnt.h os.h -pico_os.c: osdep/os-lnx.c +pico_os.c: osdep/os-mnt.c $(RM) pico_os.c - $(LN) osdep/os-lnx.c pico_os.c + $(LN) osdep/os-mnt.c pico_os.c $(OFILES) main.o pilot.o: $(HFILES) pico.o: ebind.h -osdep/os-lnx.c: osdep/header osdep/unix osdep/read.sel osdep/raw.io \ +osdep/os-mnt.c: osdep/header osdep/unix osdep/read.sel osdep/raw.brk \ osdep/spell.unx osdep/term.cap \ - osdep/os-lnx.ic - cd osdep; $(MAKE) includer os-lnx.c; cd .. + osdep/os-mnt.ic + cd osdep; $(MAKE) includer os-mnt.c; cd .. diff -urX /etc/diff.exludes pine4.10-orig/pico/osdep/os-mnt.h pine4.10/pico/osdep/os-mnt.h --- pine4.10-orig/pico/osdep/os-mnt.h Thu Oct 8 20:07:00 1998 +++ pine4.10/pico/osdep/os-mnt.h Sat Feb 6 17:45:36 1999 @@ -4,7 +4,7 @@ /*---------------------------------------------------------------------- - OS dependencies, Linux 0.99.10 version. See also the os-lnx.c file. + OS dependencies, MiNT version. See also the os-mnt.c file. The following stuff may need to be changed for a new port, but once the port is done, it won't change. At the bottom of the file are a few constants that you may want to configure differently than they @@ -24,6 +24,8 @@ #include #include #include + +#define USE_DIRENT #include @@ -37,8 +39,8 @@ /*----------------- locale.h -------------------------------------------*/ -/* #include */ /* To make matching and sorting work right */ -#define collator strucmp +#include /* To make matching and sorting work right */ +#define collator strcoll @@ -79,26 +81,27 @@ /*-------------- qsort argument type -----------------------------------*/ #define QSType void /* qsort arg is of type void * */ -/* #define QSType char */ /* qsort arg is of type char * */ +/* #define QSType char */ /*-------------- fcntl flag to set non-blocking IO ---------------------*/ -#define NON_BLOCKING_IO O_NONBLOCK /* POSIX style */ +#define NON_BLOCKING_IO O_NDELAY /* POSIX style */ /*#define NON_BLOCKING_IO FNDELAY */ /* good ol' bsd style */ - +/*-------------- MiNT needs also this -----------------------------------*/ +#define EAGAIN EWOULDBLOCK /* * Choose one of the following three terminal drivers */ /*--------- Good 'ol BSD -----------------------------------------------*/ -/* #include */ /* BSD-based systems */ +#include /* BSD-based systems */ /*--------- System V terminal driver -----------------------------------*/ -#define HAVE_TERMIO /* this is for pure System V */ -#include /* Sys V */ +/* #define HAVE_TERMIO */ /* this is for pure System V */ +/* #include */ /* Sys V */ /*--------- POSIX terminal driver --------------------------------------*/ /* #define HAVE_TERMIOS */ /* this is an alternative */ @@ -120,7 +123,7 @@ /*-- What argument does wait(2) take? Define this if it is a union -----*/ -/* #define HAVE_WAIT_UNION */ /* the arg to wait is a union wait * */ +#define HAVE_WAIT_UNION /* the arg to wait is a union wait * */ @@ -161,7 +164,7 @@ /* * Place where mail gets delivered (for pico's new mail checking) */ -#define MAILDIR "/usr/spool/mail" +#define MAILDIR "/var/spool/mail" /* * What and where the tool that checks spelling is located. If this is @@ -178,6 +181,12 @@ * Mode passed chmod() to make tmp files exclusively user read/write-able */ #define MODE_READONLY (0600) + +/* + * Make sys_errlist visible + */ +/* extern char *sys_errlist[]; */ +/* extern int sys_nerr; */ #endif /* _PICO_OS_INCLUDED */ diff -urX /etc/diff.exludes pine4.10-orig/pico/osdep/os-mnt.ic pine4.10/pico/osdep/os-mnt.ic --- pine4.10-orig/pico/osdep/os-mnt.ic Thu May 22 00:47:02 1997 +++ pine4.10/pico/osdep/os-mnt.ic Sat Feb 6 16:07:34 1999 @@ -1,5 +1,5 @@ ; -; Linux 0.99.10 os-lnx.ic file for building os-lnx.c. +; MiNT os-mnt.ic file for building os-mnt.c. ; ; Boilerplate header. include(header) @@ -10,6 +10,6 @@ include(read.sel) -include(raw.io) +include(raw.brk) include(term.cap) diff -urX /etc/diff.exludes pine4.10-orig/pine/makefile.mnt pine4.10/pine/makefile.mnt --- pine4.10-orig/pine/makefile.mnt Thu Aug 27 20:50:02 1998 +++ pine4.10/pine/makefile.mnt Sat Feb 6 21:32:36 1999 @@ -37,7 +37,7 @@ # -# Make file for the Pine mail system for Linux. +# Make file for the Pine mail system for MiNT. # # Most commonly fiddled flags for compiler. # Uncomment the setttings desired here @@ -52,12 +52,22 @@ CCLIENTDIR= ../c-client PICODIR= ../pico -STDLIBS= -ltermcap +# Only need to uncomment next two lines if you run make from this directory +# and you don't want to supply them as arguments to the make. +#LDAPLIBS= ../ldap/libraries/libldap.a ../ldap/libraries/liblber.a +#LDAPCFLAGS= -DENABLE_LDAP -I../ldap/include +# Object files that need to be rebuilt if ENABLE_LDAP gets defined. +LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \ + other.o pine.o takeaddr.o + +STDLIBS= -ltermcap -lportlib -lsocket LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a -LIBS= $(EXTRALIBES) $(LOCLIBS) $(STDLIBS) +LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \ + `cat $(CCLIENTDIR)/LDFLAGS` -STDCFLAGS= -DLNX -DSYSTYPE=\"LNX\" -DMOUSE -CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) +STDCFLAGS= -DLNX -DSYSTYPE=\"MNT\" +CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ + $(STDCFLAGS) OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \ folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \ @@ -76,7 +86,7 @@ echo "char datestamp[]="\"`date`\"";" > date.c echo "char hoststamp[]="\"`hostname`\"";" >> date.c $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS) - + abookcpy: abookcpy.o $(LOCLIBES) $(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS) @@ -87,18 +97,19 @@ $(RM) *.o os.h os.c helptext.c helptext.h pine cd osdep; make clean; cd .. -os.h: osdep/os-lnx.h +os.h: osdep/os-mnt.h $(RM) os.h - $(LN) osdep/os-lnx.h os.h + $(LN) osdep/os-mnt.h os.h -os.c: osdep/os-lnx.c +os.c: osdep/os-mnt.c $(RM) os.c - $(LN) osdep/os-lnx.c os.c + $(LN) osdep/os-mnt.c os.c $(OFILES): $(HFILES) addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h context.o: $(CCLIENTDIR)/misc.h send.o: $(CCLIENTDIR)/smtp.h +$(LDAPOFILES): $(LDAPLIBS) helptext.c: pine.hlp ./cmplhelp.sh < pine.hlp > helptext.c @@ -106,7 +117,7 @@ helptext.h: pine.hlp ./cmplhlp2.sh < pine.hlp > helptext.h -osdep/os-lnx.c: osdep/bld_path osdep/canacces osdep/canonicl \ +osdep/os-mnt.c: osdep/bld_path osdep/canacces osdep/canonicl \ osdep/chnge_pw osdep/coredump osdep/creatdir \ osdep/diskquot.non osdep/domnames osdep/err_desc \ osdep/expnfldr osdep/fgetpos.non osdep/filesize osdep/fltrname \ @@ -117,5 +128,5 @@ osdep/termin.unx osdep/termout.unx \ osdep/termin.gen osdep/termout.gen \ osdep/sendmail osdep/execview \ - osdep/postreap.wtp osdep/os-lnx.ic - cd osdep; $(MAKE) includer os-lnx.c; cd .. + osdep/postreap.wtp osdep/os-mnt.ic + cd osdep; $(MAKE) includer os-mnt.c; cd .. diff -urX /etc/diff.exludes pine4.10-orig/pine/osdep/os-mnt.ic pine4.10/pine/osdep/os-mnt.ic --- pine4.10-orig/pine/osdep/os-mnt.ic Tue Nov 4 00:44:54 1997 +++ pine4.10/pine/osdep/os-mnt.ic Sat Feb 6 16:29:54 1999 @@ -1,5 +1,5 @@ ; -; Linux 0.99.10 os-bsd.ic file for building os-bsd.c. +; MiNT os-mnt.ic file for building os-mnt.c. ; ; Boilerplate header. include(header)