Updated unison to 2.48.4.

Changes not found, but this release obsoletes the pkgsrc patches
for ocaml-4.03 support.

4 files changed, 8 insertions, 41 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 64083b45784..fd16e3a38d2 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2016/05/05 11:45:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.101 2016/06/12 14:30:05 wiz Exp $
 
-DISTNAME=	unison-2.48.3
-# XXX remove DIST_SUBDIR with next release
-DIST_SUBDIR=	${DISTNAME}-release
-PKGREVISION=	11
+DISTNAME=	unison-2.48.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
@@ -20,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.11.2
 BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
 
 # docs: unison-manual.pdf/html/ps/dvi
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/src
 USE_TOOLS+=	gmake
 MAKE_FLAGS+=	CFLAGS=""
 MAKE_ENV+=	HOME=${WRKDIR:Q}
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 71e8bed91c3..71bb7a4d468 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.26 2016/05/06 14:29:04 jaapb Exp $
+$NetBSD: distinfo,v 1.27 2016/06/12 14:30:05 wiz Exp $
 
-SHA1 (unison-2.48.3-release/unison-2.48.3.tar.gz) = 2a0cfc95e95b9e9457c39faa4fe5b8184023cd0c
-RMD160 (unison-2.48.3-release/unison-2.48.3.tar.gz) = f70cca489bbde21797429a7c687e6ac86299ae79
-SHA512 (unison-2.48.3-release/unison-2.48.3.tar.gz) = 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d
-Size (unison-2.48.3-release/unison-2.48.3.tar.gz) = 1172646 bytes
+SHA1 (unison-2.48.4.tar.gz) = baeff0e3a942c710ce551cca118b891feca137c5
+RMD160 (unison-2.48.4.tar.gz) = d5a1d66caffc02832c446f375a16319779fc5e0b
+SHA512 (unison-2.48.4.tar.gz) = c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
+Size (unison-2.48.4.tar.gz) = 1200861 bytes
 SHA1 (patch-Makefile.OCaml) = 2c39a20eb731d3f787d5c938b539ceb3276d5d47
 SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
-SHA1 (patch-fs.ml) = 67bc00008c4b7d47c15d01549f6446cc0fba262d
-SHA1 (patch-system_system_intf.ml) = 58a29e56b66fb4f09306dad4d652770ffa77efec
diff --git a/net/unison/patches/patch-fs.ml b/net/unison/patches/patch-fs.ml
deleted file mode 100644
index b03fd4c0bc0..00000000000
--- a/net/unison/patches/patch-fs.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-fs.ml,v 1.1 2016/05/06 14:29:04 jaapb Exp $
-
-Solve compilation problem with ocaml 4.03
---- fs.ml.orig	2014-12-29 18:34:45.000000000 +0000
-+++ fs.ml
-@@ -21,7 +21,7 @@ type fspath = Fspath.t
- type dir_handle = System.dir_handle
-                 = { readdir : unit -> string; closedir : unit -> unit }
- 
--let symlink l f = System.symlink l (Fspath.toString f)
-+let symlink ?to_dir l f = System.symlink ?to_dir l (Fspath.toString f)
- 
- let readlink f = System.readlink (Fspath.toString f)
- 
diff --git a/net/unison/patches/patch-system_system_intf.ml b/net/unison/patches/patch-system_system_intf.ml
deleted file mode 100644
index 3f852a3f670..00000000000
--- a/net/unison/patches/patch-system_system_intf.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-system_system_intf.ml,v 1.1 2016/05/06 14:29:04 jaapb Exp $
-
-Solve compilation problem with ocaml 4.03
---- system/system_intf.ml.orig	2014-12-29 18:34:45.000000000 +0000
-+++ system/system_intf.ml
-@@ -20,7 +20,7 @@ module type Core = sig
- type fspath
- type dir_handle = { readdir : unit -> string; closedir : unit -> unit }
- 
--val symlink : string -> fspath -> unit
-+val symlink : ?to_dir:bool -> string -> fspath -> unit
- val readlink : fspath -> string
- val chown : fspath -> int -> int -> unit
- val chmod : fspath -> int -> unit