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.5
	RELEASE_3_3_0:1.4
	RELEASE_3_2_0:1.4
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.4
	RELEASE_3_0_0:1.4
	RELEASE_2_2_7:1.2
	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.12.27.00.58.51;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	99.11.01.00.40.57;	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.40;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	98.02.02.14.34.41;	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/pine.h.orig	Wed Nov 17 08:14:14 1999
+++ pine/pine.h	Fri Nov 19 16:18:24 1999
@@@@ -357,7 +357,7 @@@@
 			   && (s) && !strucmp((s),"X-VCARD")))
 #define	MIME_VCARD_A(a)	MIME_VCARD((a)->body->type, (a)->body->subtype)
 
-#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "text")
+#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "r")
 
 
 /*
@@@@ -1875,94 +1875,94 @@@@
  * Some standard Key/Command Bindings 
  */
 #define	NULL_MENU	{NULL, NULL, {MC_NONE}, KS_NONE}
-#define	HELP_MENU	{"?", "Help", \
+#define	HELP_MENU	{"?", "U", \
 			 {MC_HELP, 2, {'?',ctrl('G')}}, \
 			 KS_SCREENHELP}
-#define	OTHER_MENU	{"O", "OTHER CMDS", \
+#define	OTHER_MENU	{"O", "LRO", \
 			 {MC_OTHER, 1, {'o'}}, \
 			 KS_NONE}
-#define	WHEREIS_MENU	{"W", "WhereIs", \
+#define	WHEREIS_MENU	{"W", "jM", \
 			 {MC_WHEREIS, 2, {'w',ctrl('W')}}, \
 			 KS_WHEREIS}
-#define	MAIN_MENU	{"M", "Main Menu", \
+#define	MAIN_MENU	{"M", "D", \
 			 {MC_MAIN, 1, {'m'}}, \
 			 KS_MAINMENU}
-#define	QUIT_MENU	{"Q", "Quit Pine", \
+#define	QUIT_MENU	{"Q", " Pine", \
 			 {MC_QUIT, 1, {'q'}}, \
 			 KS_EXIT}
-#define	PREVMSG_MENU	{"P", "PrevMsg", \
+#define	PREVMSG_MENU	{"P", "e@@", \
 			 {MC_PREVITEM, 1, {'p'}}, \
 			 KS_PREVMSG}
-#define	NEXTMSG_MENU	{"N", "NextMsg", \
+#define	NEXTMSG_MENU	{"N", "U@@", \
 			 {MC_NEXTITEM, 1, {'n'}}, \
 			 KS_NEXTMSG}
-#define	PREVPAGE_MENU	{"-", "PrevPage", \
+#define	PREVPAGE_MENU	{"-", "e@@", \
 			 {MC_PAGEUP, 3, {'-',ctrl('Y'),KEY_PGUP}}, \
 			 KS_PREVPAGE}
-#define	NEXTPAGE_MENU	{"Spc", "NextPage", \
+#define	NEXTPAGE_MENU	{"Spc", "U@@", \
 			 {MC_PAGEDN, 4, {'+',' ',ctrl('V'),KEY_PGDN}}, \
 			 KS_NEXTPAGE}
-#define	JUMP_MENU	{"J", "Jump", \
+#define	JUMP_MENU	{"J", "", \
 			 {MC_JUMP, 1, {'j'}}, \
 			 KS_JUMPTOMSG}
-#define	FWDEMAIL_MENU	{"F", "Fwd Email", \
+#define	FWDEMAIL_MENU	{"F", "HH", \
 			{MC_FWDTEXT,1,{'f'}}, \
 			 KS_FORWARD}
-#define	PRYNTMSG_MENU	{"%", "Print", \
+#define	PRYNTMSG_MENU	{"%", "CL", \
 			 {MC_PRINTMSG,1,{'%'}}, \
 			 KS_PRINT}
-#define	PRYNTTXT_MENU	{"%", "Print", \
+#define	PRYNTTXT_MENU	{"%", "CL", \
 			 {MC_PRINTTXT,1,{'%'}}, \
 			 KS_PRINT}
