Simplify, now that nl_langinfo(CODESET) returns "US-ASCII" instead
of "646" as the charset of the C/POSIX locale: This removes the patches to libiconv's internal hash tables and adds US-ASCII to config.charset, for the benefit of whatever GNU code uses this-- libiconv itself has "US-ASCII" built in. The "INSTALL_DATA=cp" override has also been obsolete since we started running the fake install as non-root. ok Brad
This commit is contained in:
parent
e1bb720f18
commit
1f28cd8f1b
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2015/03/16 18:07:38 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2015/04/12 20:21:57 naddy Exp $
|
||||
|
||||
COMMENT= character set conversion library
|
||||
|
||||
DISTNAME= libiconv-1.14
|
||||
REVISION= 2
|
||||
REVISION= 3
|
||||
CATEGORIES= converters devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
|
||||
|
||||
@ -18,10 +18,6 @@ MAINTAINER= Brad Smith <brad@comstyle.com>
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
WANTLIB= c
|
||||
|
||||
BUILD_DEPENDS= devel/gperf
|
||||
|
||||
MAKE_FLAGS= INSTALL_DATA=cp
|
||||
|
||||
SEPARATE_BUILD= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux ${WRKSRC}/libcharset/build-aux
|
||||
@ -30,8 +26,4 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-extra-encodings \
|
||||
--enable-static
|
||||
|
||||
pre-configure:
|
||||
@cd ${WRKSRC}; \
|
||||
${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.devel lib/aliases.h
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_devel,v 1.2 2011/09/02 15:44:46 naddy Exp $
|
||||
|
||||
Don't blindly override these variables.
|
||||
|
||||
--- Makefile.devel.orig Thu Sep 1 18:06:12 2011
|
||||
+++ Makefile.devel Thu Sep 1 18:06:39 2011
|
||||
@@ -3,14 +3,14 @@
|
||||
# Don't use it unless you know exactly what you do!
|
||||
|
||||
SHELL = /bin/sh
|
||||
-MAKE = make
|
||||
+MAKE ?= make
|
||||
AUTOCONF = autoconf-2.68
|
||||
AUTOHEADER = autoheader-2.68
|
||||
AUTOMAKE = automake-1.11
|
||||
ACLOCAL = aclocal-1.11
|
||||
GPERF = gperf
|
||||
-CC = gcc
|
||||
-CFLAGS = -O
|
||||
+CC ?= gcc
|
||||
+CFLAGS ?= -O
|
||||
MAN2HTML = groff -mandoc -Thtml
|
||||
CP = cp
|
||||
RM = rm -f
|
@ -1,11 +0,0 @@
|
||||
$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
|
@ -1,11 +0,0 @@
|
||||
$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 */
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-libcharset_lib_config_charset,v 1.9 2015/04/12 20:21:57 naddy Exp $
|
||||
--- libcharset/lib/config.charset.orig Mon Apr 5 02:25:38 2010
|
||||
+++ libcharset/lib/config.charset Fri Apr 10 21:46:05 2015
|
||||
@@ -402,7 +402,7 @@ case "$os" in
|
||||
echo "SJIS SHIFT_JIS"
|
||||
;;
|
||||
openbsd*)
|
||||
- echo "646 ASCII"
|
||||
+ echo "US-ASCII ASCII"
|
||||
echo "ISO8859-1 ISO-8859-1"
|
||||
echo "ISO8859-2 ISO-8859-2"
|
||||
echo "ISO8859-4 ISO-8859-4"
|
Loading…
Reference in New Issue
Block a user