>Number:         25995
>Category:       pkg
>Synopsis:       update www/w3m to 0.5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 21 12:08:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kouichirou Hiratsuka
>Release:        NetBSD 2.0_BETA
>Organization:
>Environment:
System: NetBSD firefly.localdomain 2.0_BETA NetBSD 2.0_BETA (FIREFLY.MP) #28: Sat Jun 19 01:15:28 JST 2004 root@firefly.localdomain:/usr/src/sys/arch/i386/compile/FIREFLY.MP i386
Architecture: i386
Machine: i386
>Description:
	w3m-0.5.1 was released on April 24.  Many bugs are fixed since 0.5.

>How-To-Repeat:
	
>Fix:
	This is patch.
	     * regen patches/patch-ab
	     * remove patches/patch-ac (it's no longer needed)
	     * add USE_X11=YES for w3m-img
	     * add new variable W3M_IMG_IMAGELIBS for w3m-img

Index: mk/bsd.pkg.defaults.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/mk/bsd.pkg.defaults.mk,v
retrieving revision 1.252
diff -u -r1.252 bsd.pkg.defaults.mk
--- mk/bsd.pkg.defaults.mk	20 Jun 2004 20:57:17 -0000	1.252
+++ mk/bsd.pkg.defaults.mk	21 Jun 2004 09:34:17 -0000
@@ -2100,6 +2100,11 @@
 # Possible: not defined, see "configure --help"
 # Default: not defined
 
+W3M_IMG_IMAGELIBS?=		gdk-pixbuf
+# Whitespace separated list of image libraries for w3m-img package.
+# Possible: gdk-pixbuf imlib imlib2
+# Default: gdk-pixbuf
+
 W3M_USE_LYNX_KEY?=		NO
 # Enable lynx like keybinding for w3m.
 # Possible: YES, NO
Index: www/w3m/Makefile.common
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/www/w3m/Makefile.common,v
retrieving revision 1.29
diff -u -r1.29 Makefile.common
--- www/w3m/Makefile.common	14 May 2004 08:46:05 -0000	1.29
+++ www/w3m/Makefile.common	21 Jun 2004 09:37:00 -0000
@@ -2,7 +2,6 @@
 #
 
 DISTNAME=	w3m-${W3M_VERS}
-PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=w3m/}
 
@@ -15,7 +14,7 @@
 GNU_CONFIGURE=	# defined
 USE_GNU_TOOLS+=	make	# Needed for some combinations of options...
 
-W3M_VERS=	0.5
+W3M_VERS=	0.5.1
 
 # For w3mman, xface2xpm, cgi scripts.
 USE_PERL5=	run
@@ -64,7 +63,9 @@
 
 _W3M_USE_IMAGE?=	NO
 .if ${_W3M_USE_IMAGE} == YES
+USE_X11=		YES
 CONFIGURE_ARGS+=	--enable-image=x11
+CONFIGURE_ARGS+=	--enable-imagelib="${W3M_IMG_IMAGELIBS}"
 .else
 CONFIGURE_ARGS+=	--disable-image
 .endif
@@ -121,7 +122,9 @@
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .if ${_W3M_USE_IMAGE} == YES
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.  for imagelib in ${W3M_IMG_IMAGELIBS}
+.    include "../../graphics/${imagelib}/buildlink3.mk"
+.  endfor
 .endif
 .include "../../security/openssl/buildlink3.mk"
 
Index: www/w3m/distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/www/w3m/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- www/w3m/distinfo	21 Apr 2004 01:31:49 -0000	1.13
+++ www/w3m/distinfo	2 Jun 2004 23:03:28 -0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.13 2004/04/21 01:31:49 snj Exp $
 
-SHA1 (w3m-0.5.tar.gz) = d8d5439fe4777eabf3313f76ef5a71e8e8554fd5
-Size (w3m-0.5.tar.gz) = 1889076 bytes
-SHA1 (patch-ab) = c0c21616d1d3557453648107eca26eaa91af4741
-SHA1 (patch-ac) = 652e2f900b94702543d7e7cdec82787f87e0810f
+SHA1 (w3m-0.5.1.tar.gz) = 7da299648c236772bcde9b0e92e23346c8af0aca
+Size (w3m-0.5.1.tar.gz) = 1892121 bytes
+SHA1 (patch-ab) = 44c69f22659c2029a257bd8fd5c0f8d09a3d0581
Index: www/w3m/patches/patch-ab
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/www/w3m/patches/patch-ab,v
retrieving revision 1.9
diff -u -r1.9 patch-ab
--- www/w3m/patches/patch-ab	2 Mar 2002 00:08:16 -0000	1.9
+++ www/w3m/patches/patch-ab	2 Jun 2004 23:01:08 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2002/03/02 00:08:16 kei Exp $
+$NetBSD$
 
---- main.c.orig	Mon Jan 28 02:52:03 2002
-+++ main.c
-@@ -2221,7 +2221,17 @@
+--- main.c.orig	2004-04-05 01:47:20.000000000 +0900
++++ main.c	2004-06-03 07:58:10.000000000 +0900
+@@ -2454,7 +2454,17 @@
  	shell = "/bin/sh";
      system(shell);
  #else				/* SIGSTOP */

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