<!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>[131367] trunk/dports/net/unison</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/131367">131367</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-01-10 07:44:02 -0800 (Sat, 10 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>unison: update to 2.48.3 (#46505)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetunisonPortfile">trunk/dports/net/unison/Portfile</a></li>
<li><a href="#trunkdportsnetunisonfilespatchMakefileOCamldiff">trunk/dports/net/unison/files/patch-Makefile.OCaml.diff</a></li>
<li><a href="#trunkdportsnetunisonfilespatchMakefilediff">trunk/dports/net/unison/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsnetunisonfilespatchuimacnewuimacnewxcodeprojprojectpbxprojdiff">trunk/dports/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetunisonfilespatchuprintfcrashdiff">trunk/dports/net/unison/files/patch-uprintf-crash.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetunisonPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/unison/Portfile (131366 => 131367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/unison/Portfile 2015-01-10 15:33:58 UTC (rev 131366)
+++ trunk/dports/net/unison/Portfile 2015-01-10 15:44:02 UTC (rev 131367)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name unison
</span><del>-version 2.40.102
-revision 2
</del><ins>+version 2.48.3
</ins><span class="cx"> categories net
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license GPL-3
</span><span class="lines">@@ -19,10 +18,10 @@
</span><span class="cx"> homepage http://www.cis.upenn.edu/~bcpierce/unison/
</span><span class="cx"> master_sites ${homepage}download/releases/${name}-${version}/
</span><span class="cx"> platforms darwin openbsd
</span><del>-checksums rmd160 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6 \
- sha256 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
</del><ins>+checksums rmd160 884b4ec225d0411e8112e809c621b6779cf816b6\
+ sha256 a695f9d45e95d3d9c3f25fcbf1891f5eb20e5aa51709f81b785a20e14270b7ee
</ins><span class="cx">
</span><del>-patchfiles patch-Makefile.diff patch-uprintf-crash.diff
</del><ins>+patchfiles-append patch-Makefile.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnetunisonfilespatchMakefileOCamldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/unison/files/patch-Makefile.OCaml.diff (131366 => 131367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/unison/files/patch-Makefile.OCaml.diff 2015-01-10 15:33:58 UTC (rev 131366)
+++ trunk/dports/net/unison/files/patch-Makefile.OCaml.diff 2015-01-10 15:44:02 UTC (rev 131367)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.OCaml.orig 2011-04-16 22:35:38.000000000 +0200
-+++ Makefile.OCaml 2012-09-26 17:51:36.000000000 +0200
-@@ -292,7 +292,7 @@
</del><ins>+--- Makefile.OCaml.orig Sun Sep 28 18:48:05 2014
++++ Makefile.OCaml Fri Jan 9 15:23:59 2015
+@@ -299,7 +299,7 @@ endif
</ins><span class="cx">
</span><span class="cx"> # Gtk2 GUI
</span><span class="cx"> ifeq ($(UISTYLE), gtk2)
</span></span></pre></div>
<a id="trunkdportsnetunisonfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/unison/files/patch-Makefile.diff (131366 => 131367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/unison/files/patch-Makefile.diff 2015-01-10 15:33:58 UTC (rev 131366)
+++ trunk/dports/net/unison/files/patch-Makefile.diff 2015-01-10 15:44:02 UTC (rev 131367)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.orig 2011-04-16 22:35:38.000000000 +0200
-+++ Makefile 2011-04-26 17:53:52.000000000 +0200
-@@ -80,7 +80,7 @@
</del><ins>+--- Makefile.orig Thu Jul 18 11:37:09 2013
++++ Makefile Fri Jan 9 15:24:42 2015
+@@ -78,7 +78,7 @@ include Makefile.OCaml
</ins><span class="cx"> ######################################################################
</span><span class="cx"> # Installation
</span><span class="cx">
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> # This has two names because on OSX the file INSTALL shadows the target 'install'!
</span><span class="cx"> install: doinstall
</span><del>-@@ -92,9 +92,8 @@
</del><ins>+@@ -90,9 +90,8 @@ text:
</ins><span class="cx"> $(MAKE) -C .. text
</span><span class="cx">
</span><span class="cx"> doinstall: $(NAME)$(EXEC_EXT)
</span></span></pre></div>
<a id="trunkdportsnetunisonfilespatchuimacnewuimacnewxcodeprojprojectpbxprojdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff (131366 => 131367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff 2015-01-10 15:33:58 UTC (rev 131366)
+++ trunk/dports/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff 2015-01-10 15:44:02 UTC (rev 131367)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- uimacnew/uimacnew.xcodeproj/project.pbxproj.orig 2010-04-15 12:29:31.000000000 -0500
-+++ uimacnew/uimacnew.xcodeproj/project.pbxproj 2011-11-25 00:14:00.000000000 -0600
-@@ -580,7 +580,6 @@
</del><ins>+--- uimacnew/uimacnew.xcodeproj/project.pbxproj.orig Mon Sep 6 18:37:04 2010
++++ uimacnew/uimacnew.xcodeproj/project.pbxproj Fri Jan 9 15:26:10 2015
+@@ -582,7 +582,6 @@
</ins><span class="cx"> "-L$(OCAMLLIBDIR)",
</span><span class="cx"> "-lunix",
</span><span class="cx"> "-lthreadsnat",
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "-lbigarray",
</span><span class="cx"> "-lasmrun",
</span><span class="cx"> );
</span><del>-@@ -617,7 +616,6 @@
</del><ins>+@@ -622,7 +621,6 @@
</ins><span class="cx"> "-L$(OCAMLLIBDIR)",
</span><span class="cx"> "-lunix",
</span><span class="cx"> "-lthreadsnat",
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> "-lbigarray",
</span><span class="cx"> "-lasmrun",
</span><span class="cx"> );
</span><del>-@@ -651,7 +649,6 @@
</del><ins>+@@ -659,7 +657,6 @@
</ins><span class="cx"> "-L$(OCAMLLIBDIR)",
</span><span class="cx"> "-lunix",
</span><span class="cx"> "-lthreadsnat",
</span></span></pre></div>
<a id="trunkdportsnetunisonfilespatchuprintfcrashdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/unison/files/patch-uprintf-crash.diff (131366 => 131367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/unison/files/patch-uprintf-crash.diff 2015-01-10 15:33:58 UTC (rev 131366)
+++ trunk/dports/net/unison/files/patch-uprintf-crash.diff 2015-01-10 15:44:02 UTC (rev 131367)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-diff -upr .depend .depend
---- .depend 2014-10-21 19:07:15.000000000 -0400
-+++ .depend 2014-10-21 19:13:27.000000000 -0400
-@@ -326,11 +326,9 @@ ubase/trace.cmx: ubase/util.cmx system.c
- ubase/trace.cmi
- ubase/uarg.cmo: ubase/util.cmi system.cmi ubase/safelist.cmi ubase/uarg.cmi
- ubase/uarg.cmx: ubase/util.cmx system.cmx ubase/safelist.cmx ubase/uarg.cmi
--ubase/uprintf.cmo: ubase/uprintf.cmi
--ubase/uprintf.cmx: ubase/uprintf.cmi
--ubase/util.cmo: ubase/uprintf.cmi system.cmi ubase/safelist.cmi \
-+ubase/util.cmo: system.cmi ubase/safelist.cmi \
- ubase/util.cmi
--ubase/util.cmx: ubase/uprintf.cmx system.cmx ubase/safelist.cmx \
-+ubase/util.cmx: system.cmx ubase/safelist.cmx \
- ubase/util.cmi
- lwt/lwt.cmi:
- lwt/lwt_unix.cmi: lwt/lwt.cmi
-@@ -343,7 +341,6 @@ ubase/rx.cmi:
- ubase/safelist.cmi:
- ubase/trace.cmi: ubase/prefs.cmi
- ubase/uarg.cmi:
--ubase/uprintf.cmi:
- ubase/util.cmi: system.cmi
- lwt/example/editor.cmo: lwt/lwt_unix.cmi
- lwt/example/editor.cmx: lwt/lwt_unix.cmx
-diff -upr Makefile.OCaml Makefile.OCaml
---- Makefile.OCaml 2014-10-21 19:07:15.000000000 -0400
-+++ Makefile.OCaml 2014-10-21 19:13:36.000000000 -0400
-@@ -211,7 +211,7 @@ OCAMLOBJS += \
- system.cmo \
- \
- ubase/projectInfo.cmo ubase/myMap.cmo ubase/safelist.cmo \
-- ubase/uprintf.cmo ubase/util.cmo ubase/uarg.cmo \
-+ ubase/util.cmo ubase/uarg.cmo \
- ubase/prefs.cmo ubase/trace.cmo ubase/proplist.cmo \
- \
- lwt/pqueue.cmo lwt/lwt.cmo lwt/lwt_util.cmo \
-diff -upr ubase/Makefile ubase/Makefile
---- ubase/Makefile 2014-10-21 19:07:15.000000000 -0400
-+++ ubase/Makefile 2014-10-21 19:13:52.000000000 -0400
-@@ -1,7 +1,7 @@
- NAME = ubase
-
- OBJECTS = \
-- safelist.cmo uprintf.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
-+ safelist.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
- myMap.cmo
-
- OCAMLC = ocamlfind ocamlc -g
-@@ -54,4 +54,4 @@ clean::
-
- # Used by BCP to update Harmony's copy of these files from Unison's
- update:
-- cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
-\ No newline at end of file
-+ cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
-diff -upr ubase/depend ubase/depend
---- ubase/depend 2014-10-21 19:07:15.000000000 -0400
-+++ ubase/depend 2014-10-21 19:13:47.000000000 -0400
-@@ -12,10 +12,8 @@ trace.cmo: util.cmi safelist.cmi prefs.c
- trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi
- uarg.cmo: util.cmi safelist.cmi uarg.cmi
- uarg.cmx: util.cmx safelist.cmx uarg.cmi
--uprintf.cmo: uprintf.cmi
--uprintf.cmx: uprintf.cmi
--util.cmo: uprintf.cmi safelist.cmi util.cmi
--util.cmx: uprintf.cmx safelist.cmx util.cmi
-+util.cmo: safelist.cmi util.cmi
-+util.cmx: safelist.cmx util.cmi
- myMap.cmi:
- prefs.cmi: util.cmi
- proplist.cmi:
-@@ -23,5 +21,4 @@ rx.cmi:
- safelist.cmi:
- trace.cmi: prefs.cmi
- uarg.cmi:
--uprintf.cmi:
- util.cmi:
-Only in unison-2.40.102.orig/ubase: uprintf.ml
-Only in unison-2.40.102.orig/ubase: uprintf.mli
-diff -upr ubase/util.ml ubase/util.ml
---- ubase/util.ml 2014-10-21 19:07:15.000000000 -0400
-+++ ubase/util.ml 2014-10-21 19:10:16.000000000 -0400
-@@ -62,7 +62,7 @@ let set_infos s =
- if s <> !infos then begin clear_infos (); infos := s; show_infos () end
-
- let msg f =
-- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f
-+ clear_infos (); Printf.kfprintf (fun c -> flush c; show_infos ()) stderr f
-
- let msg : ('a, out_channel, unit) format -> 'a = msg
-
</del></span></pre>
</div>
</div>
</body>
</html>