From 328756c038a1c08415c8fc0cadb06957bfdd1934 Mon Sep 17 00:00:00 2001
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
Date: Tue, 27 Nov 2001 21:48:47 +0000
Subject: Update w3m to 0.2.2 and w3m-img to 0.2.2+1.14. Update WWW entry in
 pkg-descr.

Reviewed by:	knu
---
 www/w3m/Makefile  | 19 ++++++++-----------
 www/w3m/distinfo  |  4 ++--
 www/w3m/pkg-descr |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'www/w3m')

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 5c0ff1768187..6a1c9b29f549 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -8,21 +8,18 @@
 PORTNAME=	w3m
 PORTVERSION=	${W3M_VERSION}
 CATEGORIES+=	www ipv6
-MASTER_SITES=	http://mi.med.tohoku.ac.jp/~satodai/w3m/inusrc/200110/
-DISTNAME=	${PORTNAME}-${W3M_VERSION}-inu-${INU_VERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${W3M_VERSION}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
 
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
-W3M_VERSION=	0.2.1
-INU_VERSION=	1.5
-IMG_VERSION=	1.12
+W3M_VERSION=	0.2.2
+IMG_VERSION=	1.14
 M17N_VERSION=	0.19
-
-.if !defined(M17N)
-PORTREVISION?=	3
-.endif
+M17N_BASE_W3M_VERSION=	0.2.1
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-nonstop
@@ -49,7 +46,7 @@ USE_OPENSSL=	yes
 .endif
 
 .if defined(M17N)
-PORTVERSION:=	${PORTVERSION}+${M17N_VERSION}
+PORTVERSION:=	${M17N_BASE_W3M_VERSION}+${M17N_VERSION}
 
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 DISTNAME=	${PORTNAME}-m17n-${M17N_VERSION}
@@ -92,7 +89,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}-inu-${INU_VERSION}-img-${IMG_VERSION}.patch
+PATCHFILES=	${PORTNAME}-${W3M_VERSION}-img-${IMG_VERSION}.patch
 PATCH_DIST_STRIP=	-p1
 
 USE_IMLIB=	yes
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 9496a0ef9d12..baee74b35789 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,4 +1,4 @@
-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-0.2.2.tar.gz) = 5c7f93827471fa86080a742b4bbaf51d
+MD5 (w3m-0.2.2-img-1.14.patch) = 6acfce4b99497197d2665cfa74005ca2
 MD5 (w3m-m17n-0.19.tar.gz) = 96243978524a7b8fba6cbb413026eeff
 MD5 (w3m-m17n-0.19-security-fix.diff) = 3d7bb72b8d12e6fc8ba485121b458148
diff --git a/www/w3m/pkg-descr b/www/w3m/pkg-descr
index d87253cb4298..88d55dadd06d 100644
--- a/www/w3m/pkg-descr
+++ b/www/w3m/pkg-descr
@@ -6,7 +6,7 @@ doesn't have.
 * Rendering tables.
 * Rendering frames. (It converts frames into a table).
 
-WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/index.html
+WWW: http://w3m.sourceforge.net/
 
 --
 MANTANI Nobutaka <nobutaka@nobutaka.com>
-- 
cgit v1.2.3