update and split port into stable (2.10.2)/snapshot (2.12.0) as

especially windows support might work better in the snapshot version

from maintainer Zvezdan Petkovic <zpetkovic at acm.org>

net/unison/Makefile.inc

@@ -0,0 +1,55 @@
+# $OpenBSD: Makefile.inc,v 1.1.1.1 2005/05/22 17:44:40 sturm Exp $
+
+DISTNAME=	unison-${VERSION}
+CATEGORIES=	net
+
+HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
+
+MAINTAINER=	Zvezdan Petkovic <zpetkovic@acm.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=	c m util
+
+MODULES=	lang/ocaml
+
+USE_GMAKE=	Yes
+
+FLAVORS=	no_x11
+FLAVOR?=
+.if ${FLAVOR:L:Mno_x11}
+MAKE_FLAGS=	UISTYLE=text
+.else
+BUILD_DEPENDS+=	::x11/lablgtk
+LIB_DEPENDS=	gtk.1.2,gdk.1.2::x11/gtk+
+MAKE_FLAGS=	UISTYLE=gtk
+USE_X11=	Yes
+WANTLIB+=	X11 Xext Xi glib gmodule iconv intl
+.endif
+
+# CFLAGS _must_ be empty.  This is an OCaml compiler.
+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
+
+# Empty to avoid multiple all:: entries and use the first target entry.
+ALL_TARGET=
+
+DOCS=		BUGS.txt NEWS README
+
+# Avoid the nightmare of their Makefile install target.
+# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/unison ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison

net/unison/snapshot/Makefile

@@ -0,0 +1,9 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+
+COMMENT=	"multi-platform file synchronization tool, beta version"
+
+VERSION=	2.12.0
+
+MASTER_SITES=	${HOMEPAGE}download/beta-test/${DISTNAME}/
+
+.include <bsd.port.mk>

net/unison/snapshot/distinfo

@@ -0,0 +1,4 @@
+MD5 (unison-2.12.0.tar.gz) = c2b818e77e95951b5db0b95272e385a2
+RMD160 (unison-2.12.0.tar.gz) = 89f215787df9b8f1d0edb367559be5dce810c215
+SHA1 (unison-2.12.0.tar.gz) = 71cc8abedf8e9434285a610c3f4090ddc05cdfa9
+SIZE (unison-2.12.0.tar.gz) = 841717

net/unison/snapshot/patches/patch-files_ml

@@ -0,0 +1,23 @@
+$OpenBSD: patch-files_ml,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+Fix the problem with comparison of files using diff
+when the files are on two different hosts.
+--- files.ml.orig	Sat Mar 12 11:17:59 2005
++++ files.ml	Sun May 22 08:13:59 2005
+@@ -476,7 +476,7 @@ let rec diff root1 path1 ui1 root2 path2
+              (Update.translatePath root2 path2 >>= (fun path2 ->
+               Copy.file root2 path2 root1 workingDir tmppath realPath
+                 `Copy (Props.setLength Props.fileSafe (Props.length desc2))
+-                 fp1 ress1 id));
++                 fp2 ress2 id));
+            displayDiff
+ 	     (Fspath.concat workingDir realPath)
+              (Fspath.concat workingDir tmppath);
+@@ -494,7 +494,7 @@ let rec diff root1 path1 ui1 root2 path2
+               (* Note that we don't need the ressource fork *)
+               Copy.file root1 path1 root2 workingDir tmppath realPath
+                 `Copy (Props.setLength Props.fileSafe (Props.length desc1))
+-                 fp2 ress2 id));
++                 fp1 ress1 id));
+            displayDiff
+              (Fspath.concat workingDir tmppath)
+ 	     (Fspath.concat workingDir realPath);

net/unison/snapshot/pkg/DESCR

@@ -0,0 +1,11 @@
+Unison is a file-synchronization tool for Unix and Windows.  It allows
+two replicas of a collection of files and directories to be stored on
+different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes in
+each replica to the other.
+
+This is the "beta" version of Unison.
+The "stable" version is also available.
+
+Flavors:
+	no_x11 	- build without X support

