Update to 2.40.61 from Björn Ketelaars with tweaks by me.

Unicode support is now enabled by default.

net/unison/Makefile.inc

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.16 2010/11/19 22:31:39 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2011/03/03 08:47:55 giovanni Exp $
 
 DISTNAME=	unison-$V
 CATEGORIES=	net
@@ -32,6 +32,7 @@ WANTLIB += atk-1.0 iconv intl cairo png xcb z
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
 WANTLIB += gdk-x11-2.0 gtk-x11-2.0
+WANTLIB += GL Xxf86vm drm gthread-2.0 pthread xcb-render xcb-shm
 .endif
 
 # CFLAGS _must_ be empty.  This is an OCaml compiler.
@@ -39,11 +40,8 @@ MAKE_FLAGS+=	NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
 		OCAMLOPT=ocamlopt.opt \
 		CFLAGS=
 
-# We are still not sure whether ocaml works -with-pthreads on all
-# architectures.  For now keep it at default false.
-# MAKE_FLAGS+=	THREADS=true
-
-NO_REGRESS=	Yes
+REGRESS_TARGET=	selftest
+PORTHOME=	${WRKDIR}
 
 # Avoid multiple all:: entries and use the real target entry.
 ALL_TARGET=	unison

net/unison/stable/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2010/12/07 14:57:19 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.16 2011/03/03 08:47:55 giovanni Exp $
 
 COMMENT=	multi-platform file synchronization tool
 
-V=		2.32.52
-REVISION=	4
+V=		2.40.61
 
 MASTER_SITES=	${HOMEPAGE}download/releases/stable/
 

net/unison/stable/distinfo

@@ -1,5 +1,5 @@
-MD5 (unison-2.32.52.tar.gz) = BwHwlcFyF3agRUuUYH7aSA==
-RMD160 (unison-2.32.52.tar.gz) = ghai5ILVpEXdes22Lhu2N36Q0aE=
-SHA1 (unison-2.32.52.tar.gz) = aOpXCd5PzC+a73sBskY3UDthtaw=
-SHA256 (unison-2.32.52.tar.gz) = FULl1K0D6SgmDgYaj/nV4LyjKCSB7YvsVVLeF6AnBIU=
-SIZE (unison-2.32.52.tar.gz) = 697866
+MD5 (unison-2.40.61.tar.gz) = nUh5axFXBDIcakpQ3Qko7g==
+RMD160 (unison-2.40.61.tar.gz) = SgvMY20OGCvhNyOl2cZ2QGgk9jg=
+SHA1 (unison-2.40.61.tar.gz) = hkXOk6UluVYdUczrnE+fCM6mUOk=
+SHA256 (unison-2.40.61.tar.gz) = 5hFL9qmdi74VElC34op0qlRtIT9Pf3kUyghqSLN1J3s=
+SIZE (unison-2.40.61.tar.gz) = 2702722

net/unison/stable/patches/patch-Makefile

@@ -0,0 +1,11 @@
+--- Makefile.orig	Thu Dec 16 22:52:10 2010
++++ Makefile	Thu Dec 16 22:52:39 2010
+@@ -60,7 +60,7 @@
+ # NAME, VERSION, and MAJORVERSION, automatically generated
+ -include Makefile.ProjectInfo
+ 
+-Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
++Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
+ 	./mkProjectInfo > $@
+ 
+ mkProjectInfo: mkProjectInfo.ml

net/unison/stable/patches/patch-update_mli

@@ -1,15 +0,0 @@
-$OpenBSD: patch-update_mli,v 1.1 2010/12/07 14:57:19 dcoppa Exp $
-
-Make Unison compile with Ocaml 3.12
-
---- update.mli.orig	Wed Nov 10 15:06:41 2010
-+++ update.mli	Wed Nov 10 15:07:12 2010
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
- 
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
- 
- type archive =
-     ArchiveDir of Props.t * archive NameMap.t