Subject: pkg/16495: w3m w/o image support
To: None <gnats-bugs@gnats.netbsd.org>
From: None <yamt@mwd.biglobe.ne.jp>
List: netbsd-bugs
Date: 04/25/2002 21:31:21
>Number:         16495
>Category:       pkg
>Synopsis:       w3m w/o image support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 25 05:32:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.5ZC
>Organization:
>Environment:
	
	
System: NetBSD bear.yamanet 1.5ZC NetBSD 1.5ZC (build) #13: Wed Apr 3 03:54:19 JST 2002 takashi@bear.yamanet:/usr/home/takashi/work/kernel/build i386
Architecture: i386
Machine: i386
>Description:
	IMO, it should be able to exclude image support for pkgsrc/www/w3m.
>How-To-Repeat:
>Fix:
	apply following patch.

PLIST.image:
------------------
@comment $NetBSD$
lib/w3m/w3mimgdisplay
lib/w3m/w3mimgsize
@dirrm lib/w3m
------------------

Index: Makefile
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/www/w3m/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	2002/04/24 13:48:48	1.35
+++ Makefile	2002/04/25 11:52:38
@@ -61,6 +61,8 @@
 W3M_USE_MOUSE?=			YES
 # set this to YES if you want color support.
 W3M_USE_COLOR?=			YES
+# set this to YES if you want image support.
+W3M_USE_IMAGE?=			YES
 
 CONFIGURE_ENV+=	use_m17n=y
 .if ${W3M_USE_UNICODE} == YES
@@ -107,7 +109,14 @@
 CONFIGURE_ENV+=	lynx_key=n
 HELP_W3M=			-w3m
 .endif
-CONFIGURE_ENV+= use_menu=y use_matrix=n use_image=y use_ansi_color=y
+.if ${W3M_USE_IMAGE} == YES
+CONFIGURE_ENV+=	use_image=y
+PLIST_SRC+=	${PKGDIR}/PLIST.image
+PLIST_SRC+=	${PKGDIR}/PLIST
+.else
+CONFIGURE_ENV+=	use_image=n
+.endif
+CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y
 CONFIGURE_ENV+= use_help_cgi=n use_migemo=n
 CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
 CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap"
@@ -160,15 +169,19 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR}
+.if ${W3M_USE_IMAGE} == YES
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR}
+.endif
 
 post-install:
 	(cd ${LOCALBASE}/${HELPDIR}; \
 	    ${RM} -f w3mhelp.html; \
 	    ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html)
 
+.if ${W3M_USE_IMAGE} == YES
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
+.endif
 .include "../../devel/boehm-gc/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/www/w3m/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2002/04/21 23:34:32	1.3
+++ PLIST	2002/04/25 11:42:10
@@ -51,6 +51,4 @@
 lib/w3m/inflate
 lib/w3m/w3mbookmark
 lib/w3m/w3mhelperpanel
-lib/w3m/w3mimgdisplay
-lib/w3m/w3mimgsize
 @dirrm lib/w3m
>Release-Note:
>Audit-Trail:
>Unformatted:
 	YAMAMOTO Takashi