Update to 2.48.3:

Changes in Version 2.48.3

   Changes since 2.45:
     * Incorporated a patch from Christopher Zimmermann to replace the
       Uprintf module (which doesn't work with OCaml 4.02, causing Unison
       to crash) with equivalent functionality from the standard library.
     * Incorporated a refresh of the OSX GUI, contributed by Alan Shutko.
     * Added a maxsizethreshold option, which prevents the transfer of
       files larger than the size specified (in Kb).
     * Added a "copyonconflict" preference, to make a copy of files that
       would otherwise be overwritten or deleted in case of conflicting
       changes. (This makes it possible to automatically resolve conflicts
       in a fairly safe way when synchronizing continuously, in
       combination with the "repeat = watch" and "prefer = newer"
       preferences.
     * File system monitoring:
          + The file watcher now fails when unable to watch a directory,
            rather than silently ignoring the issue.
          + File system monitoring: more robust communication with the
            helper program (in socket mode, the unison server will still
            work properly despite unexpected unison client
            disconnections).
          + A bytecode version of unison-fsmonitor is now produced by
            "make NATIVE=false"
          + Improved search for unison-fsmonitor
          + Detect when the helper process exits.
          + More robust file watching helper programs for Windows and
            Linux. They communicate with Unison through pipes (Unison
            redirects stdin and stdout), using a race-free protocol.
          + Retries paths with failures using an exponential backoff
            algorithm.
          + The information returned by the file watchers are used
            independently for each replica; thus, when only one replica
            has changes, Unison will only rescan this replica.
          + When available, used by the graphical UIs to speed up
            rescanning (can be disabled by setting the new watch
            preference to
          + Small fix to the way fsmonitor.py gets invoked when using the
            file watching functionality, suggested by Josh Berdine. Unison
            will now look for fsmonitor.py in the same directory where the
            Unison executable itself lives.
     * Minor:
          + Fixed a bug in export procedure that was messing up
            documentation strings.
          + Incorporated a patch from Irányossy Knoblauch Artúr to make
            temp file names fit within 143 characters (to make eCryptFS
            happy).
          + Added a string to the Conflict direction to document the
            reason of the conflict.
          + Log conflicts and problems in the text UI even if nothing is
            propagated.
          + Use hash function from OCaml 3.x for comparing archives, even
            when compiled with OCaml 4.x.
          + Do not restart Unison in case of uncaught exception when the
            repeat preference is set. This seems safer. And it does not
            work, for instance, in case of lost connection.
          + Fix Unix.readlink invalid argument error under Windows
          + Fix a crash when the output of the diff program is too large.
          + Fixed Makefile for cross-compiling towards Windows (updated to
            MinGW-w64)

   Changes since 2.40.63:
     * New preference fastercheckUNSAFE, which can be used (with care!) to
       achieve much faster update detection when all the common files in
       the two replicas are known to be identical. See the manual for more
       information.
       This feature should still be considered experimental, but it's
       ready for other people to try out.
     * Added option clientHostName. If specified, it will be used to as
       the client host name, overriding UNISONLOCALHOSTNAME and the actual
       host name.
     * OS X GUI:
          + fix crash under Lion, because of problems with the toolbar,
            using the fix suggested in
            http://blitzbasic.com/Community/posts.php?topic=95778.
          + uimacnew09 is now the standard graphical interface on OSX
          + A small improvement to the uimacnew09 interface from Alan
            Schmitt and Steve Kalkwarf: when Unison is run with the -batch
            flag, the interface will now automatically propagate changes
            and terminate, without waiting for user interaction.
          + Show a modal warning window if there is no archive for the
            hosts. The user can then choose to exit or proceed (proceed is
            the default). The window is not shown if the batch preference
            is true.
          + file details panel selectable
     * GTK GUI:
          + New version of uigtk2.ml from Matt Zagrabelny that reorganizes
            the icons in a slightly more intuitive way.
     * Minor fixes:
          + Setting the prefer preference to older or newer now propagates
            deletions when there is no conflict.
          + Correctly quote the path when running merge commands.
          + Add quotes to paths when calling external file watcher
            utility.
          + Incorporate a patch to fsmonitor.py (the external filewatcher
            utility) from Tomasz Zernicki to make it work better under
            Windows.
          + Incorporated new version of fsmonitor.py from Christophe Gohle
          + Fixed incompatibility with OpenSSH 5.6.
          + Fixed fingerprint cache: do not cache file properties
          + Some spelling corrections in documentation and comments from
            Stephane Glondu
          + Fixed O_APPEND mode for open under Windows
          + Fixed String.sub invalid argument error when an AppleDouble
            file does not contain a finder information field
          + Trim duplicate paths when using "-repeat watch"
          + Unison now passes path arguments and -follow directives to
            fsmonitor.py. This seems to work except for one small issue
            with how fsmonitor.py treats -follow directives for
            directories that don't exist (or maybe this is an issue with
            how it treats any kind of monitoring when the thing being
            monitored doesn't exist?). If we create a symlink to a
            nonexistant directory, give Unison (hence fsmonitor.py) a
            'follow' directive for the symlink, start unison, and then
            create the directory, fsmonitor.py misses the change.
          + Lines added in profile files by unison always start at a new
            line

3 files changed, 15 insertions, 17 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 4f29757b4d3..e33811fa3a1 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2014/10/22 09:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2015/01/06 12:58:36 wiz Exp $
 
-DISTNAME=	unison-2.40.102
-PKGREVISION=	22
+DISTNAME=	unison-2.48.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
diff --git a/net/unison/distinfo b/net/unison/distinfo
index c434bbed9f2..20074f9efbe 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2014/10/22 09:43:01 wiz Exp $
+$NetBSD: distinfo,v 1.23 2015/01/06 12:58:36 wiz Exp $
 
-SHA1 (unison-2.40.102.tar.gz) = bf18f64fa30bd04234e864d42190294e0d9a2910
-RMD160 (unison-2.40.102.tar.gz) = 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6
-Size (unison-2.40.102.tar.gz) = 2694761 bytes
-SHA1 (patch-Makefile.OCaml) = 2872f07e323f23375b0b7ea5ec17fe387fe22a0f
+SHA1 (unison-2.48.3.tar.gz) = 74f1c087ee49dc1db4680ad779280f7333d5c968
+RMD160 (unison-2.48.3.tar.gz) = 884b4ec225d0411e8112e809c621b6779cf816b6
+Size (unison-2.48.3.tar.gz) = 1172532 bytes
+SHA1 (patch-Makefile.OCaml) = 2c39a20eb731d3f787d5c938b539ceb3276d5d47
 SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
-SHA1 (patch-ubase_util.ml) = d8ee8ea1cc1a5d0e8794623c24621f1a2d57d189
diff --git a/net/unison/patches/patch-Makefile.OCaml b/net/unison/patches/patch-Makefile.OCaml
index fbc63923d18..a2a00dfd9d3 100644
--- a/net/unison/patches/patch-Makefile.OCaml
+++ b/net/unison/patches/patch-Makefile.OCaml
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.OCaml,v 1.4 2012/12/09 15:02:51 wiz Exp $
+$NetBSD: patch-Makefile.OCaml,v 1.5 2015/01/06 12:58:37 wiz Exp $
 
 Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
 
---- Makefile.OCaml.orig	2011-04-16 20:35:38.000000000 +0000
+--- Makefile.OCaml.orig	2014-09-28 16:48:05.000000000 +0000
 +++ Makefile.OCaml
-@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 
+@@ -75,8 +75,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 
  #
  # This should be set to an appropriate value automatically, depending
  # on whether the lablgtk library is available
@@ -15,7 +15,7 @@ Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
  ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
  ## at the moment and we don't want to confuse people by building it by default
  ifeq ($(OSARCH),osx)
-@@ -285,14 +285,14 @@ endif
+@@ -292,14 +292,14 @@ endif
  
  # Gtk GUI
  ifeq ($(UISTYLE), gtk)
@@ -32,12 +32,12 @@ Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
    OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
    OCAMLLIBS+=lablgtk.cma
  endif
-@@ -364,7 +364,7 @@ ifeq ($(PROFILING), true)
+@@ -384,7 +384,7 @@ ifeq ($(PROFILING), true)
  else
-   OCAMLC=ocamlc
+   OCAMLC=$(EXEC_PREFIX)ocamlc
  endif
--OCAMLOPT=ocamlopt
-+OCAMLOPT=ocamlopt.opt
+-OCAMLOPT=$(EXEC_PREFIX)ocamlopt
++OCAMLOPT=$(EXEC_PREFIX)ocamlopt.opt
  
  ifeq ($(NATIVE), true)
    ## Set up for native code compilation