CVS commit: pkgsrc/net/unison2.32

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/unison2.32
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Fri, 18 Oct 2019 09:45:28 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Oct 18 09:45:28 UTC 2019

Modified Files:
        pkgsrc/net/unison2.32: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/unison2.32: ALTERNATIVES
        pkgsrc/net/unison2.32/patches: patch-files.ml patch-recon.ml

Log Message:
Rename bin/unison to bin/unison-2.32 so it can co-exist with other versions of unison

Also add ALTERNATIVES file.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.32/ALTERNATIVES
cvs rdiff -u -r1.81 -r1.82 pkgsrc/net/unison2.32/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/unison2.32/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/unison2.32/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.32/patches/patch-files.ml \
    pkgsrc/net/unison2.32/patches/patch-recon.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/unison2.32/Makefile
diff -u pkgsrc/net/unison2.32/Makefile:1.81 pkgsrc/net/unison2.32/Makefile:1.82
--- pkgsrc/net/unison2.32/Makefile:1.81 Sun Jul 21 22:25:34 2019
+++ pkgsrc/net/unison2.32/Makefile      Fri Oct 18 09:45:27 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2019/07/21 22:25:34 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2019/10/18 09:45:27 pho Exp $
 
 DISTNAME=      unison-2.32.52
-PKGREVISION=   80
+PKGREVISION=   81
 CATEGORIES=    net
 MASTER_SITES=  http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
@@ -37,16 +37,17 @@ MAKE_FLAGS+=        THREADS=true
 .endif
 
 INSTALLATION_DIRS=     bin
-INSTALLATION_DIRS+=    share/doc/unison
+INSTALLATION_DIRS+=    share/doc/unison-2.32
 
 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.32
+       ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.32
+       ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.32
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/unison2.32/PLIST
diff -u pkgsrc/net/unison2.32/PLIST:1.1.1.1 pkgsrc/net/unison2.32/PLIST:1.2
--- pkgsrc/net/unison2.32/PLIST:1.1.1.1 Fri Feb 25 20:01:37 2011
+++ pkgsrc/net/unison2.32/PLIST Fri Oct 18 09:45:27 2019
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/25 20:01:37 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:45:27 pho Exp $
+bin/unison-2.32
+share/doc/unison-2.32/BUGS.txt
+share/doc/unison-2.32/CONTRIB
+share/doc/unison-2.32/COPYING
+share/doc/unison-2.32/NEWS
+share/doc/unison-2.32/README
+share/doc/unison-2.32/ROADMAP.txt
+share/doc/unison-2.32/TODO.txt

Index: pkgsrc/net/unison2.32/distinfo
diff -u pkgsrc/net/unison2.32/distinfo:1.3 pkgsrc/net/unison2.32/distinfo:1.4
--- pkgsrc/net/unison2.32/distinfo:1.3  Wed Mar 14 10:16:03 2018
+++ pkgsrc/net/unison2.32/distinfo      Fri Oct 18 09:45:27 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/03/14 10:16:03 dholland Exp $
+$NetBSD: distinfo,v 1.4 2019/10/18 09:45:27 pho Exp $
 
 SHA1 (unison-2.32.52.tar.gz) = 68ea5709de4fcc2f9aef7b01b24637503b61b5ac
 RMD160 (unison-2.32.52.tar.gz) = 8216a2e482d5a445dd7acdb62e1bb6377e90d1a1
@@ -10,6 +10,7 @@ SHA1 (patch-bytearray.ml) = efe1e039f9f6
 SHA1 (patch-bytearray.mli) = a93299b6880159c66b2e3feed2db10b53a99489f
 SHA1 (patch-bytearray__stubs.c) = 6ad17f3c6a581b749f1c6d52149377f908179290
 SHA1 (patch-case.ml) = 20721eb771af7a446961af5a2e1c9bcb958a87dc
+SHA1 (patch-files.ml) = cc6bf1b29e0fa0659860a310eb3ebf2a683c9649
 SHA1 (patch-fileutil.ml) = cfa84095f6a3d249d483fcf6aaeb18083ee3593d
 SHA1 (patch-fingerprint.ml) = 709e0ee1fa3ccdc22ac00421d0538e37f35c31b1
 SHA1 (patch-fspath.ml) = d4929f4bf127100ca400de1c0f3a560975cfdb96
@@ -17,6 +18,7 @@ SHA1 (patch-lwt_lwt__unix.ml) = 61196ccb
 SHA1 (patch-lwt_lwt__unix.mli) = 0e9d553cced1ff8c86188e6a4b9acd5963c26e6f
 SHA1 (patch-osx.ml) = d90bf2df6f15883c692b1dcfcbba461ca955c345
 SHA1 (patch-path.ml) = f48a08d01e2bfeff405d9a882cf6a4ab30bd48f4
+SHA1 (patch-recon.ml) = a1776f1c0023196a746a74e47ff72dc13f0cde56
 SHA1 (patch-remote.ml) = 5e275cbc374b2ff519f69e7656a205009f7160d5
 SHA1 (patch-terminal.ml) = 1e84fb39df5e4d5a1df39a1cc35879d73369ca3c
 SHA1 (patch-test.ml) = 6a23b78ad5270bb7ad9c7dcf9b043b44a090f611

Added files:

Index: pkgsrc/net/unison2.32/ALTERNATIVES
diff -u /dev/null pkgsrc/net/unison2.32/ALTERNATIVES:1.1
--- /dev/null   Fri Oct 18 09:45:28 2019
+++ pkgsrc/net/unison2.32/ALTERNATIVES  Fri Oct 18 09:45:27 2019
@@ -0,0 +1 @@
+bin/unison @PREFIX@/bin/unison-2.32

Index: pkgsrc/net/unison2.32/patches/patch-files.ml
diff -u /dev/null pkgsrc/net/unison2.32/patches/patch-files.ml:1.1
--- /dev/null   Fri Oct 18 09:45:28 2019
+++ pkgsrc/net/unison2.32/patches/patch-files.ml        Fri Oct 18 09:45:27 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-files.ml,v 1.1 2019/10/18 09:45:27 pho Exp $
+
+Replace deprecated sort function
+
+--- files.ml.orig      2009-06-09 15:46:38.000000000 +0000
++++ files.ml
+@@ -569,7 +569,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+     Unix.closedir dirh
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
Index: pkgsrc/net/unison2.32/patches/patch-recon.ml
diff -u /dev/null pkgsrc/net/unison2.32/patches/patch-recon.ml:1.1
--- /dev/null   Fri Oct 18 09:45:28 2019
+++ pkgsrc/net/unison2.32/patches/patch-recon.ml        Fri Oct 18 09:45:27 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-recon.ml,v 1.1 2019/10/18 09:45:27 pho Exp $
+
+Replace deprecated sort function
+
+--- recon.ml.orig      2009-05-02 02:31:27.000000000 +0000
++++ recon.ml
+@@ -455,8 +455,8 @@ let rec reconcile path ui1 ui2 counter e
+ 
+ (* 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 p t =

Prev by Date: CVS commit: pkgsrc/textproc/py-markovify
Next by Date: CVS commit: pkgsrc/graphics/MesaLib
Previous by Thread: CVS commit: pkgsrc/textproc/py-markovify
Next by Thread: CVS commit: pkgsrc/graphics/MesaLib
Indexes:

Home | Main Index | Thread Index | Old Index