Changeset 82457

Timestamp:

08/13/11 23:11:55 (4 years ago)

Author:

ryandesign@…

Message:

libiconv: update to 1.14, rename enable_cp932fix variant to cp932fix

Location:

trunk/dports/textproc/libiconv

Files:

• Portfile (modified) (4 diffs)
• files/patch-c99.diff (modified) (1 diff)

trunk/dports/textproc/libiconv/Portfile

@@ -6 +6 @@
 
 name                    libiconv
-version                 1.13.1
+version                 1.14
 set cp932fix_version    1.13
 set cp932fix_patchfile  ${name}-${cp932fix_version}-cp932-devel.patch.gz
@@ -26 +26 @@
     conversion.
 
-checksums \
-    ${distname}${extract.suffix} \
-        md5     7ab33ebd26687c744a37264a330bbe9a \
-        sha1    5b0524131cf0d7abd50734077f13aaa5508f6bbe \
-        rmd160  a3e4b4d419006447045fde50fef0fe39bed9d501 \
-    ${cp932fix_patchfile} \
-        md5     07610e708d664627b83f905832f671d4 \
-        sha1    8384da4114d62018b6bed2d8973237a423c1cbf1 \
-        rmd160  62852bd1cd22f0be0280c4f64bd6d256b4b00917
+checksums               ${distname}${extract.suffix} \
+                        sha1    be7d67e50d72ff067b2c0291311bc283add36965 \
+                        rmd160  87c36ba3f8ad1a49eb0d06f71856c856893bb52e \
+                        ${cp932fix_patchfile} \
+                        sha1    8384da4114d62018b6bed2d8973237a423c1cbf1 \
+                        rmd160  62852bd1cd22f0be0280c4f64bd6d256b4b00917
 
 depends_build \
@@ -74 +71 @@
 }
 
-variant enable_cp932fix description {Apply a patch to fix the conversion problem between Shift-JIS and Unicode (See Microsoft KB Q170559)} {
+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}
 }
@@ -99 +98 @@
     }
 
-    # See http://trac.macports.org/ticket/18440.
+    # See https://trac.macports.org/ticket/18440
     if { ${os.major}=="8" } {
             foreach arch "ppc64 x86_64" {

trunk/dports/textproc/libiconv/files/patch-c99.diff

@@ -1 @@
---- a/lib/iconv.c.orig  2011-07-03 10:09:20.000000000 -0700
-+++ b/lib/iconv.c       2011-07-03 10:11:24.000000000 -0700
-@@ -172,7 +172,9 @@ static const struct alias sysdep_aliases
+--- 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
+@@ -176,7 +176,9 @@
  #include "aliases2.h"
  #undef S