summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbad <bad@pkgsrc.org>2010-08-24 19:01:59 +0000
committerbad <bad@pkgsrc.org>2010-08-24 19:01:59 +0000
commite7399b4e6bb03f5b5ef37a2c6a5b6bb00951b7fe (patch)
tree41342d718a731ae21870718faa697203ce338c1b
parentfbd0b82362b4da325f5bc427561ade14dd51646b (diff)
downloadpkgsrc-e7399b4e6bb03f5b5ef37a2c6a5b6bb00951b7fe.tar.gz
Apply r456 from svn repository to update.mli:
* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12. PKGREVISION++
-rw-r--r--net/unison/Makefile3
-rw-r--r--net/unison/distinfo3
-rw-r--r--net/unison/patches/patch-ab13
3 files changed, 17 insertions, 2 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile
index cadbe916538..b44c60960d5 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2009/11/20 20:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/08/24 19:01:59 bad Exp $
DISTNAME= unison-2.32.52
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 66e622f10f4..8b46f89e606 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2009/11/20 20:18:47 wiz Exp $
+$NetBSD: distinfo,v 1.15 2010/08/24 19:01:59 bad Exp $
SHA1 (unison-2.32.52.tar.gz) = 68ea5709de4fcc2f9aef7b01b24637503b61b5ac
RMD160 (unison-2.32.52.tar.gz) = 8216a2e482d5a445dd7acdb62e1bb6377e90d1a1
Size (unison-2.32.52.tar.gz) = 697866 bytes
SHA1 (patch-aa) = d59adf3446ea3f98f4ab72274b95b1140d3cf896
+SHA1 (patch-ab) = 29a2bc3842be7bb1bde7372dfeca2a5c5b4acdef
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
new file mode 100644
index 00000000000..4ae17e6a879
--- /dev/null
+++ b/net/unison/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2010/08/24 19:01:59 bad Exp $
+
+--- update.mli.orig 2009-05-02 02:31:27.000000000 +0000
++++ update.mli 2010-08-23 22:18:21.000000000 +0000
+@@ -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