-#define	SAVE_MENU	{"S", "Save", \
+#define	SAVE_MENU	{"S", "s", \
 			 {MC_SAVE,1,{'s'}}, \
 			 KS_SAVE}
-#define	EXPORT_MENU	{"E", "Export", \
+#define	EXPORT_MENU	{"E", "ץX", \
 			 {MC_EXPORT, 1, {'e'}}, \
 			 KS_EXPORT}
-#define	COMPOSE_MENU	{"C", "Compose", \
+#define	COMPOSE_MENU	{"C", "s", \
 			 {MC_COMPOSE,1,{'c'}}, \
 			 KS_COMPOSER}
-#define	RCOMPOSE_MENU	{"#", "Role", \
+#define	RCOMPOSE_MENU	{"#", "", \
 			 {MC_ROLE,1,{'#'}}, \
 			 KS_NONE}
-#define	DELETE_MENU	{"D", "Delete", \
+#define	DELETE_MENU	{"D", "R", \
 			 {MC_DELETE,2,{'d',KEY_DEL}}, \
 			 KS_DELETE}
-#define	UNDELETE_MENU	{"U", "Undelete", \
+#define	UNDELETE_MENU	{"U", "_R", \
 			 {MC_UNDELETE,1,{'u'}}, \
 			 KS_UNDELETE}
-#define	REPLY_MENU	{"R", "Reply", \
+#define	REPLY_MENU	{"R", "^", \
 			 {MC_REPLY,1,{'r'}}, \
 			 KS_REPLY}
-#define	FORWARD_MENU	{"F", "Forward", \
+#define	FORWARD_MENU	{"F", "H", \
 			 {MC_FORWARD,1,{'f'}}, \
 			 KS_FORWARD}
-#define	LISTFLD_MENU	{"L", "ListFldrs", \
+#define	LISTFLD_MENU	{"L", "ƧXC", \
 			 {MC_COLLECTIONS,1,{'l'}}, \
 			 KS_FLDRLIST}
-#define	INDEX_MENU	{"I", "Index", \
+#define	INDEX_MENU	{"I", "", \
 			 {MC_INDEX,1,{'i'}}, \
 			 KS_FLDRINDEX}
-#define	GOTO_MENU	{"G", "GotoFldr", \
+#define	GOTO_MENU	{"G", "ƧX", \
 			 {MC_GOTO,1,{'g'}}, \
 			 KS_GOTOFLDR}
-#define	TAKE_MENU	{"T", "TakeAddr", \
+#define	TAKE_MENU	{"T", "oa}", \
 			 {MC_TAKE,1,{'t'}}, \
 			 KS_TAKEADDR}
-#define	FLAG_MENU	{"*", "Flag", \
+#define	FLAG_MENU	{"*", "X", \
 			 {MC_FLAG,1,{'*'}}, \
 			 KS_FLAG}
-#define	PIPE_MENU	{"|", "Pipe", \
+#define	PIPE_MENU	{"|", "ɦV(Pipe)", \
 			 {MC_PIPE,1,{'|'}}, \
 			 KS_NONE}
-#define	BOUNCE_MENU	{"B", "Bounce", \
+#define	BOUNCE_MENU	{"B", "hH", \
 			 {MC_BOUNCE,1,{'b'}}, \
 			 KS_BOUNCE}
-#define	HDRMODE_MENU	{"H", "HdrMode", \
+#define	HDRMODE_MENU	{"H", "Y", \
 			 {MC_FULLHDR,1,{'h'}}, \
 			 KS_HDRMODE}
-#define	TAB_MENU	{"Tab", "NextNew", \
+#define	TAB_MENU	{"Tab", "U@@ӷs", \
 			 {MC_TAB,1,{TAB}}, \
 			 KS_NONE}
 
@@@@ -2831,7 +2831,7 @@@@
 } ATABLE_S;
 
 
