support 646 as an alias for ASCII in the converter.

ok brad via steven; discussed with jasper, naddy, steven
This commit is contained in:
sthen 2007-11-19 13:12:57 +00:00
parent 117ac1f407
commit 24854c8d58
3 changed files with 29 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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 */