From ginga@guges.silab.ecl.ntt.co.jp  Tue May  8 03:45:29 2001
Return-Path: <ginga@guges.silab.ecl.ntt.co.jp>
Received: from tama5.ecl.ntt.co.jp (tama5.ecl.ntt.co.jp [129.60.39.102])
	by hub.freebsd.org (Postfix) with ESMTP id 02F0137B422
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 May 2001 03:45:28 -0700 (PDT)
	(envelope-from ginga@guges.silab.ecl.ntt.co.jp)
Received: from nttmail3.ecl.ntt.co.jp (nttmail3.ecl.ntt.co.jp [129.60.39.100])
	by tama5.ecl.ntt.co.jp (8.9.3+3.2W/3.7W/01/21/00) with ESMTP id TAA12090
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 May 2001 19:45:21 +0900 (JST)
	(envelope-from ginga@guges.silab.ecl.ntt.co.jp)
Received: from eclscan3.m.ecl.ntt.co.jp
	by nttmail3.ecl.ntt.co.jp (8.9.3+3.2W/3.7W/03/21/01) with ESMTP id TAA00490
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 May 2001 19:45:16 +0900 (JST)
	(envelope-from ginga@guges.silab.ecl.ntt.co.jp)
Received: from imf.m.ecl.ntt.co.jp (localhost [127.0.0.1])
	by eclscan3.m.ecl.ntt.co.jp (8.9.3/3.7W) with ESMTP id TAA29590
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 May 2001 19:45:12 +0900 (JST)
Received: from guges.silab.ecl.ntt.co.jp (guges.silab.ecl.ntt.co.jp [129.60.21.121])
	by imf.m.ecl.ntt.co.jp (8.9.3/3.7W) with ESMTP id TAA18137
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 May 2001 19:45:12 +0900 (JST)
Received: by guges.silab.ecl.ntt.co.jp (Postfix, from userid 4397)
	id 0F0B62209; Tue,  8 May 2001 19:45:11 +0900 (JST)
Message-Id: <20010508104511.0F0B62209@guges.silab.ecl.ntt.co.jp>
Date: Tue,  8 May 2001 19:45:11 +0900 (JST)
From: ginga@athena.club.ne.jp
Sender: ginga@guges.silab.ecl.ntt.co.jp
Reply-To: ginga@athena.club.ne.jp
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: port: mail/xbuffy update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         27199
>Category:       ports
>Synopsis:       xbuffy version up
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sada
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 08 03:50:01 PDT 2001
>Closed-Date:    Tue May 29 07:03:07 PDT 2001
>Last-Modified:  Tue May 29 07:03:56 PDT 2001
>Originator:     Kawaguti Ginga
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
NTT
>Environment:
System: FreeBSD guges 4.3-STABLE FreeBSD 4.3-STABLE #2: Tue Apr 24 11:57:28 JST 2001 


	
>Description:
	mail/xbuffy port update. 
	I'm not current maintainer, but current 
	maintainer (dchapes@zeus.leitch.com) is unreachable,
	so I've also modified MAINTAINER field.
		>>> RCPT To:<dchapes@zeus.leitch.com>
		<<< 550 <dchapes@zeus.leitch.com>... User unknown

>How-To-Repeat:
	diff attatched.
>Fix:

diff -ur /usr/ports/mail/xbuffy/Makefile ./Makefile
--- /usr/ports/mail/xbuffy/Makefile	Sat Feb 10 02:40:33 2001
+++ ./Makefile	Tue May  8 19:27:48 2001
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	xbuffy
-PORTVERSION=	3.3
+PORTVERSION=	3.3.3
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	http://www.fiction.net/blong/programs/xbuffy/
+DISTNAME=	${PORTNAME}-3.3.bl.3
 
-MAINTAINER=	dchapes@zeus.leitch.com
+MAINTAINER=	ginga@athena.club.ne.jp
 
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 MAN1=		xbuffy.1
 
 .include <bsd.port.mk>