-#define TAG_EMBED	'\377'	/* Announces embedded data in text string */
+#define TAG_EMBED	'\001'	/* Announces embedded data in text string */
 #define	TAG_INVON	'\001'	/* Supported character attributes	  */
 #define	TAG_INVOFF	'\002'
 #define	TAG_BOLDON	'\003'
@


1.6
log
@Update to version 4.21.

PR:		14994
Submitted by:	maintainer
@
text
@@


1.5
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/pine.h.orig	Tue Oct 12 06:14:28 1999
+++ pine/pine.h	Thu Oct 14 12:35:27 1999
d137 1
a137 1
@@@@ -2819,7 +2819,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/pine.h.orig	Wed Jul 22 06:02:49 1998
+++ pine/pine.h	Tue Aug  4 12:42:20 1998
@@@@ -348,7 +348,7 @@@@
d12 1
a12 1
@@@@ -1582,91 +1582,91 @@@@
d33 1
a33 1
+#define	QUIT_MENU	{"Q", "} Pine", \
d80 4
d121 1
a121 1
+#define	PIPE_MENU	{"|", "V(Pipe)", \
d137 1
a137 1
@@@@ -2304,7 +2304,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 141
a141 109
--- pine/screen.c.orig	Fri Jun  5 04:09:17 1998
+++ pine/screen.c	Tue Jul 28 08:35:06 1998
@@@@ -433,7 +433,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},
@@@@ -1124,10 +1124,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   */
@@@@ -1144,17 +1144,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));
@@@@ -1162,7 +1162,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));
@@@@ -1174,7 +1174,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),
@@@@ -1185,7 +1185,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));
@@@@ -1259,7 +1259,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)
@@@@ -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 @@@@
 
     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.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 109
a109 52
--- build.orig	Tue Jun 16 01:35:10 1998
+++ build	Wed Jul 15 17:02:29 1998
@@@@ -256,11 +256,11 @@@@
 
         if [ -s c-client ] ; then rm -f c-client ; fi
         ln -s imap/c-client c-client
-        if [ -s mtest    ] ; then rm -f mtest    ; fi
-        ln -s imap/mtest mtest
-        if [ -s imapd    ] ; then rm -f imapd    ; fi
-        ln -s imap/imapd imapd
-        echo "Making c-client library, mtest and imapd"
+#       if [ -s mtest    ] ; then rm -f mtest    ; fi
+#       ln -s imap/mtest mtest
+#       if [ -s imapd    ] ; then rm -f imapd    ; fi
+#       ln -s imap/imapd imapd
+        echo "Making c-client library"
         eval echo make "$makeargs" "$K1" "$K2" $ccltarg
         cd $PHOME/imap
         eval make "$makeargs" "$K1" "$K2" $ccltarg
@@@@ -281,14 +281,16 @@@@
         cd $PHOME/bin
         rm -f pine mtest imapd pico pilot
         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
+#       if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
+#       if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+        if [ -s ../pico/libpico.so.1.3 ] ;
+              then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi
         cd $PHOME
         echo ''
         echo "Links to executables are in bin directory:"
-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
+        size bin/pine bin/pico bin/pilot bin/libpico.so.1.3
         echo "Done"
         ;;
 
@@@@ -299,10 +301,10 @@@@
 	make clean
         echo "Cleaning Pine"
         cd $PHOME/pine
-        make -f makefile.ult clean
+        make -f makefile.bsf clean
         echo "Cleaning pico"
         cd $PHOME/pico
-        make $makeargs -f makefile.ult clean
+        make $makeargs -f makefile.bsf clean
         echo "Done"
         cd $PHOME
         ;;
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 3
a3 4
--- pine/signals.c.orig	Wed Jun  5 12:47:21 1996
+++ pine/signals.c	Sat Jan 17 21:23:52 1998
@@@@ -493,7 +493,7 @@@@
     int retval = 1;
d5 34
a38 14
     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,
@@@@ -517,7 +517,7 @@@@
 	    final_message = 1;
 	}
 	else{
-	    strcpy(busy_message, "Busy");
+	    strcpy(busy_message, "еy");
 	    final_message = 0;
 	}
d40 13
@