net/unison/snapshot/pkg/PLIST

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+bin/unison
+share/doc/unison/
+share/doc/unison/BUGS.txt
+share/doc/unison/NEWS
+share/doc/unison/README

net/unison/stable/Makefile

@@ -0,0 +1,9 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/05/22 17:44:40 sturm Exp $
+
+COMMENT=	"multi-platform file synchronization tool"
+
+VERSION=	2.10.2
+
+MASTER_SITES=	${HOMEPAGE}download/stable/${DISTNAME}/
+
+.include <bsd.port.mk>

net/unison/stable/distinfo

@@ -0,0 +1,4 @@
+MD5 (unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5
+RMD160 (unison-2.10.2.tar.gz) = 593d71c39b49f30e82df58f62891d6d5540c2af7
+SHA1 (unison-2.10.2.tar.gz) = 1d378292d944981fb41504c8cea92cd3e1913c49
+SIZE (unison-2.10.2.tar.gz) = 458032

net/unison/stable/patches/patch-files_ml

@@ -0,0 +1,23 @@
+$OpenBSD: patch-files_ml,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+Fix the problem with comparison of files using diff
+when the files are on two different hosts.
+--- files.ml.orig	Mon Sep  6 15:15:46 2004
++++ files.ml	Sun May 22 07:58:42 2005
+@@ -470,7 +470,7 @@ let rec diff root1 path1 ui1 root2 path2
+              (Update.translatePath root2 path2 >>= (fun path2 ->
+               Copy.file root2 path2 root1 workingDir tmppath realPath
+                 `Copy (Props.setLength Props.fileSafe (Props.length desc1))
+-                 fp1 ress1 id));
++                 fp2 ress2 id));
+            displayDiff
+ 	     (Fspath.concat workingDir realPath)
+              (Fspath.concat workingDir tmppath);
+@@ -488,7 +488,7 @@ let rec diff root1 path1 ui1 root2 path2
+               (* Note that we don't need the ressource fork *)
+               Copy.file root1 path1 root2 workingDir tmppath realPath
+                 `Copy (Props.setLength Props.fileSafe (Props.length desc2))
+-                 fp2 ress2 id));
++                 fp1 ress1 id));
+            displayDiff
+              (Fspath.concat workingDir tmppath)
+ 	     (Fspath.concat workingDir realPath);

net/unison/stable/patches/patch-uigtk_ml

@@ -0,0 +1,30 @@
+$OpenBSD: patch-uigtk_ml,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+Fix compilation with GTK 1.
+--- uigtk.ml.orig	Mon Sep  6 15:15:46 2004
++++ uigtk.ml	Tue May 17 02:21:59 2005
+@@ -1606,7 +1606,7 @@ in
+                   catch (fun () ->
+                            Transport.transportItem
+                              theSI.ri (Uutil.File.ofLine i)
+-                             (fun title text -> Trace.status (Printf.sprintf "\n%s\n\n%s\n\n" title text))
++                             (fun title text -> Trace.status (Printf.sprintf "\n%s\n\n%s\n\n" title text); true)
+                            >>= (fun () ->
+                            return Util.Succeeded))
+                         (fun e ->
+@@ -1760,6 +1760,7 @@ in
+   actionBar#insert_space ();
+   grAdd grDiff (actionBar#insert_button ~text:"Diff" ~callback:diffCmd ());
+ 
++(*
+   let mergeCmd () =
+     match !current with
+       Some i ->
+@@ -1787,7 +1788,7 @@ in
+ 
+   actionBar#insert_space ();
+   grAdd grDiff (actionBar#insert_button ~text:"Merge" ~callback:mergeCmd ());
+-
++*)
+   (*********************************************************************
+     Keyboard commands
+    *********************************************************************)

net/unison/stable/pkg/DESCR

@@ -0,0 +1,8 @@
+Unison is a file-synchronization tool for Unix and Windows.  It allows
+two replicas of a collection of files and directories to be stored on
+different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes in
+each replica to the other.
+
+Flavors:
+	no_x11 	- build without X support

net/unison/stable/pkg/PLIST

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
+bin/unison
+share/doc/unison/
+share/doc/unison/BUGS.txt
+share/doc/unison/NEWS
+share/doc/unison/README