pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net net/unison2.32: Remove
details: https://anonhg.NetBSD.org/pkgsrc/rev/f54a864ab229
branches: trunk
changeset: 416866:f54a864ab229
user: gdt <gdt%pkgsrc.org@localhost>
date: Thu Oct 31 16:56:02 2019 +0000
description:
net/unison2.32: Remove
As proposed on pkgsrc-users with no comments. Note that unison has
multiple versions only to deal with wire protocol breaks that happen
every version; without that there would just be a single recent unison
version.
In addition to being very old and unused, I believe that 2.32 from
pkgsrc cannot work to interoperate with other systems that still have
2.32, because pkgsrc's ocaml version has an incompatible serialization
format, and the unison wire protocol is effectively the combination of
the unison version and the ocaml serialization version.
(Separate from 2.40 removal to ease separate reverting, should it be
necessary.)
diffstat:
net/Makefile | 3 +-
net/unison2.32/ALTERNATIVES | 1 -
net/unison2.32/DESCR | 8 -
net/unison2.32/Makefile | 53 ---------
net/unison2.32/PLIST | 9 -
net/unison2.32/distinfo | 26 ----
net/unison2.32/options.mk | 14 --
net/unison2.32/patches/patch-aa | 42 -------
net/unison2.32/patches/patch-ab | 13 --
net/unison2.32/patches/patch-bytearray.ml | 68 ------------
net/unison2.32/patches/patch-bytearray.mli | 17 ---
net/unison2.32/patches/patch-bytearray__stubs.c | 29 -----
net/unison2.32/patches/patch-case.ml | 30 -----
net/unison2.32/patches/patch-files.ml | 15 --
net/unison2.32/patches/patch-fileutil.ml | 25 ----
net/unison2.32/patches/patch-fingerprint.ml | 24 ----
net/unison2.32/patches/patch-fspath.ml | 30 -----
net/unison2.32/patches/patch-lwt_lwt__unix.ml | 93 -----------------
net/unison2.32/patches/patch-lwt_lwt__unix.mli | 28 -----
net/unison2.32/patches/patch-osx.ml | 128 ------------------------
net/unison2.32/patches/patch-path.ml | 35 ------
net/unison2.32/patches/patch-recon.ml | 17 ---
net/unison2.32/patches/patch-remote.ml | 95 -----------------
net/unison2.32/patches/patch-terminal.ml | 49 ---------
net/unison2.32/patches/patch-test.ml | 18 ---
net/unison2.32/patches/patch-transfer.ml | 124 -----------------------
net/unison2.32/patches/patch-uicommon.ml | 27 -----
27 files changed, 1 insertions(+), 1020 deletions(-)
diffs (truncated from 1139 to 300 lines):
diff -r d238311605c8 -r f54a864ab229 net/Makefile
--- a/net/Makefile Thu Oct 31 16:30:19 2019 +0000
+++ b/net/Makefile Thu Oct 31 16:56:02 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1273 2019/10/27 14:29:23 kamil Exp $
+# $NetBSD: Makefile,v 1.1274 2019/10/31 16:56:02 gdt Exp $
#
COMMENT= Networking tools
@@ -895,7 +895,6 @@
SUBDIR+= unbound
SUBDIR+= unfs3
SUBDIR+= unifi
-SUBDIR+= unison2.32
SUBDIR+= unison2.40
SUBDIR+= unison2.48
SUBDIR+= unison2.51
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/ALTERNATIVES
--- a/net/unison2.32/ALTERNATIVES Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-bin/unison @PREFIX@/bin/unison-2.32
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/DESCR
--- a/net/unison2.32/DESCR Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows
-two replicas of a collection of files and directories to be stored
-on different hosts (or different disks on the same host), modified
-separately, and then brought up to date by propagating the changes
-in each replica to the other.
-
-This package contains the very old and unmaintained 2.32 version,
-because unison does not interoperate across versions.
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/Makefile
--- a/net/unison2.32/Makefile Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.82 2019/10/18 09:45:27 pho Exp $
-
-DISTNAME= unison-2.32.52
-PKGREVISION= 81
-CATEGORIES= net
-MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
-
-MAINTAINER= tonio%NetBSD.org@localhost
-HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
-COMMENT= File-synchronization tool (old 2.32 branch)
-LICENSE= gnu-gpl-v3
-
-BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2
-
-# docs: unison-manual.pdf/html/ps/dvi
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake
-MAKE_FLAGS+= CFLAGS=""
-MAKE_ENV+= HOME=${WRKDIR}
-
-# with -j, runs only about half the build and then stops
-MAKE_JOBS_SAFE= no
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
-MAKE_FLAGS+= NATIVE=true
-.else
-MAKE_FLAGS+= NATIVE=false
-.endif
-
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
-MAKE_FLAGS+= THREADS=true
-.endif
-
-INSTALLATION_DIRS= bin
-INSTALLATION_DIRS+= share/doc/unison-2.32
-
-post-install:
- ${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"
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/PLIST
--- a/net/unison2.32/PLIST Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-@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
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/distinfo
--- a/net/unison2.32/distinfo Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$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
-SHA512 (unison-2.32.52.tar.gz) = a97ab23ca8b87575653f6fea4f7eba7fb5aacb8cfa0195ebfff70ecc38f88f26677b26d76c8ba68bd2dac24bdabfabc2f7334ab94bd4b4c0eeb94303438dbda1
-Size (unison-2.32.52.tar.gz) = 697866 bytes
-SHA1 (patch-aa) = d59adf3446ea3f98f4ab72274b95b1140d3cf896
-SHA1 (patch-ab) = 29a2bc3842be7bb1bde7372dfeca2a5c5b4acdef
-SHA1 (patch-bytearray.ml) = efe1e039f9f64c204229b0d6d483a480ce13dce7
-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
-SHA1 (patch-lwt_lwt__unix.ml) = 61196ccbb2b4f689698f2cab3079ed40984f2773
-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
-SHA1 (patch-transfer.ml) = fd33382fa283e25a705659651105b74f290431f9
-SHA1 (patch-uicommon.ml) = 54602d200323fd1d0eb18741fb06572846d434a4
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/options.mk
--- a/net/unison2.32/options.mk Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2014/10/10 08:39:08 jaapb Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.unison
-PKG_SUPPORTED_OPTIONS= lablgtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mlablgtk)
-MAKE_FLAGS+= UISTYLE=gtk2
-.include "../../x11/ocaml-lablgtk/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-MAKE_FLAGS+= UISTYLE=text
-.endif
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/patches/patch-aa
--- a/net/unison2.32/patches/patch-aa Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
-
---- Makefile.orig 2009-05-02 02:31:27.000000000 +0000
-+++ Makefile
-@@ -39,7 +39,7 @@ all:: INSTALL
-
- INSTALL: $(NAME)$(EXEC_EXT)
- # file isn't made for OS X, so check that it's there first
-- (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
-+## (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
-
- ########################################################################
- ## Miscellaneous developer-only switches
-@@ -68,7 +68,7 @@ include Makefile.OCaml
- ######################################################################
- # Installation
-
--INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/
-
- # This has two names because on OSX the file INSTALL shadows the target 'install'!
- install: doinstall
-@@ -80,10 +80,7 @@ text:
- $(MAKE) -C .. text
-
- doinstall: $(NAME)$(EXEC_EXT)
-- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
-- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
--
-
- ######################################################################
- # Demo
-@@ -336,7 +333,7 @@ testmerge:
- tags:
- -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
-
--all:: TAGS
-+#all:: TAGS
-
- TAGS:
- $(MAKE) tags
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/patches/patch-ab
--- a/net/unison2.32/patches/patch-ab Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/02/25 20:01:37 wiz 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
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/patches/patch-bytearray.ml
--- a/net/unison2.32/patches/patch-bytearray.ml Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-$NetBSD: patch-bytearray.ml,v 1.1 2018/03/14 10:16:03 dholland Exp $
-
-Fix build with ocaml 4.06.
-
---- bytearray.ml~ 2009-05-29 14:00:18.000000000 +0000
-+++ bytearray.ml
-@@ -36,17 +36,20 @@ let unsafe_blit_to_string a i s j l =
- *)
-
- external unsafe_blit_from_string : string -> int -> t -> int -> int -> unit
-- = "ml_blit_string_to_bigarray" "noalloc"
-+ = "ml_blit_string_to_bigarray" [@@noalloc]
-
--external unsafe_blit_to_string : t -> int -> string -> int -> int -> unit
-- = "ml_blit_bigarray_to_string" "noalloc"
-+external unsafe_blit_from_bytes : bytes -> int -> t -> int -> int -> unit
-+ = "ml_blit_bytes_to_bigarray" [@@noalloc]
-+
-+external unsafe_blit_to_bytes : t -> int -> bytes -> int -> int -> unit
-+ = "ml_blit_bigarray_to_bytes" [@@noalloc]
-
- let to_string a =
- let l = length a in
- if l > Sys.max_string_length then invalid_arg "Bytearray.to_string" else
-- let s = String.create l in
-- unsafe_blit_to_string a 0 s 0 l;
-- s
-+ let s = Bytes.create l in
-+ unsafe_blit_to_bytes a 0 s 0 l;
-+ Bytes.to_string s
-
- let of_string s =
- let l = String.length s in
-@@ -60,9 +63,9 @@ let sub a ofs len =
- then
- invalid_arg "Bytearray.sub"
- else begin
-- let s = String.create len in
-- unsafe_blit_to_string a ofs s 0 len;
-- s
-+ let s = Bytes.create len in
-+ unsafe_blit_to_bytes a ofs s 0 len;
-+ Bytes.to_string s
- end
-
- let rec prefix_rec a i a' i' l =
-@@ -81,11 +84,17 @@ let blit_from_string s i a j l =
- then invalid_arg "Bytearray.blit_from_string"
- else unsafe_blit_from_string s i a j l
-
--let blit_to_string a i s j l =
-+let blit_from_bytes s i a j l =
-+ if l < 0 || i < 0 || i > Bytes.length s - l
-+ || j < 0 || j > length a - l
-+ then invalid_arg "Bytearray.blit_from_bytes"
-+ else unsafe_blit_from_bytes s i a j l
-+
-+let blit_to_bytes a i s j l =
- if l < 0 || i < 0 || i > length a - l
-- || j < 0 || j > String.length s - l
-- then invalid_arg "Bytearray.blit_to_string"
-- else unsafe_blit_to_string a i s j l
-+ || j < 0 || j > Bytes.length s - l
-+ then invalid_arg "Bytearray.blit_to_bytes"
-+ else unsafe_blit_to_bytes a i s j l
-
- external marshal : 'a -> Marshal.extern_flags list -> t
- = "ml_marshal_to_bigarray"
diff -r d238311605c8 -r f54a864ab229 net/unison2.32/patches/patch-bytearray.mli
--- a/net/unison2.32/patches/patch-bytearray.mli Thu Oct 31 16:30:19 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-bytearray.mli,v 1.1 2018/03/14 10:16:03 dholland Exp $
-
-Fix build with ocaml 4.06.
-
---- bytearray.mli~ 2009-05-29 14:00:18.000000000 +0000
-+++ bytearray.mli
-@@ -16,7 +16,9 @@ val sub : t -> int -> int -> string
-
- val blit_from_string : string -> int -> t -> int -> int -> unit
Home |
Main Index |
Thread Index |
Old Index