10 files changed, 160 insertions, 255 deletions

diff --git a/mail/xbuffy/files/patch-aa b/mail/xbuffy/files/patch-aa
index 62bd74c831c4..75665ec74149 100644
--- a/mail/xbuffy/files/patch-aa
+++ b/mail/xbuffy/files/patch-aa
@@ -1,27 +1,20 @@
-*** XBuffy.ad.orig	Tue Jan 31 16:37:56 1995
---- XBuffy.ad	Wed Jun 21 16:37:30 1995
-***************
-*** 1,11 ****
-  !
-  ! Application Defaults file for XBuffy, this is just meant as an example
-  !
-! *nobeep:	FALSE
-! *horiz:		FALSE
-! *names:		FALSE
-! *shortnames:	TRUE
-! *polltime:	30
-! *priority:	15
-! *headertime:	10
-! *mailboxes:	/usr/spool/mail/wfp5p:/home/wfp5p/.Mail/elmProblems
---- 1,11 ----
-  !
-  ! Application Defaults file for XBuffy, this is just meant as an example
-  !
-! !XBuffy*nobeep:		FALSE
-! !XBuffy*horiz:		TRUE
-! !XBuffy*names:		FALSE
-! !XBuffy*shortnames:	TRUE
-! XBuffy*polltime:	30
-! XBuffy*priority:	15
-! XBuffy*headertime:	10
-! !XBuffy*mailboxes:	/usr/spool/mail/wfp5p:/home/wfp5p/.Mail/elmProblems
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_append.c ./libdyn/dyn_append.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_append.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_append.c	Tue May  8 13:13:43 2001
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "dynP.h"
+ 
+@@ -20,7 +21,7 @@
+    int num;
+ {
+      if (obj->debug)
+-	  fprintf(stderr, "dyn: append: Writing %d bytes from %d to %d + %d\n",
++	  fprintf(stderr, "dyn: append: Writing %d bytes from %p to %p + %d\n",
+ 		  obj->el_size*num, els, obj->array, obj->num_el*obj->el_size);
+ 
+      if (obj->size < obj->num_el + num) {
diff --git a/mail/xbuffy/files/patch-ab b/mail/xbuffy/files/patch-ab
new file mode 100644
index 000000000000..33dd3d5344c6
--- /dev/null
+++ b/mail/xbuffy/files/patch-ab
@@ -0,0 +1,11 @@
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_create.c ./libdyn/dyn_create.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_create.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_create.c	Tue May  8 13:13:43 2001
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "dynP.h"
+ 
diff --git a/mail/xbuffy/files/patch-ac b/mail/xbuffy/files/patch-ac
index b89ba09b8e23..3bdaaf9a2083 100644
--- a/mail/xbuffy/files/patch-ac
+++ b/mail/xbuffy/files/patch-ac
@@ -1,29 +1,29 @@
-*** libdyn/dyn_append.c.orig	Fri Dec 10 14:56:02 1993
---- libdyn/dyn_append.c	Wed Jun 21 16:45:48 1995
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  
-  #include "dynP.h"
-  
-***************
-*** 20,26 ****
-     int num;
-  {
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: append: Writing %d bytes from %d to %d + %d\n",
-  		  obj->el_size*num, els, obj->array, obj->num_el*obj->el_size);
-  
-       if (obj->size < obj->num_el + num) {
---- 21,27 ----
-     int num;
-  {
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: append: Writing %d bytes from %p to %p + %d\n",
-  		  obj->el_size*num, els, obj->array, obj->num_el*obj->el_size);
-  
-       if (obj->size < obj->num_el + num) {
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_delete.c ./libdyn/dyn_delete.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_delete.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_delete.c	Tue May  8 13:13:43 2001
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "dynP.h"
+ 
+@@ -45,7 +46,7 @@
+      else {
+ 	  if (obj->debug)
+ 	       fprintf(stderr,
+-		       "dyn: delete: copying %d bytes from %d + %d to + %d.\n",
++		       "dyn: delete: copying %d bytes from %p + %d to + %d.\n",
+ 		       obj->el_size*(obj->num_el - index), obj->array,
+ 		       (index+1)*obj->el_size, index*obj->el_size);
+ 	  
+@@ -56,7 +57,7 @@
+ 	  if (obj->paranoid) {
+ 	       if (obj->debug)
+ 		    fprintf(stderr,
+-			    "dyn: delete: zeroing %d bytes from %d + %d\n",
++			    "dyn: delete: zeroing %d bytes from %p + %d\n",
+ 			    obj->el_size, obj->array,
+ 			    obj->el_size*(obj->num_el - 1));
+ 	       bzero(obj->array + obj->el_size*(obj->num_el - 1),
diff --git a/mail/xbuffy/files/patch-ad b/mail/xbuffy/files/patch-ad
index 80dac2fb31c5..893ecc332448 100644
--- a/mail/xbuffy/files/patch-ad
+++ b/mail/xbuffy/files/patch-ad
@@ -1,11 +1,29 @@
-*** libdyn/dyn_create.c.orig	Fri Dec 10 14:56:02 1993
---- libdyn/dyn_create.c	Wed Jun 21 16:39:16 1995
-***************
-*** 12,17 ****
---- 12,18 ----
-   */
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  
-  #include "dynP.h"
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_insert.c ./libdyn/dyn_insert.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_insert.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_insert.c	Tue May  8 13:13:43 2001
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "dynP.h"
+ 
+ int DynInsert(obj, index, els, num)
+@@ -35,7 +36,7 @@
+      }
+ 
+      if (obj->debug)
+-	  fprintf(stderr,"dyn: insert: Moving %d bytes from %d + %d to + %d\n",
++	  fprintf(stderr,"dyn: insert: Moving %d bytes from %p + %d to + %d\n",
+ 		  (obj->num_el-index)*obj->el_size, obj->array,
+ 		  obj->el_size*index, obj->el_size*(index+num));
+ 
+@@ -46,7 +47,7 @@
+ 	   (obj->num_el-index)*obj->el_size);
+ 
+      if (obj->debug)
+-	  fprintf(stderr, "dyn: insert: Copying %d bytes from %d to %d + %d\n",
++	  fprintf(stderr, "dyn: insert: Copying %d bytes from %p to %p + %d\n",
+ 		  obj->el_size*num, els, obj->array, obj->el_size*index);
+ 
+      bcopy(els, obj->array + obj->el_size*index, obj->el_size*num);
diff --git a/mail/xbuffy/files/patch-ae b/mail/xbuffy/files/patch-ae
index 2dfa30da136f..26b0a16ae07e 100644
--- a/mail/xbuffy/files/patch-ae
+++ b/mail/xbuffy/files/patch-ae
@@ -1,46 +1,29 @@
-*** libdyn/dyn_delete.c.orig	Fri Dec 10 14:56:03 1993
---- libdyn/dyn_delete.c	Wed Jun 21 16:45:00 1995
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  
-  #include "dynP.h"
-  
-***************
-*** 45,51 ****
-       else {
-  	  if (obj->debug)
-  	       fprintf(stderr,
-! 		       "dyn: delete: copying %d bytes from %d + %d to + %d.\n",
-  		       obj->el_size*(obj->num_el - index), obj->array,
-  		       (index+1)*obj->el_size, index*obj->el_size);
-  	  
---- 46,52 ----
-       else {
-  	  if (obj->debug)
-  	       fprintf(stderr,
-! 		       "dyn: delete: copying %d bytes from %p + %d to + %d.\n",
-  		       obj->el_size*(obj->num_el - index), obj->array,
-  		       (index+1)*obj->el_size, index*obj->el_size);
-  	  
-***************
-*** 56,62 ****
-  	  if (obj->paranoid) {
-  	       if (obj->debug)
-  		    fprintf(stderr,
-! 			    "dyn: delete: zeroing %d bytes from %d + %d\n",
-  			    obj->el_size, obj->array,
-  			    obj->el_size*(obj->num_el - 1));
-  	       bzero(obj->array + obj->el_size*(obj->num_el - 1),
---- 57,63 ----
-  	  if (obj->paranoid) {
-  	       if (obj->debug)
-  		    fprintf(stderr,
-! 			    "dyn: delete: zeroing %d bytes from %p + %d\n",
-  			    obj->el_size, obj->array,
-  			    obj->el_size*(obj->num_el - 1));
-  	       bzero(obj->array + obj->el_size*(obj->num_el - 1),
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_put.c ./libdyn/dyn_put.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_put.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_put.c	Tue May  8 13:13:44 2001
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "dynP.h"
+ 
+@@ -34,7 +35,7 @@
+      }
+      
+      if (obj->debug)
+-	  fprintf(stderr, "dyn: get: Returning address %d + %d.\n",
++	  fprintf(stderr, "dyn: get: Returning address %p + %d.\n",
+ 		  obj->array, obj->el_size*num);
+      
+      return (DynPtr) obj->array + obj->el_size*num;
+@@ -67,7 +68,7 @@
+      int ret;
+      
+      if (obj->debug)
+-	  fprintf(stderr, "dyn: put: Writing %d bytes from %d to %d + %d\n",
++	  fprintf(stderr, "dyn: put: Writing %d bytes from %p to %p + %d\n",
+ 		  obj->el_size, el, obj->array, index*obj->el_size);
+ 
+      if ((ret = _DynResize(obj, index)) != DYN_OK)
diff --git a/mail/xbuffy/files/patch-af b/mail/xbuffy/files/patch-af
index a1d43fb9f586..585f84a6cb13 100644
--- a/mail/xbuffy/files/patch-af
+++ b/mail/xbuffy/files/patch-af
@@ -1,46 +1,11 @@
-*** libdyn/dyn_insert.c.orig	Fri Dec 10 14:56:04 1993
---- libdyn/dyn_insert.c	Wed Jun 21 16:47:42 1995
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  #include "dynP.h"
-  
-  int DynInsert(obj, index, els, num)
-***************
-*** 35,41 ****
-       }
-  
-       if (obj->debug)
-! 	  fprintf(stderr,"dyn: insert: Moving %d bytes from %d + %d to + %d\n",
-  		  (obj->num_el-index)*obj->el_size, obj->array,
-  		  obj->el_size*index, obj->el_size*(index+num));
-  
---- 36,42 ----
-       }
-  
-       if (obj->debug)
-! 	  fprintf(stderr,"dyn: insert: Moving %d bytes from %p + %d to + %d\n",
-  		  (obj->num_el-index)*obj->el_size, obj->array,
-  		  obj->el_size*index, obj->el_size*(index+num));
-  
-***************
-*** 46,52 ****
-  	   (obj->num_el-index)*obj->el_size);
-  
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: insert: Copying %d bytes from %d to %d + %d\n",
-  		  obj->el_size*num, els, obj->array, obj->el_size*index);
-  
-       bcopy(els, obj->array + obj->el_size*index, obj->el_size*num);
---- 47,53 ----
-  	   (obj->num_el-index)*obj->el_size);
-  
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: insert: Copying %d bytes from %p to %p + %d\n",
-  		  obj->el_size*num, els, obj->array, obj->el_size*index);
-  
-       bcopy(els, obj->array + obj->el_size*index, obj->el_size*num);
+diff -ur ../../xbuffy-3.3.bl.3/libdyn/dyn_realloc.c ./libdyn/dyn_realloc.c
+--- ../../xbuffy-3.3.bl.3/libdyn/dyn_realloc.c	Fri Feb 20 17:54:14 1998
++++ ./libdyn/dyn_realloc.c	Tue May  8 13:13:44 2001
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "dynP.h"
+ 
diff --git a/mail/xbuffy/files/patch-ag b/mail/xbuffy/files/patch-ag
index ad960f9c0a53..fc177e5ede21 100644
--- a/mail/xbuffy/files/patch-ag
+++ b/mail/xbuffy/files/patch-ag
@@ -1,46 +1,16 @@
-*** libdyn/dyn_put.c.orig	Fri Dec 10 14:56:04 1993
---- libdyn/dyn_put.c	Wed Jun 21 16:43:13 1995
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  
-  #include "dynP.h"
-  
-***************
-*** 34,40 ****
-       }
-       
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: get: Returning address %d + %d.\n",
-  		  obj->array, obj->el_size*num);
-       
-       return (DynPtr) obj->array + obj->el_size*num;
---- 35,41 ----
-       }
-       
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: get: Returning address %p + %d.\n",
-  		  obj->array, obj->el_size*num);
-       
-       return (DynPtr) obj->array + obj->el_size*num;
-***************
-*** 67,73 ****
-       int ret;
-       
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: put: Writing %d bytes from %d to %d + %d\n",
-  		  obj->el_size, el, obj->array, index*obj->el_size);
-  
-       if ((ret = _DynResize(obj, index)) != DYN_OK)
---- 68,74 ----
-       int ret;
-       
-       if (obj->debug)
-! 	  fprintf(stderr, "dyn: put: Writing %d bytes from %p to %p + %d\n",
-  		  obj->el_size, el, obj->array, index*obj->el_size);
-  
-       if ((ret = _DynResize(obj, index)) != DYN_OK)
+diff -ur ../../xbuffy-3.3.bl.3/nntp.c ./nntp.c
+--- ../../xbuffy-3.3.bl.3/nntp.c	Wed Jul  1 19:12:51 1998
++++ ./nntp.c	Tue May  8 16:43:06 2001
+@@ -294,12 +294,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-ah b/mail/xbuffy/files/patch-ah
index 19da78be771c..c1d7b699a87a 100644
--- a/mail/xbuffy/files/patch-ah
+++ b/mail/xbuffy/files/patch-ah
@@ -1,12 +1,15 @@
-*** libdyn/dyn_realloc.c.orig	Fri Dec 10 14:56:05 1993
---- libdyn/dyn_realloc.c	Wed Jun 21 16:46:32 1995
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  
-  #include "dynP.h"
-  
+diff -ur ../../xbuffy-3.3.bl.3/xbuffy.c ./xbuffy.c
+--- ../../xbuffy-3.3.bl.3/xbuffy.c	Wed Jul  1 19:53:44 1998
++++ ./xbuffy.c	Tue May  8 13:14:21 2001
+@@ -177,11 +177,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;
+ 
diff --git a/mail/xbuffy/files/patch-ai b/mail/xbuffy/files/patch-ai
deleted file mode 100644
index 9425a7503516..000000000000
--- a/mail/xbuffy/files/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 4030f2631dfc..000000000000
--- a/mail/xbuffy/files/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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;
-