summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2005-06-03 14:26:30 +0000
committeruebayasi <uebayasi@pkgsrc.org>2005-06-03 14:26:30 +0000
commit84d78a9e7e96e0642d65e5419284907e43c35f9e (patch)
treef7af5a7aa82b525bb5e6167e97f99f89a4f9e3a4 /www
parent5fa9d959f641b46a886c5f1893ada51bcda870ad (diff)
downloadpkgsrc-84d78a9e7e96e0642d65e5419284907e43c35f9e.tar.gz
Utilize brand new PKG_OPTIONS_GROUP to select imaging library
exclusively. Pointed out by wiz.
Diffstat (limited to 'www')
-rw-r--r--www/w3m/options.mk21
1 files changed, 6 insertions, 15 deletions
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index d659c6d5655..0a1de678075 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -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_LYNX_KEY:w3m-lynx-key
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 \
- w3m-image-imlib2
-_W3M_IMAGELIB_DEFAULT= w3m-image-gdk-pixbuf
.if ${_W3M_USE_IMAGE} == "YES"
-PKG_SUPPORTED_OPTIONS+= ${_W3M_SUPPORTED_IMAGELIBS}
+PKG_OPTIONS_OPTIONAL_GROUPS= imagelib
+PKG_OPTIONS_GROUP.imagelib= w3m-image-gdk-pixbuf w3m-image-imlib \
+ w3m-image-imlib2
+PKG_SUGGESTED_OPTIONS+= w3m-image-gdk-pixbuf
.endif
# Memo about W3m configuration:
@@ -51,20 +51,11 @@ CONFIGURE_ARGS+= --enable-keymap=w3m
.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=''