Update to 0.2.1-inu-1.4 and www/w3m-img port to 0.2.1-inu-1.4-img-1.11

PR:		31124
Submitted by:	MAINTAINER

11 files changed, 167 insertions, 252 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 5ff41f84d275..b9c033f83a5a 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -8,28 +8,31 @@
 PORTNAME=	w3m
 PORTVERSION=	${W3M_VERSION}
 CATEGORIES+=	www ipv6
-MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
-		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
-		ftp://ftp.firedrake.org/w3m/ \
-		ftp://ftp.umlauf.de/pub/w3m/ \
-		http://www.instinct.org/w3m/ \
-		http://grilli.net/mirrors/w3m/download/
-DISTNAME=	${PORTNAME}-${W3M_VERSION}
+MASTER_SITES=	http://mi.med.tohoku.ac.jp/~satodai/w3m/inusrc/200109/
+DISTNAME=	${PORTNAME}-${W3M_VERSION}-inu-${INU_VERSION}
 
 MAINTAINER?=	nobutaka@nobutaka.com
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 W3M_VERSION=	0.2.1
-IMG_VERSION=	1.10
-PORTREVISION?=	1
+INU_VERSION=	1.4
+IMG_VERSION=	1.11
+M17N_VERSION=	0.19
 
-.if defined(INLINE_IMAGE)
-PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
-.else
-PORTREVISION=	1
+.if !defined(M17N)
+PORTREVISION?=	2
 .endif
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	-nonstop
+HOSTNAME!=	/bin/hostname
+SCRIPTS_ENV=	HOSTNAME=${HOSTNAME} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
+		LOCALBASE=${LOCALBASE} JAPANESE=${JAPANESE} \
+		USE_OPENSSL="${USE_OPENSSL}" SSL_CFLAGS="${SSL_CFLAGS}" \
+		SSL_LIBS="${SSL_LIBS}" EXTRA_SSL_LIBS="${EXTRA_SSL_LIBS}" \
+		INLINE_IMAGE=${INLINE_IMAGE} M17N=${M17N}
+
 MAN1=		w3m.1
 MANLANG=	""
 CFLAGS+=	-pipe
@@ -45,29 +48,40 @@ SED_CMD=	-e "s,%%PREFIX%%,${PREFIX},g" \
 USE_OPENSSL=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(M17N)
+PORTVERSION:=	${PORTVERSION}+${M17N_VERSION}
+
+MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+DISTNAME=	${PORTNAME}-m17n-${M17N_VERSION}
+
+PATCH_SITES=	http://www.nobutaka.com/FreeBSD/ports/20011009/
+PATCHFILES=	${PORTNAME}-m17n-${M17N_VERSION}-security-fix.diff
+PATCH_DIST_STRIP=	-p0 -F3
 
-.if ${OSVERSION} >= 400014
-SED_CMD+=	-e "s,undef INET6,define INET6,g"
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-XMakefile.m17n
+PLIST_SUB+=	M17N_ONLY="" NO_M17N="@comment "
+
+# Disable inline image support for w3m-m17n.
+.undef INLINE_IMAGE
+.else
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-XMakefile
+PLIST_SUB+=	M17N_ONLY="@comment " NO_M17N=""
 .endif
 
 .if defined(JAPANESE)
-SED_CMD+=	-e "s,undef JAPANESE,define JAPANESE,g"
 MANLANG+=	ja
-DOCS_JP=	${DOCS} HISTORY.kokb README.SSL README.cookie \
+DOCS_JP=	${DOCS} README.SSL README.cookie \
 		README.keymap README.mailcap README.menu
 
-PLIST_SUB=	JAPANESE_ONLY=""
+PLIST_SUB+=	JAPANESE_ONLY=""
 .else
