diff options
author | pho <pho@pkgsrc.org> | 2019-10-18 09:59:26 +0000 |
---|---|---|
committer | pho <pho@pkgsrc.org> | 2019-10-18 09:59:26 +0000 |
commit | 0e57cceb5b6eff0d0dbe73d62a71d5549c0e16e3 (patch) | |
tree | 544f452e7c67a467b6a0a7119f542f49ab5fe596 /net | |
parent | 6e30613c1effa6365901af40b49aa2f8aef5700a (diff) | |
download | pkgsrc-0e57cceb5b6eff0d0dbe73d62a71d5549c0e16e3.tar.gz |
Rename bin/unison to bin/unison-2.40 so it can co-exist with other versions of unison
Also add ALTERNATIVES file.
Diffstat (limited to 'net')
-rw-r--r-- | net/unison2.40/ALTERNATIVES | 1 | ||||
-rw-r--r-- | net/unison2.40/Makefile | 21 | ||||
-rw-r--r-- | net/unison2.40/PLIST | 18 | ||||
-rw-r--r-- | net/unison2.40/distinfo | 6 | ||||
-rw-r--r-- | net/unison2.40/patches/patch-files.ml | 15 | ||||
-rw-r--r-- | net/unison2.40/patches/patch-recon.ml | 17 | ||||
-rw-r--r-- | net/unison2.40/patches/patch-system_system__generic.ml | 15 |
7 files changed, 70 insertions, 23 deletions
diff --git a/net/unison2.40/ALTERNATIVES b/net/unison2.40/ALTERNATIVES new file mode 100644 index 00000000000..9ab379bec43 --- /dev/null +++ b/net/unison2.40/ALTERNATIVES @@ -0,0 +1 @@ +bin/unison @PREFIX@/bin/unison-2.40 diff --git a/net/unison2.40/Makefile b/net/unison2.40/Makefile index 293ea79c884..7c1c0f11518 100644 --- a/net/unison2.40/Makefile +++ b/net/unison2.40/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2019/07/21 22:25:35 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2019/10/18 09:59:26 pho Exp $ DISTNAME= unison-2.40.128 -PKGREVISION= 39 +PKGREVISION= 40 CATEGORIES= net MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ @@ -41,16 +41,17 @@ MAKE_FLAGS+= THREADS=true BUILD_TARGET= buildexecutable INSTALLATION_DIRS= bin -INSTALLATION_DIRS+= share/doc/unison +INSTALLATION_DIRS+= share/doc/unison-2.40 post-install: - ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison + ${MV} ${DESTDIR}${PREFIX}/bin/unison ${DESTDIR}${PREFIX}/bin/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.40 + ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.40 .include "../../lang/ocaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/unison2.40/PLIST b/net/unison2.40/PLIST index cf09d9de5cf..2ee8ebbcfc0 100644 --- a/net/unison2.40/PLIST +++ b/net/unison2.40/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2015/01/06 12:57:03 wiz Exp $ -bin/unison -share/doc/unison/BUGS.txt -share/doc/unison/CONTRIB -share/doc/unison/COPYING -share/doc/unison/NEWS -share/doc/unison/README -share/doc/unison/ROADMAP.txt -share/doc/unison/TODO.txt +@comment $NetBSD: PLIST,v 1.2 2019/10/18 09:59:26 pho Exp $ +bin/unison-2.40 +share/doc/unison-2.40/BUGS.txt +share/doc/unison-2.40/CONTRIB +share/doc/unison-2.40/COPYING +share/doc/unison-2.40/NEWS +share/doc/unison-2.40/README +share/doc/unison-2.40/ROADMAP.txt +share/doc/unison-2.40/TODO.txt diff --git a/net/unison2.40/distinfo b/net/unison2.40/distinfo index aeee5490682..371bb53c767 100644 --- a/net/unison2.40/distinfo +++ b/net/unison2.40/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2018/03/14 11:16:14 dholland Exp $ +$NetBSD: distinfo,v 1.6 2019/10/18 09:59:26 pho Exp $ SHA1 (unison-2.40.128.tar.gz) = 392a573cbf331d71cac8ccb32f5440dceec88470 RMD160 (unison-2.40.128.tar.gz) = ad3f4191af957aef1084e3ea9b99c17777e35596 @@ -10,6 +10,7 @@ SHA1 (patch-bytearray.ml) = efe1e039f9f64c204229b0d6d483a480ce13dce7 SHA1 (patch-bytearray.mli) = a93299b6880159c66b2e3feed2db10b53a99489f SHA1 (patch-bytearray__stubs.c) = 6ad17f3c6a581b749f1c6d52149377f908179290 SHA1 (patch-external.ml) = 11198c37a72ee552e15f394a7f3b005ef1b4d392 +SHA1 (patch-files.ml) = 403162873ece0702eb992f9deffd9d57c3609069 SHA1 (patch-fileutil.ml) = cfa84095f6a3d249d483fcf6aaeb18083ee3593d SHA1 (patch-fingerprint.ml) = 709e0ee1fa3ccdc22ac00421d0538e37f35c31b1 SHA1 (patch-fpcache.ml) = 595791d3f9f40f058c449a361a6439088eed3121 @@ -18,8 +19,9 @@ SHA1 (patch-lwt_generic_lwt__unix__impl.ml) = f73bbd3a9b25a0fd22b946151b4b18150a SHA1 (patch-lwt_lwt__unix.mli) = 22875429a5fb31835f7c8c0a27473ea4d3030456 SHA1 (patch-osx.ml) = a7bd0c11c7a49ec86fa277a128c6a887ac37f0b7 SHA1 (patch-path.ml) = f48a08d01e2bfeff405d9a882cf6a4ab30bd48f4 +SHA1 (patch-recon.ml) = a88f6285db139c6934f941432ec923ba5979ccaf SHA1 (patch-remote.ml) = e1f6126be4eb784f1b37f61dda2068821d81ff11 -SHA1 (patch-system_system__generic.ml) = 02d4d678b8868a7237b0aecc3f4add74e1011fd0 +SHA1 (patch-system_system__generic.ml) = 08654e51578982c9c0814aaf89d58ac2155d8f56 SHA1 (patch-terminal.ml) = f3c98c01361be18c97552037dc3b703419251f46 SHA1 (patch-test.ml) = 989c23bb359fef8e8cee7df0f6cc0614b386f954 SHA1 (patch-transfer.ml) = 4f7f2eb1621010a05a629809bb6c543a4a6e65af diff --git a/net/unison2.40/patches/patch-files.ml b/net/unison2.40/patches/patch-files.ml new file mode 100644 index 00000000000..3fd493070f1 --- /dev/null +++ b/net/unison2.40/patches/patch-files.ml @@ -0,0 +1,15 @@ +$NetBSD: patch-files.ml,v 1.1 2019/10/18 09:59:26 pho Exp $ + +Replace deprecated sort function + +--- files.ml.orig 2010-04-15 17:29:31.000000000 +0000 ++++ files.ml +@@ -679,7 +679,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient diff --git a/net/unison2.40/patches/patch-recon.ml b/net/unison2.40/patches/patch-recon.ml new file mode 100644 index 00000000000..da9be36cfdd --- /dev/null +++ b/net/unison2.40/patches/patch-recon.ml @@ -0,0 +1,17 @@ +$NetBSD: patch-recon.ml,v 1.1 2019/10/18 09:59:26 pho Exp $ + +Replace deprecated sort function + +--- recon.ml.orig 2010-10-08 15:44:59.000000000 +0000 ++++ recon.ml +@@ -622,8 +622,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ (fun (p1, _) (p2, _) -> Path.compare p1 p2) + pathUpdatesList + + let rec enterPath p1 p2 t = diff --git a/net/unison2.40/patches/patch-system_system__generic.ml b/net/unison2.40/patches/patch-system_system__generic.ml index 985ef7474a7..82239a2f3d4 100644 --- a/net/unison2.40/patches/patch-system_system__generic.ml +++ b/net/unison2.40/patches/patch-system_system__generic.ml @@ -1,7 +1,18 @@ -$NetBSD: patch-system_system__generic.ml,v 1.1 2017/07/14 12:59:23 joerg Exp $ +$NetBSD: patch-system_system__generic.ml,v 1.2 2019/10/18 09:59:26 pho Exp $ ---- system/system_generic.ml.orig 2017-07-12 22:40:13.071158899 +0000 +Needed for compatibility with OCaml 4.08 + +--- system/system_generic.ml.orig 2010-04-15 17:29:31.000000000 +0000 +++ system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in @@ -57,7 +57,7 @@ let opendir f = let readdir = Unix.readdir let closedir = Unix.closedir |