<!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" />
<title>[131099] trunk/dports/net/mldonkey</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131099">131099</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-01-05 20:56:19 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mldonkey: update to 3.1.5 (#46377)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetmldonkeyPortfile">trunk/dports/net/mldonkey/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetmldonkeyfilespatchsrcutilsnetterminalmldiff">trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetmldonkeyfilespatchconfigconfigurediff">trunk/dports/net/mldonkey/files/patch-config-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetmldonkeyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/mldonkey/Portfile (131098 => 131099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mldonkey/Portfile 2015-01-06 04:48:33 UTC (rev 131098)
+++ trunk/dports/net/mldonkey/Portfile 2015-01-06 04:56:19 UTC (rev 131099)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name mldonkey
</span><del>-version 3.1.3
-revision 6
</del><ins>+version 3.1.5
</ins><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -28,8 +27,8 @@
</span><span class="cx"> master_sites sourceforge:project/mldonkey/mldonkey/${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 2b640fbd9ac85918bf3ba0a51f86fabb6d862890 \
- sha256 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2
</del><ins>+checksums rmd160 63a21aef47a7510b7f9867544345c8f03edc89c3 \
+ sha256 74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -50,6 +49,6 @@
</span><span class="cx"> # ocaml is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-patchfiles patch-config-configure.diff
</del><ins>+patchfiles-append patch-src-utils-net-terminal.ml.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-gui=newgui2
</span></span></pre></div>
<a id="trunkdportsnetmldonkeyfilespatchconfigconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/mldonkey/files/patch-config-configure.diff (131098 => 131099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mldonkey/files/patch-config-configure.diff 2015-01-06 04:48:33 UTC (rev 131098)
+++ trunk/dports/net/mldonkey/files/patch-config-configure.diff 2015-01-06 04:56:19 UTC (rev 131099)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-https://savannah.nongnu.org/patch/?8123
-http://www.mail-archive.com/mldonkey-users@nongnu.org/msg03645.html
---- config/configure.orig 2012-08-05 10:51:35.000000000 -0500
-+++ config/configure 2013-07-19 03:30:44.000000000 -0500
-@@ -6814,15 +6814,35 @@
- GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
- GDMINORVERSION=`$GDLIBCONFIG --minorversion`
- GDREVISION=`$GDLIBCONFIG --revision`
-- if [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION -gt 14 ]; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+ case $GDMAJORVERSION in
-+ 1)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
-+$as_echo "no (found $GDVERSION)" >&6; }
-+ LIBGD=no
-+ ;;
-+ 2)
-+ if test $GDMINORVERSION -ge 1; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
- $as_echo "$GDVERSION" >&6; }
-- LIBGD=yes
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
-+ LIBGD=yes
-+ else
-+ if test $GDREVISION -gt 14; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+$as_echo "$GDVERSION" >&6; }
-+ LIBGD=yes
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
- $as_echo "no (found $GDVERSION)" >&6; }
-- LIBGD=no
-- fi
-+ LIBGD=no
-+ fi
-+ fi
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+$as_echo "$GDVERSION" >&6; }
-+ LIBGD=yes
-+ ;;
-+ esac
- else
- LIBGD=yes
- fi
-@@ -10784,7 +10804,7 @@
- if test ! -z "$SCM_VERSION"; then
- printf " - SCM: %s" "$SCM_VERSION"
- fi
--ec " completed.\n"
-+echo " completed.\n"
-
- echo ""
- echo "Network modules:"
</del></span></pre></div>
<a id="trunkdportsnetmldonkeyfilespatchsrcutilsnetterminalmldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff (0 => 131099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff (rev 0)
+++ trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff 2015-01-06 04:56:19 UTC (rev 131099)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Fix build with ocaml 4.02
+http://savannah.nongnu.org/bugs/?43934
+https://github.com/ygrek/mldonkey/commit/c91a78896526640a301f5a9eeab8b698923e285c
+--- src/utils/net/terminal.ml.orig
++++ src/utils/net/terminal.ml
+@@ -185,7 +185,7 @@ module Output = struct
+ let canal = List.assoc chan !chanmap in
+ etat.chan <- Some (chan, canal);
+ info (sprintf "connecte au canal '%s'" chan);
+- (* {| canal ALL } *)
++ (* { | canal ALL } *)
+ with Not_found -> (* pas encore de recepteur pour ce canal *)
+ try (* on en cree un *)
+ let serveur = nsrecord.get_loc chan in
</ins></span></pre>
</div>
</div>
</body>
</html>