Make w3m image support optional

[Masao Uebayashi <uebayasi@soum.co.jp>]

こんにちは。

www/w3m の use_image を optional にしつつ、W3M_USE_* を 
mk/bsd.pkg.defaults.mk に移すパッチを作ってみました。
（W3M_USE_* は BUILD_DEFS にも入れた方がいいのかな？）

? work
Index: Makefile
===================================================================
RCS file: /cvsroot/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/05/04 08:46:47
@@ -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?=			NO
 
 CONFIGURE_ENV+=	use_m17n=y
 .if ${W3M_USE_UNICODE} == YES
@@ -107,7 +109,12 @@
 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
+.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"
@@ -122,6 +129,12 @@
 CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include
 CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib
 
+.if ${W3M_USE_IMAGE} == YES
+PLIST_SUBST+=	USE_IMAGE=''
+.else
+PLIST_SUBST+=	USE_IMAGE='@comment '
+.endif
+
 post-extract:
 	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
@@ -160,8 +173,10 @@
 	${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}; \
Index: PLIST
===================================================================
RCS file: /cvsroot/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/05/04 08:46:47
@@ -51,6 +51,6 @@
 lib/w3m/inflate
 lib/w3m/w3mbookmark
 lib/w3m/w3mhelperpanel
-lib/w3m/w3mimgdisplay
-lib/w3m/w3mimgsize
+${USE_IMAGE}lib/w3m/w3mimgdisplay
+${USE_IMAGE}lib/w3m/w3mimgsize
 @dirrm lib/w3m


Index: bsd.pkg.defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.defaults.mk,v
retrieving revision 1.56
diff -u -r1.56 bsd.pkg.defaults.mk
--- bsd.pkg.defaults.mk	2002/05/04 01:22:03	1.56
+++ bsd.pkg.defaults.mk	2002/05/04 08:47:23
@@ -1313,6 +1313,52 @@
 # Possible: not defined, see "configure --help"
 # Default: not defined
 
+W3M_USE_COLOR?=                 YES
+# Used in w3m to use colors.
+# Possible: YES, NO
+# Default: YES
+
+W3M_USE_COOKIE?=                YES
+# Enable cookie support in w3m.
+# Possible: YES, NO
+# Default: YES
+
+W3M_USE_IMAGE?=			NO
+# Enable inline image display support in w3m.  (Useful, but still a bit
+# buggy yet?)
+# Possible: YES, NO
+# Default: NO
+
+W3M_USE_JAPANESE_MESSAGES?=     NO
+# Let w3m to use Japanese messages. (Japanese localization.)
+# Possible: YES, NO
+# Default: NO
+
+W3M_USE_LYNX_KEY?=              NO
+# Enable lynx like keybinding for w3m.
+# Possible: YES, NO
+# Default: NO
+
+W3M_USE_M17N=                   YES
+# For multilingual support for w3m.
+# Possible: YES, NO
+# Default: YES
+
+W3M_USE_MOUSE?=                 YES
+# Enable mouse support in w3m.
+# Possible: YES, NO
+# Default: YES
+
+W3M_USE_SSL?=                   YES
+# Enable HTTPS support in w3m.
+# Possible: YES, NO
+# Default: YES
+
+W3M_USE_UNICODE?=               YES
+# Used in w3m to use Unicode characters.
+# Possible: YES, NO
+# Default: YES
+
 WINDOWMAKER_OPTIONS?= gnome kde openlook
 # Options for building windowmaker package. Used to add support for
 # GNOME, KDE or OPEN LOOK(tm) and to avoid redundancies with KDE.