summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/w3m-img/pkg-descr2
-rw-r--r--japanese/w3m/pkg-descr2
-rw-r--r--www/w3m-img/pkg-descr2
-rw-r--r--www/w3m-m17n/pkg-descr2
-rw-r--r--www/w3m/Makefile9
-rw-r--r--www/w3m/distinfo4
-rw-r--r--www/w3m/files/patch-au39
-rw-r--r--www/w3m/pkg-descr2
8 files changed, 30 insertions, 32 deletions
diff --git a/japanese/w3m-img/pkg-descr b/japanese/w3m-img/pkg-descr
index 182f816a20e4..cd32d476d009 100644
--- a/japanese/w3m-img/pkg-descr
+++ b/japanese/w3m-img/pkg-descr
@@ -5,8 +5,6 @@ doesn't have.
* Rendering tables.
* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/index.html
diff --git a/japanese/w3m/pkg-descr b/japanese/w3m/pkg-descr
index 044126af889f..43207fcccfb7 100644
--- a/japanese/w3m/pkg-descr
+++ b/japanese/w3m/pkg-descr
@@ -5,8 +5,6 @@ doesn't have.
* Rendering tables.
* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/index.html
diff --git a/www/w3m-img/pkg-descr b/www/w3m-img/pkg-descr
index 076f238deccb..35c34dae45a3 100644
--- a/www/w3m-img/pkg-descr
+++ b/www/w3m-img/pkg-descr
@@ -5,8 +5,6 @@ doesn't have.
* Rendering tables.
* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/index.html
diff --git a/www/w3m-m17n/pkg-descr b/www/w3m-m17n/pkg-descr
index c2e23c6ffe5d..26d5f6039d37 100644
--- a/www/w3m-m17n/pkg-descr
+++ b/www/w3m-m17n/pkg-descr
@@ -5,8 +5,6 @@ doesn't have.
* Rendering tables.
* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
This package also supports multilingualization.
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 3863c8d2217c..357829f852f4 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -16,12 +16,12 @@ MAINTAINER?= nobutaka@FreeBSD.org
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
W3M_VERSION= 0.2.1
-INU_VERSION= 1.4
-IMG_VERSION= 1.11
+INU_VERSION= 1.5
+IMG_VERSION= 1.12
M17N_VERSION= 0.19
.if !defined(M17N)
-PORTREVISION?= 2
+PORTREVISION?= 3
.endif
HAS_CONFIGURE= yes
@@ -58,7 +58,8 @@ PATCH_SITES= http://www.nobutaka.com/FreeBSD/ports/20011009/
PATCHFILES= ${PORTNAME}-m17n-${M17N_VERSION}-security-fix.diff
PATCH_DIST_STRIP= -p0 -F3
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-XMakefile.m17n
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-XMakefile.m17n \
+ ${PATCHDIR}/extra-patch-terms.c.m17n
PLIST_SUB+= M17N_ONLY="" NO_M17N="@comment "
# Disable inline image support for w3m-m17n.
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 8e5257043f2e..9496a0ef9d12 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,4 +1,4 @@
-MD5 (w3m-0.2.1-inu-1.4.tar.gz) = 0524de2794aa2562f92e06ab1a631d5e
-MD5 (w3m-0.2.1-inu-1.4-img-1.11.patch) = 8440e8ec39e028e176054eb348584348
+MD5 (w3m-0.2.1-inu-1.5.tar.gz) = b1d41611bcbe8c5523450c0381f91541
+MD5 (w3m-0.2.1-inu-1.5-img-1.12.patch) = ed148df5ba00061270b95e435fd0a495
MD5 (w3m-m17n-0.19.tar.gz) = 96243978524a7b8fba6cbb413026eeff
MD5 (w3m-m17n-0.19-security-fix.diff) = 3d7bb72b8d12e6fc8ba485121b458148
diff --git a/www/w3m/files/patch-au b/www/w3m/files/patch-au
index d061e70c3b1e..30d8d47cfbf9 100644
--- a/www/w3m/files/patch-au
+++ b/www/w3m/files/patch-au
@@ -1,16 +1,23 @@
---- terms.c.orig Sun Oct 22 00:46:08 2000
-+++ terms.c Sun Oct 22 01:23:53 2000
-@@ -17,7 +17,13 @@
- #include <gpm.h>
- #endif /* USE_GPM */
- #ifdef USE_SYSMOUSE
-+#include <osreldate.h>
-+#if (__FreeBSD_version >= 400017)
-+#include <sys/consio.h>
-+#include <sys/fbio.h>
-+#else
- #include <machine/console.h>
-+#endif
- int (*sysm_handler) (int x, int y, int nbs, int obs);
- static int cwidth = 8, cheight = 16;
- static int xpix, ypix, nbs, obs = 0;
+--- terms.c.orig Mon Nov 5 02:59:40 2001
++++ terms.c Mon Nov 5 02:59:17 2001
+@@ -244,8 +244,18 @@
+ TerminalGet(tty, &d_ioval);
+ #ifdef MOUSE
+ term = getenv("TERM");
+- if (!strncmp(term, "kterm", 5) || !strncmp(term, "xterm", 5)) {
+- is_xterm = 1;
++ {
++ static struct { const char *prefix; int len; } xtermlike[] = {
++ { "kterm", 5 }, { "xterm", 5 }, { "rxvt", 4 }
++ };
++ int i;
++
++ for (i = 0; i < sizeof(xtermlike)/sizeof(xtermlike[0]); i++) {
++ if (!strncmp(term, xtermlike[i].prefix, xtermlike[i].len)) {
++ is_xterm = 1;
++ break;
++ }
++ }
+ }
+ #endif
+ return 0;
diff --git a/www/w3m/pkg-descr b/www/w3m/pkg-descr
index bc69455ddd6b..d87253cb4298 100644
--- a/www/w3m/pkg-descr
+++ b/www/w3m/pkg-descr
@@ -5,8 +5,6 @@ doesn't have.
* Rendering tables.
* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/index.html