net/unison2.48: import unison2.48-2.48.15v4nb5

This is a re-import of net/unison, but with all paths changed from
"unison" to "unison-2.48". This way, you can install it in parallel
with unison2.51. Run unison-2.48 with "-addversionno" to run
the appropriate unison binary on the other side.

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 outdated 2.48 release.

12 files changed, 265 insertions, 0 deletions

diff --git a/net/unison2.48/DESCR b/net/unison2.48/DESCR
new file mode 100644
index 00000000000..fc9d1719b6c
--- /dev/null
+++ b/net/unison2.48/DESCR
@@ -0,0 +1,7 @@
+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 outdated 2.48 release.
diff --git a/net/unison2.48/Makefile b/net/unison2.48/Makefile
new file mode 100644
index 00000000000..672d033164d
--- /dev/null
+++ b/net/unison2.48/Makefile
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+DISTNAME=	unison-2.48.15v4
+PKGNAME=	${DISTNAME:S/unison/unison2.48/}
+PKGREVISION=	5
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
+
+MAINTAINER=	tonio@NetBSD.org
+HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
+COMMENT=	File-synchronization tool (2.48 branch)
+LICENSE=	gnu-gpl-v3
+
+# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29:
+# Error: Unbound module Prefs
+MAKE_JOBS_SAFE=	no
+
+.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
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_TOOLS+=	gmake
+MAKE_FLAGS+=	CFLAGS="" -C src
+MAKE_ENV+=	HOME=${WRKDIR:Q}
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/ocaml.mk"
+
+.if (${OCAML_USE_OPT_COMPILER} == "true")
+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.48
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/unison ${DESTDIR}${PREFIX}/bin/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+	${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.48
+
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/unison2.48/PLIST b/net/unison2.48/PLIST
new file mode 100644
index 00000000000..0bb60c4b291
--- /dev/null
+++ b/net/unison2.48/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2019/07/29 18:07:10 wiz Exp $
+bin/unison-2.48
+share/doc/unison-2.48/BUGS.txt
+share/doc/unison-2.48/CONTRIB
+share/doc/unison-2.48/COPYING
+share/doc/unison-2.48/NEWS
+share/doc/unison-2.48/README
+share/doc/unison-2.48/ROADMAP.txt
+share/doc/unison-2.48/TODO.txt
diff --git a/net/unison2.48/distinfo b/net/unison2.48/distinfo
new file mode 100644
index 00000000000..6e38aaf3bf1
--- /dev/null
+++ b/net/unison2.48/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+SHA1 (unison-2.48.15v4.tar.gz) = 249cc0068ab62478c813189b2ac1426a3ff5edae
+RMD160 (unison-2.48.15v4.tar.gz) = 6480dfb05d6cefe20ebffa64eb6bd50c3aa7aa97
+SHA512 (unison-2.48.15v4.tar.gz) = 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
+Size (unison-2.48.15v4.tar.gz) = 1911781 bytes
+SHA1 (patch-src_Makefile) = 19cf0b79995c7848bc02d220267be4f3a3e4b59b
+SHA1 (patch-src_Makefile.OCaml) = deba98414926fc73b229a071a6f061b7bdb8a458
+SHA1 (patch-src_files.ml) = 3a15b35f6a5e5242e4c3e198dabc38ca89bbdbe0
+SHA1 (patch-src_mkProjectInfo.ml) = a1908748dbe4c1db0e2b012e73fe46c6bca30348
+SHA1 (patch-src_recon.ml) = 8aa1b2a4109fe183eedf209a91efc3f2164a3b3a
+SHA1 (patch-src_system_system__generic.ml) = e9c8d638739d35e046efe5f28df6fa8cb4c46a48
+SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d
diff --git a/net/unison2.48/options.mk b/net/unison2.48/options.mk
new file mode 100644
index 00000000000..55b60b2f969
--- /dev/null
+++ b/net/unison2.48/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/07/29 18:07:10 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 --git a/net/unison2.48/patches/patch-src_Makefile b/net/unison2.48/patches/patch-src_Makefile
new file mode 100644
index 00000000000..babc57a4d91
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_Makefile
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_Makefile,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Correct installation procedure
+--- src/Makefile.orig	2015-10-05 18:14:23.000000000 +0000
++++ src/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
+@@ -78,7 +78,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
+@@ -90,9 +90,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)
+ 
+ 
+ ######################################################################
+@@ -348,7 +346,6 @@ tags:
+ 	    $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
+           ; fi 
+ 
+-all:: TAGS
+ 
+ TAGS:
+ 	$(MAKE) tags
diff --git a/net/unison2.48/patches/patch-src_Makefile.OCaml b/net/unison2.48/patches/patch-src_Makefile.OCaml
new file mode 100644
index 00000000000..f495aa905b5
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_Makefile.OCaml
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_Makefile.OCaml,v 1.1 2019/07/29 18:07:10 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	2015-10-05 18:14:23.000000000 +0000
++++ src/Makefile.OCaml
+@@ -75,8 +75,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)
+@@ -292,14 +292,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
+@@ -384,7 +384,7 @@ ifeq ($(PROFILING), true)
+ else
+   OCAMLC=$(EXEC_PREFIX)ocamlc
+ endif
+-OCAMLOPT=$(EXEC_PREFIX)ocamlopt
++OCAMLOPT=$(EXEC_PREFIX)ocamlopt.opt
+ 
+ ifeq ($(NATIVE), true)
+   ## Set up for native code compilation
diff --git a/net/unison2.48/patches/patch-src_files.ml b/net/unison2.48/patches/patch-src_files.ml
new file mode 100644
index 00000000000..d106a84b0ba
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_files.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_files.ml,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Replace deprecated sort function
+--- src/files.ml.orig	2018-01-27 21:12:13.000000000 +0000
++++ src/files.ml
+@@ -734,7 +734,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.48/patches/patch-src_mkProjectInfo.ml b/net/unison2.48/patches/patch-src_mkProjectInfo.ml
new file mode 100644
index 00000000000..c81ef04a5ba
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_mkProjectInfo.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_mkProjectInfo.ml,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Add revision string for correct version detection
+--- src/mkProjectInfo.ml.orig	2015-10-05 18:14:23.000000000 +0000
++++ src/mkProjectInfo.ml
+@@ -42,7 +42,7 @@ let pointVersionOrigin = 533 (* Revision
+ (* ---------------------------------------------------------------------- *)
+ (* You shouldn't need to edit below. *)
+ 
+-let revisionString = "$Rev$";;
++let revisionString = "$Rev: 548$";;
+ 
+ let pointVersion = 
+   Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
diff --git a/net/unison2.48/patches/patch-src_recon.ml b/net/unison2.48/patches/patch-src_recon.ml
new file mode 100644
index 00000000000..bd206cc3a3b
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_recon.ml
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_recon.ml,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Replace deprecated sort function
+--- src/recon.ml.orig	2018-01-27 21:12:13.000000000 +0000
++++ src/recon.ml
+@@ -661,8 +661,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
++    Path.compare
+     pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
diff --git a/net/unison2.48/patches/patch-src_system_system__generic.ml b/net/unison2.48/patches/patch-src_system_system__generic.ml
new file mode 100644
index 00000000000..e20342742ad
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_system_system__generic.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system_system__generic.ml,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Needed for compatibility with OCaml 4.08
+--- src/system/system_generic.ml.orig	2017-12-18 12:23:54.000000000 +0000
++++ src/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
diff --git a/net/unison2.48/patches/patch-src_uigtk2.ml b/net/unison2.48/patches/patch-src_uigtk2.ml
new file mode 100644
index 00000000000..8253eed7880
--- /dev/null
+++ b/net/unison2.48/patches/patch-src_uigtk2.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uigtk2.ml,v 1.1 2019/07/29 18:07:10 wiz Exp $
+
+Lablgtk now has safe_string
+--- src/uigtk2.ml.orig	2015-10-05 18:14:23.000000000 +0000
++++ src/uigtk2.ml
+@@ -94,7 +94,7 @@ let icon =
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
++    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+ 
+ let leftPtrWatch =