From 985ac34c6ebb36d8e33edf82253ee3353aae1733 Mon Sep 17 00:00:00 2001 From: itohy Date: Fri, 19 May 2000 07:34:35 +0000 Subject: [PATCH] Update to 0.1.9. Mainly bug fixes, it seems.... --- www/w3m/Makefile | 6 ++-- www/w3m/files/md5 | 2 +- www/w3m/files/patch-sum | 6 ++-- www/w3m/patches/patch-aa | 10 +++--- www/w3m/patches/patch-ab | 67 +++++++++++++++++----------------------- www/w3m/pkg/PLIST | 4 +-- 6 files changed, 41 insertions(+), 54 deletions(-) diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 9b142c4e63d9..c6f06e059f62 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2000/04/21 03:54:43 itohy Exp $ +# $NetBSD: Makefile,v 1.10 2000/04/21 04:30:32 itohy Exp $ -DISTNAME= w3m-0.1.8 +DISTNAME= w3m-0.1.9 CATEGORIES= www MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ @@ -87,7 +87,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR} # Use pax to discard uid/gid (cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \ - (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r -c \*.orig \*.rej \*.x) + (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r) ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR} ${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR} ${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR} diff --git a/www/w3m/files/md5 b/www/w3m/files/md5 index 830922f82c31..57e49eeb47a3 100644 --- a/www/w3m/files/md5 +++ b/www/w3m/files/md5 @@ -1,3 +1,3 @@ $NetBSD$ -MD5 (w3m-0.1.8.tar.gz) = 8e905f7a63b8f1f387529b9a6885b9c6 +MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936 diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum index 65f0719f9e85..b109531eab34 100644 --- a/www/w3m/files/patch-sum +++ b/www/w3m/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.5 2000/04/21 03:54:44 itohy Exp $ +$NetBSD: patch-sum,v 1.6 2000/04/21 04:30:33 itohy Exp $ -MD5 (patch-aa) = c487b537a97c42b585336e77ac3b8d78 -MD5 (patch-ab) = f28717e49959c051e1a5ec484b13c153 +MD5 (patch-aa) = 95ceb3f4890955448ae1a705a6c691ce +MD5 (patch-ab) = 3d631f4e994c7f0f7e4b354ee9e8e93a diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa index 55ad29810a32..0e0d5ff66b5e 100644 --- a/www/w3m/patches/patch-aa +++ b/www/w3m/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2000/03/02 15:46:46 itojun Exp $ +$NetBSD: patch-aa,v 1.3 2000/04/21 03:54:44 itohy Exp $ ---- configure.orig Thu Apr 6 10:20:35 2000 -+++ configure Fri Apr 21 00:31:12 2000 -@@ -258,13 +258,13 @@ +--- configure.orig Fri Apr 21 12:37:24 2000 ++++ configure Fri May 19 12:36:25 2000 +@@ -309,13 +309,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.)" @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2000/03/02 15:46:46 itojun Exp $ while : do readanswer lg_ans "$def_lg" -@@ -691,14 +691,14 @@ +@@ -774,14 +774,14 @@ gclib='' gcinclude='' gctarget='' diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab index dad9608cae8a..f763bec39b8a 100644 --- a/www/w3m/patches/patch-ab +++ b/www/w3m/patches/patch-ab @@ -1,49 +1,38 @@ -$NetBSD$ +$NetBSD: patch-ab,v 1.4 2000/04/21 03:54:44 itohy Exp $ Fix problems where: 1. Suspend the job w3m belongs to, not w3m only. 2. Automatic creation of ~/.w3m fails. - 3. "w3m ." using internal listing function, select a file, and w3m crashes. ---- main.c.orig Thu Apr 6 10:25:00 2000 -+++ main.c Fri Apr 21 01:06:37 2000 -@@ -139,9 +139,8 @@ +--- main.c.orig Fri Apr 21 12:45:53 2000 ++++ main.c Fri May 19 12:40:52 2000 +@@ -145,9 +145,8 @@ - BookmarkFile = NULL; - rc_dir = expandName(RC_DIR); -- i = strlen(rc_dir); -- if (i > 1 && rc_dir[i] == '/') -- rc_dir[i] = '\0'; -+ for (p = rc_dir + strlen(rc_dir) - 1; p > rc_dir && *p == '/'; p--) -+ *p = '\0'; - config_file = rcFile("config"); + BookmarkFile = NULL; + rc_dir = expandName(RC_DIR); +- i = strlen(rc_dir); +- if (i > 1 && rc_dir[i] == '/') +- rc_dir[i] = '\0'; ++ for (p = rc_dir + strlen(rc_dir) - 1; p > rc_dir && *p == '/'; p--) ++ *p = '\0'; + config_file = rcFile("config"); - /* argument search 1 */ -@@ -1357,7 +1356,17 @@ - shell = "/bin/sh"; - system(shell); - #else /* SIGSTOP */ + /* argument search 1 */ +@@ -1427,7 +1426,17 @@ + shell = "/bin/sh"; + system(shell); + #else /* SIGSTOP */ +#ifdef SIGTSTP /* BSD */ -+ signal(SIGTSTP, SIG_DFL); /* just in case */ -+ /* -+ * Note: If susp() was called from SIGTSTP handler, -+ * unblocking SIGTSTP would be required here. -+ * Currently not. -+ */ -+ kill(0, SIGTSTP); /* stop whole job, not a single process */ ++ signal(SIGTSTP, SIG_DFL); /* just in case */ ++ /* ++ * Note: If susp() was called from SIGTSTP handler, ++ * unblocking SIGTSTP would be required here. ++ * Currently not. ++ */ ++ kill(0, SIGTSTP); /* stop whole job, not a single process */ +#else - kill(getpid(), SIGSTOP); + kill(getpid(), SIGSTOP); +#endif - #endif /* SIGSTOP */ - fmInit(); - displayBuffer(Currentbuf, B_FORCE_REDRAW); -@@ -1758,7 +1767,8 @@ - parseURL2(a->url,&u,baseURL(Currentbuf)); - if (u.scheme == Currentbuf->currentURL.scheme && - u.port == Currentbuf->currentURL.port && -- strcasecmp(u.host,Currentbuf->currentURL.host) == 0 && -+ (u.host == Currentbuf->currentURL.host || -+ strcasecmp(u.host,Currentbuf->currentURL.host) == 0) && - strcmp(u.file,Currentbuf->currentURL.file) == 0) { - /* index within this buffer */ - local_label = u.label; + #endif /* SIGSTOP */ + fmInit(); + displayBuffer(Currentbuf, B_FORCE_REDRAW); diff --git a/www/w3m/pkg/PLIST b/www/w3m/pkg/PLIST index 89839ca8c05a..c076a3ed0c32 100644 --- a/www/w3m/pkg/PLIST +++ b/www/w3m/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2000/03/02 15:46:47 itojun Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/04/21 03:54:45 itohy Exp $ bin/w3m man/man1/w3m.1 man/ja_JP.EUC/man1/w3m.1 @@ -14,7 +14,6 @@ share/doc/w3m/doc/MANUAL.html share/doc/w3m/doc/README share/doc/w3m/doc/README.cygwin share/doc/w3m/doc/README.dict -share/doc/w3m/doc/README.dj share/doc/w3m/doc/README.func share/doc/w3m/doc/STORY.html share/doc/w3m/doc/keymap.default @@ -30,7 +29,6 @@ share/doc/w3m/doc-jp/MANUAL.html share/doc/w3m/doc-jp/README share/doc/w3m/doc-jp/README.cygwin share/doc/w3m/doc-jp/README.dict -share/doc/w3m/doc-jp/README.dj share/doc/w3m/doc-jp/README.func share/doc/w3m/doc-jp/README.hp share/doc/w3m/doc-jp/README.keymap -- 2.41.0