From owner-freebsd-ports  Tue Oct 24 10:50:17 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9E38237B4E5
	for <freebsd-ports@FreeBSD.org>; Tue, 24 Oct 2000 10:50:02 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA98966;
	Tue, 24 Oct 2000 10:50:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from mail.nobutaka.com (h-hiroshimax165.tiki.ne.jp [210.236.8.165])
	by hub.freebsd.org (Postfix) with ESMTP id F388B37B479
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Oct 2000 10:49:08 -0700 (PDT)
Received: (from nobutaka@localhost)
	by mail.nobutaka.com (8.11.0/8.11.0) id e9OHmki50437;
	Wed, 25 Oct 2000 02:48:46 +0900 (JST)
	(envelope-from nobutaka)
Message-Id: <200010241748.e9OHmki50437@mail.nobutaka.com>
Date: Wed, 25 Oct 2000 02:48:46 +0900 (JST)
From: nobutaka@nobutaka.com
Reply-To: nobutaka@nobutaka.com
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/22275: Update port: www/w3m
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         22275
>Category:       ports
>Synopsis:       Update port: www/w3m
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 24 10:50:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     MANTANI Nobutaka
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Hiroshima University
>Environment:
>Description:

Change to apply w3m-0.1.11-pre-kokb17.patch. It is the collection
of patches posted in w3m-dev and w3m-dev-en mailing list.
It contains many bug fixes.

And add BUILD_DEPENDS on devel/patch. w3m-0.1.11-pre-kokb17.patch
requires this.

Remove files/patch-at.

>How-To-Repeat:
>Fix:

diff -urN w3m.old/Makefile w3m/Makefile
--- w3m.old/Makefile	Fri Sep 22 10:59:06 2000
+++ w3m/Makefile	Tue Oct 24 07:03:45 2000
@@ -6,23 +6,34 @@
 #
 
 PORTNAME=	w3m
-PORTVERSION=	0.1.11.p
+PORTVERSION=	${W3M_VERSION}.p
+PORTREVISION=	1
 CATEGORIES+=	www ipv6
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \
+		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/dev/ \
 		ftp://ftp.firedrake.org/w3m/dev/ \
+		ftp://ftp.umlauf.de/pub/w3m/dev/ \
 		http://www.instinct.org/w3m/dev/ \
 		http://grilli.net/mirrors/w3m/download/dev/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-pre/}
+DISTNAME=	${PORTNAME}-${W3M_VERSION}-pre
+PATCH_SITES=	http://www4.ocn.ne.jp/~okabek/
+PATCHFILES=	${PORTNAME}-${W3M_VERSION}-pre-kokb${W3M_PATCHLEVEL}.patch.gz
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	nobutaka@nobutaka.com
 
+W3M_VERSION=	0.1.11
+W3M_PATCHLEVEL= 17
+
+BUILD_DEPENDS=	patch:${PORTSDIR}/devel/patch
+PATCH=		${LOCALBASE}/bin/patch
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 
 MAN1=		w3m.1
 MANLANG=	""
 CFLAGS=		-pipe
 
-TARGET=		${WRKSRC}/config.h
+CONFIG_H=	${WRKSRC}/config.h
 DOCS=		FAQ.html HISTORY MANUAL.html README \
 		README.dict README.func STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
@@ -55,8 +66,8 @@
 .endif
 
 post-configure:
-	@${CP} ${TARGET} ${TARGET}.in
-	@${SED} ${SED_CMD} < ${TARGET}.in > ${TARGET}
+	@${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
diff -urN w3m.old/distinfo w3m/distinfo
--- w3m.old/distinfo	Sat Jul  8 16:52:15 2000
+++ w3m/distinfo	Tue Oct 24 17:36:44 2000
@@ -1 +1,2 @@
 MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5
+MD5 (w3m-0.1.11-pre-kokb17.patch.gz) = 10a6c4dec177aebb2cc8add08c7eb4f1
diff -urN w3m.old/files/patch-at w3m/files/patch-at
--- w3m.old/files/patch-at	Sat Jul  8 16:52:16 2000
+++ w3m/files/patch-at	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
---- file.c.orig	Fri Jul  7 19:08:32 2000
-+++ file.c	Fri Jul  7 19:08:44 2000
-@@ -5239,7 +5239,9 @@
- 	    Strcat(tmp, lineBuf2);
- 	    lineBuf2 = tmp;
- 	}
-+#ifdef JP_CHARSET
- 	lineBuf2 = convertLine(&uf, lineBuf2, &code);
-+#endif
- 	lineBuf2 = checkType(lineBuf2->ptr, propBuffer, LINELEN);
- 	len = lineBuf2->length;
- 	l = New(Line);

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message