[pkgsrc/trunk]: pkgsrc/net/unison Update net/unison to 2.27.53

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9af4e332c4d0
branches:  trunk
changeset: 545076:9af4e332c4d0
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Fri Jul 25 20:03:03 2008 +0000

description:
Update net/unison to 2.27.53
Enable full destdir support.

Changes since 2.17:
* Several small fixes to the GTK2 UI to make it work better under Windows
* The backup functionality has been completely rewritten. The external
  interface has not changed, but numerous bugs, irregular behaviors, and
  cross-platform inconsistencies have been corrected.
* Some important safety improvements:
  o Added a new mountpoint preference, which can be used to specify a path
    that must exist in both replicas at the end of update detection
  o The confirmation of “big deletes” is now controlled by a boolean
preference confirmbigdeletes. Default is true, which gives the same behavior
as previously. (This functionality is at least partly superceded by the
mountpoint preference, but it has been left in place in case it is useful to
some people.)
  o If Unison is asked to “follow” a symbolic link but there is nothing at
the other end of the link, it will now flag this path as an error, rather
than treating the symlink itself as missing or deleted. This avoids a
potentially dangerous situation where a followed symlink points to an
external filesystem that might be offline when Unison is run (whereupon
Unison would cheerfully delete the corresponding files in the other
replica!).
* Smaller changes:
  o Added forcepartial and preferpartial preferences, which behave like force
and prefer but can be specified on a per-path basis. [Thanks to Alan Schmitt
for this.]
  o A bare-bones self test feature was added, which runs unison through some
of its paces and checks that the results are as expected. The coverage of the
tests is still very limited, but the facility has already been very useful in
debugging the new backup functionality (especially in exposing some subtle
cross-platform issues).
  o Refined debugging code so that the verbosity of individual modules can be
controlled separately. Instead of just putting '-debug verbose' on the
command line, you can put '-debug update+', which causes all the extra
messages in the Update module, but not other modules, to be printed. Putting
'-debug verbose' causes all modules to print with maximum verbosity.
  o Removed mergebatch preference. (It never seemed very useful, and its
semantics were confusing.)
  o Rewrote some of the merging functionality, for better cooperation with
