summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2018-04-30 10:21:02 +0000
committerwiz <wiz@pkgsrc.org>2018-04-30 10:21:02 +0000
commit083fbe30b1b8836a2169fd8e6d5058ed24e6cbf4 (patch)
tree6ff5b523aa07e75011a333daa5613d432bfe9497 /net
parent35e472afbcb84143a5ea486a602e3f46d3478c9c (diff)
downloadpkgsrc-083fbe30b1b8836a2169fd8e6d5058ed24e6cbf4.tar.gz
unison2.51: Remove unnecessary patches. Update a comment.
Diffstat (limited to 'net')
-rw-r--r--net/unison2.51/distinfo7
-rw-r--r--net/unison2.51/patches/patch-src_Makefile.OCaml3
-rw-r--r--net/unison2.51/patches/patch-src_fs.ml14
-rw-r--r--net/unison2.51/patches/patch-src_system_system__generic.ml15
-rw-r--r--net/unison2.51/patches/patch-src_system_system_intf.ml14
5 files changed, 3 insertions, 50 deletions
diff --git a/net/unison2.51/distinfo b/net/unison2.51/distinfo
index 90617c204c3..925ee07cec0 100644
--- a/net/unison2.51/distinfo
+++ b/net/unison2.51/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.1 2018/04/30 10:14:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2018/04/30 10:21:02 wiz Exp $
SHA1 (unison-2.51.2.tar.gz) = 63e3b526254ab6356a3fabf74be533982c2962c2
RMD160 (unison-2.51.2.tar.gz) = d73c88be2a5c3c677939f4adede4c0f772ecff33
SHA512 (unison-2.51.2.tar.gz) = 4ec4a1603ce5e561084dcd59621a0cc72c1ea40e3e23e36408c436c51bde3eb82774f671aba85c016f87982417800e8a27b978be59c92aa62ce9e4be1a072011
Size (unison-2.51.2.tar.gz) = 1398790 bytes
SHA1 (patch-src_Makefile) = 3172ed284bea2d21ccb475439c53ce65a45b79f6
-SHA1 (patch-src_Makefile.OCaml) = 6c959562b218459e5986cb3d2af18261c6098b44
-SHA1 (patch-src_fs.ml) = 1d02f83d245466c0aad45a3261bba8149ed3db56
-SHA1 (patch-src_system_system__generic.ml) = f1965308ec5da5fa0e55c449e263985a64c6f09f
-SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
+SHA1 (patch-src_Makefile.OCaml) = df9c889fc892e66f48c769e72cbb1cea8da525fc
SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d
diff --git a/net/unison2.51/patches/patch-src_Makefile.OCaml b/net/unison2.51/patches/patch-src_Makefile.OCaml
index 731eab187d0..9d0d54d1c70 100644
--- a/net/unison2.51/patches/patch-src_Makefile.OCaml
+++ b/net/unison2.51/patches/patch-src_Makefile.OCaml
@@ -1,7 +1,6 @@
-$NetBSD: patch-src_Makefile.OCaml,v 1.1 2018/04/30 10:14:29 wiz Exp $
+$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/04/30 10:21:02 wiz Exp $
Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
-Add -unsafe-string for OCaml >= 4.06.
--- src/Makefile.OCaml.orig 2018-01-27 21:12:13.000000000 +0000
+++ src/Makefile.OCaml
diff --git a/net/unison2.51/patches/patch-src_fs.ml b/net/unison2.51/patches/patch-src_fs.ml
deleted file mode 100644
index d15cb161d9f..00000000000
--- a/net/unison2.51/patches/patch-src_fs.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_fs.ml,v 1.1 2018/04/30 10:14:29 wiz Exp $
-
-System symlink definition has changed
---- src/fs.ml.orig 2015-10-05 18:14:23.000000000 +0000
-+++ src/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 l (Fspath.toString f)
-
- let readlink f = System.readlink (Fspath.toString f)
-
diff --git a/net/unison2.51/patches/patch-src_system_system__generic.ml b/net/unison2.51/patches/patch-src_system_system__generic.ml
deleted file mode 100644
index 286c5f0181a..00000000000
--- a/net/unison2.51/patches/patch-src_system_system__generic.ml
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_system_system__generic.ml,v 1.1 2018/04/30 10:14:29 wiz Exp $
-
-Adapt for API change.
-
---- src/system/system_generic.ml.orig 2018-01-27 21:12:13.000000000 +0000
-+++ src/system/system_generic.ml
-@@ -58,7 +58,7 @@ let readdir = Unix.readdir
- let closedir = Unix.closedir
- let readlink = Unix.readlink
- (* BCP 5/16: Eta-expand for backward compatibility with OCaml <=4.02 *)
--let symlink s1 s2 = Unix.symlink s1 s2
-+let symlink ?to_dir s1 s2 = Unix.symlink ?to_dir s1 s2
- let chdir = Sys.chdir
- let getcwd = Sys.getcwd
-
diff --git a/net/unison2.51/patches/patch-src_system_system_intf.ml b/net/unison2.51/patches/patch-src_system_system_intf.ml
deleted file mode 100644
index d11152d1735..00000000000
--- a/net/unison2.51/patches/patch-src_system_system_intf.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_system_system_intf.ml,v 1.1 2018/04/30 10:14:29 wiz Exp $
-
-System symlink definition has changed
---- src/system/system_intf.ml.orig 2015-10-05 18:14:23.000000000 +0000
-+++ src/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