diff options
Diffstat (limited to 'www/w3m/patches')
| -rw-r--r-- | www/w3m/patches/patch-aa | 46 | ||||
| -rw-r--r-- | www/w3m/patches/patch-ab | 14 | ||||
| -rw-r--r-- | www/w3m/patches/patch-ac | 50 | ||||
| -rw-r--r-- | www/w3m/patches/patch-ad | 41 | ||||
| -rw-r--r-- | www/w3m/patches/patch-ae | 132 | ||||
| -rw-r--r-- | www/w3m/patches/patch-af | 14 |
6 files changed, 114 insertions, 183 deletions
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa index b1d566646a5..9a7b41716e3 100644 --- a/www/w3m/patches/patch-aa +++ b/www/w3m/patches/patch-aa @@ -1,12 +1,19 @@ -$NetBSD: patch-aa,v 1.7 2000/08/15 03:57:48 itojun Exp $ ---- configure.orig Mon Jun 5 18:41:35 2000 -+++ configure Tue Aug 15 12:43:25 2000 -@@ -190,3 +190,3 @@ +$NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $ + +--- configure.orig Fri Mar 23 11:18:40 2001 ++++ configure Fri Mar 30 21:11:58 2001 +@@ -188,7 +188,7 @@ + + find_ssl() { sslinclude="" - for i1 in /usr /usr/local + for i1 in /usr /usr/local /usr/pkg do -@@ -312,9 +312,9 @@ + for i2 in /openssl /ssl / + do +@@ -312,13 +312,13 @@ + echo "Which language do you prefer?" + echo " 1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)" echo " 2 - English (charset US_ASCII, ISO-8859-1, etc.)" -if [ "$pref_lang" = 2 ]; then - Echo '[2]? ' @@ -23,17 +30,40 @@ $NetBSD: patch-aa,v 1.7 2000/08/15 03:57:48 itojun Exp $ +# def_lg=1 +#fi while : -@@ -786,3 +786,3 @@ + do + readanswer lg_ans "$def_lg" +@@ -469,7 +469,7 @@ + case "$ans" in + 1) + use_color=n; def_color="#undef COLOR" +- use_menu=n; def_menu="#undef MENU" ++ use_menu=y; def_menu="#undef MENU" + use_mouse=n; def_mouse="#undef MOUSE" + use_cookie=n; def_cookie="#undef USE_COOKIE" + use_ssl=n; def_ssl="#undef USE_SSL" +@@ -796,7 +796,7 @@ + gclib='' + gcinclude='' gctarget='' -for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib +for libdir in /lib /usr/lib ${LOCALBASE}/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib do -@@ -794,3 +794,3 @@ + if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then + echo "$libdir/libgc found" +@@ -804,7 +804,7 @@ + break + fi done -for inc in /usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include +for inc in /usr/include /usr/include/gc ${LOCALBASE}/include /usr/local/include /usr/local/include/gc ${HOME}/include do -@@ -1555,2 +1555,3 @@ + if [ -f $inc/gc.h ]; then + echo "$inc/gc.h found" +@@ -1699,6 +1699,7 @@ + if [ `expr "$perl" : 'not found'` != 0 ]; then + perl=/usr/local/bin/perl fi +perl=/usr/pkg/bin/perl if [ $sysname = CYGWIN ]; then + cygwin=1 + else diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab index 0dbbe03d076..b1f5a713454 100644 --- a/www/w3m/patches/patch-ab +++ b/www/w3m/patches/patch-ab @@ -1,14 +1,12 @@ -$NetBSD: patch-ab,v 1.6 2000/06/21 08:22:12 itohy Exp $ +$NetBSD: patch-ab,v 1.7 2001/03/31 09:21:17 itojun Exp $ -Suspend the job w3m belongs to, not w3m only. - ---- main.c.orig Tue Jun 6 14:56:48 2000 -+++ main.c Tue Jun 20 21:21:19 2000 -@@ -1529,7 +1529,17 @@ +--- main.c.orig Fri Mar 23 11:14:58 2001 ++++ main.c Fri Mar 30 21:02:12 2001 +@@ -1645,7 +1645,17 @@ shell = "/bin/sh"; system(shell); #else /* SIGSTOP */ -+#ifdef SIGTSTP /* BSD */ ++#ifdef SIGTSTP + signal(SIGTSTP, SIG_DFL); /* just in case */ + /* + * Note: If susp() was called from SIGTSTP handler, @@ -17,7 +15,7 @@ Suspend the job w3m belongs to, not w3m only. + */ + kill(0, SIGTSTP); /* stop whole job, not a single process */ +#else - kill(getpid(), SIGSTOP); + kill((pid_t)0, SIGSTOP); +#endif #endif /* SIGSTOP */ fmInit(); diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac index 2e41ef0414b..7e5741f1311 100644 --- a/www/w3m/patches/patch-ac +++ b/www/w3m/patches/patch-ac @@ -1,14 +1,38 @@ -$NetBSD: patch-ac,v 1.7 2000/10/14 01:22:42 itojun Exp $ +$NetBSD: patch-ac,v 1.8 2001/03/31 09:21:17 itojun Exp $ ---- display.c.orig Wed Jun 14 19:26:34 2000 -+++ display.c Wed Oct 11 15:35:33 2000 -@@ -232,3 +232,3 @@ - else --#if LANG == JA -+#if KANJI_SYMBOL - msg = Sprintf("¢ã¢¬¢Viewing <%s> ", cleanup_str(buf->buffername)); -@@ -251,3 +251,3 @@ - Strcat(msg, Strsubstr(s, 0, (l - 2) / 2)); --#if LANG == JA -+#if KANJI_SYMBOL - Strcat_charp(msg, "¡Ä"); +*** display.c.orig Fri Mar 23 10:49:53 2001 +--- display.c Fri Mar 30 21:02:31 2001 +*************** +*** 251,257 **** + + #ifdef MOUSE + if (use_mouse) +! #if LANG == JA + msg = Strnew_charp("¢ã¢¬¢"); + #else /* LANG != JA */ + msg = Strnew_charp("<=UpDn "); +--- 251,257 ---- + + #ifdef MOUSE + if (use_mouse) +! #if KANJI_SYMBOL + msg = Strnew_charp("¢ã¢¬¢"); + #else /* LANG != JA */ + msg = Strnew_charp("<=UpDn "); +*************** +*** 273,279 **** + if (s->length > l) { + if (l >= 4) { + msg = Strsubstr(s, 0, (l - 2) / 2); +! #if LANG == JA + Strcat_charp(msg, "¡Ä"); + #else /* LANG != JA */ + Strcat_charp(msg, ".."); +--- 273,279 ---- + if (s->length > l) { + if (l >= 4) { + msg = Strsubstr(s, 0, (l - 2) / 2); +! #if KANJI_SYMBOL + Strcat_charp(msg, "¡Ä"); + #else /* LANG != JA */ + Strcat_charp(msg, ".."); diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad index 8c03397b1a2..d800d64b8d1 100644 --- a/www/w3m/patches/patch-ad +++ b/www/w3m/patches/patch-ad @@ -1,24 +1,49 @@ -$NetBSD: patch-ad,v 1.5 2000/10/14 01:22:42 itojun Exp $ +$NetBSD: patch-ad,v 1.6 2001/03/31 09:21:17 itojun Exp $ ---- rc.c.orig Wed Jun 14 19:18:51 2000 -+++ rc.c Wed Oct 11 15:36:29 2000 -@@ -52,3 +52,3 @@ +--- rc.c.orig Fri Mar 23 10:51:04 2001 ++++ rc.c Fri Mar 30 21:07:29 2001 +@@ -51,7 +51,7 @@ + #endif + #define P_PIXELS 8 -#if LANG == JA +#if KANJI_SYMBOL #define CMT_HELPER "³°Éô¥Ó¥å¡¼¥¢¤ÎÊÔ½¸" -@@ -129,3 +129,3 @@ + #define CMT_TABSTOP "¥¿¥ÖÉý" + #define CMT_PIXEL_PER_CHAR "ʸ»úÉý (4.0...32.0)" +@@ -146,7 +146,7 @@ + #define CMT_PAGERLINE "# of reserved line when w3m is used as a pager" + #define CMT_HISTSIZE "# of reserved URL" #define CMT_SAVEHIST "Save URL history" -/* #define CMT_KANJICODE "Display Kanji Code" */ +#define CMT_KANJICODE "Display Kanji Code" #define CMT_FRAME "Automatic rendering of frame" -@@ -218,3 +218,3 @@ + #define CMT_TSELF "use _self as default target" + #define CMT_DISPLINK "Automatic display of link URL" +@@ -184,7 +184,7 @@ + #define CMT_FTPPASS "Password for FTP(use your mail address)" + #define CMT_USERAGENT "User-Agent" + #define CMT_ACCEPTLANG "Accept-Language" +-/* #define CMT_DOCUMENTCODE "Document Charset" */ ++#define CMT_DOCUMENTCODE "Document Charset" + #define CMT_WRAP "Wrap search" + #define CMT_VIEW_UNSEENOBJECTS "Display unseenobjects (e.g. bgimage) tag" + #ifdef __EMX__ +@@ -260,7 +260,7 @@ + #ifdef COLOR + static struct sel_c colorstr[] = { --#if LANG== JA +-#if LANG == JA +#if KANJI_SYMBOL {0, "black", "¹õ"}, -@@ -367,3 +367,3 @@ + {1, "red", "ÀÖ"}, + {2, "green", "ÎÐ"}, +@@ -442,7 +442,7 @@ + + struct param_section sections[] = { -#if LANG == JA +#if KANJI_SYMBOL {"ɽ¼¨´Ø·¸", params1}, + #ifdef COLOR + {"ɽ¼¨¿§", params2}, diff --git a/www/w3m/patches/patch-ae b/www/w3m/patches/patch-ae deleted file mode 100644 index 343fdb98693..00000000000 --- a/www/w3m/patches/patch-ae +++ /dev/null @@ -1,132 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2000/08/16 00:31:34 itojun Exp $ -Index: ftp.c -=================================================================== -RCS file: /cvsroot/apps/w3m/ftp.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -1 -r1.1 -r1.2 ---- ftp.c 2000/08/15 23:53:35 1.1 -+++ ftp.c 2000/08/16 00:28:03 1.2 -@@ -15,4 +15,5 @@ - --#ifdef FTPPASS_HOSTNAMEGEN - #include <sys/socket.h> -+ -+#ifdef FTPPASS_HOSTNAMEGEN - #include <netinet/in.h> -@@ -22,3 +23,8 @@ - -+#ifdef INET6 -+#include <netdb.h> -+#endif -+ - typedef struct _FTP { -+ int family; - FILE *rcontrol; -@@ -105,2 +111,8 @@ - Str tmp; -+#ifdef INET6 -+ struct sockaddr_storage ss; -+#else -+ struct sockaddr ss; -+#endif -+ int sslen; - FTP ftp = New(struct _FTP); -@@ -116,3 +128,7 @@ - if (n > 0 && pass[n - 1] == '@') { -+#ifdef INET6 -+ struct sockaddr_storage sockname; -+#else - struct sockaddr_in sockname; -+#endif - int socknamelen = sizeof(sockname); -@@ -120,5 +136,19 @@ - if (!getsockname(fd, (struct sockaddr *) &sockname, &socknamelen)) { -+#ifdef INET6 -+ char hbuf[NI_MAXHOST]; -+#else - struct hostent *sockent; -+#endif - Str tmp2 = Strnew_charp(pass); - -+#ifdef INET6 -+ if (getnameinfo((struct sockaddr *)&sockname, socknamelen, -+ hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) { -+ Strcat_charp(tmp2, hbuf); -+ } else if (getnameinfo((struct sockaddr *)&sockname, socknamelen, -+ hbuf, sizeof(hbuf), NULL, 0, 0) == 0) { -+ Strcat_m_charp(tmp2, "[", hbuf, "]", NULL); -+ } else -+ Strcat_charp(tmp2, "invalid"); -+#else - if (sockent = gethostbyaddr((char *) &sockname.sin_addr, -@@ -129,2 +159,3 @@ - Strcat_m_charp(tmp2, "[", inet_ntoa(sockname.sin_addr), "]", NULL); -+#endif - -@@ -135,2 +166,8 @@ - #endif -+ sslen = sizeof(ss); -+ if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) { -+ close(fd); -+ return -1; -+ } -+ ftp->family = ((struct sockaddr *)&ss)->sa_family; - ftp->rcontrol = fdopen(fd, "rb"); -@@ -176,3 +213,46 @@ - -+#ifdef INET6 - int -+ftp_epsv(FTP ftp) -+{ -+ int port; -+ int data_s; -+ char *p; -+ Str tmp; -+ char hbuf[NI_MAXHOST]; -+ struct sockaddr_storage ss; -+ int sslen; -+ -+ sslen = sizeof(ss); -+ if (getpeername(fileno(ftp->wcontrol), (struct sockaddr *)&ss, &sslen) < 0) -+ return -1; -+ if (getnameinfo((struct sockaddr *)&ss, ((struct sockaddr *)&ss)->sa_len, -+ hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) { -+ return -1; -+ } -+ -+ fwrite("EPSV\r\n", 6, sizeof(char), ftp->wcontrol); -+ fflush(ftp->wcontrol); -+ tmp = read_response(ftp); -+ if (atoi(tmp->ptr) != 229) -+ return -1; -+ for (p = tmp->ptr + 4; *p && *p != '('; p++); /*)*/ -+ if (*p == '\0') -+ return -1; -+ p++; -+ /* find "|||port|" */ -+ if (p[0] && p[0] == p[1] && p[0] == p[2]) -+ p += 3; -+ else -+ return -1; -+ sscanf(p, "%d", &port); -+ data_s = openSocket(hbuf, "", port); -+ if (data_s < 0) -+ return -1; -+ ftp->data = fdopen(data_s, "rb"); -+ return 0; -+} -+#endif -+ -+int - ftp_pasv(FTP ftp) -@@ -183,2 +263,9 @@ - Str tmp; -+ -+#ifdef INET6 -+ if (ftp->family == AF_INET6 || ftp->family == AF_INET) { -+ if (ftp_epsv(ftp) == 0) -+ return 0; -+ } -+#endif - diff --git a/www/w3m/patches/patch-af b/www/w3m/patches/patch-af deleted file mode 100644 index 462fe928a39..00000000000 --- a/www/w3m/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/02/11 22:30:09 hubertf Exp $ - ---- file.c.orig Wed Jun 14 12:35:40 2000 -+++ file.c -@@ -5239,7 +5239,9 @@ - Strcat(tmp, lineBuf2); - lineBuf2 = tmp; - } -+#ifdef CHARSET_JP - lineBuf2 = convertLine(&uf, lineBuf2, &code); -+#endif - lineBuf2 = checkType(lineBuf2->ptr, propBuffer, LINELEN); - len = lineBuf2->length; - l = New(Line); |