[pkgsrc/trunk]: pkgsrc/www/w3m Enable m17n and unicode unconditionally. The ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcb756f7991b
branches:  trunk
changeset: 397790:bcb756f7991b
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Aug 19 05:47:17 2009 +0000

description:
Enable m17n and unicode unconditionally.  The package size increase
caused by them is less than 1MB.

OK'ed by uebayasi@.

diffstat:

 www/w3m/Makefile        |   4 ++--
 www/w3m/Makefile.common |   4 +++-
 www/w3m/options.mk      |  33 ++-------------------------------
 3 files changed, 7 insertions(+), 34 deletions(-)

diffs (89 lines):

diff -r 8451809e7ce2 -r bcb756f7991b www/w3m/Makefile
--- a/www/w3m/Makefile  Wed Aug 19 05:14:06 2009 +0000
+++ b/www/w3m/Makefile  Wed Aug 19 05:47:17 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2008/03/05 18:01:50 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2009/08/19 05:47:17 minskim Exp $
 #
 
 PKGNAME=       w3m-${W3M_VERS}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=    w3m-img-[0-9]*
diff -r 8451809e7ce2 -r bcb756f7991b www/w3m/Makefile.common
--- a/www/w3m/Makefile.common   Wed Aug 19 05:14:06 2009 +0000
+++ b/www/w3m/Makefile.common   Wed Aug 19 05:47:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.53 2009/06/03 10:56:01 wiz Exp $
+# $NetBSD: Makefile.common,v 1.54 2009/08/19 05:47:17 minskim Exp $
 #
 
 DISTNAME=      w3m-${W3M_VERS}
@@ -39,7 +39,9 @@
 CONFIGURE_ARGS+=       --disable-help_cgi
 CONFIGURE_ARGS+=       --enable-color
 CONFIGURE_ARGS+=       --enable-cookie
+CONFIGURE_ARGS+=       --enable-m17n
 CONFIGURE_ARGS+=       --enable-mouse
+CONFIGURE_ARGS+=       --enable-unicode
 CONFIGURE_ARGS+=       --with-browser=
 CONFIGURE_ARGS+=       --with-termlib
 CONFIGURE_ARGS+=       --with-editor=vi
diff -r 8451809e7ce2 -r bcb756f7991b www/w3m/options.mk
--- a/www/w3m/options.mk        Wed Aug 19 05:14:06 2009 +0000
+++ b/www/w3m/options.mk        Wed Aug 19 05:47:17 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2008/12/13 08:52:13 obache Exp $
+# $NetBSD: options.mk,v 1.10 2009/08/19 05:47:17 minskim Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.w3m
-PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key w3m-m17n w3m-unicode
-PKG_SUGGESTED_OPTIONS= w3m-m17n
+PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key
 
 .if ${_W3M_USE_IMAGE} == "YES"
 PKG_OPTIONS_REQUIRED_GROUPS+=  imagelib
@@ -13,22 +12,6 @@
 PKG_OPTIONS_GROUP.imagelib=    w3m-image-gdk-pixbuf w3m-image-imlib    \
                                w3m-image-imlib2 w3m-image-gtk2
 
-# Memo about W3m configuration:
-#
-#      * pkgsrc should export only user configurable build options that can't
-#        be configured at run-time.
-#
-#      * As of 0.5, W3m is moving from English/Japanese (localized model) to
-#        internationalized model.  The set of its options are not well refined
-#        nor tested yet.  These configuration should be revisited later.
-#
-#      * --enable-m17n enables multibyte encoding support, and
-#        --enable-unicode adds UTF-7/UTF-8 support.  W3m has a home-grown M17N
-#        library (libwc) instead of using libc's I18N functions, that means
-#        enabling M17N much increases the size of W3m binary.  Additionary W3m
-#        has a home-grown Unicode mapping table, which is huge too!
-#
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
@@ -37,18 +20,6 @@
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
-.if !empty(PKG_OPTIONS:Mw3m-m17n)
-CONFIGURE_ARGS+=       --enable-m17n
-.else
-CONFIGURE_ARGS+=       --disable-m17n
-.endif
-
-.if !empty(PKG_OPTIONS:Mw3m-unicode)
-CONFIGURE_ARGS+=       --enable-unicode
-.else
-CONFIGURE_ARGS+=       --disable-unicode
-.endif
-
 .if !empty(PKG_OPTIONS:Mw3m-lynx-key)
 CONFIGURE_ARGS+=       --enable-keymap=lynx
 .else