From 24854c8d5868ede66156975de420e887e70bb5db Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 19 Nov 2007 13:12:57 +0000
Subject: [PATCH] support 646 as an alias for ASCII in the converter.

ok brad via steven; discussed with jasper, naddy, steven
---
 converters/libiconv/Makefile                        |  9 +++++++--
 converters/libiconv/patches/patch-lib_aliases_gperf | 11 +++++++++++
 converters/libiconv/patches/patch-lib_encodings_def | 11 +++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 converters/libiconv/patches/patch-lib_aliases_gperf
 create mode 100644 converters/libiconv/patches/patch-lib_encodings_def

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 3ff4b89db5c..ac4a3b74e31 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.27 2007/08/25 13:51:08 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2007/11/19 13:12:57 sthen Exp $
 
 COMMENT=	character set conversion library
 
 DISTNAME=	libiconv-1.9.2
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
 SHARED_LIBS +=	charset              1.0      # .1.0
 SHARED_LIBS +=	iconv                4.0      # .4.0
+BUILD_DEPENDS=	::devel/gperf
 
 HOMEPAGE=	http://www.gnu.org/software/libiconv/
 
@@ -32,8 +33,12 @@ CONFIGURE_ARGS+= --enable-static \
 
 USE_LIBTOOL=Yes
 
+pre-configure:
+	@cd ${WRKSRC}; make -f Makefile.devel lib/aliases.h
+
 .include <bsd.port.mk>
 
 .if ${NO_SHARED_LIBS:L} == "no"
 CONFIGURE_ENV=	LIBTOOL_FLAGS="-fPIC -DPIC"
 .endif
+
diff --git a/converters/libiconv/patches/patch-lib_aliases_gperf b/converters/libiconv/patches/patch-lib_aliases_gperf
new file mode 100644
index 00000000000..7d01cf1c2c3
--- /dev/null
+++ b/converters/libiconv/patches/patch-lib_aliases_gperf
@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_aliases_gperf,v 1.1 2007/11/19 13:12:57 sthen Exp $
+--- lib/aliases.gperf.orig	Wed Oct 24 23:41:32 2007
++++ lib/aliases.gperf	Wed Oct 24 23:47:38 2007
+@@ -10,6 +10,7 @@ struct alias { int name; unsigned int encoding_index; 
+ %pic
+ %%
+ US-ASCII, ei_ascii
++646, ei_ascii
+ ASCII, ei_ascii
+ ISO646-US, ei_ascii
+ ISO_646.IRV:1991, ei_ascii
diff --git a/converters/libiconv/patches/patch-lib_encodings_def b/converters/libiconv/patches/patch-lib_encodings_def
new file mode 100644
index 00000000000..52d20afd58e
--- /dev/null
+++ b/converters/libiconv/patches/patch-lib_encodings_def
@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_encodings_def,v 1.1 2007/11/19 13:12:57 sthen Exp $
+--- lib/encodings.def.orig	Wed Oct 24 23:41:41 2007
++++ lib/encodings.def	Wed Oct 24 23:43:47 2007
+@@ -37,6 +37,7 @@
+ 
+ 
+ DEFENCODING(( "US-ASCII",               /* IANA */
++              "646",
+               "ASCII",                  /* IANA, JDK 1.1 */
+               "ISO646-US",              /* IANA */
+               "ISO_646.IRV:1991",       /* IANA */