diff -ur /usr/ports/mail/xbuffy/distinfo ./distinfo
--- /usr/ports/mail/xbuffy/distinfo	Thu Dec  4 11:35:27 1997
+++ ./distinfo	Tue May  8 13:12:03 2001
@@ -1 +1 @@
-MD5 (xbuffy3.3.tar.gz) = 38a41fc0c4aa10e8e402a4a72c919818
+MD5 (xbuffy-3.3.bl.3.tar.gz) = f4de2adc9d0b2327040e700e2fd25a42
diff -ur /usr/ports/mail/xbuffy/files/patch-aa ./files/patch-aa
--- /usr/ports/mail/xbuffy/files/patch-aa	Thu Jun 22 15:32:40 1995
+++ ./files/patch-aa	Tue May  8 17:06:15 2001
@@ -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) {
Only in ./files: patch-ab
diff -ur /usr/ports/mail/xbuffy/files/patch-ac ./files/patch-ac
--- /usr/ports/mail/xbuffy/files/patch-ac	Thu Jun 22 15:32:40 1995
+++ ./files/patch-ac	Tue May  8 17:06:33 2001
@@ -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 -ur /usr/ports/mail/xbuffy/files/patch-ad ./files/patch-ad
--- /usr/ports/mail/xbuffy/files/patch-ad	Thu Jun 22 15:32:40 1995
+++ ./files/patch-ad	Tue May  8 17:07:06 2001
@@ -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 -ur /usr/ports/mail/xbuffy/files/patch-ae ./files/patch-ae
--- /usr/ports/mail/xbuffy/files/patch-ae	Thu Jun 22 15:32:41 1995
+++ ./files/patch-ae	Tue May  8 17:07:17 2001
@@ -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 -ur /usr/ports/mail/xbuffy/files/patch-af ./files/patch-af
--- /usr/ports/mail/xbuffy/files/patch-af	Thu Jun 22 15:32:41 1995
+++ ./files/patch-af	Tue May  8 17:07:38 2001
@@ -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 -ur /usr/ports/mail/xbuffy/files/patch-ag ./files/patch-ag
--- /usr/ports/mail/xbuffy/files/patch-ag	Thu Jun 22 15:32:41 1995
+++ ./files/patch-ag	Tue May  8 17:07:52 2001
@@ -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 -ur /usr/ports/mail/xbuffy/files/patch-ah ./files/patch-ah
--- /usr/ports/mail/xbuffy/files/patch-ah	Thu Jun 22 15:32:41 1995
+++ ./files/patch-ah	Tue May  8 17:08:17 2001
@@ -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;
+ 
Only in /usr/ports/mail/xbuffy/files: patch-ai
Only in /usr/ports/mail/xbuffy/files: patch-ak
Only in .: portdiff
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: sada 
State-Changed-When: Thu May 10 01:55:56 PDT 2001 
State-Changed-Why:  
Please clarify files to add/remove if exist. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27199 

From: Kawaguti Ginga <ginga@athena.club.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/27199: xbuffy version up
Date: Tue, 22 May 2001 11:08:36 +0900

 In Thu, May 10, 2001 at 02:00:55AM -0700,
 sada@FreeBSD.org wrote:
 > State-Changed-From-To: open->analyzed
 > State-Changed-By: sada
 > State-Changed-When: Thu May 10 01:55:56 PDT 2001
 > State-Changed-Why: 
 > Please clarify files to add/remove if exist.
 > 
 > http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27199
 
 I have taken diff with wrong option... sorry about that.
 the files/patch-?? part are complete replace, so
 every thing should be removed. And also some file were
 not included in the PR27199...
 
 here is the right patch:
 (should I re-send-pr, or is this reply do it all?)
 
 ---------------- cut here -----------------------------
 diff -urN /usr/ports/mail/xbuffy/Makefile ./Makefile
 --- /usr/ports/mail/xbuffy/Makefile	Sat Feb 10 02:40:33 2001
 +++ ./Makefile	Tue May  8 19:27:48 2001
 @@ -6,15 +6,16 @@
  #
  
  PORTNAME=	xbuffy
 -PORTVERSION=	3.3
 +PORTVERSION=	3.3.3
  CATEGORIES=	mail
 -MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 -MASTER_SITE_SUBDIR=	utilities
 -DISTNAME=	${PORTNAME}${PORTVERSION}
 +MASTER_SITES=	http://www.fiction.net/blong/programs/xbuffy/
 +DISTNAME=	${PORTNAME}-3.3.bl.3
  
 -MAINTAINER=	dchapes@zeus.leitch.com
 +MAINTAINER=	ginga@athena.club.ne.jp
  
 -USE_IMAKE=	yes
 +USE_X_PREFIX=	yes
 +USE_GMAKE=	yes
 +GNU_CONFIGURE=	yes
  MAN1=		xbuffy.1
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/mail/xbuffy/distinfo ./distinfo
 --- /usr/ports/mail/xbuffy/distinfo	Thu Dec  4 11:35:27 1997
 +++ ./distinfo	Tue May  8 13:12:03 2001
 @@ -1 +1 @@
 -MD5 (xbuffy3.3.tar.gz) = 38a41fc0c4aa10e8e402a4a72c919818
 +MD5 (xbuffy-3.3.bl.3.tar.gz) = f4de2adc9d0b2327040e700e2fd25a42
 diff -urN /usr/ports/mail/xbuffy/files/patch-aa ./files/patch-aa
 --- /usr/ports/mail/xbuffy/files/patch-aa	Thu Jun 22 15:32:40 1995
 +++ ./files/patch-aa	Tue May  8 17:06:15 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ab ./files/patch-ab
 --- /usr/ports/mail/xbuffy/files/patch-ab	Thu Jan  1 09:00:00 1970
 +++ ./files/patch-ab	Tue May  8 17:06:23 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ac ./files/patch-ac
 --- /usr/ports/mail/xbuffy/files/patch-ac	Thu Jun 22 15:32:40 1995
 +++ ./files/patch-ac	Tue May  8 17:06:33 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ad ./files/patch-ad
 --- /usr/ports/mail/xbuffy/files/patch-ad	Thu Jun 22 15:32:40 1995
 +++ ./files/patch-ad	Tue May  8 17:07:06 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ae ./files/patch-ae
 --- /usr/ports/mail/xbuffy/files/patch-ae	Thu Jun 22 15:32:41 1995
 +++ ./files/patch-ae	Tue May  8 17:07:17 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-af ./files/patch-af
 --- /usr/ports/mail/xbuffy/files/patch-af	Thu Jun 22 15:32:41 1995
 +++ ./files/patch-af	Tue May  8 17:07:38 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ag ./files/patch-ag
 --- /usr/ports/mail/xbuffy/files/patch-ag	Thu Jun 22 15:32:41 1995
 +++ ./files/patch-ag	Tue May  8 17:07:52 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ah ./files/patch-ah
 --- /usr/ports/mail/xbuffy/files/patch-ah	Thu Jun 22 15:32:41 1995
 +++ ./files/patch-ah	Tue May  8 17:08:17 2001
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ai ./files/patch-ai
 --- /usr/ports/mail/xbuffy/files/patch-ai	Thu Dec  4 11:35:32 1997
 +++ ./files/patch-ai	Thu Jan  1 09:00:00 1970
 @@ -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 -urN /usr/ports/mail/xbuffy/files/patch-ak ./files/patch-ak
 --- /usr/ports/mail/xbuffy/files/patch-ak	Thu Dec  4 11:35:36 1997
 +++ ./files/patch-ak	Thu Jan  1 09:00:00 1970
 @@ -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;
 - 
Responsible-Changed-From-To: freebsd-ports->sada 
Responsible-Changed-By: sada 
Responsible-Changed-When: Mon May 28 14:37:02 PDT 2001 
Responsible-Changed-Why:  
I'm handling this. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27199 
State-Changed-From-To: analyzed->closed 
State-Changed-By: sada 
State-Changed-When: Tue May 29 07:03:07 PDT 2001 
State-Changed-Why:  
Committed, thanks. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27199 
>Unformatted:
