From b5c6eac37b3764cbc1fcf28d953114eb07bb47f1 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi>
Date: Tue, 20 Apr 2004 14:21:19 +0000
Subject: Fix "M17N without Unicode".

---
 www/w3m/Makefile.common  | 15 +++++++--------
 www/w3m/patches/patch-ac | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 www/w3m/patches/patch-ac

(limited to 'www/w3m')

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;
+     }
-- 
cgit v1.2.3