Update to 0.2.5. Major new features in this release are:

* RFC2617: HTTP Digest authentication
* rc: default_url=0(empty) 1(current URL) 2(link URL)
* GOTO_RELATIVE (M-u)
* highlight for incremental search
* use w3mmail.cgi for mailto: URL
* support external URI loader
* support -dump_extra ftp://
* new regex implementation

www/w3m/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.37 2002/02/01 14:33:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.38 2002/02/02 03:19:01 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386 sparc m68k
 
 COMMENT=		"text-based web browser/pager"
-COMMENT-japanese=	"Japanese text-based web browser/pager"
 COMMENT-image=		"text-based web browser/pager with inline image support"
+COMMENT-japanese=	"Japanese text-based web browser/pager"
 COMMENT-japanese-image=	"Japanese text-based web browser/pager with image support"
 
-VERSION=	0.2.4
-IMG_VERSION=	2.2
+VERSION=	0.2.5
 
 DISTNAME=	w3m-${VERSION}
 CATEGORIES=	www
@@ -24,12 +23,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	w3m
-MASTER_SITES0=		http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+MASTER_SITES0=		http://sites.inka.de/mips/unix/distfiles/
 SUPDISTFILES=		${DISTFILES} ${IMG_PATCH}
-IMG_PATCH=		w3m-${VERSION}-img-${IMG_VERSION}.patch.gz:0
+IMG_PATCH=		w3m-${VERSION}-img-2.2.patch.gz:0
 PATCH_DIST_STRIP=	-p1
 
-FLAVORS=	japanese image
+FLAVORS=	image japanese
 FLAVOR?=
 
 CONFIGURE_STYLE= simple
@@ -48,7 +47,6 @@ DOCS=	FAQ.html HISTORY MANUAL.html \
 	keymap.default keymap.lynx menu.default menu.submenu
 
 .if ${FLAVOR:L:Mimage}
-PKGNAME=	w3m-${VERSION}.${IMG_VERSION}
 PATCHFILES=	${IMG_PATCH}
 LIB_DEPENDS=	Imlib.19::graphics/imlib
 CONFIGURE_ENV+=	use_image=y

www/w3m/distinfo

@@ -1,6 +1,6 @@
-MD5 (w3m-0.2.4-img-2.2.patch.gz) = 144740f817c5ac811bfdc95f5489d693
-MD5 (w3m-0.2.4.tar.gz) = 36407b35c7520092d00dd996c08d9645
-RMD160 (w3m-0.2.4-img-2.2.patch.gz) = df45824b6299729cc83e154662793237a31faacc
-RMD160 (w3m-0.2.4.tar.gz) = 75a7be99f7eb7fafd4029b0e07ed9028c6d2d7e7
-SHA1 (w3m-0.2.4-img-2.2.patch.gz) = 7d669bbc00a8a1cb8b217f88debcacb52784cba6
-SHA1 (w3m-0.2.4.tar.gz) = 4bc929f8515f0f33fb47b71c8f670e45afd16dfa
+MD5 (w3m-0.2.5-img-2.2.patch.gz) = 181e4da95f9fbe45b8177c28efa16aae
+MD5 (w3m-0.2.5.tar.gz) = 9a1b4846d9672ae87d561a2eda94f46c
+RMD160 (w3m-0.2.5-img-2.2.patch.gz) = 0d028d4a14fd3f5d4eacee49b2bb5766deb63884
+RMD160 (w3m-0.2.5.tar.gz) = 4a9b9371fdb551a951935ce794fd74451d02e986
+SHA1 (w3m-0.2.5-img-2.2.patch.gz) = 399b3103d9bb617403c6277181e47d58f6cdf6a3
+SHA1 (w3m-0.2.5.tar.gz) = 2fb557bac49776600ecc88982a6d75ccea2db4d4

www/w3m/patches/patch-configure

@@ -1,15 +1,15 @@
-$OpenBSD: patch-configure,v 1.5 2001/12/20 22:36:10 naddy Exp $
---- configure.orig	Thu Nov 15 01:32:13 2001
-+++ configure	Sat Nov 17 03:01:53 2001
-@@ -859,6 +859,7 @@ else
-   inflate=
- fi
+$OpenBSD: patch-configure,v 1.6 2002/02/02 03:19:01 naddy Exp $
+--- configure.orig	Tue Jan 29 20:08:49 2002
++++ configure	Sat Feb  2 03:40:55 2002
+@@ -980,6 +980,7 @@ Linux|linux|LINUX)
+  ;;
+ esac
  
 +if false; then # always use the included gclib for now
  gclib=''
  gcinclude=''
  gctarget=''
-@@ -878,6 +879,7 @@ do
+@@ -999,6 +1000,7 @@ do
      break
    fi
  done

www/w3m/patches/patch-file_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-file_c,v 1.1 2002/02/02 03:19:01 naddy Exp $
+--- file.c.orig	Sat Feb  2 03:41:14 2002
++++ file.c	Sat Feb  2 03:41:43 2002
+@@ -1238,7 +1238,7 @@ findAuthentication(struct http_auth *hau
+ 		SKIP_BLANKS(p);
+ 		p0 = p;
+ 		for (ha = &www_auth[0]; ha->scheme != NULL; ha++) {
+-		    if (strncmp(p, ha->scheme, strlen(ha->scheme)) == 0) {
++		    if (strncasecmp(p, ha->scheme, strlen(ha->scheme)) == 0) {
+ 			if (hauth->pri < ha->pri) {
+ 			    *hauth = *ha;
+ 			    p += strlen(ha->scheme);

www/w3m/pkg/DESCR

@@ -7,9 +7,9 @@ it has several features Lynx doesn't have:
 * w3m is small
 
 Available flavors:
-  japanese  - Provide Japanese menus and documentation, and properly
-              display Japanese characters in kterm.
   image     - Supports displaying inline images when run from an X11
               terminal emulator.
+  japanese  - Provide Japanese menus and documentation, and properly
+              display Japanese characters in kterm.
 
 WWW: ${HOMEPAGE}

www/w3m/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2002/01/20 22:17:51 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.12 2002/02/02 03:19:01 naddy Exp $
 %%japanese%%
 !%%japanese%%
 %%image%%
@@ -10,6 +10,7 @@ libexec/w3m/multipart.cgi
 libexec/w3m/w3mbookmark
 libexec/w3m/w3mhelp.cgi
 libexec/w3m/w3mhelperpanel
+libexec/w3m/w3mmail.cgi
 libexec/w3m/w3mman2html.cgi
 man/man1/w3m.1
 share/doc/w3m/FAQ.html