Upgrade to 3.3

PR:	ports/5115

2 files changed, 38 insertions, 286 deletions

diff --git a/mail/xbuffy/files/patch-ai b/mail/xbuffy/files/patch-ai
index f33fbcdf535e..9425a7503516 100644
--- a/mail/xbuffy/files/patch-ai
+++ b/mail/xbuffy/files/patch-ai
@@ -1,85 +1,24 @@
-*** nntp.c.orig	Tue Jan 31 16:37:56 1995
---- nntp.c	Wed Jun 21 19:33:33 1995
-***************
-*** 73,79 ****
-  }
-  
-  
-! int initNNTP()
-  {
-  	char line[1024];
-  	int err;
---- 73,79 ----
-  }
-  
-  
-! void initNNTP()
-  {
-  	char line[1024];
-  	int err;
-***************
-*** 101,107 ****
-  
-  	bcopy(*hp->h_addr_list, (char *) &server.sin_addr, hp->h_length);
-  
-! 	err = connect(sock, &server, sizeof(server));
-  
-  	if (err)
-  		Fatal("connect failed");
---- 101,107 ----
-  
-  	bcopy(*hp->h_addr_list, (char *) &server.sin_addr, hp->h_length);
-  
-! 	err = connect(sock, (struct sockaddr*)&server, sizeof(server));
-  
-  	if (err)
-  		Fatal("connect failed");
-***************
-*** 137,143 ****
-  
-  	if ((x = atoi(line)) != 221)
-  	{
-! 		if (x = 423)			/* then the article just don't exist */
-  			return (0);
-  		else
-  			Fatal("getHeaders: got a bad value: %s", line);
---- 137,143 ----
-  
-  	if ((x = atoi(line)) != 221)
-  	{
-! 		if (x == 423)			/* then the article just don't exist */
-  			return (0);
-  		else
-  			Fatal("getHeaders: got a bad value: %s", line);
-***************
-*** 184,190 ****
-  	return (fname);
-  }
-  
-! int readNewsrcEntry(newsBox, firstArt, lastArt)
-  	BoxInfo_t *newsBox;
-  	long firstArt;
-  	long lastArt;
---- 184,190 ----
-  	return (fname);
-  }
-  
-! void readNewsrcEntry(newsBox, firstArt, lastArt)
-  	BoxInfo_t *newsBox;
-  	long firstArt;
-  	long lastArt;
-***************
-*** 289,300 ****
-  	DynObject headerString;
-  	Boolean *beenTouched;
-  {
-- 	int sock, err, len;
-  	char line[1024];
-- 	long ipaddr;
-  	char *from;
-  	char *subject;
-- 	long firstScanArticle;
-  	long firstArticle;
-  	long lastArticle;
-  	long retVal;
---- 289,297 ----
+--- nntp.c.orig	Wed Mar 20 22:45:11 1996
++++ nntp.c	Thu Nov 20 03:58:04 1997
+@@ -101,7 +101,7 @@
+ 
+ 	bcopy(*hp->h_addr_list, (char *) &server.sin_addr, hp->h_length);
+ 
+-	err = connect(sock, (struct aockaddr*)&server, sizeof(server));
++	err = connect(sock, (struct sockaddr*)&server, sizeof(server));
+ 
+ 	if (err)
+ 		Fatal("connect failed");
+@@ -289,12 +289,9 @@
+ 	DynObject headerString;
+ 	Boolean *beenTouched;
+ {
+-	int sock, err, len;
+ 	char line[1024];
+-	long ipaddr;
+ 	char *from;
+ 	char *subject;
+-	long firstScanArticle;
+ 	long firstArticle;
+ 	long lastArticle;
+ 	long retVal;
diff --git a/mail/xbuffy/files/patch-ak b/mail/xbuffy/files/patch-ak
index 558e93b19cce..4030f2631dfc 100644
--- a/mail/xbuffy/files/patch-ak
+++ b/mail/xbuffy/files/patch-ak
@@ -1,201 +1,14 @@
-*** xbuffy.c.orig	Thu Mar 30 09:57:43 1995
---- xbuffy.c	Wed Jun 21 18:51:45 1995
-***************
-*** 179,193 ****
-  void CheckBox(i)
-      int i;
-  {
-!     int num;
-!     char amt[MAX_STRING];
-      Arg args[5];
-      int nargs;
--     static BoxInfo_t *tempNews = 0;
-      BoxInfo_t *currentBox;
--     int found;
--     static char *mailHeader = NULL;
--     int headerSize;
-      Boolean beenTouched;
-      Boolean isIcon = FALSE;
-  
---- 179,188 ----
-  void CheckBox(i)
-      int i;
-  {
-!     int num = 0;
-      Arg args[5];
-      int nargs;
-      BoxInfo_t *currentBox;
-      Boolean beenTouched;
-      Boolean isIcon = FALSE;
-  
-***************
-*** 276,283 ****
-      char amt[MAX_STRING];
-      char fmtString[MAX_STRING];
-      char *ptr;
-!    int offset;
-!     Boolean name, shortName;
-      Arg args[5];
-      int nargs;
-  
---- 271,277 ----
-      char amt[MAX_STRING];
-      char fmtString[MAX_STRING];
-      char *ptr;
-!     int offset;
-      Arg args[5];
-      int nargs;
-  
-***************
-*** 439,445 ****
-      static XtIntervalId timerID;
-      static int rootH = 0;
-      static int rootW = 0;
-!     int number;
-      static Boolean firstTime = TRUE;
-      static DynObject mailHeaders;
-      static char *hdrPtr;
---- 433,439 ----
-      static XtIntervalId timerID;
-      static int rootH = 0;
-      static int rootW = 0;
-!     int number = 0;
-      static Boolean firstTime = TRUE;
-      static DynObject mailHeaders;
-      static char *hdrPtr;
-***************
-*** 620,631 ****
-      XEvent *event;
-      Boolean *cont;
-  {
--     char *command;
-      BoxInfo_t *currentBox;
--     char *tmp;
--     char buf[512];
--     char *av[5];
--     int ac = 0;
-  
-      currentBox = &boxInfo[i];
-  
---- 614,620 ----
-***************
-*** 665,671 ****
-      char buffer[MAX_STRING];
-      char From[MAX_STRING], Subject[MAX_STRING];
-      register int count = 0;
-!     int status;
-      register Boolean in_header = FALSE;
-      struct stat f_stat;
-  
---- 654,660 ----
-      char buffer[MAX_STRING];
-      char From[MAX_STRING], Subject[MAX_STRING];
-      register int count = 0;
-!     int status = UNKNOWN;
-      register Boolean in_header = FALSE;
-      struct stat f_stat;
-  
-***************
-*** 697,704 ****
-  
-      while (fgets(buffer, MAX_STRING - 2, fp) != 0)
-      {
-!        long CL;
-!        int has_CL;
-  
-          buffer[MAX_STRING - 1] = '\0';  /* just in case */
-          if ((strchr(buffer, '\n') == NULL) && (!feof(fp)))
---- 686,693 ----
-  
-      while (fgets(buffer, MAX_STRING - 2, fp) != 0)
-      {
-!        long CL = 0L;
-!        int has_CL = FALSE;
-  
-          buffer[MAX_STRING - 1] = '\0';  /* just in case */
-          if ((strchr(buffer, '\n') == NULL) && (!feof(fp)))
-***************
-*** 836,842 ****
-      tempBox.type = BoxType;
-      tempBox.boxNum = nBoxes;
-  
-!     if (BoxType = NNTPBOX)
-      {
-          tempBox.articles = DynCreate(sizeof(Articles_t), 2);
-  #ifdef DEBUG
---- 825,831 ----
-      tempBox.type = BoxType;
-      tempBox.boxNum = nBoxes;
-  
-!     if (BoxType == NNTPBOX)
-      {
-          tempBox.articles = DynCreate(sizeof(Articles_t), 2);
-  #ifdef DEBUG
-***************
-*** 902,908 ****
-  {
-      char *mailPath = 0;
-      char *boxes = 0;
--     int pos = 0;
-      char *str = 0;
-  
-      /* get mail path */
---- 891,896 ----
-***************
-*** 946,952 ****
-  {
-      char *newsPath = 0;
-      char *boxes = 0;
--     int pos = 0;
-      char *str = 0;
-  
-      /* get nntp path */
---- 934,939 ----
-***************
-*** 1023,1028 ****
---- 1010,1016 ----
-              break;
-          case NONE:
-          case USR:
-+ 	case UNDEF:
-              break;
-          }
-  
-***************
-*** 1039,1044 ****
---- 1027,1033 ----
-              break;
-          case NONE:
-          case USR:
-+ 	case UNDEF:
-              break;
-          }
-  
-***************
-*** 1100,1113 ****
-      };
-  
-  #endif
--     FILE *boxes;
-      static Boolean mailArgs;
-      Widget form;
--     Widget command;
-      int i;
-      char *check;
-      char name[MAX_STRING];
--     Pixel bg, fg;
-      Arg args[5];
-      int nargs;
-      int pid;
---- 1089,1099 ----
-***************
-*** 1223,1230 ****
-  #ifdef NNTP
-              else
-              {
--                 int dummy;
-- 
-                  initBox(NEWstrdup(*argv), NNTPBOX, envPolltime, envHeadertime,
-                          UNDEF, data.command, data.audioCmd, NULL, data.origMode, data.nobeep,NULL,NULL);
-  
---- 1209,1214 ----
+--- xbuffy.c.orig	Thu Nov 20 03:59:39 1997
++++ xbuffy.c	Thu Nov 20 04:01:41 1997
+@@ -171,11 +171,7 @@
+     int num = 0;
+     Arg args[5];
+     int nargs;
+-    static BoxInfo_t *tempNews = 0;
+     BoxInfo_t *currentBox;
+-    int found;
+-    static char *mailHeader = NULL;
+-    int headerSize;
+     Boolean beenTouched;
+     Boolean isIcon = FALSE;
+