- Update unison to 2.10.2

- Lots of changes, in summary:
	- out of the box OS X and OpenBSD support
	- limit the number of simultaneous file transfers
	- support for ocaml >3.07
	- Files larger than 2Gb are now supported
	- Major tidying and enhancement of 'merge' functionality

5 files changed, 83 insertions, 59 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 9c91e24d459..1bd1556de78 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/24 12:48:43 adrianp Exp $
 
-DISTNAME=	src
-PKGNAME=	unison-2.9.1
-PKGREVISION=	4
+DISTNAME=	unison-2.10.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
@@ -10,10 +8,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
+BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
@@ -37,7 +35,14 @@ MAKE_FLAGS+=	THREADS=true
 
 INSTALLATION_DIRS=	bin
 
+SUBST_CLASSES=		x11
+SUBST_STAGE.x11=	post-patch
+SUBST_FILES.x11=	Makefile.OCaml
+SUBST_SED.x11=		-e "s|/usr/X11R6|${X11BASE}|g"
+SUBST_MESSAGE.x11=	"Fixing X11 paths."
+
 post-install:
+		@cd ${WRKSRC} && ./unison -doc install > INSTALL
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/CONTRIB ${PREFIX}/share/doc/unison
diff --git a/net/unison/distinfo b/net/unison/distinfo
index ea3c878e881..6292a4c7216 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/04/24 12:48:43 adrianp Exp $
 
-SHA1 (unison-2.9.1/src.tar.gz) = d355639b8191f5c74e652fe257fd98dcf76d4cc0
-RMD160 (unison-2.9.1/src.tar.gz) = f00ae5ab3e6e9bd04e184b3c1bc6a4c78b84fdc1
-Size (unison-2.9.1/src.tar.gz) = 319081 bytes
-SHA1 (patch-aa) = bb844e8070faab7d4c8aac30345881c1c66ca8d2
-SHA1 (patch-ab) = 0d391ffc0c47a16d24cda5e9f219665eeafb1553
-SHA1 (patch-ac) = e04d12ec7a25ff343bd0af41754508bc81326098
+SHA1 (unison-2.10.2/unison-2.10.2.tar.gz) = 1d378292d944981fb41504c8cea92cd3e1913c49
+RMD160 (unison-2.10.2/unison-2.10.2.tar.gz) = 593d71c39b49f30e82df58f62891d6d5540c2af7
+Size (unison-2.10.2/unison-2.10.2.tar.gz) = 458032 bytes
+SHA1 (patch-aa) = b6974657b864a75262562053185a7fd9b8df6b73
+SHA1 (patch-ab) = 0fe6bbb5f39f535c4b6a956978e75822528d7bdf
+SHA1 (patch-ac) = 4c080aaf879921f0120633ee37fa031c64e6a243
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index 656bb94052e..b360df2da36 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,8 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2002/06/01 04:41:31 deberg Exp $
+$NetBSD: patch-aa,v 1.4 2005/04/24 12:48:43 adrianp Exp $
 
---- Makefile.orig	Thu Apr 11 01:13:23 2002
-+++ Makefile	Sat Jun  1 00:29:22 2002
-@@ -62,14 +62,12 @@
+--- Makefile.orig	Mon Sep  6 20:15:46 2004
++++ Makefile
+@@ -55,19 +55,17 @@ all:: strings.ml buildexecutable
+ all:: INSTALL
+ 
+ INSTALL: $(NAME)$(EXEC_EXT)
+-	./$(NAME) -doc install > INSTALL
++##	./$(NAME) -doc install > INSTALL
+ 
  ######################################################################
  # Installation
  
@@ -20,12 +26,12 @@ $NetBSD: patch-aa,v 1.3 2002/06/01 04:41:31 deberg Exp $
  
  
  ######################################################################
-@@ -231,7 +229,7 @@
+@@ -345,7 +343,7 @@ testmerge:
  tags:
- 	-$(ETAGS) {*,*/*}.mli {*,*/*}.ml *.txt 
+ 	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
  
 -all:: TAGS
 +# all:: TAGS
  
- TAGS: 
+ TAGS:
  	$(MAKE) tags
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
index 6131a0eabe9..fc7b4f9238b 100644
--- a/net/unison/patches/patch-ab
+++ b/net/unison/patches/patch-ab
@@ -1,44 +1,46 @@
-$NetBSD: patch-ab,v 1.1 2003/06/29 23:52:05 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2005/04/24 12:48:43 adrianp Exp $
 
