Hi, update to latest version, switch to github because patch releases are released only there and enable regression tests. Original diff by Björn Ketelaars with tweaks by me. Comments ? Ok ? Cheers Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/net/unison/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 16 Nov 2017 22:23:42 -0000 1.13
+++ Makefile 13 Dec 2017 08:06:52 -0000
@@ -3,10 +3,13 @@
COMMENT= multi-platform file synchronization tool
CATEGORIES= net
-V= 2.48.4
-REVISION= 2
-DISTNAME= unison-${V}
-MASTER_SITES= ${HOMEPAGE}download/releases/stable/
+REV= v3
+VER= 2.48.15
+GH_ACCOUNT= bcpierce00
+GH_PROJECT= unison
+GH_TAGNAME= v${VER}${REV}
+DISTNAME= ${GH_TAGNAME}
+PKGNAME= ${GH_PROJECT}-${VER}
HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
@@ -14,7 +17,7 @@ MAINTAINER= Giovanni Bechis <giovanni@op
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c m util
+WANTLIB= c curses m pthread util
MODULES= lang/ocaml
@@ -39,6 +42,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 g
WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo z
.endif
+TEST_DEPENDS += emacs->=24:editors/emacs
+
# CFLAGS _must_ be empty. This is an OCaml compiler.
MAKE_FLAGS+= NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
OCAMLOPT=ocamlopt.opt \
@@ -52,7 +57,7 @@ ALL_TARGET= unison
DOCS= BUGS.txt NEWS README
-WRKDIST= ${WRKDIR}/src
+WRKDIST= ${WRKDIR}/${PKGNAME}${REV}/src
# Avoid the nightmare of their Makefile install target.
# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/net/unison/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 27 Jun 2016 13:34:49 -0000 1.6
+++ distinfo 11 Dec 2017 07:28:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (unison-2.48.4.tar.gz) = MKpTzWcdZzWAEE8Evjz4GsHiCi6LqvcnRJhznVnpneg=
-SIZE (unison-2.48.4.tar.gz) = 1200861
+SHA256 (v2.48.15v3.tar.gz) = 2DfbASwkH4/0Bdu5a/0EnirXc4n8LVv78gjyOpvfSuI=
+SIZE (v2.48.15v3.tar.gz) = 1911724
Index: patches/patch-test_ml
===================================================================
RCS file: patches/patch-test_ml
diff -N patches/patch-test_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_ml 13 Dec 2017 07:58:37 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: test.ml
+--- test.ml.orig
++++ test.ml
+@@ -370,8 +370,6 @@ let test() =
+ check "4" R2 (Dir ["x", File "foo"]);
+ );
+
+- (raise (Util.Fatal "Skipping some tests -- remove me!\n") : unit);
+-
+ if bothRootsLocal then
+ runtest "backups 1 (local)" ["backup = Name *"] (fun() ->
+ put R1 (Dir []); put R2 (Dir []); sync();
signature.asc
Description: PGP signature
