Hide _LIBICONV_VERSION when LIBICONV_PLUG is defined.

This fixes building devel/gettext-runtime with gcc from lang/gcc*.
With base system compiler gettext includes /usr/include/iconv.h but
lang/gcc* implies -I/usr/local/include and gettext calls
libiconv_set_relocation_prefix when it sees _LIBICONV_VERSION which
isn't implemented (and isn't needed) by libc iconv.

Reported by:	Dewayne Geraghty <dewayne.geraghty@heuristicsystems.com.au>

2 files changed, 17 insertions, 6 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index be7d261b5a24..78ca639386f7 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 
diff --git a/converters/libiconv/files/patch-include-iconv.h.in b/converters/libiconv/files/patch-include-iconv.h.in
index 5f5b86cd2dd3..a11ee8417ad1 100644
--- a/converters/libiconv/files/patch-include-iconv.h.in
+++ b/converters/libiconv/files/patch-include-iconv.h.in
@@ -1,6 +1,17 @@
 --- include/iconv.h.in.orig	2011-08-07 17:48:03 UTC
 +++ include/iconv.h.in
-@@ -94,7 +94,6 @@ extern int iconv_close (iconv_t cd);
+@@ -21,8 +21,10 @@
+ #ifndef _LIBICONV_H
+ #define _LIBICONV_H
+ 
++#ifndef LIBICONV_PLUG
+ #define _LIBICONV_VERSION 0x010E    /* version number: (major<<8) + minor */
+ extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
++#endif
+ 
+ /* We would like to #include any system header file which could define
+    iconv_t, 1. in order to eliminate the risk that the user gets compilation
+@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);
  #endif
  
  
@@ -8,7 +19,7 @@
  
  /* Nonstandard extensions. */
  
-@@ -127,12 +126,16 @@ typedef struct {
+@@ -127,12 +128,16 @@ typedef struct {
  /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
     encoding ‘tocode’ into preallocated memory. Returns an error indicator
     (0 or -1 with errno set). */
@@ -25,7 +36,7 @@
  extern int iconvctl (iconv_t cd, int request, void* argument);
  
  /* Hook performed after every successful conversion of a Unicode character. */
-@@ -212,7 +215,9 @@ struct iconv_fallbacks {
+@@ -212,7 +217,9 @@ struct iconv_fallbacks {
  #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
  
  /* Listing of locale independent encodings. */
@@ -35,7 +46,7 @@
  extern void iconvlist (int (*do_one) (unsigned int namescount,
                                        const char * const * names,
                                        void* data),
-@@ -224,6 +229,7 @@ extern const char * iconv_canonicalize (
+@@ -224,6 +231,7 @@ extern const char * iconv_canonicalize (
  
  /* Support for relocatable packages.  */
  
@@ -43,7 +54,7 @@
  /* Sets the original and the current installation prefix of the package.
     Relocation simply replaces a pathname starting with the original prefix
     by the corresponding pathname with the current prefix instead.  Both
-@@ -231,12 +237,12 @@ extern const char * iconv_canonicalize (
+@@ -231,12 +239,12 @@ extern const char * iconv_canonicalize (
     instead of "/").  */
  extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                              const char *curr_prefix);