Date: 20 Nov 1997 21:05:32 -0000 From: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5115: Update xbuffy to 3.3 Message-ID: <19971120210532.20200.qmail@MinJe.com.TW> Resent-Message-ID: <199711202130.NAA09374@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 5115
>Category: ports
>Synopsis: Update xbuffy to 3.3
>Confidential: yes
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 20 13:30:00 PST 1997
>Last-Modified:
>Originator: Vanill I. Shu
>Organization:
Cray running FreeBSD
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
Update to 3.3
delete some patchs, because author merge it..
>How-To-Repeat:
>Fix:
diff -ruN xbuffy.orig/Makefile xbuffy/Makefile
--- xbuffy.orig/Makefile Mon Nov 18 17:55:51 1996
+++ xbuffy/Makefile Thu Nov 20 03:46:35 1997
@@ -1,13 +1,13 @@
# New ports collection makefile for: xbuffy
-# Version required: 3.2.1
+# Version required: 3.3
# Date created: 18 June 1995
# Whom: dchapes@zeus.leitch.com
#
# $Id: Makefile,v 1.2 1996/11/18 09:55:51 asami Exp $
#
-DISTNAME= xbuffy3.2.1
-PKGNAME= xbuffy-3.2.1
+DISTNAME= xbuffy3.3
+PKGNAME= xbuffy-3.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff -ruN xbuffy.orig/files/md5 xbuffy/files/md5
--- xbuffy.orig/files/md5 Thu Jun 22 14:32:39 1995
+++ xbuffy/files/md5 Thu Nov 20 03:46:44 1997
@@ -1 +1 @@
-MD5 (xbuffy3.2.1.tar.gz) = fe31f9759c80d0726b9e6dfb69abee2a
+MD5 (xbuffy3.3.tar.gz) = 38a41fc0c4aa10e8e402a4a72c919818
diff -ruN xbuffy.orig/patches/patch-ab xbuffy/patches/patch-ab
--- xbuffy.orig/patches/patch-ab Thu Jun 22 14:32:40 1995
+++ xbuffy/patches/patch-ab Thu Jan 1 08:00:00 1970
@@ -1,19 +0,0 @@
-*** boxfile.c.orig Tue Jan 31 16:37:56 1995
---- boxfile.c Wed Jun 21 18:52:00 1995
-***************
-*** 234,240 ****
- BoxInfo_t tempBox;
- FILE *boxes;
- char line[MAX_STRING];
-! int inBox, oldBox;
- char next[MAX_STRING];
-
- tempBox.bgName = tempBox.fgName = tempBox.box = tempBox.command = tempBox.audioCmd = tempBox.boxTitle = NULL;
---- 234,240 ----
- BoxInfo_t tempBox;
- FILE *boxes;
- char line[MAX_STRING];
-! int inBox;
- char next[MAX_STRING];
-
- tempBox.bgName = tempBox.fgName = tempBox.box = tempBox.command = tempBox.audioCmd = tempBox.boxTitle = NULL;
diff -ruN xbuffy.orig/patches/patch-ai xbuffy/patches/patch-ai
--- xbuffy.orig/patches/patch-ai Mon Aug 19 06:03:54 1996
+++ xbuffy/patches/patch-ai Thu Nov 20 03:58:20 1997
@@ -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 -ruN xbuffy.orig/patches/patch-aj xbuffy/patches/patch-aj
--- xbuffy.orig/patches/patch-aj Thu Jun 22 14:32:41 1995
+++ xbuffy/patches/patch-aj Thu Jan 1 08:00:00 1970
@@ -1,12 +0,0 @@
-*** realfrom.c.orig Tue Jan 31 16:37:56 1995
---- realfrom.c Wed Jun 21 19:02:15 1995
-***************
-*** 63,69 ****
- */
-
- char field[255]; /* buffer for current field of line */
-- char save_tz[255]; /* extracted time zone field */
- int len; /* length of current field */
- int day;
- int i;
---- 63,68 ----
diff -ruN xbuffy.orig/patches/patch-ak xbuffy/patches/patch-ak
--- xbuffy.orig/patches/patch-ak Thu Jun 22 14:32:41 1995
+++ xbuffy/patches/patch-ak Thu Nov 20 04:01:57 1997
@@ -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;
+
diff -ruN xbuffy.orig/patches/patch-al xbuffy/patches/patch-al
--- xbuffy.orig/patches/patch-al Thu Jun 22 14:32:40 1995
+++ xbuffy/patches/patch-al Thu Jan 1 08:00:00 1970
@@ -1,13 +0,0 @@
-*** Imakefile.orig Tue Jan 31 16:37:56 1995
---- Imakefile Wed Jun 21 19:44:46 1995
-***************
-*** 42,47 ****
---- 42,49 ----
-
- DOC = README xbuffy.man boxfile.fmt boxfile.sample
- DEFAULTS = XBuffy.ad
-+ #define InstallAppDefFiles NO
-+
-
- #ifndef MOTIF
- LOCAL_LIBRARIES = XawClientLibs libdyn/libdyn.a -lm
diff -ruN xbuffy.orig/pkg/PLIST xbuffy/pkg/PLIST
--- xbuffy.orig/pkg/PLIST Mon Nov 18 22:16:47 1996
+++ xbuffy/pkg/PLIST Thu Nov 20 04:05:02 1997
@@ -1,2 +1,3 @@
bin/xbuffy
+lib/X11/app-defaults/XBuffy
man/man1/xbuffy.1.gz
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19971120210532.20200.qmail>