pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net net/unison2.40: Remove
details: https://anonhg.NetBSD.org/pkgsrc/rev/5d5970d26c8c
branches: trunk
changeset: 343207:5d5970d26c8c
user: gdt <gdt%pkgsrc.org@localhost>
date: Thu Oct 31 16:58:03 2019 +0000
description:
net/unison2.40: 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.40 from
pkgsrc cannot work to interoperate with other systems that still have
2.40, 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.32 removal to ease separate reverting, should it be
necessary.)
diffstat:
net/Makefile | 3 +-
net/unison2.40/ALTERNATIVES | 1 -
net/unison2.40/DESCR | 8 -
net/unison2.40/Makefile | 57 -
net/unison2.40/PLIST | 9 -
net/unison2.40/distinfo | 30 -
net/unison2.40/options.mk | 15 -
net/unison2.40/patches/patch-Makefile.OCaml | 43 -
net/unison2.40/patches/patch-aa | 41 -
net/unison2.40/patches/patch-bytearray.ml | 68 -
net/unison2.40/patches/patch-bytearray.mli | 17 -
net/unison2.40/patches/patch-bytearray__stubs.c | 29 -
net/unison2.40/patches/patch-external.ml | 35 -
net/unison2.40/patches/patch-files.ml | 15 -
net/unison2.40/patches/patch-fileutil.ml | 25 -
net/unison2.40/patches/patch-fingerprint.ml | 24 -
net/unison2.40/patches/patch-fpcache.ml | 50 -
net/unison2.40/patches/patch-fspath.ml | 47 -
net/unison2.40/patches/patch-lwt_generic_lwt__unix__impl.ml | 58 -
net/unison2.40/patches/patch-lwt_lwt__unix.mli | 23 -
net/unison2.40/patches/patch-osx.ml | 112 --
net/unison2.40/patches/patch-path.ml | 35 -
net/unison2.40/patches/patch-recon.ml | 17 -
net/unison2.40/patches/patch-remote.ml | 87 -
net/unison2.40/patches/patch-system_system__generic.ml | 24 -
net/unison2.40/patches/patch-terminal.ml | 49 -
net/unison2.40/patches/patch-test.ml | 18 -
net/unison2.40/patches/patch-transfer.ml | 152 ---
net/unison2.40/patches/patch-uicommon.ml | 27 -
net/unison2.40/patches/patch-uitext.ml | 22 -
net/unison2.40/patches/patch-unicode.ml | 546 ------------
31 files changed, 1 insertions(+), 1686 deletions(-)
diffs (truncated from 1821 to 300 lines):
diff -r aee268a9ef8e -r 5d5970d26c8c net/Makefile
--- a/net/Makefile Thu Oct 31 16:56:02 2019 +0000
+++ b/net/Makefile Thu Oct 31 16:58:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1274 2019/10/31 16:56:02 gdt Exp $
+# $NetBSD: Makefile,v 1.1275 2019/10/31 16:58:03 gdt Exp $
#
COMMENT= Networking tools
@@ -895,7 +895,6 @@
SUBDIR+= unbound
SUBDIR+= unfs3
SUBDIR+= unifi
-SUBDIR+= unison2.40
SUBDIR+= unison2.48
SUBDIR+= unison2.51
SUBDIR+= unworkable
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/ALTERNATIVES
--- a/net/unison2.40/ALTERNATIVES Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-bin/unison @PREFIX@/bin/unison-2.40
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/DESCR
--- a/net/unison2.40/DESCR Thu Oct 31 16:56:02 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.40 version,
-because unison does not interoperate across versions.
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/Makefile
--- a/net/unison2.40/Makefile Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2019/10/18 09:59:26 pho Exp $
-
-DISTNAME= unison-2.40.128
-PKGREVISION= 40
-CATEGORIES= net
-MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
-
-MAINTAINER= tonio%NetBSD.org@localhost
-HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
-COMMENT= File-synchronization tool
-LICENSE= gnu-gpl-v3
-
-.if (${MACHINE_ARCH} == "arm")
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.12.0nb2
-.else
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.11.2
-.endif
-BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
-
-# docs: unison-manual.pdf/html/ps/dvi
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake
-MAKE_FLAGS+= CFLAGS=""
-MAKE_ENV+= HOME=${WRKDIR:Q}
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH}=="arm") || (${MACHINE_ARCH} == "x86_64")
-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
-
-BUILD_TARGET= buildexecutable
-
-INSTALLATION_DIRS= bin
-INSTALLATION_DIRS+= share/doc/unison-2.40
-
-post-install:
- ${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 -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/PLIST
--- a/net/unison2.40/PLIST Thu Oct 31 16:56:02 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: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 -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/distinfo
--- a/net/unison2.40/distinfo Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$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
-SHA512 (unison-2.40.128.tar.gz) = f33450445e2a83c5b62696b8b0aaa7d9fcbdd02cccda8e4bce4a9efe1e2b4a32d38c49a4716315e7b4bec6e21e4eb8efac529a31f45062765a6e53e02c600d11
-Size (unison-2.40.128.tar.gz) = 2717593 bytes
-SHA1 (patch-Makefile.OCaml) = 2872f07e323f23375b0b7ea5ec17fe387fe22a0f
-SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
-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
-SHA1 (patch-fspath.ml) = 28b8b95b993c0bc764babe56190472eccadc0269
-SHA1 (patch-lwt_generic_lwt__unix__impl.ml) = f73bbd3a9b25a0fd22b946151b4b18150ad1d5a4
-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) = 08654e51578982c9c0814aaf89d58ac2155d8f56
-SHA1 (patch-terminal.ml) = f3c98c01361be18c97552037dc3b703419251f46
-SHA1 (patch-test.ml) = 989c23bb359fef8e8cee7df0f6cc0614b386f954
-SHA1 (patch-transfer.ml) = 4f7f2eb1621010a05a629809bb6c543a4a6e65af
-SHA1 (patch-uicommon.ml) = 54602d200323fd1d0eb18741fb06572846d434a4
-SHA1 (patch-uitext.ml) = c90c22671b54bdb6e9dd5db32ff6367dc7d4b2b8
-SHA1 (patch-unicode.ml) = 54d1e5e6c2c0c146698f11c558a6421d60f77a0f
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/options.mk
--- a/net/unison2.40/options.mk Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/01/06 12:57:03 wiz 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
-DEPENDS+= font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
-.include "../../x11/ocaml-lablgtk/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-MAKE_FLAGS+= UISTYLE=text
-.endif
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/patches/patch-Makefile.OCaml
--- a/net/unison2.40/patches/patch-Makefile.OCaml Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-Makefile.OCaml,v 1.1 2015/01/06 12:57:03 wiz Exp $
-
-Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
-
---- Makefile.OCaml.orig 2011-04-16 20:35:38.000000000 +0000
-+++ Makefile.OCaml
-@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
- #
- # This should be set to an appropriate value automatically, depending
- # on whether the lablgtk library is available
--LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
--LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
-+LABLGTKLIB=$(OCAMLLIBDIR)/site-lib/lablgtk
-+LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
- ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
- ## at the moment and we don't want to confuse people by building it by default
- ifeq ($(OSARCH),osx)
-@@ -285,14 +285,14 @@ endif
-
- # Gtk GUI
- ifeq ($(UISTYLE), gtk)
-- CAMLFLAGS+=-I +lablgtk
-+ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk
- OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
- OCAMLLIBS+=lablgtk.cma
- endif
-
- # Gtk2 GUI
- ifeq ($(UISTYLE), gtk2)
-- CAMLFLAGS+=-I +lablgtk2
-+ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2
- OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
- OCAMLLIBS+=lablgtk.cma
- endif
-@@ -364,7 +364,7 @@ ifeq ($(PROFILING), true)
- else
- OCAMLC=ocamlc
- endif
--OCAMLOPT=ocamlopt
-+OCAMLOPT=ocamlopt.opt
-
- ifeq ($(NATIVE), true)
- ## Set up for native code compilation
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/patches/patch-aa
--- a/net/unison2.40/patches/patch-aa Thu Oct 31 16:56:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2015/01/06 12:57:03 wiz Exp $
-
-Correct installation procedure
---- Makefile.orig 2011-04-16 20:35:38.000000000 +0000
-+++ Makefile
-@@ -49,7 +49,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
-@@ -80,7 +80,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
-@@ -92,9 +92,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)
-
-
- ######################################################################
-@@ -350,7 +348,6 @@ tags:
- $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
- ; fi
-
--all:: TAGS
-
- TAGS:
- $(MAKE) tags
diff -r aee268a9ef8e -r 5d5970d26c8c net/unison2.40/patches/patch-bytearray.ml
--- a/net/unison2.40/patches/patch-bytearray.ml Thu Oct 31 16:56:02 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 11:16:15 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
Home |
Main Index |
Thread Index |
Old Index