summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortonio <tonio>2007-04-08 22:46:36 +0000
committertonio <tonio>2007-04-08 22:46:36 +0000
commit529f60008b5f6d64e9510dee6e0c7105324893c4 (patch)
tree334519728b716963693f002bf7896ec12140a879 /net
parent8b81800fd078bf910c7be859e2c085bc01e442fe (diff)
downloadpkgsrc-529f60008b5f6d64e9510dee6e0c7105324893c4.tar.gz
update net/unison-devel to 2.27.10
Changes since 2.17: * The native OS X user interface has been enormously improved by Ben Willmore and Trevor Jim. * 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: + 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 (otherwise Unison aborts). + The confirmation of "big deletes" is now controlled by a boolean preference confirmbigdeletes. Default is true, which gives the same behavior as previously. + 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. * Smaller changes: + Added forcepartial and preferpartial preferences + 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. + Rewrote some of the merging functionality, for better cooperation with external Harmony instances. + Changed the temp file prefix from .# to .unison. + Compressed the output from the text user interface + Added .mpp files to the "never fastcheck" list * Many small bugfixes, including: + Fixed a bug that would occasionally cause the archives to be left in non-identical states on the two hosts after synchronization. + Fixed a bug that prevented Unison from communicating correctly between 32- and 64-bit architectures. + Set read-only file to R/W on OSX before attempting to change other attributes. + Fixed bug resulting in spurious "Aborted" errors during transport (thanks to Jerome Vouillon) + Enable diff if file contents have changed in one replica, but only properties in the other. + Removed misleading documentation for 'repeat' preference. + Fixed a bug in merging code where Unison could sometimes deadlock with the external merge program, if the latter produced large amounts of output. + Workaround for a bug compiling gtk2 user interface against current versions of gtk2+ libraries. + Added a better error message for "ambiguous paths". + Squashed a longstanding bug that would cause file transfer to fail with the message "Failed: Error in readWrite: Is a directory."
Diffstat (limited to 'net')
-rw-r--r--net/unison-devel/Makefile5
-rw-r--r--net/unison-devel/distinfo12
-rw-r--r--net/unison-devel/patches/patch-aa12
-rw-r--r--net/unison-devel/patches/patch-ac16
4 files changed, 16 insertions, 29 deletions
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 9906d0037dc..877ab4adf60 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2006/12/11 23:00:52 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2007/04/08 22:46:36 tonio Exp $
-DISTNAME= unison-2.17.1
-PKGREVISION= 2
+DISTNAME= unison-2.27.10
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/
diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
index a1c3b058c71..744ca901543 100644
--- a/net/unison-devel/distinfo
+++ b/net/unison-devel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/09/27 14:44:18 tonio Exp $
+$NetBSD: distinfo,v 1.10 2007/04/08 22:46:36 tonio Exp $
-SHA1 (unison-2.17.1/unison-2.17.1.tar.gz) = 03e02df5499b2c9db79ac895ca7c2d5d59b1f294
-RMD160 (unison-2.17.1/unison-2.17.1.tar.gz) = 7b5143d160c09cefd6027807ca54c02e83265008
-Size (unison-2.17.1/unison-2.17.1.tar.gz) = 415057 bytes
-SHA1 (patch-aa) = 1f863c233ca99e9f030d85dfd64be29d59bc64bf
+SHA1 (unison-2.27.10/unison-2.27.10.tar.gz) = 7962b928ad215ae7122b21bce333fe3dad383546
+RMD160 (unison-2.27.10/unison-2.27.10.tar.gz) = 9b550911be92510a95f15c3e636439554bfe3bc8
+Size (unison-2.27.10/unison-2.27.10.tar.gz) = 546231 bytes
+SHA1 (patch-aa) = 8557f1a5a22e7faf6c49b6e8fbab5682e91a7e24
SHA1 (patch-ab) = d1ca5128ff3177c2592e0035da10350d91c5f68f
-SHA1 (patch-ac) = c01b261d0c25f9625003e31b64b2bdfe6fb054ca
+SHA1 (patch-ac) = 4fc8a46e930d2c2d5bbe5f888ba518ce5dcc89bf
diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa
index 943eec79dc7..7f58695ca7f 100644
--- a/net/unison-devel/patches/patch-aa
+++ b/net/unison-devel/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/09/27 14:44:18 tonio Exp $
+$NetBSD: patch-aa,v 1.5 2007/04/08 22:46:36 tonio Exp $
---- Makefile.orig 2005-08-12 02:26:59.000000000 +0200
+--- Makefile.orig 2007-04-02 05:03:20.000000000 +0200
+++ Makefile
@@ -39,7 +39,7 @@ all:: INSTALL
@@ -20,8 +20,8 @@ $NetBSD: patch-aa,v 1.4 2005/09/27 14:44:18 tonio Exp $
# This has two names because on OSX the file INSTALL shadows the target 'install'!
install: doinstall
-@@ -77,10 +77,7 @@ installtext:
- make -C .. installtext
+@@ -80,10 +80,7 @@ text:
+ make -C .. text
doinstall: $(NAME)$(EXEC_EXT)
- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
@@ -31,9 +31,9 @@ $NetBSD: patch-aa,v 1.4 2005/09/27 14:44:18 tonio Exp $
######################################################################
# Demo
-@@ -358,7 +355,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 --git a/net/unison-devel/patches/patch-ac b/net/unison-devel/patches/patch-ac
index 2503e89b55b..974a055f699 100644
--- a/net/unison-devel/patches/patch-ac
+++ b/net/unison-devel/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2005/09/27 14:44:18 tonio Exp $
+$NetBSD: patch-ac,v 1.7 2007/04/08 22:46:36 tonio Exp $
---- pty.c.orig 2005-08-12 02:26:59.000000000 +0200
+--- pty.c.orig 2007-04-02 05:03:20.000000000 +0200
+++ pty.c
@@ -15,7 +15,7 @@ extern void uerror (char * cmdname, valu
#define HAS_OPENPTY 1
@@ -11,15 +11,3 @@ $NetBSD: patch-ac,v 1.6 2005/09/27 14:44:18 tonio Exp $
#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;