-PLIST_SUB=	JAPANESE_ONLY="@comment "
+PLIST_SUB+=	JAPANESE_ONLY="@comment "
 .endif
 
 .if defined(USE_OPENSSL)
 SSL_CFLAGS=	-I${OPENSSLINC}/openssl -I${OPENSSLINC} ${OPENSSL_CFLAGS}
 SSL_LIBS=	-L${OPENSSLLIB} -lssl -lcrypto
 
-SED_CMD+=	-e "s,undef USE_SSL,define USE_SSL,g" \
-		-e "s,undef USE_SSL_VERIFY, define USE_SSL_VERIFY,g"
 MAKE_FLAGS+=	DEFS="${SSL_CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib"
 .else
@@ -75,10 +89,10 @@ MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 .endif
 
 .if defined(INLINE_IMAGE)
+PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
 PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	${DISTNAME}-img-${IMG_VERSION}.patch
+PATCHFILES=	${PORTNAME}-${W3M_VERSION}-inu-${INU_VERSION}-img-${IMG_VERSION}.patch
 PATCH_DIST_STRIP=	-p1
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile
 
 USE_IMLIB=	yes
 
@@ -88,7 +102,6 @@ PLIST_SUB+=	INLINE_IMAGE_ONLY=""
 
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile.noimg
 PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
 
 # Don't use pkg-message
@@ -100,13 +113,6 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
-post-configure:
-	@${CP} ${CONFIG_H} ${CONFIG_H}.in
-	@${SED} ${SED_CMD} < ${CONFIG_H}.in > ${CONFIG_H}
-	@${SED} -e "s,@PERL@,${PERL},g" \
-		-e "s,@CYGWIN@,0,g" \
-		< ${WRKSRC}/scripts/dirlist.in > ${WRKSRC}/scripts/dirlist.cgi
-
 post-install:
 .if !defined(NOPORTDOCS)
 .if defined(JAPANESE)
@@ -120,6 +126,9 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
+.if defined(M17N)
+	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
+.endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
 .if defined(JAPANESE)
