Marc Espie [Wed, Nov 30, 2005 at 05:35:01PM +0100] wrote:
>> "646" as a designation is a bit weird. This should really be
>> "ISO-646" aka "ASCII". I guess I should take a look how glib arrives
>> at "646".
>
>You don't have to look. It's the default runelocale, in libc/locale.
>
>If you want it to be ASCII, just so be it.
>
>
>However, I'd rather not touch it. I think that just writing an alias that
>says 646 is ASCII in charset.alias will fix everything for now.
>
Like this? Works for me. Verified with gqview.
ok, comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 23 Apr 2005 14:40:42 -0000 1.21
+++ Makefile 30 Nov 2005 18:07:28 -0000
@@ -3,7 +3,7 @@
COMMENT= "character set conversion library"
DISTNAME= libiconv-1.9.2
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
Index: patches/patch-libcharset_lib_config_charset
===================================================================
RCS file:
/cvs/ports/converters/libiconv/patches/patch-libcharset_lib_config_charset,v
retrieving revision 1.5
diff -u -r1.5 patch-libcharset_lib_config_charset
--- patches/patch-libcharset_lib_config_charset 16 Apr 2005 21:10:22 -0000
1.5
+++ patches/patch-libcharset_lib_config_charset 30 Nov 2005 18:07:28 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libcharset_lib_config_charset,v 1.5 2005/04/16 21:10:22 espie
Exp $
--- libcharset/lib/config.charset.orig Wed Jan 21 19:53:20 2004
-+++ libcharset/lib/config.charset Sun Apr 10 17:20:33 2005
-@@ -345,7 +345,7 @@ case "$os" in
++++ libcharset/lib/config.charset Wed Nov 30 17:52:14 2005
+@@ -345,13 +345,14 @@ case "$os" in
#echo "sun_eu_greek ?" # what is this?
echo "UTF-8 UTF-8"
;;
@@ -10,3 +10,10 @@
# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
# localcharset.c falls back to using the full locale name
# from the environment variables.
+ # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+ # reuse FreeBSD's locale data for OS/2.
+ echo "C ASCII"
++ echo "646 ASCII"
+ echo "US-ASCII ASCII"
+ for l in la_LN lt_LN; do
+ echo "$l.ASCII ASCII"
