From 0b31d075bc0e27d93cf260d6dda0f3fbe47654e6 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Mon, 18 Mar 2002 09:43:25 +0000
Subject: 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
---
 .../libiconv/files/patch-include::iconv.h.in       | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 converters/libiconv/files/patch-include::iconv.h.in

(limited to 'converters/libiconv/files/patch-include::iconv.h.in')

diff --git a/converters/libiconv/files/patch-include::iconv.h.in b/converters/libiconv/files/patch-include::iconv.h.in
new file mode 100644
index 000000000000..625de57a1494
--- /dev/null
+++ b/converters/libiconv/files/patch-include::iconv.h.in
@@ -0,0 +1,48 @@
+
+$FreeBSD$
+
+--- include/iconv.h.in.orig	Mon Jun 25 15:06:22 2001
++++ include/iconv.h.in	Sun Mar 17 15:41:14 2002
+@@ -21,6 +21,10 @@
+ #ifndef _LIBICONV_H
+ #define _LIBICONV_H
+ 
++#ifdef __FreeBSD__
++#define LIBICONV_PLUG
++#endif
++
+ #define _LIBICONV_VERSION 0x0107    /* version number: (major<<8) + minor */
+ extern int _libiconv_version;       /* Likewise */
+ 
+@@ -68,6 +72,8 @@
+    encoding `tocode'. */
+ #ifndef LIBICONV_PLUG
+ #define iconv_open libiconv_open
++#else
++#define libiconv_open iconv_open
+ #endif
+ extern iconv_t iconv_open (const char* tocode, const char* fromcode);
+ 
+@@ -78,17 +84,21 @@
+    Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */
+ #ifndef LIBICONV_PLUG
+ #define iconv libiconv
++#else
++#define libiconv iconv
+ #endif
+ extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
+ 
+ /* Frees resources allocated for conversion descriptor `cd'. */
+ #ifndef LIBICONV_PLUG
+ #define iconv_close libiconv_close
++#else
++#define libiconv_close iconv_close
+ #endif
+ extern int iconv_close (iconv_t cd);
+ 
+ 
+-#ifndef LIBICONV_PLUG
++#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
+ 
+ /* Nonstandard extensions. */
+ 
-- 
cgit v1.2.3