libiconv: Update to 1.15

macports · Feb 4, 2017 · 434330c · 434330c
1 parent cbc5c4c
commit 434330c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
@@ -4,7 +4,7 @@ PortSystem              1.0
 PortGroup               muniversal 1.0
 
 name                    libiconv
-version                 1.14
+version                 1.15
 set cp932fix_version    1.13
 set cp932fix_patchfile  ${name}-${cp932fix_version}-cp932-devel.patch.gz
 categories              textproc
@@ -25,11 +25,11 @@ long_description \
     conversion.
 
 checksums               ${distname}${extract.suffix} \
-                        sha1    be7d67e50d72ff067b2c0291311bc283add36965 \
-                        rmd160  87c36ba3f8ad1a49eb0d06f71856c856893bb52e \
+                        rmd160  35fc57cc9366bf09d9bbf6763d80d4a59ea14c2d \
+                        sha256  ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 \
                         ${cp932fix_patchfile} \
-                        sha1    8384da4114d62018b6bed2d8973237a423c1cbf1 \
-                        rmd160  62852bd1cd22f0be0280c4f64bd6d256b4b00917
+                        rmd160  62852bd1cd22f0be0280c4f64bd6d256b4b00917 \
+                        sha256  7ac7133de0549316a98504ec1b50c751de69f8df91f99a92465a9eeb187f0147
 
 depends_build           port:gperf
 
@@ -71,8 +71,6 @@ post-destroot {
     }
 }
 
-variant enable_cp932fix requires cp932fix description {Legacy compatibility variant} {}
-
 variant cp932fix description {Apply a patch to fix the conversion problem between Shift-JIS and Unicode (See Microsoft KB Q170559)} {
     patchfiles-append ${cp932fix_patchfile}
 }

diff --git a/textproc/libiconv/files/patch-Makefile.devel b/textproc/libiconv/files/patch-Makefile.devel
@@ -1,8 +1,8 @@
---- a/Makefile.devel.orig	2009-06-21 06:17:33.000000000 -0500
-+++ b/Makefile.devel	2010-01-20 19:17:55.000000000 -0600
-@@ -105,7 +105,7 @@
+--- a/Makefile.devel	2017-01-01 17:00:24.000000000 -0600
++++ b/Makefile.devel	2017-02-03 19:30:03.000000000 -0600
+@@ -120,7 +120,7 @@
  	$(CC) $(CFLAGS) lib/genaliases.c -o genaliases
- 	./genaliases > lib/aliases.gperf 3> canonical.sh 4> canonical_local.sh
+ 	./genaliases lib/aliases.gperf canonical.sh canonical_local.sh
  	$(RM) genaliases
 -	$(GPERF) -m 10 lib/aliases.gperf > tmp.h
 +	$(GPERF) lib/aliases.gperf > tmp.h

diff --git a/textproc/libiconv/files/patch-c99.diff b/textproc/libiconv/files/patch-c99.diff
@@ -1,5 +1,5 @@
---- a/lib/iconv.c.orig	2011-01-29 11:28:09.000000000 -0600
-+++ b/lib/iconv.c	2011-08-14 00:54:08.000000000 -0500
+--- a/lib/iconv.c	2016-11-19 10:09:28.000000000 -0600
++++ b/lib/iconv.c	2017-02-03 16:21:47.000000000 -0600
 @@ -176,7 +176,9 @@
  #include "aliases2.h"
  #undef S
@@ -9,5 +9,5 @@
 +static inline
 +#elif defined(__GNUC__)
  __inline
- #endif
- const struct alias *
+ #else
+ #ifdef __cplusplus
diff --git a/textproc/libiconv/files/patch-utf8mac.diff b/textproc/libiconv/files/patch-utf8mac.diff
@@ -1,16 +1,16 @@
---- a/lib/converters.h	2009-06-21 06:17:33.000000000 -0500
-+++ b/lib/converters.h	2010-01-20 19:54:37.000000000 -0600
-@@ -119,6 +119,7 @@
+--- a/lib/converters.h	2016-10-13 19:31:28.000000000 -0500
++++ b/lib/converters.h	2017-02-03 19:27:47.000000000 -0600
+@@ -122,6 +122,7 @@
  /* General multi-byte encodings */
  #include "utf8.h"
  #include "ucs2.h"
 +#include "utf8mac.h"
  #include "ucs2be.h"
  #include "ucs2le.h"
  #include "ucs4.h"
---- a/lib/encodings.def	2009-06-12 01:19:03.000000000 +0200
-+++ b/lib/encodings.def	2009-06-12 01:20:39.000000000 +0200
-@@ -69,6 +69,12 @@
+--- a/lib/encodings.def	2014-01-02 16:23:02.000000000 -0600
++++ b/lib/encodings.def	2017-02-03 19:27:47.000000000 -0600
+@@ -68,6 +68,12 @@
              utf8)
  #endif