9 files changed, 16 insertions, 99 deletions

diff --git a/www/Makefile b/www/Makefile
index ea059fe5580d..1b574406b73a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2047,8 +2047,6 @@
     SUBDIR += vtiger-customerportal
     SUBDIR += w3m
     SUBDIR += w3m-img
-    SUBDIR += w3m-m17n
-    SUBDIR += w3m-m17n-img
     SUBDIR += w3mir
     SUBDIR += waccess
     SUBDIR += wadcomblog
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 6a263881b6fb..96a94a69a89c 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.471.b.${SNAPDATE}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nobutaka
@@ -90,8 +90,8 @@ SEMI_PORT?=	${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}
 MULE_UCS_PORT?=	${PORTSDIR}/converters/mule-ucs-${EMACS_PORT_NAME}
 MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
 
-BUILD_DEPENDS+=	w3m:${PORTSDIR}/www/w3m-m17n
-RUN_DEPENDS+=	w3m:${PORTSDIR}/www/w3m-m17n
+BUILD_DEPENDS+=	w3m:${PORTSDIR}/www/w3m
+RUN_DEPENDS+=	w3m:${PORTSDIR}/www/w3m
 .if ${PORT_OPTIONS:MSHIMBUN}
 BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
 RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index 86717bc80dcd..0ffff9074e0a 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   w3m-image
-# Date Created:                22 July 2001
-# Whom:                        MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-img
 
@@ -14,7 +10,8 @@ MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_INLINE_IMAGE=	yes
-CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-m17n-img-0.5.*
+OPTIONS_OVERRIDE=	DOCS INLINE_IMAGE
+NO_DIALOG=	yes
+CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.*0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-m17n-img/Makefile b/www/w3m-m17n-img/Makefile
deleted file mode 100644
index acd85a99b84f..000000000000
--- a/www/w3m-m17n-img/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:   w3m-m17n
-# Date Created:                11 January 2004
-# Whom:                        MANTANI Nobutaka <nobutaka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-m17n-img
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	A pager/text-based WWW browser with m17n and inline image support
-
-MASTERDIR=	${.CURDIR}/../../www/w3m
-PKGDIR=		${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-
-WITH_M17N=		yes
-WITH_INLINE_IMAGE=	yes
-CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.*
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-m17n-img/pkg-descr b/www/w3m-m17n-img/pkg-descr
deleted file mode 100644
index 1b4f9654172c..000000000000
--- a/www/w3m-m17n-img/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-w3m is a pager/text-based WWW browser.
-
-It is a similar application to Lynx, but it has several features Lynx
-doesn't have.
-
-* Rendering tables.
-* Rendering frames. (It converts frames into a table).
-
-This package also supports multilingualization and inline image.
-
-WWW: http://w3m.sourceforge.net/
diff --git a/www/w3m-m17n/Makefile b/www/w3m-m17n/Makefile
deleted file mode 100644
index eb3150c7f4e1..000000000000
--- a/www/w3m-m17n/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:   w3m-m17n
-# Date Created:                08 October 2001
-# Whom:                        MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-m17n
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	A pager/text-based WWW browser with multilingualization support
-
-MASTERDIR=	${.CURDIR}/../w3m
-PKGDIR=		${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-
-WITH_M17N=	yes
-CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-m17n/pkg-descr b/www/w3m-m17n/pkg-descr
deleted file mode 100644
index 91a4dbbe4bb5..000000000000
--- a/www/w3m-m17n/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-w3m is a pager/text-based WWW browser.
-
-It is a similar application to Lynx, but it has several features Lynx
-doesn't have.
-
-* Rendering tables.
-* Rendering frames. (It converts frames into a table).
-
-This package also supports multilingualization.
-
-WWW: http://w3m.sourceforge.net/
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index fd84afa9c97f..f454ae447373 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	w3m
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	www ipv6
 MASTER_SITES=	SF/w3m/w3m/w3m-${PORTVERSION}
 
@@ -11,11 +11,11 @@ MAINTAINER?=	nobutaka@FreeBSD.org
 COMMENT?=	A pager/text-based WWW browser
 
 USE_OPENSSL=	yes
-LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc:${PORTSDIR}/devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
+CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gc=${LOCALBASE}
 
@@ -23,36 +23,23 @@ MAN1=		w3m.1 w3mman.1
 MANLANG=	"" ja
 
 DOCS=		FAQ.html HISTORY MANUAL.html README \
-		README.dict README.func STORY.html keymap.default \
+		README.dict README.func README.m17n STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
 
-.if !defined(MASTERDIR)
-OPTIONS_DEFINE=	M17N JAPANESE INLINE_IMAGE KEY_LYNX DOCS
-M17N_DESC=		Multilingualization support
+OPTIONS_DEFINE=	JAPANESE INLINE_IMAGE KEY_LYNX DOCS
 JAPANESE_DESC=		Japanese messages and migemo support
 INLINE_IMAGE_DESC=	Inline image support
 KEY_LYNX_DESC=		Keymap like lynx browser
-.endif
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MM17N}
-CONFIGURE_ARGS+=	--enable-m17n
-PLIST_SUB+=	M17N=""
-.else
-.if ! ${PORT_OPTIONS:MJAPANESE}
-CONFIGURE_ARGS+=	--disable-m17n
-PLIST_SUB+=	M17N="@comment "
-.endif
-.endif
-
 .if ${PORT_OPTIONS:MJAPANESE}
 USES+=		gettext
-CONFIGURE_ARGS+=	--enable-m17n --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
+CONFIGURE_ARGS+=	--enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
 DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
 		README.menu README.migemo
 
-PLIST_SUB+=	JAPANESE="" M17N=""
+PLIST_SUB+=	JAPANESE=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	JAPANESE="@comment "
@@ -103,9 +90,6 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
-.if ${PORT_OPTIONS:MM17N} || ${PORT_OPTIONS:MJAPANESE}
-	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
-.endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
 .if ${PORT_OPTIONS:MINLINE_IMAGE}
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 58b5d3864490..1b7d9647ed95 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -20,6 +20,7 @@ libexec/w3m/xface2xpm
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.func
 %%PORTDOCS%%%%JAPANESE%%%%INLINE_IMAGE%%share/doc/ja/w3m/README.img
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.keymap
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.m17n
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.mailcap
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.menu
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.migemo
@@ -35,7 +36,7 @@ libexec/w3m/xface2xpm
 %%PORTDOCS%%%%DOCSDIR%%/README.dict
 %%PORTDOCS%%%%DOCSDIR%%/README.func
 %%PORTDOCS%%%%INLINE_IMAGE%%%%DOCSDIR%%/README.img
-%%PORTDOCS%%%%M17N%%%%DOCSDIR%%/README.m17n
+%%PORTDOCS%%%%DOCSDIR%%/README.m17n
 %%PORTDOCS%%%%DOCSDIR%%/STORY.html
 %%PORTDOCS%%%%DOCSDIR%%/keymap.default
 %%PORTDOCS%%%%DOCSDIR%%/keymap.lynx