From a1ef6db3e67397b028106299e116910f69f5f3b4 Mon Sep 17 00:00:00 2001
From: chrisz <chrisz@openbsd.org>
Date: Sun, 22 Sep 2019 17:59:03 +0000
Subject: [PATCH] Add instructions how to build unison with fixed OCaml version
 via OPAM.

reviewed by sthen@, ok bket@
---
 net/unison/2.4x/Makefile   |  4 ++--
 net/unison/2.4x/pkg/README | 12 +++++++++---
 net/unison/2.5x/Makefile   |  4 ++--
 net/unison/2.5x/pkg/README | 12 +++++++++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/net/unison/2.4x/Makefile b/net/unison/2.4x/Makefile
index 91d53de8e41..ab942530964 100644
--- a/net/unison/2.4x/Makefile
+++ b/net/unison/2.4x/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2019/09/18 17:49:36 chrisz Exp $
+# $OpenBSD: Makefile,v 1.8 2019/09/22 17:59:03 chrisz Exp $
 
 VER=		2.48.15
 REV=		v4
-REVISION=	0
+REVISION=	1
 GH_TAGNAME=	v${VER}${REV}
 PKGNAME=	unison-${VER}${REV:S/^v/pl/}
 
diff --git a/net/unison/2.4x/pkg/README b/net/unison/2.4x/pkg/README
index 51d7ab23f76..a8a7f8c7d79 100644
--- a/net/unison/2.4x/pkg/README
+++ b/net/unison/2.4x/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.2 2018/09/04 12:46:19 espie Exp $
+$OpenBSD: README,v 1.3 2019/09/22 17:59:03 chrisz Exp $
 
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
@@ -8,5 +8,11 @@ Unison uses native OCaml marshalling in its prococol. This
 means that unison might not work when the OCaml versions of
 two instances are out of sync.
 One way to work around this limitation of unison is to use
-the OPAM OCaml package and compiler manager to sync the
-OCaml versions on your machines.
+the OPAM OCaml package manager to build unison with the same
+version of the OCaml compiler on all machines:
+
+doas pkg_add opam
+opam init --no-setup --root ~/opam_unison \
+       --compiler ocaml-base-compiler.4.09.0
+opam install unison lablgtk  # To build without the gui, remove lablgtk
+$(opam var bin)/unison
diff --git a/net/unison/2.5x/Makefile b/net/unison/2.5x/Makefile
index c975d3cb1f2..3c246b90c30 100644
--- a/net/unison/2.5x/Makefile
+++ b/net/unison/2.5x/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2019/09/18 17:49:36 chrisz Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/22 17:59:03 chrisz Exp $
  
 GH_TAGNAME=	v2.51.2
-REVISION=	2
+REVISION=	3
 
 WRKDIST=	${WRKDIR}/${PKGNAME}/src
 
diff --git a/net/unison/2.5x/pkg/README b/net/unison/2.5x/pkg/README
index 51d7ab23f76..a8a7f8c7d79 100644
--- a/net/unison/2.5x/pkg/README
+++ b/net/unison/2.5x/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.2 2018/09/04 12:46:19 espie Exp $
+$OpenBSD: README,v 1.3 2019/09/22 17:59:03 chrisz Exp $
 
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
@@ -8,5 +8,11 @@ Unison uses native OCaml marshalling in its prococol. This
 means that unison might not work when the OCaml versions of
 two instances are out of sync.
 One way to work around this limitation of unison is to use
-the OPAM OCaml package and compiler manager to sync the
-OCaml versions on your machines.
+the OPAM OCaml package manager to build unison with the same
+version of the OCaml compiler on all machines:
+
+doas pkg_add opam
+opam init --no-setup --root ~/opam_unison \
+       --compiler ocaml-base-compiler.4.09.0
+opam install unison lablgtk  # To build without the gui, remove lablgtk
+$(opam var bin)/unison