diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-18 09:43:25 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-18 09:43:25 +0000 |
| commit | 0b31d075bc0e27d93cf260d6dda0f3fbe47654e6 (patch) | |
| tree | cc417f6c1e09adfeacf163534c572adfc3e479f7 /converters/iconv/files/patch-ai | |
| parent | Update to patch level z. (diff) | |
Iconv cleanup, stage 1a: remove `g' prefix from binaries, headers, libraries and
manpages installed by libiconv (aka GNU iconv) and add similar `b'-prefixes
into components installed by iconv (aka BSD iconv). The reason why we do this
is because unfortunately BSD iconv become abadonware (author doesn't maintain
it anymore), while number of ports that need functional iconv library grows
very fast, thus creating significant overhead due to patches needed to make
ports working with prefixed GNU iconv. For compatibility reasons create
symlinks in GNU iconv, so that all ports that expect GNU iconv to have `g'
prefix should work unmodified until all those `g'-hacks are wiped out.
Prompted by: ache
Reviewed by (in principle): freebsd-ports, freebsd-gnome
Diffstat (limited to 'converters/iconv/files/patch-ai')
| -rw-r--r-- | converters/iconv/files/patch-ai | 54 |
1 files changed, 51 insertions, 3 deletions
diff --git a/converters/iconv/files/patch-ai b/converters/iconv/files/patch-ai index 14534137b3d2..07ee8b05b37e 100644 --- a/converters/iconv/files/patch-ai +++ b/converters/iconv/files/patch-ai @@ -1,6 +1,20 @@ ---- lib/Makefile.orig Mon Nov 27 23:33:49 2000 -+++ lib/Makefile Thu Dec 7 15:23:52 2000 -@@ -10,8 +10,8 @@ + +$FreeBSD$ + +--- lib/Makefile.orig Tue Nov 28 01:33:49 2000 ++++ lib/Makefile Sun Mar 17 13:12:04 2002 +@@ -1,27 +1,27 @@ +-LIB = iconv ++LIB = biconv + SHLIB_MAJOR = 2 + SHLIB_MINOR = 0 + + SRCS = aliases.c ccs.c ces.c ces_euc.c ces_iso2022.c ces_table.c \ +- converter.c iconv.c utils.c ++ converter.c iconv.c utils.c biconv.h + + BUILTIN_CCS != cd ${.CURDIR}/../ccs && make lib >/dev/null && ${AR} t libccs.a + BUILTIN_CES != cd ${.CURDIR}/../ces && make lib >/dev/null && ${AR} t libces.a BUILTIN_CES_STATIC != cd ${.CURDIR}/../ces && make libces_static.a \ >/dev/null && ${AR} t libces_static.a @@ -11,3 +25,37 @@ LIBDIR = ${PREFIX}/lib + INCDIR = ${PREFIX}/include +-INCS = iconv.h ++INCS = biconv.h + + CFLAGS += -DICONV_MODULE_PATH=\"${MODULEDIR}\" \ + -DICONV_TABLE_PATH=\"${TABLEDIR}\" + +-MAN3 = iconv.3 iconv_open.3 iconv_close.3 ++MAN3 = biconv.3 biconv_open.3 biconv_close.3 + + ALIASES = ${.CURDIR}/../ccs/charset.aliases \ + ${.CURDIR}/../ces/charset.aliases +@@ -32,13 +32,19 @@ + cat ${.ALLSRC} | ${.CURDIR}/../iconv_builtin ${BUILTIN_CCS} \ + ${BUILTIN_CES} PIC ${BUILTIN_CES_STATIC} > ${.TARGET} + +-iconv.3: iconv.3.in ++biconv.3: iconv.3.in + sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ + -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} + +-iconv_open.3: iconv_open.3.in ++biconv_open.3: iconv_open.3.in + sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ + -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} ++ ++biconv_close.3: iconv_close.3 ++ cp ${.ALLSRC} ${.TARGET} ++ ++biconv.h: iconv.h ++ cp ${.ALLSRC} ${.TARGET} + + CLEANFILES= ${.CURDIR}/../ccs/libccs.a ${.CURDIR}/../ces/libces*.a \ + aliases.h iconv.3 iconv_open.3 |