diff options
author | Steve Price <steve@FreeBSD.org> | 1998-08-24 01:24:44 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1998-08-24 01:24:44 +0000 |
commit | 754e3fbecb89f59a3b92237b79092f7632a31ceb (patch) | |
tree | a24cb36db220a1cd2175f962aaa431f90df99f6d /chinese | |
parent | Pick up libraries from /usr/lib/aout too. (diff) |
Update to version 4.0a2.
PR: 7672
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=12778
Diffstat (limited to 'chinese')
-rw-r--r-- | chinese/pine4/Makefile | 13 | ||||
-rw-r--r-- | chinese/pine4/distinfo | 1 | ||||
-rw-r--r-- | chinese/pine4/files/patch-aj | 66 | ||||
-rw-r--r-- | chinese/pine4/files/patch-as | 26 | ||||
-rw-r--r-- | chinese/pine4/files/patch-au | 11 | ||||
-rw-r--r-- | chinese/pine4/files/patch-bc | 44 | ||||
-rw-r--r-- | chinese/pine4/files/patch-bd | 82 | ||||
-rw-r--r-- | chinese/pine4/files/patch-bk | 180 | ||||
-rw-r--r-- | chinese/pine4/files/patch-bo | 8 | ||||
-rw-r--r-- | chinese/pine4/files/patch-bp | 17 | ||||
-rw-r--r-- | chinese/pine4/files/patch-br | 48 | ||||
-rw-r--r-- | chinese/pine4/pkg-plist | 2 |
12 files changed, 301 insertions, 197 deletions
diff --git a/chinese/pine4/Makefile b/chinese/pine4/Makefile index 0bbce42d4955..3ae5a1d4e970 100644 --- a/chinese/pine4/Makefile +++ b/chinese/pine4/Makefile @@ -1,17 +1,21 @@ # New ports collection makefile for: pine # http://www.washington.edu/pine/ -# Version required: 4.02 +# Version required: 4.02A # Date created: 15 July 1998 # Whom: Liang Tai-hwa <avatar@www.mmlab.cse.yzu.edu.tw> # -# $Id: Makefile,v 1.24 1998/07/21 13:45:58 asami Exp $ +# $Id: Makefile,v 1.6 1998/08/09 00:51:22 steve Exp $ # DISTNAME= pine4.02 -PKGNAME= zh-pine-4.02 +PKGNAME= zh-pine-4.02a CATEGORIES= chinese mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= ${DISTNAME}A.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= avatar@www.mmlab.cse.yzu.edu.tw NO_LATEST_LINK= yes @@ -23,7 +27,7 @@ do-build: do-install: ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${WRKSRC}/bin/libpico.so.1.3 ${PREFIX}/lib/libpico.so.1.3 + ${WRKSRC}/bin/libpico.so.2.0 ${PREFIX}/lib/libpico.so.2.0 ${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico ${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot ${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine @@ -40,6 +44,7 @@ do-install: .if !defined(NOPORTDOCS) ${INSTALL_DATA} -d ${PREFIX}/share/doc/pine ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \ + ${PREFIX}/share/doc/pine \ ${PREFIX}/share/doc/pine/tech-notes ${INSTALL_DATA} ${WRKSRC}/doc/brochure.txt ${PREFIX}/share/doc/pine ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine diff --git a/chinese/pine4/distinfo b/chinese/pine4/distinfo index 9ddf8a40e7d0..0feef2c611e2 100644 --- a/chinese/pine4/distinfo +++ b/chinese/pine4/distinfo @@ -1 +1,2 @@ MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7 +MD5 (pine4.02A.patch) = 96271a2a00293186941cad0c0175bd69 diff --git a/chinese/pine4/files/patch-aj b/chinese/pine4/files/patch-aj index 0ca3965c112d..cc7d338da183 100644 --- a/chinese/pine4/files/patch-aj +++ b/chinese/pine4/files/patch-aj @@ -1,5 +1,5 @@ ---- pico/composer.c.orig Fri Jul 3 07:00:40 1998 -+++ pico/composer.c Tue Aug 4 12:42:14 1998 +--- pico/composer.c.orig Wed Aug 19 10:37:25 1998 ++++ pico/composer.c Wed Aug 19 10:45:17 1998 @@ -136,12 +136,12 @@ @@ -19,7 +19,7 @@ }; #define SEND_KEY 1 #define RICH_KEY 2 -@@ -231,7 +231,7 @@ +@@ -245,7 +245,7 @@ if(strlen(addrbuf) + strlen(buf) >= addrbuflen){ addrbuflen += NLINE * 4; if(!(addrbuf = (char *)realloc(addrbuf, addrbuflen))){ @@ -28,7 +28,7 @@ (void *) addrbuflen); return(ABORT); } -@@ -298,7 +298,7 @@ +@@ -312,7 +312,7 @@ * get first chunk of memory, and tie it to structure... */ if((curline = HALLOC()) == NULL){ @@ -37,7 +37,7 @@ return(FALSE); } longest = term.t_ncol - e->prlen - 1; -@@ -680,7 +680,7 @@ +@@ -694,7 +694,7 @@ } else{ (*term.t_beep)(); @@ -46,7 +46,7 @@ } break; -@@ -693,12 +693,12 @@ +@@ -707,12 +707,12 @@ err = NULL; if(headents[ods.cur_e].is_attach){ if(SyncAttach() < 0){ @@ -61,7 +61,7 @@ UpdateHeader(); PaintHeader(COMPOSER_TOP_LINE, FALSE); PaintBody(1); -@@ -952,7 +952,7 @@ +@@ -966,7 +966,7 @@ if(FormatLines(headents[ods.cur_e].hd_text, buf, term.t_ncol - headents[ods.cur_e].prlen, headents[ods.cur_e].break_on_comma,0)==-1){ @@ -70,7 +70,7 @@ } UpdateHeader(); -@@ -1011,7 +1011,7 @@ +@@ -1025,7 +1025,7 @@ if(FormatLines(ods.cur_l, bufp, (term.t_ncol-headents[ods.cur_e].prlen), headents[ods.cur_e].break_on_comma, 0) == -1){ @@ -79,7 +79,7 @@ NULL); (*term.t_beep)(); break; -@@ -1092,10 +1092,10 @@ +@@ -1106,10 +1106,10 @@ default : /* huh? */ bleep: if(ch&CTRL) @@ -92,7 +92,7 @@ case NODATA: break; -@@ -1135,14 +1135,14 @@ +@@ -1149,14 +1149,14 @@ if(gripe){ char xx[81]; @@ -111,7 +111,7 @@ strcat(xx, "."); emlwrite(xx, NULL); } -@@ -1177,7 +1177,7 @@ +@@ -1191,7 +1191,7 @@ if(FormatLines(headents[ods.cur_e].hd_text, "", term.t_ncol-headents[new_e].prlen, headents[ods.cur_e].break_on_comma, 0) == -1) @@ -120,7 +120,7 @@ } } else if(headents[ods.cur_e].builder) { /* expand addresses */ int mangled = 0; -@@ -1248,8 +1248,8 @@ +@@ -1262,8 +1262,8 @@ if(!(new_l = prev_sel_hline(&new_e, ods.cur_l))){ /* all the way up! */ ods.p_line = COMPOSER_TOP_LINE; if(gripe) @@ -131,7 +131,7 @@ return(0); } -@@ -1278,7 +1278,7 @@ +@@ -1292,7 +1292,7 @@ if(FormatLines(headents[ods.cur_e].hd_text, "", term.t_ncol - headents[ods.cur_e].prlen, headents[ods.cur_e].break_on_comma,0) == -1) @@ -140,7 +140,7 @@ } } else if(headents[ods.cur_e].builder){ -@@ -1357,7 +1357,7 @@ +@@ -1371,7 +1371,7 @@ lp = lp->next; } else{ @@ -149,7 +149,7 @@ return(0); } } -@@ -1371,12 +1371,12 @@ +@@ -1385,12 +1385,12 @@ /* validate the new attachment, and reformat if needed */ if(status = SyncAttach()){ if(status < 0) @@ -164,7 +164,7 @@ return(0); } } -@@ -1452,7 +1452,7 @@ +@@ -1466,7 +1466,7 @@ if (term.t_nrow < 6 && ch != NODATA){ (*term.t_beep)(); @@ -173,7 +173,7 @@ continue; } -@@ -1523,13 +1523,13 @@ +@@ -1537,13 +1537,13 @@ if(headents[ods.cur_e].only_file_chars && !fallowc((unsigned char) ch)){ /* no garbage in filenames */ @@ -189,7 +189,7 @@ continue; } -@@ -1675,7 +1675,7 @@ +@@ -1689,7 +1689,7 @@ headents[ods.cur_e].dirty = 1; } else @@ -198,7 +198,7 @@ continue; case (CTRL|'F') : -@@ -1726,7 +1726,7 @@ +@@ -1740,7 +1740,7 @@ continue; if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off)){ @@ -207,7 +207,7 @@ continue; } -@@ -1740,7 +1740,7 @@ +@@ -1754,7 +1754,7 @@ } if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off-1)){ @@ -216,7 +216,7 @@ continue; } -@@ -1951,7 +1951,7 @@ +@@ -1965,7 +1965,7 @@ if(nlp == NULL){ /* no place to add below? */ if((lp = HALLOC()) == NULL){ @@ -225,7 +225,7 @@ free(buf); return(-1); } -@@ -1986,7 +1986,7 @@ +@@ -2000,7 +2000,7 @@ if(strlen(buf) && !nlp){ if((lp = HALLOC()) == NULL){ @@ -234,7 +234,7 @@ free(buf); return(-1); } -@@ -2272,14 +2272,14 @@ +@@ -2286,14 +2286,14 @@ if(level < 0 || !headents[level].name){ (*term.t_beep)(); @@ -253,7 +253,7 @@ headents[level].name); (*Pmaster->helper)(headents[level].help, buf, 1); ttresize(); -@@ -2909,7 +2909,7 @@ +@@ -2923,7 +2923,7 @@ } if((sbuf=(char *)malloc((unsigned) i)) == NULL){ @@ -262,7 +262,7 @@ return(-1); } -@@ -2966,7 +2966,7 @@ +@@ -2980,7 +2980,7 @@ if(!arg){ headarg = arg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG)); if(!arg){ @@ -271,7 +271,7 @@ return(-1); } else{ -@@ -2979,7 +2979,7 @@ +@@ -2993,7 +2993,7 @@ else{ nextarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG)); if(!nextarg){ @@ -280,7 +280,7 @@ return(-1); } else{ -@@ -2995,7 +2995,7 @@ +@@ -3009,7 +3009,7 @@ if(!e->sticky){ line = e->hd_text; if(!(arg->tptr=(char *)malloc(strlen(line->text) + 1))){ @@ -289,7 +289,7 @@ return(-1); } else -@@ -3012,7 +3012,7 @@ +@@ -3026,7 +3026,7 @@ if(!headarg){ headarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG)); if(!headarg){ @@ -298,7 +298,7 @@ return(-1); } else{ -@@ -3321,7 +3321,7 @@ +@@ -3335,7 +3335,7 @@ if(ksize()){ if((bp = buf = (char *)malloc(ksize()+5)) == NULL){ @@ -307,7 +307,7 @@ return(FALSE); } } -@@ -3355,7 +3355,7 @@ +@@ -3369,7 +3369,7 @@ work_buf_len = strlen(ods.cur_l->text) + buf_len; work_buf = (char *) malloc((work_buf_len + 1) * sizeof(char)); if (work_buf == NULL) { @@ -316,7 +316,7 @@ return(FALSE); } -@@ -3564,9 +3564,9 @@ +@@ -3578,9 +3578,9 @@ if(Pmaster && Pmaster->exit_label) menu_header[SEND_KEY].label = Pmaster->exit_label; else if(gmode & (MDVIEW | MDHDRONLY)) @@ -328,7 +328,7 @@ if(gmode & MDVIEW){ menu_header[CUT_KEY].name = NULL; -@@ -3587,7 +3587,7 @@ +@@ -3601,7 +3601,7 @@ menu_header[RICH_KEY].name = NULL; } else{ @@ -337,7 +337,7 @@ menu_header[RICH_KEY].name = "^R"; } -@@ -3666,7 +3666,7 @@ +@@ -3680,7 +3680,7 @@ *headents[i].realaddr = bufp; } else{ diff --git a/chinese/pine4/files/patch-as b/chinese/pine4/files/patch-as index 79d6e07fbfda..bc2d25b502a9 100644 --- a/chinese/pine4/files/patch-as +++ b/chinese/pine4/files/patch-as @@ -1,5 +1,29 @@ --- pico/search.c.orig Fri Jun 26 05:48:14 1998 -+++ pico/search.c Tue Aug 4 12:42:15 1998 ++++ pico/search.c Wed Aug 19 10:45:20 1998 +@@ -127,9 +127,9 @@ + /* ask the user for the text of a pattern */ + while(1){ + if (gmode & MDREPLACE) +- status = srpat("Search", defpat, repl_mode); ++ status = srpat("搜尋", defpat, repl_mode); + else +- status = readpattern("Search"); ++ status = readpattern("搜尋"); + + switch(status){ + case TRUE: /* user typed something */ +@@ -138,9 +138,9 @@ + case HELPCH: /* help requested */ + if(Pmaster) + (*Pmaster->helper)(Pmaster->search_help, +- "Help for Searching", 1); ++ "搜尋的輔助說明", 1); + else +- pico_help(SearchHelpText, "Help for Searching", 1); ++ pico_help(SearchHelpText, "搜尋的輔助說明", 1); + case (CTRL|'L'): /* redraw requested */ + refresh(FALSE, 1); + update(); @@ -165,7 +165,7 @@ break; default: diff --git a/chinese/pine4/files/patch-au b/chinese/pine4/files/patch-au index 3ecf284c2db9..543234a9f097 100644 --- a/chinese/pine4/files/patch-au +++ b/chinese/pine4/files/patch-au @@ -1,5 +1,14 @@ --- pine/osdep/os-bsf.h.orig Fri Jun 26 14:19:54 1998 -+++ pine/osdep/os-bsf.h Tue Aug 4 12:42:19 1998 ++++ pine/osdep/os-bsf.h Wed Aug 19 10:45:25 1998 +@@ -74,7 +74,7 @@ + default-composer-hdrs or customized-hdrs to get at it. Instead of + defining NEVER_ALLOW_CHANGING_FROM, an easier way of preventing From + changing is to put the feature "no-allow-changing-from" in the +- /usr/local/lib/pine.conf.fixed file. ++ /usr/local/etc/pine.conf.fixed file. + ----*/ + /* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */ + @@ -87,7 +87,7 @@ NOTE: You'll also have to make sure the appropriate osdep/postreap.* file is included in the os-*.ic file for your system. diff --git a/chinese/pine4/files/patch-bc b/chinese/pine4/files/patch-bc index df4d5dbc9942..458027423721 100644 --- a/chinese/pine4/files/patch-bc +++ b/chinese/pine4/files/patch-bc @@ -1,5 +1,5 @@ ---- pine/mailpart.c.orig Tue Jul 21 03:18:49 1998 -+++ pine/mailpart.c Tue Aug 4 12:42:18 1998 +--- pine/mailpart.c.orig Wed Aug 19 10:37:25 1998 ++++ pine/mailpart.c Wed Aug 19 10:45:24 1998 @@ -134,18 +134,18 @@ {HELP_MENU, OTHER_MENU, @@ -148,7 +148,7 @@ {-1, 0, NULL, NULL}, {-1, 0, NULL, NULL}, {-1, 0, NULL, NULL}}; -@@ -1242,7 +1242,7 @@ +@@ -1243,7 +1243,7 @@ att_save_opts[++r].ch = ctrl('V'); att_save_opts[r].rval = 12; att_save_opts[r].name = "^V"; @@ -157,7 +157,7 @@ } #endif /* !(DOS || MAC) */ -@@ -1250,7 +1250,7 @@ +@@ -1251,7 +1251,7 @@ att_save_opts[++r].ch = ctrl('I'); att_save_opts[r].rval = 11; att_save_opts[r].name = "TAB"; @@ -166,7 +166,7 @@ } att_save_opts[++r].ch = -1; -@@ -1469,7 +1469,7 @@ +@@ -1470,7 +1470,7 @@ a->number, save_folder); else if(rv == -1) @@ -175,7 +175,7 @@ /* else whatever broke in save_fetch_append shoulda bitched */ so_give(&so); -@@ -1545,11 +1545,11 @@ +@@ -1546,11 +1546,11 @@ if(rv == 1) q_status_message2(SM_ORDER, 0, 4, @@ -189,7 +189,7 @@ /* else whatever broke in save_fetch_append shoulda bitched */ if(our_stream) -@@ -1603,7 +1603,7 @@ +@@ -1604,7 +1604,7 @@ ATTACH_S *ap = a; STORE_S *store; static ESCKEY_S opts[] = { @@ -198,7 +198,7 @@ {-1, 0, NULL, NULL}, {-1, 0, NULL, NULL}}; -@@ -1611,7 +1611,7 @@ +@@ -1612,7 +1612,7 @@ opts[i].ch = ctrl('I'); opts[i].rval = 11; opts[i].name = "TAB"; @@ -207,7 +207,7 @@ } filename[0] = full_filename[0] = '\0'; -@@ -1624,7 +1624,7 @@ +@@ -1625,7 +1625,7 @@ if(rv < 0){ switch(rv){ case -1: @@ -216,7 +216,7 @@ break; case -2: -@@ -1676,7 +1676,7 @@ +@@ -1677,7 +1677,7 @@ ATTACH_S *ap; STORE_S *store; static ESCKEY_S opts[] = { @@ -225,7 +225,7 @@ {-1, 0, NULL, NULL}, {-1, 0, NULL, NULL}}; -@@ -1684,7 +1684,7 @@ +@@ -1685,7 +1685,7 @@ opts[i].ch = ctrl('I'); opts[i].rval = 11; opts[i].name = "TAB"; @@ -234,7 +234,7 @@ } filename[0] = full_filename[0] = '\0'; -@@ -1697,7 +1697,7 @@ +@@ -1698,7 +1698,7 @@ if(rv < 0){ switch(rv){ case -1: @@ -243,7 +243,7 @@ break; case -2: -@@ -1905,14 +1905,14 @@ +@@ -1906,14 +1906,14 @@ /*----- Can't display this type ------*/ if(a->body->encoding < ENCOTHER) q_status_message4(SM_ORDER | SM_DING, 3, 5, @@ -261,7 +261,7 @@ body_encodings[(a->body->encoding <= ENCMAX) ? a->body->encoding : ENCOTHER]); -@@ -2101,7 +2101,7 @@ +@@ -2102,7 +2102,7 @@ gf_set_so_writec(&pc, store); (void) decode_text(a, msgno, pc, QStatus, FM_DISPLAY | FM_HANDLES); gf_clear_so_writec(store); @@ -270,7 +270,7 @@ free_handles(&handles); so_give(&store); /* free resources associated with store */ } -@@ -2276,22 +2276,22 @@ +@@ -2277,22 +2277,22 @@ memset(&sargs, 0, sizeof(SCROLL_S)); sargs.text.text = so_text(store); sargs.text.src = src; @@ -297,7 +297,7 @@ } if(!handles){ -@@ -2705,10 +2705,10 @@ +@@ -2706,10 +2706,10 @@ memset(&sargs, 0, sizeof(SCROLL_S)); sargs.text.text = so_text(store); sargs.text.src = CharStar; @@ -311,7 +311,7 @@ scrolltool(&sargs); -@@ -2770,7 +2770,7 @@ +@@ -2771,7 +2771,7 @@ else /* partially formatted outgoing message */ pine_send(outgoing, &body, ps_global->nr_mode @@ -320,7 +320,7 @@ NULL, NULL, NULL, NULL, NULL, FALSE); ps_global->mangled_screen = 1; -@@ -2856,7 +2856,7 @@ +@@ -2857,7 +2857,7 @@ pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1); else /* partially formatted outgoing message */ pine_send(outgoing, &body, @@ -329,7 +329,7 @@ NULL, NULL, NULL, NULL, NULL, FALSE); ps_global->mangled_screen = 1; -@@ -2953,7 +2953,7 @@ +@@ -2954,7 +2954,7 @@ tp = body_partno(stream, msgno, a->body), msgtext, prefix, include_text)){ /* partially formatted outgoing message */ @@ -338,7 +338,7 @@ fcc.tptr, NULL, NULL, NULL, NULL, 0); pine_free_body(&body); -@@ -3034,7 +3034,7 @@ +@@ -3035,7 +3035,7 @@ sprintf(prompt, "Pipe %sattachment %s to %s: ", raw ? "RAW " : "", a->number, capture ? "" : "(Free Output) "); @@ -347,7 +347,7 @@ pipe_opt[2].label = capture ? "Free Output" : "Capture Output"; flags = OE_APPEND_CURRENT | OE_SEQ_SENSITIVE; rc = optionally_enter(pipe_command, -FOOTER_ROWS(ps_global), 0, -@@ -3052,7 +3052,7 @@ +@@ -3053,7 +3053,7 @@ } else if(rc == 0){ if(pipe_command[0] == '\0'){ @@ -356,7 +356,7 @@ break; } -@@ -3126,7 +3126,7 @@ +@@ -3127,7 +3127,7 @@ break; } else if(rc == 1){ diff --git a/chinese/pine4/files/patch-bd b/chinese/pine4/files/patch-bd index 12ebde48e3bf..42ad8eb016ec 100644 --- a/chinese/pine4/files/patch-bd +++ b/chinese/pine4/files/patch-bd @@ -1,5 +1,5 @@ ---- pine/mailview.c.orig Fri Jul 17 15:10:35 1998 -+++ pine/mailview.c Tue Aug 4 12:42:18 1998 +--- pine/mailview.c.orig Wed Aug 19 10:37:26 1998 ++++ pine/mailview.c Wed Aug 19 10:45:24 1998 @@ -140,8 +140,8 @@ static struct key view_keys[] = {HELP_MENU, @@ -104,7 +104,7 @@ scrollargs.keys.menu = &view_keymenu; scrollargs.keys.what = save_what; setbitmap(scrollargs.keys.bitmap); -@@ -1190,7 +1190,7 @@ +@@ -1196,7 +1196,7 @@ /*---- format and copy envelope ----*/ if(ps_global->full_header) q_status_message(SM_INFO, 0, 3, @@ -113,7 +113,7 @@ HD_INIT(&h, ps_global->VAR_VIEW_HEADERS, ps_global->view_all_except, FE_DEFAULT); -@@ -1229,7 +1229,7 @@ +@@ -1235,7 +1235,7 @@ if(append_file_name) fs_give((void **)&append_file_name); @@ -122,7 +122,7 @@ error_description(errno)); return(0); } -@@ -1523,7 +1523,7 @@ +@@ -1529,7 +1529,7 @@ write_error: if(!(flgs & FM_DISPLAY)) @@ -131,7 +131,7 @@ decode_err ? decode_err : error_description(errno)); return(0); -@@ -1853,8 +1853,8 @@ +@@ -1865,8 +1865,8 @@ char prompt[256], tmp[MAILTMPLEN]; int rc, flags, local_h; static ESCKEY_S launch_opts[] = { @@ -142,7 +142,7 @@ {-2, 0, NULL, NULL}, {-2, 0, NULL, NULL}, {0, 'u', "U", "editURL"}, -@@ -1875,7 +1875,7 @@ +@@ -1887,7 +1887,7 @@ else{ launch_opts[5].ch = -1; if(!local_h){ @@ -151,7 +151,7 @@ 'y', 0, NO_HELP, WT_SEQ_SENSITIVE) == 'y'){ /* Prompt for the displayer? */ tmp[0] = '\0'; -@@ -1919,7 +1919,7 @@ +@@ -1931,7 +1931,7 @@ } else{ q_status_message1(SM_ORDER | SM_DING, 2, 2, @@ -160,7 +160,7 @@ error_description(errno)); continue; } -@@ -1948,8 +1948,8 @@ +@@ -1960,8 +1960,8 @@ return(1); while(1){ @@ -171,7 +171,7 @@ (handle->type == URL) ? "\"" : "", (handle->type == URL) ? handle->h.url.path : "", (handle->type == URL) -@@ -2414,11 +2414,11 @@ +@@ -2426,11 +2426,11 @@ mode = PIPE_RESET | PIPE_USER ; if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){ close_system_pipe(&syspipe); @@ -185,7 +185,7 @@ } else if(f = url_local_handler(handle->h.url.path)){ if((*f)(handle->h.url.path) > 1) -@@ -2426,7 +2426,7 @@ +@@ -2438,7 +2438,7 @@ } else q_status_message1(SM_ORDER, 2, 2, @@ -194,7 +194,7 @@ handle->h.url.path); return(rv); -@@ -2746,7 +2746,7 @@ +@@ -2758,7 +2758,7 @@ } else q_status_message(SM_ORDER | SM_DING, 3, 4, @@ -203,7 +203,7 @@ if(outgoing) mail_free_envelope(&outgoing); -@@ -2810,7 +2810,7 @@ +@@ -2822,7 +2822,7 @@ else if(errstr) q_status_message(SM_ORDER|SM_DING, 3, 3, errstr); else @@ -212,7 +212,7 @@ break; -@@ -2833,7 +2833,7 @@ +@@ -2845,7 +2845,7 @@ if(uid_val != ps_global->mail_stream->uid_validity){ /* Complain! */ q_status_message(SM_ORDER|SM_DING, 3, 3, @@ -221,7 +221,7 @@ } if(uid){ -@@ -2849,7 +2849,7 @@ +@@ -2861,7 +2861,7 @@ if(i > mn_get_total(ps_global->msgmap)) q_status_message(SM_ORDER, 2, 3, @@ -230,7 +230,7 @@ } else if(search){ /* -@@ -2870,9 +2870,9 @@ +@@ -2882,9 +2882,9 @@ if(i = any_lflagged(ps_global->msgmap, MN_SLCT)){ extern long zoom_index(); @@ -243,7 +243,7 @@ /* Zoom the index! */ zoom_index(ps_global, ps_global->msgmap); } -@@ -3011,9 +3011,9 @@ +@@ -3023,9 +3023,9 @@ if(auth && *auth != '*') q_status_message1(SM_ORDER, 3, 3, @@ -256,7 +256,7 @@ /* * At this point our structure should contain the -@@ -3098,7 +3098,7 @@ +@@ -3110,7 +3110,7 @@ if(i > mn_get_total(ps_global->msgmap)) q_status_message(SM_ORDER, 2, 3, @@ -265,7 +265,7 @@ } break; -@@ -3177,7 +3177,7 @@ +@@ -3189,7 +3189,7 @@ } else q_status_message1(SM_ORDER | SM_DING, 0, 3, @@ -274,7 +274,7 @@ return(1); } -@@ -3204,7 +3204,7 @@ +@@ -3216,7 +3216,7 @@ dprint(2, (debugfile, "-- bogus url \"%s\": %s\n", url ? url : "<NULL URL>", reason)); if(url) @@ -283,7 +283,7 @@ (void *) (strchr(url, ':') - url), url, reason); return(0); -@@ -3344,7 +3344,7 @@ +@@ -3356,7 +3356,7 @@ write_error: if(style == QStatus) @@ -292,7 +292,7 @@ error_description(errno)); return(1); -@@ -3594,7 +3594,7 @@ +@@ -3606,7 +3606,7 @@ gf_set_so_writec(&tmp_pc, df_store); if(errstr = dfilter(display_filter, tmp_store, tmp_pc, NULL)){ q_status_message1(SM_ORDER | SM_DING, 3, 3, @@ -301,7 +301,7 @@ rv = FHT_WRTERR; } else{ -@@ -3606,7 +3606,7 @@ +@@ -3618,7 +3618,7 @@ } else{ q_status_message1(SM_ORDER | SM_DING, 3, 3, @@ -310,7 +310,7 @@ rv = FHT_WRTERR; } } -@@ -3631,7 +3631,7 @@ +@@ -3643,7 +3643,7 @@ if(errstr = gf_pipe(tmp_gc, final_pc)){ rv = FHT_WRTERR; q_status_message1(SM_ORDER | SM_DING, 3, 3, @@ -319,7 +319,7 @@ } } -@@ -3770,7 +3770,7 @@ +@@ -3782,7 +3782,7 @@ format_newsgroup_string("Newsgroups: ", e->newsgroups, prefix, pc); if(e->ngbogus) q_status_message(SM_ORDER, 0, 3, @@ -328,7 +328,7 @@ } if((which & FE_FOLLOWUPTO) && e->followup_to) -@@ -4394,7 +4394,7 @@ +@@ -4406,7 +4406,7 @@ } if(!sparms->bar.title) @@ -337,7 +337,7 @@ if(sparms->bar.style == TitleBarNone) sparms->bar.style = MsgTextPercent; -@@ -4543,7 +4543,7 @@ +@@ -4555,7 +4555,7 @@ } if(first_view && num_display_lines >= get_scroll_text_lines()) @@ -346,7 +346,7 @@ force = 0; /* may not need to next time around */ -@@ -4659,7 +4659,7 @@ +@@ -4671,7 +4671,7 @@ whereis_pos.row = 0; if(sparms->help.text == NO_HELP || ps_global->nr_mode){ q_status_message(SM_ORDER, 0, 5, @@ -355,7 +355,7 @@ break; } -@@ -4698,12 +4698,12 @@ +@@ -4710,12 +4710,12 @@ cur_top_line -= scroll_lines; if(cur_top_line <= 0){ cur_top_line = 0; @@ -370,7 +370,7 @@ STYLE_NAME(sparms)); break; -@@ -4717,12 +4717,12 @@ +@@ -4729,12 +4729,12 @@ cur_top_line += scroll_lines; if(cur_top_line + num_display_lines >= get_scroll_text_lines()) @@ -385,7 +385,7 @@ STYLE_NAME(sparms)); break; -@@ -4739,11 +4739,11 @@ +@@ -4751,11 +4751,11 @@ cur_top_line++; if(cur_top_line + num_display_lines >= get_scroll_text_lines()) @@ -399,7 +399,7 @@ STYLE_NAME(sparms)); } -@@ -4760,11 +4760,11 @@ +@@ -4772,11 +4772,11 @@ if(cur_top_line){ cur_top_line--; if(cur_top_line == 0) @@ -413,7 +413,7 @@ STYLE_NAME(sparms)); } -@@ -4795,7 +4795,7 @@ +@@ -4807,7 +4807,7 @@ } q_status_message(SM_ORDER, 0, 1, @@ -422,7 +422,7 @@ } break; -@@ -4825,7 +4825,7 @@ +@@ -4837,7 +4837,7 @@ } q_status_message(SM_ORDER, 0, 1, @@ -431,7 +431,7 @@ } break; -@@ -4844,7 +4844,7 @@ +@@ -4856,7 +4856,7 @@ break; case -1 : @@ -440,7 +440,7 @@ break; default : -@@ -4931,14 +4931,14 @@ +@@ -4943,14 +4943,14 @@ q_status_message(SM_ORDER, 0, 3, tmp_20k_buf); else q_status_message2(SM_ORDER, 0, 3, @@ -459,7 +459,7 @@ break; -@@ -4994,7 +4994,7 @@ +@@ -5006,7 +5006,7 @@ break; case -1 : @@ -468,7 +468,7 @@ break; default : -@@ -5239,13 +5239,13 @@ +@@ -5251,13 +5251,13 @@ int rc, flags; static char search_string[MAX_SEARCH+1] = { '\0' }; static ESCKEY_S word_search_key[] = { { 0, 0, "", "" }, @@ -485,7 +485,7 @@ help = NO_HELP; nsearch_string[0] = '\0'; -@@ -5260,13 +5260,13 @@ +@@ -5272,13 +5272,13 @@ continue; } else if(rc == 10){ @@ -501,7 +501,7 @@ cursor_pos->row = max(get_scroll_text_lines() - 1, 0); cursor_pos->col = 0; return(cursor_pos->row); -@@ -6055,10 +6055,10 @@ +@@ -6069,10 +6069,10 @@ if(*msg_p[0]) for(i = 0; i < msg_q; i++) q_status_message2(SM_ORDER, 3, 4, @@ -514,7 +514,7 @@ } else{ SCROLL_S sargs; -@@ -6069,7 +6069,7 @@ +@@ -6083,7 +6083,7 @@ memset(&sargs, 0, sizeof(SCROLL_S)); sargs.text.text = f; sargs.text.src = FileStar; diff --git a/chinese/pine4/files/patch-bk b/chinese/pine4/files/patch-bk index 6243074149b1..d967e6e9d9af 100644 --- a/chinese/pine4/files/patch-bk +++ b/chinese/pine4/files/patch-bk @@ -1,6 +1,6 @@ ---- pine/send.c.orig Tue Jul 21 03:02:18 1998 -+++ pine/send.c Tue Aug 4 12:42:21 1998 -@@ -208,18 +208,18 @@ +--- pine/send.c.orig Wed Aug 19 10:37:27 1998 ++++ pine/send.c Wed Aug 19 10:45:31 1998 +@@ -209,18 +209,18 @@ #define INTRPT_PMT \ @@ -25,7 +25,7 @@ /* * Since c-client preallocates, it's necessary here to define a limit -@@ -374,14 +374,14 @@ +@@ -375,14 +375,14 @@ mail_close(stream); if(ret == 'x'){ q_status_message(SM_ORDER, 0, 3, @@ -42,7 +42,7 @@ file_path); if(stream) mail_close(stream); -@@ -450,14 +450,14 @@ +@@ -451,14 +451,14 @@ if(ret == 'x'){ q_status_message(SM_ORDER, 0, 3, @@ -59,7 +59,7 @@ if(stream) mail_close(stream); } -@@ -532,7 +532,7 @@ +@@ -533,7 +533,7 @@ if(ret == 'x'){ q_status_message(SM_ORDER, 0, 3, @@ -68,7 +68,7 @@ done++; } } -@@ -542,7 +542,7 @@ +@@ -543,7 +543,7 @@ } else{ q_status_message1(SM_ORDER | SM_DING, 3, 3, @@ -77,7 +77,7 @@ if(stream) mail_close(stream); } -@@ -616,7 +616,7 @@ +@@ -617,7 +617,7 @@ fs_give((void **)&tmp_fcc); } @@ -86,7 +86,7 @@ reply, redraft_pos, lcc, custom, fcc_is_sticky); if(reply){ -@@ -683,7 +683,7 @@ +@@ -684,7 +684,7 @@ */ if(!stream->nmsgs){ q_status_message(SM_ORDER | SM_DING, 3, 5, @@ -95,7 +95,7 @@ return(redraft_cleanup(stream, TRUE)); } else if(stream == ps_global->mail_stream){ -@@ -719,7 +719,7 @@ +@@ -720,7 +720,7 @@ mn_give(&msgmap); if(rv){ @@ -104,7 +104,7 @@ (void) redraft_cleanup(stream, FALSE); return(0); /* special case */ } -@@ -957,7 +957,7 @@ +@@ -958,7 +958,7 @@ if(b->type == TYPEMULTIPART){ if(strucmp(b->subtype, "mixed")){ q_status_message1(SM_INFO, 3, 4, @@ -113,7 +113,7 @@ b->subtype); fs_give((void **)&b->subtype); b->subtype = cpystr("mixed"); -@@ -965,7 +965,7 @@ +@@ -966,7 +966,7 @@ } else{ q_status_message2(SM_ORDER | SM_DING, 3, 4, @@ -122,7 +122,7 @@ body_types[b->type], b->subtype); return(redraft_cleanup(stream, TRUE)); } -@@ -979,7 +979,7 @@ +@@ -980,7 +980,7 @@ set_mime_type_by_grope(&part->body, NULL); if(part->body.type != TYPETEXT){ q_status_message2(SM_ORDER | SM_DING, 3, 4, @@ -131,7 +131,7 @@ body_types[part->body.type], part->body.subtype); return(redraft_cleanup(stream, TRUE)); -@@ -1040,7 +1040,7 @@ +@@ -1041,7 +1041,7 @@ if(stream == ps_global->mail_stream){ q_status_message1(SM_ORDER, 3, 7, @@ -140,7 +140,7 @@ ps_global->inbox_name); do_broach_folder(ps_global->inbox_name, ps_global->context_list); -@@ -1061,7 +1061,7 @@ +@@ -1062,7 +1062,7 @@ if(!(rv = mail_delete(stream, mbox))) q_status_message1(SM_ORDER|SM_DING, 3, 3, @@ -149,7 +149,7 @@ fs_give((void **) &mbox); success = rv > 0L; -@@ -1084,7 +1084,7 @@ +@@ -1085,7 +1085,7 @@ { if(background_posting(FALSE)){ q_status_message1(SM_ORDER, 0, 3, @@ -158,7 +158,7 @@ type); return(failure); } -@@ -1307,7 +1307,7 @@ +@@ -1308,7 +1308,7 @@ if(rc == 1 || (rc == 0 && !answer)) { q_status_message(SM_ORDER, 3, 4, @@ -167,7 +167,7 @@ return(0); } -@@ -1396,7 +1396,7 @@ +@@ -1397,7 +1397,7 @@ if(rc == 1 || (rc == 0 && !answer)) { q_status_message(SM_ORDER, 3, 4, @@ -176,7 +176,7 @@ return(0); } -@@ -1452,7 +1452,7 @@ +@@ -1453,7 +1453,7 @@ if(rc == 1 || (rc == 0 && answer[0] == '\0')) { q_status_message(SM_ORDER, 3, 4, @@ -185,7 +185,7 @@ return(0); } -@@ -1479,31 +1479,31 @@ +@@ -1480,31 +1480,31 @@ */ static struct headerentry he_template[]={ {"From : ", "From", h_composer_from, 10, 0, NULL, @@ -226,7 +226,7 @@ 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, KS_NONE}, {"Subject : ", "Subject", h_composer_subject, 10, 0, NULL, valid_subject, NULL, NULL, NULL, NULL, -@@ -1538,7 +1538,7 @@ +@@ -1539,7 +1539,7 @@ static struct headerentry he_custom_addr_templ={ NULL, NULL, h_composer_custom_addr,10, 0, NULL, @@ -235,7 +235,7 @@ 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK}; static struct headerentry he_custom_free_templ={ NULL, NULL, h_composer_custom_free,10, 0, NULL, -@@ -1821,7 +1821,7 @@ +@@ -1822,7 +1822,7 @@ default: q_status_message1(SM_ORDER,3,3, @@ -244,7 +244,7 @@ break; } } -@@ -1831,7 +1831,7 @@ +@@ -1832,7 +1832,7 @@ ekey[0].ch = ctrl('T'); ekey[0].rval = 2; ekey[0].name = "^T"; @@ -253,7 +253,7 @@ ekey[1].ch = -1; /*---------------------------------------------------------------------- -@@ -1942,12 +1942,12 @@ +@@ -1943,12 +1943,12 @@ opts[i].ch = 'y'; opts[i].rval = 'y'; opts[i].name = "Y"; @@ -268,7 +268,7 @@ verbose_requested = 0; if(F_ON(F_VERBOSE_POST, ps_global)){ -@@ -1994,7 +1994,7 @@ +@@ -1995,7 +1995,7 @@ dsn_show = (dsn_requested & DSN_SHOW); sprintf(tmp_20k_buf, "%s%s%s%s%s%sto \"%s\" ? ", @@ -277,7 +277,7 @@ (verbose_requested || dsn_show) ? "(" : "", (verbose_requested) -@@ -2131,7 +2131,7 @@ +@@ -2132,7 +2132,7 @@ if(!(outgoing->to || outgoing->cc || outgoing->bcc || local_so)){ q_status_message(SM_ORDER, 3, 5, @@ -286,7 +286,7 @@ continue; } -@@ -2156,7 +2156,7 @@ +@@ -2157,7 +2157,7 @@ } else if(result == 0){ q_status_message(SM_ORDER,3,5, @@ -295,7 +295,7 @@ retval = -1; dprint(1, (debugfile, "explicit fcc write failed!\n")); -@@ -2174,7 +2174,7 @@ +@@ -2175,7 +2175,7 @@ } } else{ @@ -304,7 +304,7 @@ retval = -1; } } -@@ -2202,7 +2202,7 @@ +@@ -2203,7 +2203,7 @@ break; case 1: @@ -313,7 +313,7 @@ done++; retval = -1; break; -@@ -2446,7 +2446,7 @@ +@@ -2447,7 +2447,7 @@ break; case 'x': /* ^C */ @@ -322,7 +322,7 @@ dprint(4, (debugfile, "=== send: cancelled\n")); return; -@@ -2836,7 +2836,7 @@ +@@ -2837,7 +2837,7 @@ default: q_status_message1(SM_ORDER,3,7, @@ -331,7 +331,7 @@ (void *)pf->type); break; } -@@ -2863,7 +2863,7 @@ +@@ -2864,7 +2864,7 @@ #endif if(pf->canedit || !he->rich_header) q_status_message(SM_ORDER, 3, 3, @@ -340,7 +340,7 @@ memset(he, 0, (size_t)sizeof(*he)); pf->he = NULL; -@@ -3206,7 +3206,7 @@ +@@ -3207,7 +3207,7 @@ ? "CANCEL" : "HUH?")); if((editor_result & COMP_CANCEL) && F_ON(F_QUELL_DEAD_LETTER, ps_global)){ @@ -349,7 +349,7 @@ break; } -@@ -3230,7 +3230,7 @@ +@@ -3231,7 +3231,7 @@ && (check_addresses(&header) == CA_BAD)){ /*--- Addresses didn't check out---*/ q_status_message(SM_ORDER, 7, 7, @@ -358,7 +358,7 @@ continue; } -@@ -3287,7 +3287,7 @@ +@@ -3288,7 +3288,7 @@ if(!so_puts(local_so, tmp_20k_buf)){ if(editor_result & COMP_CANCEL) q_status_message2(SM_ORDER | SM_DING, 3, 3, @@ -367,7 +367,7 @@ folder, error_description(errno)); else dprint(1, (debugfile, "* * * CAN'T WRITE %s: %s\n", -@@ -3299,7 +3299,7 @@ +@@ -3300,7 +3300,7 @@ if(!ps_global->VAR_POSTPONED_FOLDER || !ps_global->VAR_POSTPONED_FOLDER[0]){ q_status_message(SM_ORDER | SM_DING, 3, 3, @@ -376,7 +376,7 @@ continue; } -@@ -3329,7 +3329,7 @@ +@@ -3330,7 +3330,7 @@ } else{ strcpy(folder, ps_global->VAR_POSTPONED_FOLDER); @@ -385,7 +385,7 @@ } local_so = open_fcc(folder,&fcc_cntxt, 1, NULL, NULL); -@@ -3471,10 +3471,10 @@ +@@ -3472,10 +3472,10 @@ && ps_global->VAR_FORM_FOLDER[0] && !strcmp(folder, ps_global->VAR_FORM_FOLDER)) q_status_message(SM_ORDER, 0, 3, @@ -398,7 +398,7 @@ break; /* postpone went OK, get out of here */ } -@@ -3484,15 +3484,15 @@ +@@ -3485,15 +3485,15 @@ if(fcc_result && folder) lc = last_cmpnt(folder); @@ -417,7 +417,7 @@ body_start = 1; continue; /* postpone failed, jump back in to composer */ } -@@ -3508,14 +3508,14 @@ +@@ -3509,14 +3509,14 @@ /* --- If posting, confirm with user ----*/ if(outgoing->newsgroups && *outgoing->newsgroups && want_to(POST_PMT, 'n', 'n', NO_HELP, WT_NORM) == 'n'){ @@ -434,7 +434,7 @@ dprint(4, (debugfile, "no recip, continuing\n")); continue; } -@@ -3557,8 +3557,8 @@ +@@ -3558,8 +3558,8 @@ && !filter_message_text(sending_filter_requested, outgoing, *body, &orig_so)){ q_status_message1(SM_ORDER, 3, 3, @@ -445,7 +445,7 @@ continue; } -@@ -3649,7 +3649,7 @@ +@@ -3650,7 +3650,7 @@ } else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){ q_status_message(SM_ORDER, 3, 5, @@ -454,7 +454,7 @@ dprint(1, (debugfile, "explicit fcc write failed!\n")); result |= P_FCC_LOSE; -@@ -3716,7 +3716,7 @@ +@@ -3717,7 +3717,7 @@ } else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){ q_status_message(SM_ORDER,3,5, @@ -463,7 +463,7 @@ dprint(1, (debugfile, "explicit fcc write failed!\n")); result |= P_FCC_LOSE; } -@@ -3800,8 +3800,8 @@ +@@ -3801,8 +3801,8 @@ postpone_prompt() { int ret = 1; @@ -474,7 +474,7 @@ {-1, 0, NULL, NULL} }; return(radio_buttons(PSTPN_FORM_PMT, -FOOTER_ROWS(ps_global), -@@ -3948,23 +3948,23 @@ +@@ -3949,23 +3949,23 @@ char *buf; int *goodorbad; { @@ -506,7 +506,7 @@ (result & P_FCC_WIN) ? "\"" : "", (result & P_FCC_WIN) ? fcc_name : "", (result & P_FCC_WIN) ? "\"" : ""); -@@ -4003,7 +4003,7 @@ +@@ -4004,7 +4004,7 @@ || (F_ON(F_COMPOSE_REJECTS_UNQUAL, ps_global) && a->host[0] == '@'))){ q_status_message2(SM_ORDER, 4, 7, @@ -515,7 +515,7 @@ a->mailbox, (a->host[0] == '.') ? a->host -@@ -4013,7 +4013,7 @@ +@@ -4014,7 +4014,7 @@ else if(ps_global->restricted && !address_is_us(*pf->addr, ps_global)){ q_status_message(SM_ORDER, 3, 3, @@ -524,7 +524,7 @@ return(CA_BAD); } else if(a->mailbox && strucmp(a->mailbox, "mailer-daemon") == 0 -@@ -4163,7 +4163,7 @@ +@@ -4164,7 +4164,7 @@ if(!(n > 0L && n <= mn_get_total(ps_global->msgmap) && (e = mail_fetchstructure(ps_global->mail_stream, mn_m2raw(ps_global->msgmap, n), &b)))){ @@ -533,7 +533,7 @@ flush_status_messages(0); return(0L); } -@@ -4178,7 +4178,7 @@ +@@ -4179,7 +4179,7 @@ /* actually write message text */ if(!format_message(mn_m2raw(ps_global->msgmap, n), e, b, FM_NEW_MESS | FM_DISPLAY, f)){ @@ -542,7 +542,7 @@ flush_status_messages(0); rv = 0L; } -@@ -4291,12 +4291,12 @@ +@@ -4292,12 +4292,12 @@ opts[i].ch = 'y'; opts[i].rval = 'y'; opts[i].name = "Y"; @@ -557,7 +557,7 @@ if(filters){ /* set global_filter_pointer to desired filter or NULL if none */ -@@ -4304,12 +4304,12 @@ +@@ -4305,12 +4305,12 @@ opts[i].ch = ctrl('P'); opts[i].rval = 10; opts[i].name = "^P"; @@ -572,7 +572,7 @@ if(F_ON(F_FIRST_SEND_FILTER_DFLT, ps_global)) filters = filters->next; -@@ -4379,23 +4379,23 @@ +@@ -4380,23 +4380,23 @@ p = NULL; dsn_show = (dsn_requested & DSN_SHOW); @@ -601,7 +601,7 @@ (verbose_requested || background_requested) ? "mode" : "", (dsn_show -@@ -4410,11 +4410,11 @@ +@@ -4411,11 +4411,11 @@ *p = ' '; if(verbose_label) @@ -615,7 +615,7 @@ if(F_ON(F_DSN, ps_global)){ if(dsn_requested & DSN_SHOW){ -@@ -4438,11 +4438,11 @@ +@@ -4439,11 +4439,11 @@ break; } else if(rv == 'n'){ /* Declined! */ @@ -629,7 +629,7 @@ break; } else if(rv == 10) /* PREVIOUS filter */ -@@ -4624,7 +4624,7 @@ +@@ -4625,7 +4625,7 @@ if(body->type != TYPEOTHER){ rv = 1; q_status_message3(SM_ORDER, 0, 3, @@ -638,7 +638,7 @@ body_types[body->type], body->subtype ? body->subtype : rfc822_default_subtype(body->type)); } -@@ -4673,7 +4673,7 @@ +@@ -4674,7 +4674,7 @@ (void) close_system_pipe(&syspipe); if((l = name_file_size(fname)) < 0L){ q_status_message2(SM_ORDER | SM_DING, 3, 4, @@ -647,7 +647,7 @@ fnp = error_description(errno)); dprint(1, (debugfile, "!!! Upload cmd \"%s\" failed for \"%s\": %s\n", -@@ -4685,7 +4685,7 @@ +@@ -4686,7 +4686,7 @@ return(l >= 0); } else @@ -656,7 +656,7 @@ return(0); } -@@ -4738,7 +4738,7 @@ +@@ -4739,7 +4739,7 @@ else if(reply->flags == REPLY_MSGNO) return; @@ -665,7 +665,7 @@ if(!stream){ if(stream = mail_open(NULL, reply->mailbox, OP_SILENT)){ ourstream++; -@@ -4816,7 +4816,7 @@ +@@ -4817,7 +4817,7 @@ so_give(&tmpf_so); } else @@ -674,7 +674,7 @@ } if(!errstr){ -@@ -4840,13 +4840,13 @@ +@@ -4841,13 +4841,13 @@ so_give(&tmpf_so); } else @@ -691,7 +691,7 @@ } else errstr = gf_filter(cmd, key ? filter_session_key() : NULL, -@@ -4857,7 +4857,7 @@ +@@ -4858,7 +4858,7 @@ if(errstr){ int ch; @@ -700,7 +700,7 @@ fflush(stdout); while((ch = read_char(300)) != ctrl('M') && ch != NO_OP_IDLE) -@@ -4950,7 +4950,7 @@ +@@ -4951,7 +4951,7 @@ if(tmp_so) so_give(&tmp_so); @@ -709,7 +709,7 @@ errstr); dprint(1, (debugfile, "Filter FAILED: %s\n", errstr)); } -@@ -5035,11 +5035,11 @@ +@@ -5036,11 +5036,11 @@ loser = pine_simple_send(outgoing, &body, NULL, NULL, NULL, 0); @@ -723,7 +723,7 @@ mail_free_envelope(&outgoing); pine_free_body(&body); -@@ -5123,7 +5123,7 @@ +@@ -5124,7 +5124,7 @@ if(!pf){ q_status_message(SM_ORDER,3,3, @@ -732,7 +732,7 @@ return(0); } -@@ -5132,7 +5132,7 @@ +@@ -5133,7 +5133,7 @@ gf_filter_init(); /* zero piped byte count, 'n */ send_bytes_to_send = send_body_size(body); /* count body bytes */ ps_global->c_client_error[0] = error_buf[0] = '\0'; @@ -741,7 +741,7 @@ send_bytes_to_send ? sent_percent : NULL, 1); /* try posting via local "<mta> <-t>" if specified */ -@@ -5317,7 +5317,7 @@ +@@ -5318,7 +5318,7 @@ struct headerentry *last_he = NULL; sprintf(error_buf, @@ -750,7 +750,7 @@ (sending_stream && sending_stream->reply) ? ": ": ".", (sending_stream && sending_stream->reply) ? sending_stream->reply : ""); -@@ -5390,7 +5390,7 @@ +@@ -5391,7 +5391,7 @@ TIME_STAMP("smtp done", 1); } else if(!error_mess) @@ -759,7 +759,7 @@ ps_global->c_client_error); if(verbose_file){ -@@ -5398,7 +5398,7 @@ +@@ -5399,7 +5399,7 @@ TIME_STAMP("verbose start", 1); fclose(verbose_send_output); verbose_send_output = NULL; @@ -768,7 +768,7 @@ display_output_file(verbose_file, "Verbose SMTP Interaction",NULL, 1); TIME_STAMP("verbose end", 1); } -@@ -5487,12 +5487,12 @@ +@@ -5488,12 +5488,12 @@ if(folder_index(fcc, *fcc_cntxt, FI_FOLDER) < 0){ if(ps_global->context_list->next) sprintf(tmp_20k_buf, @@ -783,7 +783,7 @@ strsquish(tmp_20k_buf + 500, fcc, 40)); if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){ -@@ -5529,7 +5529,7 @@ +@@ -5530,7 +5530,7 @@ ok++; } else{ @@ -792,7 +792,7 @@ strsquish(tmp_20k_buf + 500, fcc, 40)); if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){ /* -@@ -5563,8 +5563,8 @@ +@@ -5564,8 +5564,8 @@ if(ok == 0){ if(ps_global->mm_log_error){ @@ -803,7 +803,7 @@ l1 = strlen(s1); l2 = strlen(s2); -@@ -5582,10 +5582,10 @@ +@@ -5583,10 +5583,10 @@ } else @@ -816,7 +816,7 @@ q_status_message(SM_ORDER | SM_DING, 3, 3, errstr); } -@@ -5633,7 +5633,7 @@ +@@ -5634,7 +5634,7 @@ if(label && *label){ char msg_buf[80]; @@ -825,7 +825,7 @@ we_cancel = busy_alarm(1, msg_buf, NULL, 1); } else -@@ -5669,7 +5669,7 @@ +@@ -5670,7 +5670,7 @@ we_cancel = 0; q_status_message1(SM_ORDER | SM_DING, 3, 5, @@ -834,7 +834,7 @@ dprint(1, (debugfile, "ERROR appending %s in \"%s\"", fcc, cntxt ? cntxt->context : "NULL")); return(0); -@@ -6145,7 +6145,7 @@ +@@ -6146,7 +6146,7 @@ if((file_contents = (void *)so_get(FileStar, pa->filename, READ_ACCESS)) == NULL){ q_status_message2(SM_ORDER | SM_DING, 3, 4, @@ -843,7 +843,7 @@ error_description(errno), pa->filename); display_message('x'); continue; -@@ -6672,13 +6672,17 @@ +@@ -6673,13 +6673,17 @@ body->subtype = cpystr("octet-stream"); } @@ -868,7 +868,7 @@ } } -@@ -6847,6 +6851,9 @@ +@@ -6848,6 +6852,9 @@ value = rfc1522_encode(tmp_20k_buf, (unsigned char *) text, ps_global->VAR_CHAR_SET); @@ -887,7 +887,7 @@ break; } } -@@ -7508,7 +7515,8 @@ +@@ -7499,7 +7506,8 @@ switch (body->encoding) { /* all else needs filtering */ case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */ @@ -897,7 +897,7 @@ break; case ENCBINARY: /* encode binary into BASE64 */ -@@ -7522,7 +7530,7 @@ +@@ -7513,7 +7521,7 @@ if(encode_error = gf_pipe(gc, l_putc)){ /* shove body part down pipe */ q_status_message1(SM_ORDER | SM_DING, 3, 4, @@ -906,16 +906,16 @@ display_message('x'); } -@@ -7575,7 +7583,7 @@ - sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012", - body_encodings[(body->encoding == ENCBINARY) - ? ENCBASE64 -- : (body->encoding == ENC8BIT) -+ : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global)) - ? ENCQUOTEDPRINTABLE - : (body->encoding <= ENCMAX) - ? body->encoding : ENCOTHER]); -@@ -8137,7 +8145,7 @@ +@@ -7582,7 +7590,7 @@ + && !(so_puts(so, "Content-Transfer-Encoding: ") + && so_puts(so, body_encodings[(body->encoding==ENCBINARY) + ? ENCBASE64 +- : (body->encoding == ENC8BIT) ++ : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global)) + ? ENCQUOTEDPRINTABLE + : (body->encoding <= ENCMAX) + ? body->encoding +@@ -8205,7 +8213,7 @@ || (forbid = pine_header_forbidden(name))){ if(forbid) q_status_message1(SM_ORDER, 3, 3, @@ -924,7 +924,7 @@ *t = save; continue; -@@ -8254,7 +8262,7 @@ +@@ -8322,7 +8330,7 @@ if(ps_global->post){ if(gripe) q_status_message(SM_ORDER|SM_DING, 3, 3, diff --git a/chinese/pine4/files/patch-bo b/chinese/pine4/files/patch-bo index 834f91c85297..e0eef8d39021 100644 --- a/chinese/pine4/files/patch-bo +++ b/chinese/pine4/files/patch-bo @@ -1,5 +1,5 @@ --- build.orig Tue Jun 16 01:35:10 1998 -+++ build Tue Aug 4 12:42:12 1998 ++++ build Wed Aug 19 10:45:16 1998 @@ -256,11 +256,11 @@ if [ -s c-client ] ; then rm -f c-client ; fi @@ -27,13 +27,13 @@ +# 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 ++ if [ -s ../pico/libpico.so.2.0 ] ; ++ then ln ../pico/libpico.so.2.0 libpico.so.2.0 ; 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 ++ size bin/pine bin/pico bin/pilot bin/libpico.so.2.0 echo "Done" ;; diff --git a/chinese/pine4/files/patch-bp b/chinese/pine4/files/patch-bp new file mode 100644 index 000000000000..ddcafda265d2 --- /dev/null +++ b/chinese/pine4/files/patch-bp @@ -0,0 +1,17 @@ +--- doc/pine.1.orig Wed Jul 22 03:48:42 1998 ++++ doc/pine.1 Wed Aug 19 10:45:16 1998 +@@ -256,11 +256,11 @@ + .br + /etc/mime.types System-wide file ext. to MIME type mapping + .br +-/usr/local/lib/pine.info Local pointer to system administrator. ++/usr/local/etc/pine.info Local pointer to system administrator. + .br +-/usr/local/lib/pine.conf System-wide configuration file. ++/usr/local/etc/pine.conf System-wide configuration file. + .br +-/usr/local/lib/pine.conf.fixed Non-overridable configuration file. ++/usr/local/etc/pine.conf.fixed Non-overridable configuration file. + .br + /tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. + .br diff --git a/chinese/pine4/files/patch-br b/chinese/pine4/files/patch-br new file mode 100644 index 000000000000..3ea141eae580 --- /dev/null +++ b/chinese/pine4/files/patch-br @@ -0,0 +1,48 @@ +--- pine/pine.hlp.orig Wed Jul 22 06:04:04 1998 ++++ pine/pine.hlp Wed Aug 19 10:45:28 1998 +@@ -750,9 +750,9 @@ + + executable <Unix search path>/pine + persnl cfg ~/.pinerc +- global cfg /usr/local/lib/pine.conf +- fixed cfg /usr/local/lib/pine.conf.fixed +- local help /usr/local/lib/pine.info ++ global cfg /usr/local/etc/pine.conf ++ fixed cfg /usr/local/etc/pine.conf.fixed ++ local help /usr/local/etc/pine.info + + interrupted ~/.pine-interrupted-mail + debug ~/.pine-debugN +@@ -1137,9 +1137,9 @@ + this link now to send a message to it:<BR> + <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P> + <!--chtml endif--> +-<!--chtml if [ -r /usr/local/lib/pine.info ]--> ++<!--chtml if [ -r /usr/local/etc/pine.info ]--> + <HR WIDTH="75%">Local Support Contacts:<P> +-<!--#include file="/usr/local/lib/pine.info"--> ++<!--#include file="/usr/local/etc/pine.info"--> + <HR WIDTH="75%"> + <!--chtml endif--> + <P> +@@ -1226,7 +1226,7 @@ + <OL> + <LI> <A HREF="#intro">Introduction</A> + <LI> <A HREF="#pine_help">Pine Help</A> +-<!--chtml if [ -r /usr/local/lib/pine.info ]--> ++<!--chtml if [ -r /usr/local/etc/pine.info ]--> + <LI> <A HREF="#local_support">Local Support Contacts</A> + <!--chtml endif--> + <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A> +@@ -1333,9 +1333,9 @@ + at your site.) + + +-<!--chtml if [ -r /usr/local/lib/pine.info ]--> ++<!--chtml if [ -r /usr/local/etc/pine.info ]--> + <H2><A NAME="local_support">Local Support Contacts</A></H2> +-<!--#include file="/usr/local/lib/pine.info"--> ++<!--#include file="/usr/local/etc/pine.info"--> + <!--chtml endif--> + + <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2> diff --git a/chinese/pine4/pkg-plist b/chinese/pine4/pkg-plist index c41c83b0fa3c..e477632da870 100644 --- a/chinese/pine4/pkg-plist +++ b/chinese/pine4/pkg-plist @@ -6,7 +6,7 @@ bin/pilot bin/pine etc/dot.pinerc.pgp.sample etc/dot.pinerc.sample -lib/libpico.so.1.3 +lib/libpico.so.2.0 @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/doc/pine/brochure.txt |