@@ -129,4 +138,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 6aa730f9692c..8e5257043f2e 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1,4 @@
-MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
-MD5 (w3m-0.2.1-img-1.10.patch) = 8cd810eb925fd5da17d04ffcb2b22b1a
+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-m17n-0.19.tar.gz) = 96243978524a7b8fba6cbb413026eeff
+MD5 (w3m-m17n-0.19-security-fix.diff) = 3d7bb72b8d12e6fc8ba485121b458148
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
index ed4f27a937bf..2d8efe6a9113 100644
--- a/www/w3m/files/extra-patch-XMakefile
+++ b/www/w3m/files/extra-patch-XMakefile
@@ -1,27 +1,6 @@
---- XMakefile.orig	Mon Aug 13 00:52:11 2001
-+++ XMakefile	Mon Aug 13 00:53:15 2001
-@@ -22,16 +22,16 @@
- 
- INCLUDES=-I.
- 
--DEFS=$(INCLUDES) # -DDEBUG
--CFLAGS=$(MYCFLAGS) $(DEFS) 
--LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-+DEFS+=$(INCLUDES) # -DDEBUG
-+CFLAGS+=$(DEFS) 
-+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
- INSTALL=sh install.sh
- INSTALL2=sh ../install.sh
- AR=ar
- 
- all: $(TARGETS)
- 
--$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
-+$(TARGET): $(ALLOBJS) $(ALIB)
- 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
- 
- $(ALIB): $(ALIBOBJS)
-@@ -86,24 +86,25 @@
+--- XMakefile.orig	Thu Sep 27 21:30:08 2001
++++ XMakefile	Sun Oct  7 14:42:43 2001
+@@ -80,22 +80,23 @@
  install: $(TARGETS)
  	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
  	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -33,16 +12,16 @@
 -	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
 -	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
 -	$(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
--	for d in $(BOOKMARKER) $(HELPER) $(IMGTARGET); \
--		do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+-	for d in $(EXT_TARGETS); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
 -	(cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
 +	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
 +	$(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
 +	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
 +	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
 +	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-+	for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-+	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
++	$(BSD_INSTALL_DATA) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
++	for d in $(EXT_TARGETS); do $(BSD_INSTALL_SCRIPT) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
++	(cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
  
  uninstall:
  	-$(RM) $(BIN_DIR)/$(TARGET)
@@ -51,11 +30,7 @@
 +	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
  	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
 -	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
--	-$(RM) $(HELP_DIR)/w3mhelp.html
 +	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
-+	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
-+	-$(RM) $(LIB_DIR)/$(HELPER)
-+
- 
- clean: sweep
- 	rm -f *.o *.a $(TARGETS) mktable$(EXT)
+ 	-$(RM) $(HELP_DIR)/w3mhelp.html
+ 	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
+ 	-$(RM) $(LIB_DIR)/$(HELPER)
diff --git a/www/w3m/files/extra-patch-XMakefile.noimg b/www/w3m/files/extra-patch-XMakefile.m17n
index 0fc2a7566d2c..da5ba4c68f88 100644
--- a/www/w3m/files/extra-patch-XMakefile.noimg
+++ b/www/w3m/files/extra-patch-XMakefile.m17n
@@ -1,27 +1,6 @@
---- XMakefile.orig	Fri Apr 21 13:35:48 2000
-+++ XMakefile	Sat Apr 22 06:51:43 2000
-@@ -18,16 +18,16 @@
- 
- INCLUDES=-I.
- 
--DEFS=$(INCLUDES) # -DDEBUG
--CFLAGS=$(MYCFLAGS) $(DEFS) 
--LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-+DEFS+=$(INCLUDES) # -DDEBUG
-+CFLAGS+=$(DEFS) 
-+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
- INSTALL=sh install.sh
- INSTALL2=sh ../install.sh
- AR=ar
- 
- all: $(TARGETS)
- 
--$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
-+$(TARGET): $(ALLOBJS) $(ALIB)
- 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
- 
- $(ALIB): $(ALIBOBJS)
-@@ -67,23 +67,24 @@
+--- XMakefile.orig	Mon Oct  8 13:08:11 2001
++++ XMakefile	Mon Oct  8 13:11:26 2001
+@@ -87,22 +87,23 @@
  install: $(TARGETS)
  	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
  	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -40,8 +19,9 @@
 +	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
 +	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
 +	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-+	for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-+	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
++	$(BSD_INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
++	for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_SCRIPT) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
++	(cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
  
  uninstall:
  	-$(RM) $(BIN_DIR)/$(TARGET)
@@ -50,10 +30,7 @@
 +	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
  	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
 -	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
--	-$(RM) $(HELP_DIR)/w3mhelp.html
 +	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
-+	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
-+	-$(RM) $(LIB_DIR)/$(HELPER)
+ 	-$(RM) $(HELP_DIR)/w3mhelp.html
  
  clean: sweep
- 	rm -f *.o *.a $(TARGETS) mktable
diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa
deleted file mode 100644
index 674330e205be..000000000000
--- a/www/w3m/files/patch-aa
+++ /dev/null
@@ -1,92 +0,0 @@
---- config.h.orig	Fri Mar 23 11:49:44 2001
-+++ config.h	Mon Aug 27 15:16:50 2001
-@@ -20,3 +20,3 @@
- */
--#undef USE_MARK
-+#define USE_MARK
- 
-@@ -36,3 +36,3 @@
-  */
--#undef VIEW_UNSEENOBJECTS
-+#define VIEW_UNSEENOBJECTS
- 
-@@ -51,3 +51,3 @@
-  */
--#undef USE_GOPHER
-+#define USE_GOPHER
- 
-@@ -86,3 +86,3 @@
-  */
--#undef EMACS_LIKE_LINEEDIT
-+#define EMACS_LIKE_LINEEDIT
- 
-@@ -96,11 +96,10 @@
- 
--BIN_DIR = /usr/local/bin
--HELP_DIR = /usr/local/lib/w3m
--LIB_DIR = /usr/local/lib/w3m
-+PREFIX = %%PREFIX%%
-+BIN_DIR = %%PREFIX%%/bin
-+HELP_DIR = %%PREFIX%%/share/doc/w3m
-+HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m
-+LIB_DIR = %%PREFIX%%/libexec/w3m
- HELP_FILE = w3mhelp-w3m_ja.html
--SYS_LIBRARIES = -lgpm  -lbsd -lnsl -ltermcap  -L/usr/local/ssl/lib -lssl -lcrypto 
-+SYS_LIBRARIES = -lncurses
- LOCAL_LIBRARIES = 
--CC = gcc
--MYCFLAGS = -g -Wall -I./gc/include  -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
--GCCFLAGS = -g -Wall -I./gc/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT -DNO_DEBUGGING #-DNO_SIGNALS
- KEYBIND_SRC = keybind.c
-@@ -109,4 +108,2 @@
- MATHLIB=-lm
--GCLIB=gc/gc.a
--GCTARGET=gc/gc.a
- RANLIB=ranlib
-@@ -122,12 +119,19 @@
- #define EN 1
-+#undef JAPANESE
-+#ifdef JAPANESE
- #define LANG JA
- #define KANJI_SYMBOLS
-+#else
-+#define LANG EN
-+#undef KANJI_SYMBOLS
-+#endif
-+
- #define COLOR
- #define MOUSE
--#define USE_GPM
--#undef USE_SYSMOUSE
-+#undef USE_GPM
-+#define USE_SYSMOUSE
- #define MENU
- #define USE_COOKIE
--#define USE_SSL
--#define USE_SSL_VERIFY
-+#undef USE_SSL
-+#undef USE_SSL_VERIFY
- #define FTPPASS_HOSTNAMEGEN
-@@ -135,9 +139,15 @@
- 
--#define DEF_EDITOR "/bin/vi"
--#define DEF_MAILER "/bin/mail"
--#define DEF_EXT_BROWSER "/usr/X11R6/bin/netscape"
--
--#define LIB_DIR      "/usr/local/lib/w3m"
--#define HELP_DIR     "/usr/local/lib/w3m"
--#define HELP_FILE    "w3mhelp.html"
-+#define DEF_EDITOR "/usr/bin/vi"
-+#define DEF_MAILER "/usr/bin/mail"
-+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
-+
-+#define IMGSIZE "w3mimgsize"
-+#define IMGDISPLAY "w3mimgdisplay"
-+
-+#define LIB_DIR      "%%PREFIX%%/libexec/w3m"
-+#ifdef JAPANESE
-+#define HELP_FILE    "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html"
-+#else
-+#define HELP_FILE    "%%PREFIX%%/share/doc/w3m/w3mhelp-w3m_en.html"
-+#endif
- #define W3MCONFIG    "w3mconfig"
diff --git a/www/w3m/files/patch-ak b/www/w3m/files/patch-ak
deleted file mode 100644
index 9f1e5a2221b0..000000000000
--- a/www/w3m/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig	Fri Apr 21 12:45:53 2000
-+++ main.c	Sat Apr 22 06:35:44 2000
-@@ -1139,7 +1139,7 @@
- void
- ldhelp(void)
- {
--    cmd_loadURL(helpFile(HELP_FILE), NULL);
-+    cmd_loadURL(HELP_FILE, NULL);
- }
- 
- static void
diff --git a/www/w3m/files/patch-ao b/www/w3m/files/patch-ao
deleted file mode 100644
index 594673af2bdc..000000000000
--- a/www/w3m/files/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
---- rc.c.orig	Fri Jun  9 04:55:18 2000
-+++ rc.c	Fri Jun  9 04:55:26 2000
-@@ -990,16 +990,3 @@
-     Strcat_charp(file, base);
-     return expandName(file->ptr);
- }
--
--char *
--helpFile(char *base)
--{
--#ifdef __EMX__
--    Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR));
--#else				/* not __EMX__ */
--    Str file = Strnew_charp(HELP_DIR);
--#endif				/* not __EMX__ */
--    Strcat_char(file, '/');
--    Strcat_charp(file, base);
--    return expandName(file->ptr);
--}
diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure
new file mode 100644
index 000000000000..f30e30de70fe
--- /dev/null
+++ b/www/w3m/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig	Thu Sep 27 21:30:08 2001
++++ configure	Sun Oct  7 14:33:20 2001
+@@ -33,7 +33,9 @@
+ 
+ # parameters:
+ 
+-prefix=/usr/local
++if [ -z "$prefix" ]; then
++  prefix=/usr/local
++fi
+ all_yes=0
+ while [ $# -gt 0 ]
+ do
+@@ -332,6 +334,9 @@
+ readdir "$def_helpdir"
+ helpdir=$_dir
+ echo "def_helpdir='$helpdir'" >> config.param
++readdir "$def_helpdir_ja"
++helpdir_ja=$_dir
++echo "def_helpdir_ja='$helpdir_ja'" >> config.param
+ 
+ echo "Which language do you prefer?"
+ echo "  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)"
+@@ -1686,7 +1691,7 @@
+    VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
+    e.g. background image.
+  */
+-#undef VIEW_UNSEENOBJECTS
++#define VIEW_UNSEENOBJECTS
+ 
+ /*
+    VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
+@@ -1731,7 +1736,7 @@
+ /*
+  * Use Emacs-like key binding for file name completion
+  */
+-#undef EMACS_LIKE_LINEEDIT
++#define EMACS_LIKE_LINEEDIT
+ 
+ /*
+  * Remove line trailing spaces in html buffer.
+@@ -1753,6 +1758,7 @@
+ 
+ BIN_DIR = $bindir
+ HELP_DIR = $helpdir
++HELP_DIR_JA = $helpdir_ja
+ LIB_DIR = $suplibdir
+ HELP_FILE = $helpfile
+ SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib
+@@ -1801,6 +1807,7 @@
+ 
+ #define LIB_DIR      "$suplibdir"
+ #define HELP_DIR     "$helpdir"
++#define HELP_DIR_JA  "$helpdir_ja"
+ #define HELP_FILE    "w3mhelp.html"
+ #define W3MCONFIG    "w3mconfig"
+ 
diff --git a/www/w3m/files/patch-mimehead.c b/www/w3m/files/patch-mimehead.c
deleted file mode 100644
index 1d1a81c3cb3b..000000000000
--- a/www/w3m/files/patch-mimehead.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- mimehead.c.orig	Fri Mar 23 10:49:53 2001
-+++ mimehead.c	Tue Jun 19 21:46:21 2001
-@@ -166,21 +166,20 @@
- Str
- decodeWord(char **ow)
- {
--    char charset[32];
-     char *p, *w = *ow;
-     char method;
-     Str a = Strnew();
-+    Str charset = Strnew();
- 
-     if (*w != '=' || *(w + 1) != '?')
- 	goto convert_fail;
-     w += 2;
--    for (p = charset; *w != '?'; w++) {
-+    for (; *w != '?'; w++) {
- 	if (*w == '\0')
- 	    goto convert_fail;
--	*(p++) = *w;
-+	Strcat_char(charset,*w);
-     }
--    *p = '\0';
--    if (strcasecmp(charset, J_CHARSET) != 0) {
-+    if (Strcasecmp_charp(charset, J_CHARSET) != 0) {
- 	/* NOT ISO-2022-JP encoding ... don't convert */
- 	goto convert_fail;
-     }
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 33facd70cd97..bad757e77da2 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -1,12 +1,12 @@
 bin/w3m
 libexec/w3m/dirlist.cgi
+%%NO_M17N%%libexec/w3m/inflate
 libexec/w3m/w3mbookmark
 libexec/w3m/w3mhelperpanel
 %%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
 %%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgsize
 %%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/FAQ.html
 %%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY
-%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY.kokb
 %%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/MANUAL.html
 %%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README
 %%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.SSL
@@ -31,6 +31,7 @@ share/doc/ja/w3m/w3mhelp-w3m_ja.html
 %%PORTDOCS%%share/doc/w3m/README.dict
 %%PORTDOCS%%share/doc/w3m/README.func
 %%PORTDOCS%%%%INLINE_IMAGE_ONLY%%share/doc/w3m/README.img
+%%PORTDOCS%%%%M17N_ONLY%%share/doc/w3m/README.m17n
 %%PORTDOCS%%share/doc/w3m/STORY.html
 %%PORTDOCS%%share/doc/w3m/keymap.default
 %%PORTDOCS%%share/doc/w3m/keymap.lynx
@@ -38,6 +39,7 @@ share/doc/ja/w3m/w3mhelp-w3m_ja.html
 %%PORTDOCS%%share/doc/w3m/menu.submenu
 share/doc/w3m/w3mhelp-lynx_en.html
 share/doc/w3m/w3mhelp-w3m_en.html
+share/doc/w3m/w3mhelp.html
 @dirrm libexec/w3m
 @dirrm share/doc/ja/w3m
 @dirrm share/doc/w3m
diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure
new file mode 100644
index 000000000000..757830b40bd3
--- /dev/null
+++ b/www/w3m/scripts/pre-configure
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+echo "# Configuration at ${HOSTNAME}" > ${WRKSRC}/config.param
+echo prefix=${PREFIX} >> ${WRKSRC}/config.param
+echo def_bindir=${PREFIX}/bin >> ${WRKSRC}/config.param
+echo def_libdir=${PREFIX}/libexec/w3m >> ${WRKSRC}/config.param
+echo def_helpdir=${PREFIX}/share/doc/w3m >> ${WRKSRC}/config.param
+echo def_helpdir_ja=${PREFIX}/share/doc/ja/w3m >> ${WRKSRC}/config.param
+echo ftppass_hostnamegen=y >> ${WRKSRC}/config.param
+echo show_params=y >> ${WRKSRC}/config.param
+echo use_nntp=y >> ${WRKSRC}/config.param
+echo ansi_color=y >> ${WRKSRC}/config.param
+echo dmodel=5 >> ${WRKSRC}/config.param
+echo use_ssl_verify=y >> ${WRKSRC}/config.param
+echo ded=/usr/bin/vi >> ${WRKSRC}/config.param
+echo dmail=/usr/bin/mail >> ${WRKSRC}/config.param
+echo dbrowser=${PREFIX}/bin/netscape >> ${WRKSRC}/config.param
+echo dcc=/usr/bin/cc >> ${WRKSRC}/config.param
+
+if [ "x${USE_OPENSSL}" = "xyes" ] ; then
+    echo dcflags="\"${SSL_CFLAGS} -I${LOCALBASE}/include\"" >> ${WRKSRC}/config.param
+    echo dldflags="\"${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib\"" >> ${WRKSRC}/config.param
+else
+    echo dcflags=-I${LOCALBASE}/include >> ${WRKSRC}/config.param
+    echo dldflags=-L${LOCALBASE}/lib >> ${WRKSRC}/config.param
+fi
+
+if [ "x${JAPANESE}" = "xYes" ] ; then
+    echo pref_lang=1 >> ${WRKSRC}/config.param
+else
+    echo pref_lang=2 >> ${WRKSRC}/config.param
+fi
+
+if [ "x${INLINE_IMAGE}" = "xyes" ] ; then
+    echo use_image=y >> ${WRKSRC}/config.param
+fi
+
+if [ "x${M17N}" = "xyes" ] ; then
+    echo suffix=  >> ${WRKSRC}/config.param
+    echo charset=UTF-8 >> ${WRKSRC}/config.param
+else
+    echo def_dcode=E >> ${WRKSRC}/config.param
+fi