external Harmony instances.
  o Changed the temp file prefix from .# to .unison.
  o Compressed the output from the text user interface (particularly when run
with the -terse flag) to make it easier to interpret the results when Unison
is run several times in succession from a script.
  o Changed the order of arguments to the default diff command (so that the +
and - annotations in diff's output are reversed).
  o Small fix to ctime (non-)handling in update detection under windows with
fastcheck.

diffstat:

 net/unison/Makefile         |  20 ++++++++++----------
 net/unison/distinfo         |  14 +++++++-------
 net/unison/patches/patch-aa |  14 ++++++++------
 net/unison/patches/patch-ab |   6 +++---
 net/unison/patches/patch-ac |  16 ++--------------
 5 files changed, 30 insertions(+), 40 deletions(-)

diffs (154 lines):

diff -r be0a67a8723f -r 9af4e332c4d0 net/unison/Makefile
--- a/net/unison/Makefile       Fri Jul 25 19:44:15 2008 +0000
+++ b/net/unison/Makefile       Fri Jul 25 20:03:03 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2007/09/21 13:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/07/25 20:03:03 tonio Exp $
 
-DISTNAME=      unison-2.13.16
-PKGREVISION=   3
+DISTNAME=      unison-2.27.57
 CATEGORIES=    net
 MASTER_SITES=  http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
 
@@ -10,6 +9,7 @@
 COMMENT=       File-synchronization tool
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.08.2
@@ -39,13 +39,13 @@
 INSTALLATION_DIRS+=    share/doc/unison
 
 post-install:
-               ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/NEWS ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
-               ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
+               ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r be0a67a8723f -r 9af4e332c4d0 net/unison/distinfo
--- a/net/unison/distinfo       Fri Jul 25 19:44:15 2008 +0000
+++ b/net/unison/distinfo       Fri Jul 25 20:03:03 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: distinfo,v 1.13 2008/07/25 20:03:03 tonio Exp $
 
-SHA1 (unison-2.13.16/unison-2.13.16.tar.gz) = 3f119f6a6e8bc5ade8933d4693075a768f0abf9a
-RMD160 (unison-2.13.16/unison-2.13.16.tar.gz) = 171d8bbc788be31227f6b09d1793a984d33bfdfc
-Size (unison-2.13.16/unison-2.13.16.tar.gz) = 393266 bytes
-SHA1 (patch-aa) = 25820d9e61b258d430f5b927fdab8aeaf756ae55
-SHA1 (patch-ab) = e879c62e9dcd83778e5ebebf14a739c23cba666e
-SHA1 (patch-ac) = fa8c3c46ca822a34460404aeb122f0c82d801dc3
+SHA1 (unison-2.27.57/unison-2.27.57.tar.gz) = 9892680d8bd3e3c50031451cc6e77eb5431768ea
+RMD160 (unison-2.27.57/unison-2.27.57.tar.gz) = 15388e3f2b9b593aba140416216837c49e4800c0
+Size (unison-2.27.57/unison-2.27.57.tar.gz) = 617253 bytes
+SHA1 (patch-aa) = bca069d0c27bec552c103b39e299fea36afb51c7
+SHA1 (patch-ab) = 9093c61236c379148ae99eb1ec94fb80ea6dbea4
+SHA1 (patch-ac) = d996e1ffff23da511976ba4455391952afab6234
diff -r be0a67a8723f -r 9af4e332c4d0 net/unison/patches/patch-aa
--- a/net/unison/patches/patch-aa       Fri Jul 25 19:44:15 2008 +0000
+++ b/net/unison/patches/patch-aa       Fri Jul 25 20:03:03 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-aa,v 1.7 2008/07/25 20:03:03 tonio Exp $
 
---- Makefile.orig      2005-07-03 00:44:28.000000000 +0200
+--- Makefile.orig      2008-01-18 16:46:16.000000000 +0100
 +++ Makefile
 @@ -39,7 +39,7 @@ all:: INSTALL
  
@@ -11,15 +11,17 @@
  
  ########################################################################
  ## Miscellaneous developer-only switches
-@@ -68,16 +68,13 @@ include Makefile.OCaml
+@@ -68,7 +68,7 @@ include Makefile.OCaml
  ######################################################################
  # Installation
  
 -INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = $(PREFIX)/bin/
++INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
  
  # This has two names because on OSX the file INSTALL shadows the target 'install'!
  install: doinstall
+@@ -80,10 +80,7 @@ text: 
+       make -C .. text
  
  doinstall: $(NAME)$(EXEC_EXT)
 -      -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
@@ -29,9 +31,9 @@
  
  ######################################################################
  # Demo
-@@ -355,7 +352,7 @@ testmerge:
+@@ -332,7 +329,7 @@ testmerge:
  tags:
-       -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
+       -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
  
 -all:: TAGS
 +#all:: TAGS
diff -r be0a67a8723f -r 9af4e332c4d0 net/unison/patches/patch-ab
--- a/net/unison/patches/patch-ab       Fri Jul 25 19:44:15 2008 +0000
+++ b/net/unison/patches/patch-ab       Fri Jul 25 20:03:03 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-ab,v 1.5 2008/07/25 20:03:03 tonio Exp $
 
---- Makefile.OCaml.orig        2005-06-27 19:38:25.000000000 +0200
+--- Makefile.OCaml.orig        2007-05-07 17:42:29.000000000 +0200
 +++ Makefile.OCaml
 @@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
  else
@@ -13,7 +13,7 @@
  endif
  endif
  endif
-@@ -242,6 +249,10 @@ else
+@@ -261,6 +265,10 @@ else
    endif
  endif
  
diff -r be0a67a8723f -r 9af4e332c4d0 net/unison/patches/patch-ac
--- a/net/unison/patches/patch-ac       Fri Jul 25 19:44:15 2008 +0000
+++ b/net/unison/patches/patch-ac       Fri Jul 25 20:03:03 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-ac,v 1.5 2008/07/25 20:03:03 tonio Exp $
 
---- pty.c.orig 2005-05-30 14:15:43.000000000 +0200
+--- pty.c.orig 2007-04-13 16:30:01.000000000 +0200
 +++ pty.c
 @@ -15,7 +15,7 @@ extern void uerror (char * cmdname, valu
  #define HAS_OPENPTY 1
@@ -11,15 +11,3 @@
  #include <util.h>
  #define HAS_OPENPTY 1
  #endif
-@@ -40,9 +40,10 @@ CAMLprim value setControllingTerminal(va
- /* c_openpty: unit -> (int * Unix.file_descr) */
- CAMLprim value c_openpty() {
-   int master,slave;
-+  value pair;
-   if (openpty(&master,&slave,NULL,NULL,NULL) < 0)
-     uerror("openpty", (value) 0);
--  value pair = alloc_tuple(2);
-+  pair = alloc_tuple(2);
-   Store_field(pair,0,Val_int(master));
-   Store_field(pair,1,Val_int(slave));
-   return pair;