<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[31116] trunk/dports/textproc/libiconv</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/31116">31116</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2007-11-16 02:33:28 -0800 (Fri, 16 Nov 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>libiconv: update to 1.12; closes #13310</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproclibiconvPortfile">trunk/dports/textproc/libiconv/Portfile</a></li>
<li><a href="#trunkdportstextproclibiconvfilesutf8macdiff">trunk/dports/textproc/libiconv/files/utf8mac.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproclibiconvPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/libiconv/Portfile (31115 => 31116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/libiconv/Portfile        2007-11-16 10:15:02 UTC (rev 31115)
+++ trunk/dports/textproc/libiconv/Portfile        2007-11-16 10:33:28 UTC (rev 31116)
</span><span class="lines">@@ -3,8 +3,7 @@
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> 
</span><span class="cx"> name                libiconv
</span><del>-version             1.11
-revision            6
</del><ins>+version             1.12
</ins><span class="cx"> categories          textproc
</span><span class="cx"> maintainers         ryandesign
</span><span class="cx"> platforms           darwin freebsd linux
</span><span class="lines">@@ -26,13 +25,13 @@
</span><span class="cx"> 
</span><span class="cx"> checksums \
</span><span class="cx">         ${distname}${extract.suffix} \
</span><del>-                md5 b77a17e4a5a817100ad4b2613935055e \
-                sha1 df09c3ef43443ac15c0c2d49fd791aa73a64bf30 \
-                rmd160 9adbcd61598bee2fbe4eb94ac3f35f83f568d9d0 \
</del><ins>+                md5 c2be282595751535a618ae0edeb8f648 \
+                sha1 a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179 \
+                rmd160 74a63c1a2963ac1729c1ac7adfec8fd397a685bd \
</ins><span class="cx">         ${distname}-cp932-devel.patch.gz \
</span><del>-                md5 71caa7501358d462862ffab0bd49a152 \
-                sha1 f66d156ec559fedee411393dc7223064039ce209 \
-                rmd160 bacc8421a7e57a0d4dd4d3e133581f55bdd0b886
</del><ins>+                md5 124d240bff22e20b86e86d8c8e3bae1c \
+                sha1 d989b1ce0a829fa3a12c08c3634efd5f169b399a \
+                rmd160 2042116888ee28572c1f7bcc2756e4a29edfbad0
</ins><span class="cx"> 
</span><span class="cx"> depends_build \
</span><span class="cx">         bin:gperf:gperf
</span></span></pre></div>
<a id="trunkdportstextproclibiconvfilesutf8macdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/libiconv/files/utf8mac.diff (31115 => 31116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/libiconv/files/utf8mac.diff        2007-11-16 10:15:02 UTC (rev 31115)
+++ trunk/dports/textproc/libiconv/files/utf8mac.diff        2007-11-16 10:33:28 UTC (rev 31116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-diff -Naur libiconv-1.11.orig/lib/converters.h libiconv-1.11/lib/converters.h
---- libiconv-1.11.orig/lib/converters.h        2006-05-18 21:43:55.000000000 +0900
-+++ libiconv-1.11/lib/converters.h        2007-01-26 23:15:55.000000000 +0900
</del><ins>+diff -Naur libiconv-1.12.orig/lib/converters.h libiconv-1.12/lib/converters.h
+--- libiconv-1.12.orig/lib/converters.h        2007-05-26 08:18:25.000000000 +0900
++++ libiconv-1.12/lib/converters.h        2007-11-13 17:41:10.000000000 +0900
</ins><span class="cx"> @@ -113,6 +113,7 @@
</span><span class="cx">  /* General multi-byte encodings */
</span><span class="cx">  #include &quot;utf8.h&quot;
</span><span class="lines">@@ -9,22 +9,22 @@
</span><span class="cx">  #include &quot;ucs2be.h&quot;
</span><span class="cx">  #include &quot;ucs2le.h&quot;
</span><span class="cx">  #include &quot;ucs4.h&quot;
</span><del>-diff -Naur libiconv-1.11.orig/lib/encodings.def libiconv-1.11/lib/encodings.def
---- libiconv-1.11.orig/lib/encodings.def        2006-05-18 21:43:55.000000000 +0900
-+++ libiconv-1.11/lib/encodings.def        2007-01-26 23:15:55.000000000 +0900
</del><ins>+diff -Naur libiconv-1.12.orig/lib/encodings.def libiconv-1.12/lib/encodings.def
+--- libiconv-1.12.orig/lib/encodings.def        2007-05-26 08:17:48.000000000 +0900
++++ libiconv-1.12/lib/encodings.def        2007-11-13 17:41:10.000000000 +0900
</ins><span class="cx"> @@ -55,12 +55,18 @@
</span><span class="cx">  /* General multi-byte encodings */
</span><span class="cx">  
</span><span class="cx">  DEFENCODING(( &quot;UTF-8&quot;,                  /* IANA, RFC 2279 */
</span><span class="cx"> -            /*&quot;UTF8&quot;,                      JDK 1.1 */
</span><del>-+              &quot;UTF8&quot;,                   /* JDK 1.1 */
</del><ins>++            &quot;UTF8&quot;,                     /* JDK 1.1 */
</ins><span class="cx">              /*&quot;CP65001&quot;,                   Windows */
</span><span class="cx">              ),
</span><span class="cx">              utf8,
</span><span class="cx">              { utf8_mbtowc, NULL },        { utf8_wctomb, NULL })
</span><span class="cx">  
</span><span class="cx"> +DEFENCODING(( &quot;UTF-8-MAC&quot;,              /* utf8-nfd */
</span><del>-+              &quot;UTF8-MAC&quot;,               /* label from samba 2.2jp */
</del><ins>++            &quot;UTF8-MAC&quot;,                 /* label from samba 2.2jp */
</ins><span class="cx"> +            ),
</span><span class="cx"> +            utf8mac,
</span><span class="cx"> +            { utf8mac_mbtowc, NULL },     { utf8mac_wctomb, NULL })
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">  DEFENCODING(( &quot;UCS-2&quot;,                  /* glibc */
</span><span class="cx">                &quot;ISO-10646-UCS-2&quot;,        /* IANA */
</span><span class="cx">                &quot;csUnicode&quot;,              /* IANA */
</span><del>-diff -Naur libiconv-1.11.orig/lib/utf8mac.h libiconv-1.11/lib/utf8mac.h
---- libiconv-1.11.orig/lib/utf8mac.h        1970-01-01 09:00:00.000000000 +0900
-+++ libiconv-1.11/lib/utf8mac.h        2007-01-26 23:16:20.000000000 +0900
</del><ins>+diff -Naur libiconv-1.12.orig/lib/utf8mac.h libiconv-1.12/lib/utf8mac.h
+--- libiconv-1.12.orig/lib/utf8mac.h        1970-01-01 09:00:00.000000000 +0900
++++ libiconv-1.12/lib/utf8mac.h        2007-11-13 17:42:39.000000000 +0900
</ins><span class="cx"> @@ -0,0 +1,1608 @@
</span><span class="cx"> +/*
</span><span class="cx"> + * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> +         Includes Unicode 3.2 decomposition code derived from Core Foundation
</span><span class="cx"> + */
</span><span class="cx"> +
</span><del>-+#include &lt;errno.h&gt;                      /* EINVAL, ENAMETOOLONG */
-+#include &lt;string.h&gt;                     /* bzero() */
</del><span class="cx"> +#include &lt;libkern/OSByteOrder.h&gt;
</span><ins>++#include &lt;errno.h&gt;
++#include &lt;string.h&gt;                        /* bzero() */
</ins><span class="cx"> +
</span><span class="cx"> +#define        UTF_REVERSE_ENDIAN        0x01        /* reverse UCS-2 byte order */
</span><span class="cx"> +#define        UTF_NO_NULL_TERM        0x02        /* do not add null termination */
</span><span class="lines">@@ -1148,7 +1148,7 @@
</span><span class="cx"> + * NOTES:
</span><span class="cx"> + *    The resulting UTF-8 string is NULL terminated.
</span><span class="cx"> + *
</span><del>-+ *    If '/' chars are allowed on disk then an alternate
</del><ins>++ *    If '/' chars are not allowed on disk then an alternate
</ins><span class="cx"> + *    (replacement) char must be provided in altslash.
</span><span class="cx"> + *
</span><span class="cx"> + * input flags:
</span><span class="lines">@@ -1260,7 +1260,7 @@
</span><span class="cx"> + *    The input UTF-8 string does not need to be null terminated
</span><span class="cx"> + *    if utf8len is set.
</span><span class="cx"> + *
</span><del>-+ *    If '/' chars are allowed on disk then an alternate
</del><ins>++ *    If '/' chars are not allowed on disk then an alternate
</ins><span class="cx"> + *    (replacement) char must be provided in altslash.
</span><span class="cx"> + *
</span><span class="cx"> + * input flags:
</span><span class="lines">@@ -1611,7 +1611,7 @@
</span><span class="cx"> +    flags |= UTF_REVERSE_ENDIAN;
</span><span class="cx"> +#endif
</span><span class="cx"> +
</span><del>-+    ret = utf8_decodestr(s, n, ucsp, &amp;ucslen, sizeof(ucsp), NULL, flags, &amp;consumed);
</del><ins>++    ret = utf8_decodestr(s, n, ucsp, &amp;ucslen, sizeof(ucsp), 0, flags, &amp;consumed);
</ins><span class="cx"> +
</span><span class="cx"> +    if (ret == ENAMETOOLONG)        /* Name didn't fit; only ucslen chars were decoded */
</span><span class="cx"> +        return RET_TOOFEW(0);
</span></span></pre>
</div>
</div>

</body>
</html>