summaryrefslogtreecommitdiff
path: root/mail/pine4/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/pine4/files')
-rw-r--r--mail/pine4/files/patch-ai19
-rw-r--r--mail/pine4/files/patch-al119
-rw-r--r--mail/pine4/files/patch-ax48
-rw-r--r--mail/pine4/files/patch-ay18
-rw-r--r--mail/pine4/files/patch-az22
-rw-r--r--mail/pine4/files/patch-bb9
-rw-r--r--mail/pine4/files/patch-bc11
-rw-r--r--mail/pine4/files/patch-be20
-rw-r--r--mail/pine4/files/patch-bf11
-rw-r--r--mail/pine4/files/patch-bg11
-rw-r--r--mail/pine4/files/patch-pine_strings.c11
11 files changed, 22 insertions, 277 deletions
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index 791e4e242b76..b963348653c8 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,25 +1,6 @@
*** pine/send.c.Dist Mon Aug 27 10:54:33 2001
--- pine/send.c Fri Sep 28 00:19:47 2001
***************
-*** 47,54 ****
- ====*/
-
- #include "headers.h"
-! #include "../c-client/smtp.h"
-! #include "../c-client/nntp.h"
-
-
- #ifndef TCPSTREAM
---- 47,54 ----
- ====*/
-
- #include "headers.h"
-! #include "c-client/smtp.h"
-! #include "c-client/nntp.h"
-
-
- #ifndef TCPSTREAM
-***************
*** 7689,7701 ****
body->subtype = cpystr("octet-stream");
}
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index 60f4c3f09cd2..d7fbfa5d9c0b 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,108 +1,11 @@
-*** build.orig Mon Dec 9 09:54:38 2002
---- build Mon Dec 16 02:16:44 2002
-***************
-*** 362,424 ****
- echo "Including SSL functionality"
- fi
-
-- if [ -s c-client ] ; then rm -f c-client ; fi
-- ln -s imap/c-client c-client
-- if [ -s mtest ] ; then rm -f mtest ; fi
-- ln -s imap/mtest mtest
-- if [ -s mailutil ] ; then rm -f mailutil ; fi
-- ln -s imap/mailutil mailutil
-- if [ -s imapd ] ; then rm -f imapd ; fi
-- ln -s imap/imapd imapd
-- if [ -s ipopd ] ; then rm -f ipopd ; fi
-- ln -s imap/ipopd ipopd
-- echo "Making c-client library, imapd, and ipopd"
-- echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
-- cd "$PHOME/imap"
-- # This "touch" tells the IMAP make not to give any warnings about IESG compliance.
-- if [ "$NOSSL" = "1" -o "$SSL" != "none" ] ; then touch ssl$SSL ; fi
-- if [ "$NOSSL" != "1" -a "$SSL" = "none" -a ! -f sslnone ]
-- then
-- echo "+-----------------------------------------------------------+"
-- echo "| It appears that you do not have OpenSSL or equivalent |"
-- echo "| installed on this system. |"
-- echo "| |"
-- echo "| Building PINE without SSL support will possibly introduce |"
-- echo "| problems when communicating with IMAP, POP3, or SMTP |"
-- echo "| servers that require TLS or SSL authentication. |"
-- echo "| In addition, your password may be vulnerable to a |"
-- echo "| snooping attack since it may be sent over the network |"
-- echo "| unencrypted. |"
-- echo "+-----------------------------------------------------------+"
-- echo ""
-- echo "Do you want to continue this build anyway? Type y or n please:"
-- read ans
-- case "$ans" in
-- y) echo "Building without SSL ..."
-- touch sslnone
-- ;;
--
-- *) echo "Terminating build"
-- exit 1
-- ;;
-- esac
-- fi
-- eval echo eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-- eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-- rc=$?
-- if [ $rc != "0" ]
-- then
-- echo "+---------------------------------------------+"
-- echo "| Problems building c-client |"
-- echo "| |"
-- echo "| Please check the output above for a |"
-- echo "| possible explanation for this failure |"
-- echo "+---------------------------------------------+"
-- echo ""
-- exit $rc
-- fi
-- echo ''
--
- echo "Making Pico and Pilot"
- cd "$PHOME/pico"
- eval echo make "$makeargs" -f makefile.$picotarg
---- 362,367 ----
-***************
-*** 450,456 ****
- cd "$PHOME"
- echo ''
- echo "Links to executables are in bin directory:"
-! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
- case $maketarg in
- mnt) echo "Fixing stacksizes ..."
- fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
---- 393,399 ----
- cd "$PHOME"
- echo ''
- echo "Links to executables are in bin directory:"
-! size bin/pine bin/pico bin/pilot
- case $maketarg in
- mnt) echo "Fixing stacksizes ..."
- fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-***************
-*** 484,493 ****
- rm -f sslnopwd sslunix.nopwd sslsco.nopwd sslunix sslsco sslnone
- echo "Cleaning Pine"
- cd "$PHOME/pine"
-! make -f makefile.ult clean
- echo "Cleaning pico"
- cd "$PHOME/pico"
-! make $makeargs -f makefile.ult clean
- echo "Done"
- cd "$PHOME"
- ;;
---- 427,436 ----
- rm -f sslnopwd sslunix.nopwd sslsco.nopwd sslunix sslsco sslnone
- echo "Cleaning Pine"
- cd "$PHOME/pine"
-! make -f makefile.bsf clean
- echo "Cleaning pico"
- cd "$PHOME/pico"
-! make $makeargs -f makefile.bsf clean
- echo "Done"
- cd "$PHOME"
- ;;
+--- build.orig Mon Dec 9 09:54:38 2002
++++ build Thu Jan 16 00:42:58 2003
+@@ -450,7 +450,7 @@
+ cd "$PHOME"
+ echo ''
+ echo "Links to executables are in bin directory:"
+- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
++ size bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
+ case $maketarg in
+ mnt) echo "Fixing stacksizes ..."
+ fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
diff --git a/mail/pine4/files/patch-ax b/mail/pine4/files/patch-ax
index 791d6e9a2dff..e87d1fd9ec08 100644
--- a/mail/pine4/files/patch-ax
+++ b/mail/pine4/files/patch-ax
@@ -1,47 +1,21 @@
*** pine/makefile.bsf.orig Tue Sep 10 14:39:21 2002
---- pine/makefile.bsf Tue Nov 26 03:26:41 2002
+--- pine/makefile.bsf Wed Jan 15 23:20:51 2003
***************
-*** 50,56 ****
- PROFILE= # -pg
- DEBUG= -g -DDEBUG -DDEBUGJOURNAL
+*** 67,74 ****
+ `cat $(CCLIENTDIR)/LDFLAGS`
-! CCLIENTDIR= ../c-client
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
---- 50,56 ----
- PROFILE= # -pg
- DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-
-! CCLIENTDIR= $(PREFIX)/include/c-client
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-***************
-*** 61,73 ****
- LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- mailview.o other.o pine.o strings.o takeaddr.o
-
-! STDLIBS= -ltermlib
-! LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
-! LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-! `cat $(CCLIENTDIR)/LDFLAGS`
-
-! STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
+ STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
! CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
- $(STDCFLAGS)
+! $(STDCFLAGS)
OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
---- 61,72 ----
- LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- mailview.o other.o pine.o strings.o takeaddr.o
-
-! STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4 $(SSL_LINK)
-! LOCLIBS= $(PICODIR)/libpico.a
-! LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
+ folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
+--- 67,74 ----
+ `cat $(CCLIENTDIR)/LDFLAGS`
-! STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include -I$(PREFIX)/include/c-client
+ STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
! CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
- $(STDCFLAGS)
+! $(STDCFLAGS) -static
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 \
diff --git a/mail/pine4/files/patch-ay b/mail/pine4/files/patch-ay
deleted file mode 100644
index a84564c72ad5..000000000000
--- a/mail/pine4/files/patch-ay
+++ /dev/null
@@ -1,18 +0,0 @@
---- pine/headers.h.orig Tue Feb 9 14:53:20 1999
-+++ pine/headers.h Wed Jul 5 21:57:02 2000
-@@ -59,12 +59,12 @@
- #include "../pico/headers.h"
-
-
--#include "../c-client/mail.h"
-+#include "c-client/mail.h"
-
- #include "os.h"
-
--#include "../c-client/rfc822.h"
--#include "../c-client/misc.h"
-+#include "c-client/rfc822.h"
-+#include "c-client/misc.h"
-
- #ifdef ENABLE_LDAP
-
diff --git a/mail/pine4/files/patch-az b/mail/pine4/files/patch-az
deleted file mode 100644
index 0cab09f4012a..000000000000
--- a/mail/pine4/files/patch-az
+++ /dev/null
@@ -1,22 +0,0 @@
---- pine/osdep/os-bsf.h.orig Wed Oct 7 14:51:40 1998
-+++ pine/osdep/os-bsf.h Wed Jul 5 22:03:54 2000
-@@ -40,7 +40,7 @@
- #ifndef _OS_INCLUDED
- #define _OS_INCLUDED
-
--#include "../c-client/osdep.h"
-+#include "c-client/osdep.h"
-
-
- /*----------------------------------------------------------------------
---- pine/mailindx.c.orig Wed Jul 5 22:19:38 2000
-+++ pine/mailindx.c Wed Jul 5 22:19:49 2000
-@@ -50,7 +50,7 @@
- ====*/
-
- #include "headers.h"
--#include "../c-client/imap4r1.h"
-+#include "c-client/imap4r1.h"
-
- /*
- * Some common Command Bindings
diff --git a/mail/pine4/files/patch-bb b/mail/pine4/files/patch-bb
index d7413e00afaf..7c8c701cb8d6 100644
--- a/mail/pine4/files/patch-bb
+++ b/mail/pine4/files/patch-bb
@@ -1,14 +1,5 @@
--- pine/init.c.orig Wed Nov 29 09:57:56 2000
+++ pine/init.c Mon Dec 18 02:40:53 2000
-@@ -65,7 +65,7 @@
-
-
- #include "headers.h"
--#include "../c-client/imap4r1.h" /* for LEVELSTATUS() */
-+#include "c-client/imap4r1.h" /* for LEVELSTATUS() */
-
-
- typedef enum {Sapling, Seedling, Seasoned} FeatureLevel;
@@ -370,7 +370,7 @@
/*----------------------------------------------------------------------
diff --git a/mail/pine4/files/patch-bc b/mail/pine4/files/patch-bc
deleted file mode 100644
index 99ec9ec711c4..000000000000
--- a/mail/pine4/files/patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- pine/mailcmd.c.orig Mon Dec 18 02:48:49 2000
-+++ pine/mailcmd.c Mon Dec 18 02:49:08 2000
-@@ -51,7 +51,7 @@
- ====*/
-
- #include "headers.h"
--#include "../c-client/imap4r1.h"
-+#include "c-client/imap4r1.h"
-
-
- /*
diff --git a/mail/pine4/files/patch-be b/mail/pine4/files/patch-be
deleted file mode 100644
index 3d5efa25dc68..000000000000
--- a/mail/pine4/files/patch-be
+++ /dev/null
@@ -1,20 +0,0 @@
---- pine/pine.c.orig Tue Aug 7 15:52:00 2001
-+++ pine/pine.c Fri Sep 28 00:51:54 2001
-@@ -40,7 +40,7 @@
- ----------------------------------------------------------------------*/
-
- #include "headers.h"
--#include "../c-client/imap4r1.h"
-+#include "c-client/imap4r1.h"
-
-
- /*
-@@ -361,7 +361,7 @@
- #endif
-
- /*------- Set up c-client drivers -------*/
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
- /*
- * Lookups of long login names which don't exist are very slow in aix.
- * This would normally get set in system-wide config if not needed.
diff --git a/mail/pine4/files/patch-bf b/mail/pine4/files/patch-bf
deleted file mode 100644
index 8aa9d20176a2..000000000000
--- a/mail/pine4/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- pine/rpload.c.Dist Thu Jul 26 16:21:57 2001
-+++ pine/rpload.c Fri Sep 28 01:40:12 2001
-@@ -117,7 +117,7 @@
- char *local = NULL, *remote = NULL, *special_hdr = NULL;
- RemoteType rt, type = NotSet;
-
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
-
- if(parse_args(argc, argv, &force, &trimsize, &local, &remote, &type)){
- fprintf(stderr, ustr, argv[0]);
diff --git a/mail/pine4/files/patch-bg b/mail/pine4/files/patch-bg
deleted file mode 100644
index be529024802b..000000000000
--- a/mail/pine4/files/patch-bg
+++ /dev/null
@@ -1,11 +0,0 @@
---- pine/rpdump.c.Dist Mon Jul 30 11:21:19 2001
-+++ pine/rpdump.c Fri Sep 28 01:46:43 2001
-@@ -114,7 +114,7 @@
- RemoteType rtype;
- unsigned long i;
-
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
-
- if(parse_args(argc, argv, &force, &local, &remote)){
- fprintf(stderr, ustr, argv[0]);
diff --git a/mail/pine4/files/patch-pine_strings.c b/mail/pine4/files/patch-pine_strings.c
deleted file mode 100644
index 48100aa4c6f6..000000000000
--- a/mail/pine4/files/patch-pine_strings.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pine/strings.c.Dist Wed Nov 20 10:19:45 2002
-+++ pine/strings.c Tue Nov 26 03:23:21 2002
-@@ -81,7 +81,7 @@
- ====*/
-
- #include "headers.h"
--#include "../c-client/utf8.h"
-+#include "utf8.h"
-
- typedef struct role_args {
- char *ourcharset;