Update www/w3m to 0.2.5, www/w3m-img to 0.2.5+2.2, www/w3m-m17n to 0.2.5+20020202.

5 files changed, 27 insertions, 19 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index d2e99a5fd5bd..bcbe36435564 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -16,10 +16,12 @@ MAINTAINER?=	nobutaka@FreeBSD.org
 
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
-W3M_VERSION=	0.2.4
-IMG_VERSION=	1.18
-M17N_VERSION=	20020108
-M17N_BASE_W3M_VERSION=	0.2.4
+W3M_VERSION=			0.2.5
+IMG_VERSION=			2.2
+IMG_BASE_W3M_VERSION=		0.2.4
+IMG_BASE_W3M_CVS_REVISION=	1.278
+M17N_VERSION=			20020202
+M17N_BASE_W3M_VERSION=		0.2.5
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-nonstop --prefix=${PREFIX} \
@@ -56,7 +58,6 @@ PORTVERSION:=	${M17N_BASE_W3M_VERSION}+${M17N_VERSION}
 
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 DISTNAME=	${PORTNAME}-${M17N_BASE_W3M_VERSION}-m17n-${M17N_VERSION}
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-configure.m17n
 CONFIGURE_ARGS+=	--suffix=""
 
 PLIST_SUB+=	M17N_ONLY="" NO_M17N="@comment "
@@ -68,6 +69,8 @@ PLIST_SUB+=	M17N_ONLY="@comment " NO_M17N=""
 .endif
 
 .if defined(JAPANESE)
+RUN_DEPENDS=	migemo:${PORTSDIR}/japanese/migemo
+
 MANLANG+=	ja
 DOCS_JP=	${DOCS} README.SSL README.cookie \
 		README.keymap README.mailcap README.menu
@@ -90,7 +93,7 @@ MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 .if defined(INLINE_IMAGE)
 PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
 PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	${PORTNAME}-${W3M_VERSION}-img-${IMG_VERSION}.patch.gz
+PATCHFILES=	${PORTNAME}-${IMG_BASE_W3M_VERSION}+cvs-${IMG_BASE_W3M_CVS_REVISION}-img-${IMG_VERSION}.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 USE_IMLIB=	yes
@@ -112,6 +115,18 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
+post-extract:
+.if defined(INLINE_IMAGE)
+	${SED} -e "s,w3m/0.2.5,w3m/0.2.4+cvs," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp
+	${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in
+.endif
+
+post-patch:
+.if defined(INLINE_IMAGE)
+	${SED} -e "s,w3m/0.2.4+cvs-img-2.2,w3m/0.2.5-img-2.2," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp
+	${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 .if defined(JAPANESE)
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 9c9e82de5fd9..95f5f3d7f23e 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,3 +1,3 @@
-MD5 (w3m-0.2.4.tar.gz) = 36407b35c7520092d00dd996c08d9645
-MD5 (w3m-0.2.4-img-1.18.patch.gz) = 06651becf01b9c9fc43b203c58b14310
-MD5 (w3m-0.2.4-m17n-20020108.tar.gz) = 1e84bd8397c0aafaec2092e9db8002a4
+MD5 (w3m-0.2.5.tar.gz) = 9a1b4846d9672ae87d561a2eda94f46c
+MD5 (w3m-0.2.4+cvs-1.278-img-2.2.patch.gz) = 0c08dd25b2d0fc86b86e136c7be57930
+MD5 (w3m-0.2.5-m17n-20020202.tar.gz) = 285f75c30ecec364b3bedd512f39b241
diff --git a/www/w3m/files/extra-patch-configure.m17n b/www/w3m/files/extra-patch-configure.m17n
deleted file mode 100644
index 40d174da1646..000000000000
--- a/www/w3m/files/extra-patch-configure.m17n
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun Jan  6 16:26:25 2002
-+++ configure	Sun Jan  6 16:27:18 2002
-@@ -486,7 +486,6 @@
- 
- echo "Which suffix do you want to add to the program name?"
- Echo "(default: $suffix) "
--readanswer suffix "$suffix"
- echo "suffix='$suffix'" >> config.param
- 
- d_bindir=$bindir
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index a5413d3604a1..62c910dbee03 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -5,6 +5,7 @@ libexec/w3m/inflate
 libexec/w3m/multipart.cgi
 libexec/w3m/w3mbookmark
 libexec/w3m/w3mhelp.cgi
+libexec/w3m/w3mmail.cgi
 libexec/w3m/w3mman2html.cgi
 libexec/w3m/w3mhelperpanel
 %%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure
index 314cc830dfdb..2904c7fa7a80 100644
--- a/www/w3m/scripts/pre-configure
+++ b/www/w3m/scripts/pre-configure
@@ -23,8 +23,10 @@ fi
 
 if [ "x${JAPANESE}" = "xYes" ] ; then
     echo lang=JA >> ${WRKSRC}/config.param
+    echo use_migemo=y >> ${WRKSRC}/config.param
 else
     echo lang=EN >> ${WRKSRC}/config.param
+    echo use_migemo=n >> ${WRKSRC}/config.param
 fi
 
 if [ "x${INLINE_IMAGE}" = "xyes" ] ; then