svn commit: r450634 - in head: Mk/Uses converters/libiconv converters/libiconv/files

[Tijl Coosemans]

Author: tijl
Date: Mon Sep 25 20:55:27 2017
New Revision: 450634
URL: https://svnweb.freebsd.org/changeset/ports/450634

Log:
  Define ICONV_GET_ILSEQ_INVALID and ICONV_SET_ILSEQ_INVALID when mimicking
  base system iconv.h.

Modified:
  head/Mk/Uses/iconv.mk
  head/converters/libiconv/Makefile
  head/converters/libiconv/files/patch-include-iconv.h.in

Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk	Mon Sep 25 20:52:05 2017	(r450633)
+++ head/Mk/Uses/iconv.mk	Mon Sep 25 20:55:27 2017	(r450634)
@@ -43,7 +43,7 @@ ICONV_LIB_PATH=		/usr/lib/libc.so
 
 .if exists(${LOCALBASE}/include/iconv.h)
 # Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to work.
-BUILD_DEPENDS+=	libiconv>=1.14_9:converters/libiconv
+BUILD_DEPENDS+=	libiconv>=1.14_11:converters/libiconv
 .endif
 
 # LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h.

Modified: head/converters/libiconv/Makefile
==============================================================================
--- head/converters/libiconv/Makefile	Mon Sep 25 20:52:05 2017	(r450633)
+++ head/converters/libiconv/Makefile	Mon Sep 25 20:55:27 2017	(r450634)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 

Modified: head/converters/libiconv/files/patch-include-iconv.h.in
==============================================================================
--- head/converters/libiconv/files/patch-include-iconv.h.in	Mon Sep 25 20:52:05 2017	(r450633)
+++ head/converters/libiconv/files/patch-include-iconv.h.in	Mon Sep 25 20:55:27 2017	(r450634)
@@ -36,8 +36,14 @@
  extern int iconvctl (iconv_t cd, int request, void* argument);
  
  /* Hook performed after every successful conversion of a Unicode character. */
-@@ -212,7 +217,9 @@ struct iconv_fallbacks {
+@@ -210,9 +215,15 @@ struct iconv_fallbacks {
+ #define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
+ #define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
  #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
++#ifdef LIBICONV_PLUG
++#define ICONV_GET_ILSEQ_INVALID 128
++#define ICONV_SET_ILSEQ_INVALID 129
++#endif
  
  /* Listing of locale independent encodings. */
 +#ifndef LIBICONV_PLUG
@@ -46,7 +52,7 @@
  extern void iconvlist (int (*do_one) (unsigned int namescount,
                                        const char * const * names,
                                        void* data),
-@@ -224,6 +231,7 @@ extern const char * iconv_canonicalize (
+@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n
  
  /* Support for relocatable packages.  */
  
@@ -54,7 +60,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 +239,12 @@ extern const char * iconv_canonicalize (
+@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n
     instead of "/").  */
  extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                              const char *curr_prefix);