Ticket #46505: unison.diff

File unison.diff, 8.2 KB (added by bket, 9 years ago)

  • Portfile 

    diff -urN /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/unison/Portfile ./Portfile
    old new  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 127145 2014-10-21 23:46:09Z ecronin@macports.org $
     2# $Id$
    33
    44PortSystem          1.0
    55
    66name                unison
    7 version             2.40.102
    8 revision            2
     7version             2.48.3
    98categories          net
    109maintainers         nomaintainer
    1110license             GPL-3
    … …  
    1918homepage            http://www.cis.upenn.edu/~bcpierce/unison/
    2019master_sites        ${homepage}download/releases/${name}-${version}/
    2120platforms           darwin openbsd
    22 checksums           rmd160 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6 \
    23                     sha256 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
     21checksums           rmd160 884b4ec225d0411e8112e809c621b6779cf816b6\
     22                    sha256 a695f9d45e95d3d9c3f25fcbf1891f5eb20e5aa51709f81b785a20e14270b7ee
    2423
    25 patchfiles          patch-Makefile.diff patch-uprintf-crash.diff
     24patchfiles          patch-Makefile.diff
    2625
    2726use_configure       no
    2827

  • files/patch-Makefile.OCaml.diff 

    diff -urN /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/unison/files/patch-Makefile.OCaml.diff ./files/patch-Makefile.OCaml.diff
    old new  
    1 --- Makefile.OCaml.orig 2011-04-16 22:35:38.000000000 +0200
    2 +++ Makefile.OCaml      2012-09-26 17:51:36.000000000 +0200
    3 @@ -292,7 +292,7 @@
     1--- Makefile.OCaml.orig Sun Sep 28 18:48:05 2014
     2+++ Makefile.OCaml      Fri Jan  9 15:23:59 2015
     3@@ -299,7 +299,7 @@ endif
    44 
    55 # Gtk2 GUI
    66 ifeq ($(UISTYLE), gtk2)

  • files/patch-Makefile.diff 

    diff -urN /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/unison/files/patch-Makefile.diff ./files/patch-Makefile.diff
    old new  
    1 --- Makefile.orig       2011-04-16 22:35:38.000000000 +0200
    2 +++ Makefile    2011-04-26 17:53:52.000000000 +0200
    3 @@ -80,7 +80,7 @@
     1--- Makefile.orig       Thu Jul 18 11:37:09 2013
     2+++ Makefile    Fri Jan  9 15:24:42 2015
     3@@ -78,7 +78,7 @@ include Makefile.OCaml
    44 ######################################################################
    55 # Installation
    66 
    … …  
    99 
    1010 # This has two names because on OSX the file INSTALL shadows the target 'install'!
    1111 install: doinstall
    12 @@ -92,9 +92,8 @@
     12@@ -90,9 +90,8 @@ text:
    1313        $(MAKE) -C .. text
    1414 
    1515 doinstall: $(NAME)$(EXEC_EXT)

  • files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff 

    diff -urN /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff ./files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
    old new  
    1 --- uimacnew/uimacnew.xcodeproj/project.pbxproj.orig    2010-04-15 12:29:31.000000000 -0500
    2 +++ uimacnew/uimacnew.xcodeproj/project.pbxproj 2011-11-25 00:14:00.000000000 -0600
    3 @@ -580,7 +580,6 @@
     1--- uimacnew/uimacnew.xcodeproj/project.pbxproj.orig    Mon Sep  6 18:37:04 2010
     2+++ uimacnew/uimacnew.xcodeproj/project.pbxproj Fri Jan  9 15:26:10 2015
     3@@ -582,7 +582,6 @@
    44                                        "-L$(OCAMLLIBDIR)",
    55                                        "-lunix",
    66                                        "-lthreadsnat",
    … …  
    88                                        "-lbigarray",
    99                                        "-lasmrun",
    1010                                );
    11 @@ -617,7 +616,6 @@
     11@@ -622,7 +621,6 @@
    1212                                        "-L$(OCAMLLIBDIR)",
    1313                                        "-lunix",
    1414                                        "-lthreadsnat",
    … …  
    1616                                        "-lbigarray",
    1717                                        "-lasmrun",
    1818                                );
    19 @@ -651,7 +649,6 @@
     19@@ -659,7 +657,6 @@
    2020                                        "-L$(OCAMLLIBDIR)",
    2121                                        "-lunix",
    2222                                        "-lthreadsnat",

  • files/patch-uprintf-crash.diff 

    diff -urN /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/unison/files/patch-uprintf-crash.diff ./files/patch-uprintf-crash.diff
    old new  
    1 diff -upr .depend .depend
    2 --- .depend     2014-10-21 19:07:15.000000000 -0400
    3 +++ .depend     2014-10-21 19:13:27.000000000 -0400
    4 @@ -326,11 +326,9 @@ ubase/trace.cmx: ubase/util.cmx system.c
    5      ubase/trace.cmi
    6  ubase/uarg.cmo: ubase/util.cmi system.cmi ubase/safelist.cmi ubase/uarg.cmi
    7  ubase/uarg.cmx: ubase/util.cmx system.cmx ubase/safelist.cmx ubase/uarg.cmi
    8 -ubase/uprintf.cmo: ubase/uprintf.cmi
    9 -ubase/uprintf.cmx: ubase/uprintf.cmi
    10 -ubase/util.cmo: ubase/uprintf.cmi system.cmi ubase/safelist.cmi \
    11 +ubase/util.cmo: system.cmi ubase/safelist.cmi \
    12      ubase/util.cmi
    13 -ubase/util.cmx: ubase/uprintf.cmx system.cmx ubase/safelist.cmx \
    14 +ubase/util.cmx: system.cmx ubase/safelist.cmx \
    15      ubase/util.cmi
    16  lwt/lwt.cmi:
    17  lwt/lwt_unix.cmi: lwt/lwt.cmi
    18 @@ -343,7 +341,6 @@ ubase/rx.cmi:
    19  ubase/safelist.cmi:
    20  ubase/trace.cmi: ubase/prefs.cmi
    21  ubase/uarg.cmi:
    22 -ubase/uprintf.cmi:
    23  ubase/util.cmi: system.cmi
    24  lwt/example/editor.cmo: lwt/lwt_unix.cmi
    25  lwt/example/editor.cmx: lwt/lwt_unix.cmx
    26 diff -upr Makefile.OCaml Makefile.OCaml
    27 --- Makefile.OCaml      2014-10-21 19:07:15.000000000 -0400
    28 +++ Makefile.OCaml      2014-10-21 19:13:36.000000000 -0400
    29 @@ -211,7 +211,7 @@ OCAMLOBJS += \
    30            system.cmo \
    31            \
    32            ubase/projectInfo.cmo ubase/myMap.cmo ubase/safelist.cmo \
    33 -          ubase/uprintf.cmo ubase/util.cmo ubase/uarg.cmo \
    34 +          ubase/util.cmo ubase/uarg.cmo \
    35            ubase/prefs.cmo ubase/trace.cmo ubase/proplist.cmo \
    36            \
    37            lwt/pqueue.cmo lwt/lwt.cmo lwt/lwt_util.cmo \
    38 diff -upr ubase/Makefile ubase/Makefile
    39 --- ubase/Makefile      2014-10-21 19:07:15.000000000 -0400
    40 +++ ubase/Makefile      2014-10-21 19:13:52.000000000 -0400
    41 @@ -1,7 +1,7 @@
    42  NAME = ubase
    43  
    44  OBJECTS  = \
    45 -  safelist.cmo uprintf.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
    46 +  safelist.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
    47    myMap.cmo
    48  
    49  OCAMLC = ocamlfind ocamlc -g
    50 @@ -54,4 +54,4 @@ clean::
    51  
    52  # Used by BCP to update Harmony's copy of these files from Unison's
    53  update:
    54 -       cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
    55 \ No newline at end of file
    56 +       cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
    57 diff -upr ubase/depend ubase/depend
    58 --- ubase/depend        2014-10-21 19:07:15.000000000 -0400
    59 +++ ubase/depend        2014-10-21 19:13:47.000000000 -0400
    60 @@ -12,10 +12,8 @@ trace.cmo: util.cmi safelist.cmi prefs.c
    61  trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi
    62  uarg.cmo: util.cmi safelist.cmi uarg.cmi
    63  uarg.cmx: util.cmx safelist.cmx uarg.cmi
    64 -uprintf.cmo: uprintf.cmi
    65 -uprintf.cmx: uprintf.cmi
    66 -util.cmo: uprintf.cmi safelist.cmi util.cmi
    67 -util.cmx: uprintf.cmx safelist.cmx util.cmi
    68 +util.cmo: safelist.cmi util.cmi
    69 +util.cmx: safelist.cmx util.cmi
    70  myMap.cmi:
    71  prefs.cmi: util.cmi
    72  proplist.cmi:
    73 @@ -23,5 +21,4 @@ rx.cmi:
    74  safelist.cmi:
    75  trace.cmi: prefs.cmi
    76  uarg.cmi:
    77 -uprintf.cmi:
    78  util.cmi:
    79 Only in unison-2.40.102.orig/ubase: uprintf.ml
    80 Only in unison-2.40.102.orig/ubase: uprintf.mli
    81 diff -upr ubase/util.ml ubase/util.ml
    82 --- ubase/util.ml       2014-10-21 19:07:15.000000000 -0400
    83 +++ ubase/util.ml       2014-10-21 19:10:16.000000000 -0400
    84 @@ -62,7 +62,7 @@ let set_infos s =
    85    if s <> !infos then begin clear_infos (); infos := s; show_infos () end
    86  
    87  let msg f =
    88 -  clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f
    89 +  clear_infos (); Printf.kfprintf (fun c -> flush c; show_infos ()) stderr f
    90  
    91  let msg : ('a, out_channel, unit) format -> 'a = msg
    92