[pkgsrc/trunk]: pkgsrc/www/w3m Utilize brand new PKG_OPTIONS_GROUP to select ...

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93ec9e25fc77
branches:  trunk
changeset: 495162:93ec9e25fc77
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Fri Jun 03 14:26:30 2005 +0000

description:
Utilize brand new PKG_OPTIONS_GROUP to select imaging library
exclusively.

Pointed out by wiz.

diffstat:

 www/w3m/options.mk |  21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diffs (47 lines):

diff -r e6fd07e7d071 -r 93ec9e25fc77 www/w3m/options.mk
--- a/www/w3m/options.mk        Fri Jun 03 14:25:47 2005 +0000
+++ b/www/w3m/options.mk        Fri Jun 03 14:26:30 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/06/03 13:43:29 uebayasi Exp $
+# $NetBSD: options.mk,v 1.3 2005/06/03 14:26:30 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS= w3m-lynx-key w3m-m17n w3m-unicode
@@ -7,11 +7,11 @@
 PKG_OPTIONS_LEGACY_VARS+=      W3M_USE_M17N:w3m-m17n
 PKG_OPTIONS_LEGACY_VARS+=      W3M_USE_UNICODE:w3m-unicode
 
-_W3M_SUPPORTED_IMAGELIBS=      w3m-image-gdk-pixbuf w3m-image-imlib    \
+.if ${_W3M_USE_IMAGE} == "YES"
+PKG_OPTIONS_OPTIONAL_GROUPS=   imagelib
+PKG_OPTIONS_GROUP.imagelib=    w3m-image-gdk-pixbuf w3m-image-imlib    \
                                w3m-image-imlib2
-_W3M_IMAGELIB_DEFAULT=         w3m-image-gdk-pixbuf
-.if ${_W3M_USE_IMAGE} == "YES"
-PKG_SUPPORTED_OPTIONS+=                ${_W3M_SUPPORTED_IMAGELIBS}
+PKG_SUGGESTED_OPTIONS+=                w3m-image-gdk-pixbuf
 .endif
 
 # Memo about W3m configuration:
@@ -51,20 +51,11 @@
 .endif
 
 .if ${_W3M_USE_IMAGE} == "YES"
-.  undef _W3M_IMAGELIB
-.  for _imagelib in ${_W3M_SUPPORTED_IMAGELIBS}
+.  for _imagelib in ${PKG_OPTIONS_GROUP.imagelib}
 .    if !empty(PKG_OPTIONS:M${_imagelib})
-.      if !empty(_W3M_IMAGELIB)
-PKG_FAIL_REASON+=      "Can't enable multiple image libraries."
-.      endif
 _W3M_IMAGELIB=         ${_imagelib:C|^w3m-image-||}
 .    endif
 .  endfor
-
-.  if !defined(_W3M_IMAGELIB)
-_W3M_IMAGELIB=         ${_W3M_IMAGELIB_DEFAULT:C|^w3m-image-||}
-.  endif
-
 USE_X11=               YES
 CONFIGURE_ARGS+=       --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB}
 PLIST_SUBST+=          USE_IMAGE=''