head	1.7;
access;
symbols
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.4
	RELEASE_3_0_0:1.4
	RELEASE_2_2_6:1.1;
locks; strict;
comment	@# @;


1.7
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.6;

1.6
date	99.11.01.00.40.58;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	99.03.15.01.45.42;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.26;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.07.30.12.30.39;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.07.21.14.11.42;	author vanilla;	state dead;
branches;
next	1.1;

1.1
date	98.02.02.14.34.43;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Upgrade from 4.21 to 4.30.

Especially thanks to the maintainer, Tai-hwa Liang (avatar), for
ending those long lasting evil +400k files/patch-*. :-)

According to kkenn, pine4's security will exist until it's totally
rewritten, so I'll leave pkg-install untouched, which shows the
security warning.
PR:		ports/22436
@
text
@--- pine/screen.c.orig	Thu Sep  9 05:45:46 1999
+++ pine/screen.c	Thu Oct 14 12:03:27 1999
@@@@ -578,7 +578,7 @@@@
 
 
 static struct key cancel_keys[] = 
-     {{NULL,NULL,KS_NONE},            {"^C","Cancel",KS_NONE},
+     {{NULL,NULL,KS_NONE},            {"^C","",KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
@@@@ -1281,10 +1281,10 @@@@
     as.page_column    = -1;
     is_context        = strlen(as.context_name);
     sprintf(version, "PINE %s", pine_version); 
-    ss_string         = as.stream_status == Closed ? "(CLOSED)" :
+    ss_string         = as.stream_status == Closed ? "(w)" :
                         (as.stream_status == ReadOnly
 			 && !IS_NEWS(as.stream))
-                           ? "(READONLY)" : "";
+                           ? "(Ū)" : "";
     ss_len            = strlen(ss_string);
 
     tit_len = strlen(as.title);		/* fixed title field width   */
@@@@ -1301,17 +1301,17 @@@@
     /* 
      * set location field's length and value based on requested style 
      */
-    loc_label = (is_context) ? "Msg" : "Message";
+    loc_label = (is_context) ? "H" : "H";
     loc_len   = strlen(loc_label);
     if(!mn_get_total(as.msgmap)){
-	sprintf(tmp_20k_buf, "No %ss", loc_label);
+	sprintf(tmp_20k_buf, "S%s", loc_label);
 	loc_len += 4;
     }else{
 	switch(as.style){
 	  case FolderName :			/* "x,xxx <loc_label>s" */
 	    loc_len += digit_count(mn_get_total(as.msgmap)) + 3;
-	    sprintf(tmp_20k_buf, "%s %s%s", comatose(mn_get_total(as.msgmap)),
-		    loc_label, plural(mn_get_total(as.msgmap)));
+	    sprintf(tmp_20k_buf, "%s %s", comatose(mn_get_total(as.msgmap)),
+		    loc_label);
 	    break;
 	  case MessageNumber :	       	/* "<loc_label> xxx of xxx DEL"  */
 	    num_len	     = digit_count(mn_get_total(as.msgmap));
@@@@ -1319,7 +1319,7 @@@@
 	    as.cur_mess_col  = sc - (2 * num_len) - 10;
 	    as.del_column    = as.cur_mess_col + num_len 
 	      + digit_count(as.current_msg) + 5;
-	    sprintf(tmp_20k_buf, "%s %s of %s %s", loc_label,
+	    sprintf(tmp_20k_buf, "%s %s  %s %s", loc_label,
 		    strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		    strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
 		    BAR_STATUS(as.msg_state));
@@@@ -1331,7 +1331,7 @@@@
 	    as.percent_column  = as.cur_mess_col + num_len
 	      + digit_count(as.current_msg) + 7;
 	    as.del_column      = as.percent_column + 4;
-	    sprintf(tmp_20k_buf, "%s %s of %s %s %s", loc_label, 
+	    sprintf(tmp_20k_buf, "%s %s  %s %s %s", loc_label, 
 		    strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		    strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
 		    percentage(as.current_line, as.total_lines, 1),
@@@@ -1342,7 +1342,7 @@@@
 	  case FileTextPercent :
 	    as.page_column = sc - (14 + 2*(num_len = digit_count(as.total_lines)));
 	    loc_len        = 17 + 2*num_len;
-	    sprintf(tmp_20k_buf, "Line %*ld of %*ld %s    ",
+	    sprintf(tmp_20k_buf, " %*ld  %*ld %s    ",
 		    num_len, as.current_line, 
 		    num_len, as.total_lines,
 		    percentage(as.current_line, as.total_lines, 1));
@@@@ -1417,7 +1417,7 @@@@
 		      ss_string);
 	}
 	else{
-	    char *fmt = "Folder: %s%s";
+	    char *fmt = "HXG%s%s";
 	    if(fold_len + ss_len + 8 < avail) 	/* all of folder fit? */
 	      sprintf(fold_tmp, fmt, as.folder_name, ss_string);
 	    else if((fold_len/2) + ss_len + 8 < avail)
@@@@ -1474,7 +1474,7 @@@@
 
 	    if(as.style == MsgTextPercent){
 		as.percent_column += delta;
-		PutLine5(0, as.cur_mess_col, "%s of %s %s %s%s",
+		PutLine5(0, as.cur_mess_col, "%s  %s %s %s%s",
 			 strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 			 strcpy(tmp_20k_buf + 1500,
 				comatose(mn_get_total(as.msgmap))),
@@@@ -1483,7 +1483,7 @@@@
 			 repeat_char(max(0, -delta), SPACE));
 	    }
 	    else
-	      PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+	      PutLine4(0, as.cur_mess_col, "%s  %s %s%s",
 		       strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		       strcpy(tmp_20k_buf + 1500,
 			      comatose(mn_get_total(as.msgmap))),
@@@@ -1610,7 +1610,7 @@@@
 
     as.current_line = new_line_number;
 
-    sprintf(tmp_20k_buf, "%*ld of %*ld %s    ",
+    sprintf(tmp_20k_buf, "%*ld  %*ld %s    ",
 	    digit_count(as.total_lines), as.current_line, 
 	    digit_count(as.total_lines), as.total_lines,
 	    percentage(as.current_line, as.total_lines, 0));
@


1.6
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.5
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/screen.c.orig	Wed Jan 13 10:51:51 1999
+++ pine/screen.c	Tue Feb 23 15:57:08 1999
@@@@ -435,7 +435,7 @@@@
d12 1
a12 1
@@@@ -1128,10 +1128,10 @@@@
d25 1
a25 1
@@@@ -1148,17 +1148,17 @@@@
d47 1
a47 1
@@@@ -1166,7 +1166,7 @@@@
d56 1
a56 1
@@@@ -1178,7 +1178,7 @@@@
d65 1
a65 1
@@@@ -1189,7 +1189,7 @@@@
d74 1
a74 1
@@@@ -1264,7 +1264,7 @@@@
d83 2
a84 3
@@@@ -1313,7 +1313,7 @@@@
 	StartInverse();
 	if(delta) {
d86 1
d92 2
a93 2
@@@@ -1324,7 +1324,7 @@@@
 		as.percent_column += delta;
d95 7
a101 7
 	    else{
-		PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+		PutLine4(0, as.cur_mess_col, "%s  %s %s%s",
 			 strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 			 strcpy(tmp_20k_buf + 1500,
 				comatose(mn_get_total(as.msgmap))),
@@@@ -1426,7 +1426,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/screen.c.orig	Fri Jun  5 04:09:17 1998
+++ pine/screen.c	Tue Aug  4 12:42:21 1998
@@@@ -433,7 +433,7 @@@@
d12 1
a12 1
@@@@ -1124,10 +1124,10 @@@@
d25 1
a25 1
@@@@ -1144,17 +1144,17 @@@@
d47 1
a47 1
@@@@ -1162,7 +1162,7 @@@@
d56 1
a56 1
@@@@ -1174,7 +1174,7 @@@@
d65 1
a65 1
@@@@ -1185,7 +1185,7 @@@@
d74 1
a74 1
@@@@ -1259,7 +1259,7 @@@@
d83 19
a101 19
@@@@ -1307,7 +1307,7 @@@@
 	as.current_msg = mn_get_cur(as.msgmap);
 
         if(as.style == MsgTextPercent){
-            PutLine5(0, as.cur_mess_col, "%s of %s %s %s%s",
+            PutLine5(0, as.cur_mess_col, "%s  %s %s %s%s",
 		     strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		     strcpy(tmp_20k_buf + 1500,
 			    comatose(mn_get_total(as.msgmap))),
@@@@ -1317,7 +1317,7 @@@@
 	    as.del_column     += delta;
 	    as.percent_column += delta;
         } else {
-            PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+            PutLine4(0, as.cur_mess_col, "%s  %s %s%s",
 		     strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		     strcpy(tmp_20k_buf + 1500,
 			    comatose(mn_get_total(as.msgmap))),
@@@@ -1420,7 +1420,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 75
a75 31
--- pine/signals.c.orig	Tue Jul  7 07:42:45 1998
+++ pine/signals.c	Tue Jul 28 08:35:07 1998
@@@@ -386,7 +386,7 @@@@
 	ps_global->inbox_stream->rdonly = 1;	/* and become read-only */
 	mail_ping(ps_global->inbox_stream);
 	q_status_message(SM_ASYNC, 3, 7,
-		   "Another Pine is accessing Inbox.  Session now Read-Only.");
+		   "t~@@ Pine bs InboxCo session iJŪAC");
 	dprint(1, (debugfile, "** INBOX went read-only **\n\n"));
     }
 
@@@@ -398,7 +398,7 @@@@
 	ps_global->mail_stream->rdonly = 1;	/* and become read-only */
 	mail_ping(ps_global->mail_stream);
 	q_status_message(SM_ASYNC, 3, 7,
-		  "Another Pine is accessing folder.  Session now Read-Only.");
+		  "t~@@ Pine bsƧXCo session iJŪAC");
 	dprint(1, (debugfile, "** secondary folder went read-only **\n\n"));
     }
 }
@@@@ -536,7 +536,7 @@@@
     int retval = 1;
 
     dprint(9,(debugfile, "busy_alarm(%d, %s, %p, %d)\n",
-	seconds, msg ? msg : "Busy", pc_func, init_msg));
+	seconds, msg ? msg : "еy", pc_func, init_msg));
 
     /*
      * If we're already busy'ing, and we don't have something special,
@@@@ -560,7 +560,7 @@@@
 	    final_message = 1;
d78 26
a103 4
-	    strcpy(busy_message, "Busy");
+	    strcpy(busy_message, "еy");
 	    final_message = 0;
 	}
d105 5
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 10
a10 3
--- pine/ttyin.c.orig	Tue Feb 25 05:57:44 1997
+++ pine/ttyin.c	Sat Jan 17 21:25:02 1998
@@@@ -1645,8 +1645,8 @@@@
d12 26
a38 8
 static struct key oe_keys[] =
-       {{"^G","Help",KS_SCREENHELP},	{"^C","Cancel",KS_NONE},
-	{"^T","xxx",KS_NONE},		{"Ret","Accept",KS_NONE},
+       {{"^G","U",KS_SCREENHELP},	{"^C","",KS_NONE},
+	{"^T","xxx",KS_NONE},		{"Ret","PN",KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@@
