Let users select an imaging library for w3m-img among from gdk-pixbuf,

imlib, and imlib2.

No default change expected, no revision bump.

2 files changed, 33 insertions, 16 deletions

diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 1c348bd3ab4..dfce2cf0d55 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2005/06/02 18:24:18 wiz Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/06/03 13:43:29 uebayasi Exp $
 #
 
 DISTNAME=	w3m-${W3M_VERS}
@@ -23,11 +23,6 @@ DOCDIR=		share/doc/w3m
 .include "options.mk"
 
 _W3M_USE_IMAGE?=	NO
-.if ${_W3M_USE_IMAGE} == YES
-CONFIGURE_ARGS+=	--enable-image=x11
-.else
-CONFIGURE_ARGS+=	--disable-image
-.endif
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -57,12 +52,6 @@ CONFIGURE_ARGS+=	--with-mailer=${MAIL_CMD}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-.if ${_W3M_USE_IMAGE} == YES
-PLIST_SUBST+=		USE_IMAGE=''
-.else
-PLIST_SUBST+=		USE_IMAGE='@comment '
-.endif
-
 SUBST_CLASSES+=		man-ja
 SUBST_MESSAGE.man-ja=	"Fixing the path to Japanese manual pages."
 SUBST_STAGE.man-ja=	post-patch
@@ -87,9 +76,6 @@ post-install:
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.if ${_W3M_USE_IMAGE} == YES
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index acd97f14000..d659c6d5655 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/06/02 18:24:18 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/06/03 13:43:29 uebayasi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS=	w3m-lynx-key w3m-m17n w3m-unicode
@@ -7,6 +7,13 @@ 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}
+.endif
+
 # Memo about W3m configuration:
 #
 #	* pkgsrc should export only user configurable build options that can't
@@ -42,3 +49,27 @@ CONFIGURE_ARGS+=	--enable-keymap=lynx
 .else
 CONFIGURE_ARGS+=	--enable-keymap=w3m
 .endif
+
+.if ${_W3M_USE_IMAGE} == "YES"
+.  undef _W3M_IMAGELIB
+.  for _imagelib in ${_W3M_SUPPORTED_IMAGELIBS}
+.    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=''
+.  include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-image
+PLIST_SUBST+=		USE_IMAGE='@comment '
+.endif