---- Makefile.OCaml.orig
+--- Makefile.OCaml.orig	2004-09-06 20:15:46.000000000 +0100
 +++ Makefile.OCaml
-@@ -42,7 +42,7 @@
- ifeq ($(shell hostname),saul.cis.upenn.edu)
-   OSARCH=solaris
+@@ -47,6 +47,10 @@ ifeq ($(shell uname),Darwin)
  else
--  OSARCH=linux
-+  OSARCH=bsd
+ ifeq ($(shell uname),OpenBSD)
+   OSARCH=OpenBSD
++else
++ifeq ($(shell uname),NetBSD)
++  OSARCH=NetBSD
++endif
  endif
-   ETAGS=etags
  endif
-@@ -157,7 +157,7 @@
- ifeq ($(OSARCH), win32gnuc)
-   GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs
  endif
--ifeq ($(OSARCH), linux)
-+ifeq ($(OSARCH), bsd)
+@@ -253,6 +257,9 @@ endif
+ ifeq ($(OSARCH), osx)
    X11LIBDIR=/usr/X11R6/lib
  endif
++ifeq ($(OSARCH), NetBSD)
++  X11LIBDIR=/usr/X11R6/lib
++endif
  
-@@ -243,7 +243,7 @@
-     # libcurses is not in a standard place in older Solaris releases.
-     STATICLIBS+=-cclib -R/usr/xpg4/lib
-   endif
--  ifeq ($(OSARCH), linux)
-+  ifeq ($(OSARCH), bsd)
+ # Developer-only directories
+ ifeq ($(shell hostname), raptor.research.att.com)
+@@ -396,6 +403,9 @@ ifeq ($(STATIC), true)
+   ifeq ($(OSARCH), osx)
      STATICLIBS+=-cclib -static
    endif
++  ifeq ($(OSARCH), NetBSD)
++    STATICLIBS+=-cclib -static
++  endif
    CLIBS=$(STATICLIBS)
-@@ -255,9 +255,9 @@
- # Include an automatically generated list of dependencies
- include .depend
+ endif
  
--ifeq ($(shell echo type -t ocamldot | bash), file)
--  OCAMLDOT=true
--endif
-+#ifeq ($(shell echo type -t ocamldot | bash), file)
-+  OCAMLDOT=false
-+#endif
+@@ -437,6 +447,10 @@ else
+   endif
+ endif
  
++ifeq ($(OSARCH), NetBSD)
++  OCAMLDOT=false
++endif
++
  # Rebuild dependencies (must be invoked manually)
  .PHONY: depend
+ depend::
diff --git a/net/unison/patches/patch-ac b/net/unison/patches/patch-ac
index 00c40b6c45d..5c38bfc43ab 100644
--- a/net/unison/patches/patch-ac
+++ b/net/unison/patches/patch-ac
@@ -1,15 +1,26 @@
-$NetBSD: patch-ac,v 1.1 2005/02/04 22:54:52 adrianp Exp $
+$NetBSD: patch-ac,v 1.2 2005/04/24 12:48:43 adrianp Exp $
 
---- ubase/uprintf.ml.orig	2005-01-12 18:52:27.000000000 +0100
-+++ ubase/uprintf.ml	2005-01-12 18:52:53.000000000 +0100
-@@ -10,8 +10,8 @@
- (*                                                                     *)
- (***********************************************************************)
+--- pty.c.orig	2004-09-06 20:15:47.000000000 +0100
++++ pty.c
+@@ -18,7 +18,11 @@ CAMLprim value dumpFd(value fdVal) {
+ }
  
--external format_int: string -> int -> string = "format_int"
--external format_float: string -> float -> string = "format_float"
-+external format_int: string -> int -> string = "caml_format_int"
-+external format_float: string -> float -> string = "caml_format_float"
+ #include <caml/fail.h>     // failwith
++#ifdef __NetBSD__
++#include <errno.h>         // errno
++#else
+ #include <sys/errno.h>     // errno
++#endif
+ #include <string.h>        // strerror
+ #include <caml/alloc.h>    // alloc_tuple
+ #include <caml/memory.h>   // Store_field
+@@ -32,6 +36,9 @@ CAMLprim value dumpFd(value fdVal) {
+ #ifdef __APPLE__
+ #include <util.h>          // openpty
+ #endif
++#ifdef __NetBSD__
++#include <util.h>          // openpty
++#endif
  
- let fprintf outchan doafter format =
-   let format = (Obj.magic format : string) in
+ /* c_openpty: unit -> (int * Unix.file_descr) */
+ CAMLprim value c_openpty() {