summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2004-04-20 14:21:19 +0000
committeruebayasi <uebayasi@pkgsrc.org>2004-04-20 14:21:19 +0000
commit07f145666164f7340adaa39294f9dfc9440e6dae (patch)
tree3d20c2065eb7e3f317409e067312e4271d32d706
parent540c1939dd0b07813407b3b3a291f3d7dd387406 (diff)
downloadpkgsrc-07f145666164f7340adaa39294f9dfc9440e6dae.tar.gz
Fix "M17N without Unicode".
-rw-r--r--mk/bsd.pkg.defaults.mk11
-rw-r--r--www/w3m/Makefile.common15
-rw-r--r--www/w3m/patches/patch-ac14
3 files changed, 26 insertions, 14 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index dbe821fa5f1..be01c6a4115 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.230 2004/04/19 00:23:34 recht Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.231 2004/04/20 14:21:19 uebayasi Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -2075,11 +2075,10 @@ W3M_USE_M17N?= YES
# Possible: YES, NO
# Default: YES
-# XXX Currently broken; should be fixed later.
-#W3M_USE_UNICODE?= YES
-## Used in w3m to use Unicode characters.
-## Possible: YES, NO
-## Default: YES
+W3M_USE_UNICODE?= NO
+# Used in w3m to use Unicode characters.
+# Possible: YES, NO
+# Default: YES
WGET_USE_SSL?= YES
# Enable SSL in wget (for https connections)
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 5d95555f4a2..ce04664b626 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2004/04/18 12:08:42 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.25 2004/04/20 14:21:19 uebayasi Exp $
#
DISTNAME= w3m-${W3M_VERS}
@@ -40,7 +40,7 @@ DOCDIR= share/doc/w3m
#
BUILD_DEFS+= W3M_USE_M17N
-#BUILD_DEFS+= W3M_USE_UNICODE
+BUILD_DEFS+= W3M_USE_UNICODE
BUILD_DEFS+= W3M_USE_LYNX_KEY
.if ${W3M_USE_M17N} == YES
@@ -49,12 +49,11 @@ CONFIGURE_ARGS+= --enable-m17n
CONFIGURE_ARGS+= --disable-m17n
.endif
-# XXX "M17N without Unicode" is broken now. Need to be fixed.
-#.if ${W3M_USE_UNICODE} == YES
-#CONFIGURE_ARGS+= --enable-unicode
-#.else
-#CONFIGURE_ARGS+= --disable-unicode
-#.endif
+.if ${W3M_USE_UNICODE} == YES
+CONFIGURE_ARGS+= --enable-unicode
+.else
+CONFIGURE_ARGS+= --disable-unicode
+.endif
.if ${W3M_USE_LYNX_KEY} == YES
CONFIGURE_ARGS+= --enable-keymap=lynx
diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac
new file mode 100644
index 00000000000..88acb0e3eea
--- /dev/null
+++ b/www/w3m/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.10 2004/04/20 14:21:19 uebayasi Exp $
+
+--- libwc/detect.c.orig Tue Sep 23 06:02:23 2003
++++ libwc/detect.c
+@@ -63,7 +63,9 @@ wc_create_detect_map(wc_ces ces, wc_bool
+ for (i = 0; i < 0x20; i++)
+ WC_DETECT_MAP[i] = 0;
+ WC_DETECT_MAP[WC_C_HZ_TILDA] = (ces == WC_CES_HZ_GB_2312) ? 1 : 0;
++#ifdef USE_UNICODE
+ WC_DETECT_MAP[WC_C_UTF7_PLUS] = (ces == WC_CES_UTF_7) ? 1 : 0;
++#endif
+ }
+ detect_ces = ces;
+ }