Date: Mon, 22 Feb 1999 15:45:29 +0900 (JST) From: shige@kuis.kyoto-u.ac.jp To: FreeBSD-gnats-submit@freebsd.org Cc: shige@kuis.kyoto-u.ac.jp Subject: ports/10193: Update port: japanese/lynx-current Message-ID: <199902220645.PAA19632@kusatsu.kuis.kyoto-u.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 10193 >Category: ports >Synopsis: Update port: japanese/lynx-current >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 21 22:50:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Shigeyuki FUKUSHIMA >Release: FreeBSD 3.1-STABLE i386 >Organization: Dept. of Information Science, Kyoto Univ., JAPAN >Environment: FreeBSD 3.1-STABLE i386 >Description: Update port: japanese/lynx-current 1. Fix unfetchable problem. 2. lynx-current distfiles version 2.8.2.2 => 2.8.2.17 Thank you. --- shige >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/lynx-current/Makefile lynx-current/Makefile --- /usr/ports/japanese/lynx-current/Makefile Fri Nov 20 00:04:31 1998 +++ lynx-current/Makefile Mon Feb 22 14:40:20 1999 @@ -6,10 +6,10 @@ # $Id: Makefile,v 1.5 1998/11/19 15:04:31 kuriyama Exp $ # -DISTNAME= lynx2.8.2dev.2 -PKGNAME= ja-lynx-2.8.2.2 +DISTNAME= lynx2.8.2dev.17 +PKGNAME= ja-lynx-2.8.2.17 CATEGORIES= japanese www -MASTER_SITES= ftp://sol.slcc.edu/pub/lynx/current/ +MASTER_SITES= http://sol.slcc.edu/lynx/current/ MAINTAINER= shige@kuis.kyoto-u.ac.jp diff -urN /usr/ports/japanese/lynx-current/files/md5 lynx-current/files/md5 --- /usr/ports/japanese/lynx-current/files/md5 Fri Nov 20 00:04:32 1998 +++ lynx-current/files/md5 Mon Feb 22 14:50:33 1999 @@ -1 +1 @@ -MD5 (lynx2.8.2dev.2.tar.gz) = 2a692dc5175d429fd8c255f08b5be937 +MD5 (lynx2.8.2dev.17.tar.gz) = 2d2d1a26b9b41c9817a5e464773986b9 diff -urN /usr/ports/japanese/lynx-current/patches/patch-aa lynx-current/patches/patch-aa --- /usr/ports/japanese/lynx-current/patches/patch-aa Sun Nov 15 01:57:45 1998 +++ lynx-current/patches/patch-aa Mon Feb 22 15:42:50 1999 @@ -1,6 +1,6 @@ ---- makefile.in.orig Fri Nov 6 23:29:41 1998 -+++ makefile.in Tue Nov 10 23:38:26 1998 -@@ -41,10 +41,10 @@ +--- makefile.in.orig Wed Feb 17 23:29:33 1999 ++++ makefile.in Mon Feb 22 15:42:17 1999 +@@ -43,10 +43,10 @@ libdir= @libdir@ ## Where you want the doc-files installed @@ -11,13 +11,15 @@ -helpdir= @libdir@/lynx_help +helpdir= $(prefix)/lib/lynx_help - ##set the relative location of the WWW library Implementation directory, - ##from this directory -@@ -262,6 +262,7 @@ - (cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \ - ( cd $(docdir) && tar xf - ) + ## Where your locale data is + # datadir = @datadir@ +@@ -346,6 +346,9 @@ + $(libdir)/lynx.tmp >$(libdir)/lynx.cfg + chmod 644 $(libdir)/lynx.cfg -rm -f $(libdir)/lynx.tmp ++ [ ! -d $(docdir) ] && mkdir $(docdir) ++ [ ! -d $(docdir)/samples ] && mkdir $(docdir)/samples + cp $(srcdir)/lynx.cfg $(docdir)/samples/lynx.cfg - # HPUX 'sed' does not seem to like '=' as pattern delimiter. - FIX_SED = tr '=' '%' + LYHelp.h : LYHelp.hin + @echo Constructing sed-script diff -urN /usr/ports/japanese/lynx-current/patches/patch-ab lynx-current/patches/patch-ab --- /usr/ports/japanese/lynx-current/patches/patch-ab Tue Aug 11 08:41:24 1998 +++ lynx-current/patches/patch-ab Mon Feb 22 14:54:46 1999 @@ -1,6 +1,6 @@ ---- src/GridText.c.orig Thu Aug 6 21:28:22 1998 -+++ src/GridText.c Mon Aug 10 02:14:44 1998 -@@ -7608,7 +7608,7 @@ +--- src/GridText.c.orig Wed Feb 17 23:29:33 1999 ++++ src/GridText.c Mon Feb 22 14:54:10 1999 +@@ -8392,7 +8392,7 @@ } else { /* * This is a continuation of a previous textarea @@ -9,16 +9,16 @@ */ if (escaped2[0] != '\0') { if (previous_blanks) { -@@ -7622,7 +7622,7 @@ - sprintf(&query[strlen(query)], "%s\r\n", - escaped2); +@@ -8404,7 +8404,7 @@ + } else if (Boundary) { + HTSprintf(&query, "%s\r\n", escaped2); } else { -- sprintf(&query[strlen(query)], "%%0a%s", -+ sprintf(&query[strlen(query)], "%%0d%%0a%s", - escaped2); +- HTSprintf(&query, "%%0a%s", escaped2); ++ HTSprintf(&query, "%%0d%%0a%s", escaped2); } } else { -@@ -7631,7 +7631,7 @@ + if (PlainText) { +@@ -8412,7 +8412,7 @@ } else if (Boundary) { StrAllocCat(previous_blanks, "\r\n"); } else { diff -urN /usr/ports/japanese/lynx-current/patches/patch-ad lynx-current/patches/patch-ad --- /usr/ports/japanese/lynx-current/patches/patch-ad Fri Nov 20 00:04:32 1998 +++ lynx-current/patches/patch-ad Mon Feb 22 15:01:58 1999 @@ -1,5 +1,5 @@ ---- src/LYHistory.c.orig Wed Nov 11 04:47:38 1998 -+++ src/LYHistory.c Mon Nov 16 05:54:09 1998 +--- src/LYHistory.c.orig Thu Dec 24 20:27:23 1998 ++++ src/LYHistory.c Mon Feb 22 15:01:18 1999 @@ -23,6 +23,10 @@ #include <LYexit.h> #include <LYLeaks.h> @@ -11,9 +11,9 @@ PUBLIC HTList * Visited_Links = NULL; /* List of safe popped docs. */ /* -@@ -397,6 +401,20 @@ +@@ -401,6 +405,20 @@ } else { - StrAllocCopy(Title, gettext("(no title)")); + StrAllocCopy(Title, NO_TITLE); } + if (HTCJK == JAPANESE) { + char *tmp; @@ -32,16 +32,16 @@ fprintf(fp0, "%s<em>%d</em>. <tab id=t%d><a href=\"LYNXHIST:%d\">%s</a>\n", (x > 99 ? "" : x < 10 ? " " : " "), -@@ -544,6 +562,20 @@ - LYEntify(&Title, TRUE); +@@ -552,6 +570,20 @@ + StrAllocCopy(Title , NO_TITLE); } else { - StrAllocCopy(Title , gettext("(no title)")); + StrAllocCopy(Title , NO_TITLE); + } + if (HTCJK == JAPANESE) { + char *tmp; + + if ((tmp = (char *)calloc(strlen(Title)*2, sizeof(char *))) == NULL) -+ outofmem(__FILE__, "LYShowVisitedLinks"); ++ outofmem(__FILE__, "LYShowVisitedLinks"); + *tmp = '\0'; + if (kanji_code == EUC) { + TO_EUC(Title, tmp); @@ -49,7 +49,7 @@ + TO_SJIS(Title, tmp); + } + if (*tmp) StrAllocCopy(Title, tmp); -+ FREE(tmp); ++ FREE(tmp); } if (vl->address != NULL && *vl->address != '\0') { StrAllocCopy(Address, vl->address); diff -urN /usr/ports/japanese/lynx-current/patches/patch-af lynx-current/patches/patch-af --- /usr/ports/japanese/lynx-current/patches/patch-af Sun Nov 15 01:57:45 1998 +++ lynx-current/patches/patch-af Mon Feb 22 15:04:45 1999 @@ -1,14 +1,14 @@ ---- src/LYStrings.c.orig Tue Sep 22 20:05:12 1998 -+++ src/LYStrings.c Tue Nov 10 22:07:25 1998 -@@ -23,6 +23,7 @@ - +--- src/LYStrings.c.orig Wed Feb 17 23:29:33 1999 ++++ src/LYStrings.c Mon Feb 22 14:52:34 1999 +@@ -24,6 +24,7 @@ + extern unsigned short *LYKbLayout; extern BOOL HTPassHighCtrlRaw; extern HTCJKlang HTCJK; +extern HTkcode kanji_code; - /* If you want to add mouse support for some new platform, it's fairly - ** simple to do. Once you've determined the X and Y coordinates of -@@ -1351,6 +1352,9 @@ + /*Allowing the user to press tab when entering URL to get the closest + match in the closet*/ +@@ -1737,6 +1738,9 @@ #define DspWdth edit->dspwdth #define DspStart edit->xpan #define Margin edit->margin @@ -18,7 +18,7 @@ PUBLIC void LYSetupEdit ARGS4( EDREC *, edit, -@@ -1365,6 +1369,9 @@ +@@ -1751,6 +1755,9 @@ edit->pad = ' '; edit->dirty = TRUE; edit->panon = FALSE; @@ -28,7 +28,7 @@ StrLen = strlen(old); MaxLen = maxstr; -@@ -1405,6 +1412,31 @@ +@@ -1791,6 +1798,31 @@ } } @@ -60,7 +60,7 @@ PUBLIC int LYEdit1 ARGS4( EDREC *, edit, int, ch, -@@ -1418,6 +1450,13 @@ +@@ -1807,6 +1839,13 @@ if (MaxLen <= 0) return(0); /* Be defensive */ @@ -74,7 +74,7 @@ length = strlen(&Buf[0]); StrLen = length; -@@ -1436,18 +1475,47 @@ +@@ -1839,18 +1878,47 @@ /* * ch is printable or ISO-8859-1 escape character. */ @@ -124,7 +124,7 @@ /* * Backword. * Definition of word is very naive: 1 or more a/n characters. -@@ -1456,16 +1524,58 @@ +@@ -1859,16 +1927,58 @@ Pos--; while (Pos && isalnum(Buf[Pos-1])) Pos--; @@ -183,7 +183,7 @@ break; case LYE_ERASE: -@@ -1520,6 +1630,10 @@ +@@ -1948,6 +2058,10 @@ */ if (Pos >= length) break; @@ -192,9 +192,9 @@ + Pos++; +#endif Pos++; - /* fall through */ + /* fall through - DO NOT RELOCATE the LYE_DELN case wrt LYE_DELP */ -@@ -1527,12 +1641,30 @@ +@@ -1955,12 +2069,30 @@ /* * Delete preceding character. */ @@ -225,28 +225,7 @@ Buf[i] = 0; break; -@@ -1542,9 +1674,20 @@ - */ - if (length == 0 || Pos == length) - break; -+#ifndef SUPPORT_MULTIBYTE_EDIT - for (i = Pos; i < length; i++) - Buf[i] = Buf[i+1]; - i--; -+#else /* SUPPORT_MULTIBYTE_EDIT */ -+ { -+ int offset = 1; -+ if (HTCJK != NOCJK && !isascii(Buf[Pos])) -+ offset = 2; -+ for (i = Pos; i < length; i++) -+ Buf[i] = Buf[i + offset]; -+ i -= offset; -+ } -+#endif /* SUPPORT_MULTIBYTE_EDIT */ - Buf[i] = 0; - break; - -@@ -1552,8 +1695,16 @@ +@@ -1968,8 +2100,16 @@ /* * Move cursor to the right. */ @@ -263,7 +242,7 @@ break; case LYE_BACK: -@@ -1561,7 +1712,14 @@ +@@ -1977,7 +2117,14 @@ * Left-arrow move cursor to the left. */ if (Pos > 0) @@ -278,7 +257,7 @@ break; case LYE_UPPER: -@@ -1590,6 +1748,19 @@ +@@ -2006,6 +2153,19 @@ int padsize; char *str; char buffer[3]; @@ -298,7 +277,7 @@ buffer[0] = buffer[1] = buffer[2] = '\0'; if (!edit->dirty || (DspWdth == 0)) -@@ -1614,16 +1785,57 @@ +@@ -2030,16 +2190,57 @@ * data entry at low baudrates. */ if ((DspStart + DspWdth) <= length) @@ -356,7 +335,7 @@ nrdisplayed = length-DspStart; if (nrdisplayed > DspWdth) -@@ -1642,15 +1854,29 @@ +@@ -2058,15 +2259,29 @@ !(LYCharSet_UC[current_char_set].like8859 & UCT_R_8859SPECL))))) { addch(' '); @@ -386,7 +365,7 @@ } } } -@@ -1667,16 +1893,39 @@ +@@ -2083,16 +2298,39 @@ */ if (edit->panon) { if ((DspStart + nrdisplayed) < length) { @@ -426,7 +405,7 @@ refresh(); } -@@ -1727,12 +1976,21 @@ +@@ -2157,12 +2395,21 @@ * character in the current display character set. * Otherwise, we treat this as LYE_ENTER. */ @@ -448,7 +427,7 @@ case LYE_ENTER: /* * Terminate the string and return. -@@ -1756,8 +2014,11 @@ +@@ -2195,8 +2442,11 @@ break; default: diff -urN /usr/ports/japanese/lynx-current/patches/patch-ag lynx-current/patches/patch-ag --- /usr/ports/japanese/lynx-current/patches/patch-ag Tue Aug 11 08:41:24 1998 +++ lynx-current/patches/patch-ag Mon Feb 22 14:58:36 1999 @@ -1,16 +1,16 @@ ---- src/LYBookmark.c.orig Thu Aug 6 21:28:22 1998 -+++ src/LYBookmark.c Mon Aug 10 02:26:16 1998 -@@ -10,6 +10,7 @@ - #include <LYCharUtils.h> +--- src/LYBookmark.c.orig Wed Feb 17 23:29:33 1999 ++++ src/LYBookmark.c Mon Feb 22 14:57:59 1999 +@@ -12,6 +12,7 @@ + #include <LYCharSets.h> /* need for LYHaveCJKCharacterSet */ #include <LYCurses.h> #include <GridText.h> +#include <HTCJK.h> - #ifdef DOSPATH - #include <HTDOS.h> -@@ -28,6 +29,9 @@ - PRIVATE BOOLEAN is_mosaic_hotlist = FALSE; - PRIVATE char * convert_mosaic_bookmark_file PARAMS((char *filename_buffer)); + #ifdef VMS + #include <nam.h> +@@ -37,6 +38,9 @@ + FREE(string_buffer); + } +extern HTkcode kanji_code; +extern HTCJKlang HTCJK; @@ -18,40 +18,40 @@ /* * Tries to open a bookmark file for reading, which may be * the default, or based on offering the user a choice from -@@ -195,6 +199,7 @@ +@@ -201,6 +205,7 @@ char *bookmark_URL = NULL; - char filename_buffer[256]; - char string_buffer[256]; -+ char tmp_string_buffer[256]; + char filename_buffer[LY_MAXPATH]; + char string_buffer[BUFSIZ]; ++ char tmp_string_buffer[BUFSIZ]; char *Address = NULL; char *Title = NULL; int i, c; -@@ -264,7 +269,21 @@ +@@ -270,7 +275,21 @@ * Allow user to change the title. - FM */ - string_buffer[255] = '\0'; -- LYstrncpy(string_buffer, title, 255); -+ if (HTCJK == JAPANESE) { -+ switch(kanji_code) { -+ case EUC: -+ TO_EUC(title, tmp_string_buffer); -+ break; -+ case SJIS: -+ TO_SJIS(title, tmp_string_buffer); -+ break; -+ default: -+ break; + do { +- LYstrncpy(string_buffer, title, sizeof(string_buffer)-1); ++ if (HTCJK == JAPANESE) { ++ switch(kanji_code) { ++ case EUC: ++ TO_EUC(title, tmp_string_buffer); ++ break; ++ case SJIS: ++ TO_SJIS(title, tmp_string_buffer); ++ break; ++ default: ++ break; ++ } ++ LYstrncpy(string_buffer, tmp_string_buffer, sizeof(string_buffer)-1); ++ } else { ++ LYstrncpy(string_buffer, title, sizeof(string_buffer)-1); + } -+ LYstrncpy(string_buffer, tmp_string_buffer, 255); -+ } else { -+ LYstrncpy(string_buffer, title, 255); -+ } - convert_to_spaces(string_buffer, FALSE); - LYMBM_statusline(TITLE_PROMPT); - LYgetstr(string_buffer, VISIBLE, sizeof(string_buffer), NORECALL); -@@ -280,7 +299,12 @@ - * converted to < entities and any ampersands - * converted to & entities. - FM + convert_to_spaces(string_buffer, FALSE); + LYMBM_statusline(TITLE_PROMPT); + LYgetstr(string_buffer, VISIBLE, sizeof(string_buffer), NORECALL); +@@ -291,7 +310,12 @@ + * from display character set which may need changing. + * Do NOT convert any 8-bit chars if we have CJK display. - LP */ - StrAllocCopy(Title, string_buffer); + if (HTCJK == JAPANESE) { @@ -61,5 +61,5 @@ + StrAllocCopy(Title, string_buffer); + } LYEntify(&Title, TRUE); - - /* + if (UCSaveBookmarksInUnicode && + have8bit(Title) && (!LYHaveCJKCharacterSet)) { diff -urN /usr/ports/japanese/lynx-current/pkg/PLIST lynx-current/pkg/PLIST --- /usr/ports/japanese/lynx-current/pkg/PLIST Sun Nov 15 01:57:46 1998 +++ lynx-current/pkg/PLIST Mon Feb 22 15:40:19 1999 @@ -2,10 +2,12 @@ etc/lynx.cfg lib/lynx_help/Lynx_users_guide.html lib/lynx_help/about_lynx.html +lib/lynx_help/keystrokes/alt_edit_help.html lib/lynx_help/keystrokes/bookmark_help.html lib/lynx_help/keystrokes/cookie_help.html lib/lynx_help/keystrokes/dired_help.html lib/lynx_help/keystrokes/edit_help.html +lib/lynx_help/keystrokes/environments.html lib/lynx_help/keystrokes/follow_help.html lib/lynx_help/keystrokes/gopher_types_help.html lib/lynx_help/keystrokes/history_help.html @@ -15,6 +17,7 @@ lib/lynx_help/keystrokes/other_help.html lib/lynx_help/keystrokes/print_help.html lib/lynx_help/keystrokes/scrolling_help.html +lib/lynx_help/keystrokes/test_display.html lib/lynx_help/keystrokes/visited_help.html lib/lynx_help/keystrokes/xterm_help.html lib/lynx_help/lynx-dev.html @@ -25,6 +28,7 @@ share/doc/lynx/COPYING share/doc/lynx/PROBLEMS share/doc/lynx/README +share/doc/lynx/samples/cernrules.txt share/doc/lynx/samples/jumpsUnix.html share/doc/lynx/samples/jumpsVMS.html share/doc/lynx/samples/lynx-keymaps >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902220645.PAA19632>