pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/unison2.51: import unison-2.51.2
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Sun Apr 29 08:05:52 2018 +0200
Changeset: 0cf04d2fcb754457b3f2878404c646aacb339627
Added Files:
unison2.51/DESCR
unison2.51/Makefile
unison2.51/PLIST
unison2.51/TODO
unison2.51/distinfo
unison2.51/options.mk
unison2.51/patches/patch-src_Makefile
unison2.51/patches/patch-src_Makefile.OCaml
unison2.51/patches/patch-src_fs.ml
unison2.51/patches/patch-src_system_system_intf.ml
unison2.51/patches/patch-src_uigtk2.ml
Log Message:
wip/unison2.51: import unison-2.51.2
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.
Does not build:
ocamlc -g -unsafe-string -I lwt -I ubase -I system -I fsmonitor -I fsmonitor/linux -I fsmonitor/windows -I system/generic -I lwt/generic -I /usr/pkg/lib/ocaml/site-lib/lablgtk2 -custom -g -c .../work/unison-2.51.2/src/ubase/util.ml
STATIC = false
OSTYPE =
OSARCH = NetBSD
File ".../work/unison-2.51.2/src/system.ml", line 1:
Error: The implementation .../work/unison-2.51.2/src/system.ml
does not match the interface system.cmi:
Values do not match:
val symlink : string -> string -> unit
is not included in
val symlink : ?to_dir:bool -> string -> fspath -> unit
File ".../work/unison-2.51.2/src/system/system_intf.ml", line 23, characters 0-54:
Expected declaration
File ".../work/unison-2.51.2/src/system/system_generic.ml", line 61, characters 4-11:
Actual declaration
ocamlc: ubase/uarg.ml ---> ubase/uarg.cmo
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0cf04d2fcb754457b3f2878404c646aacb339627
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
unison2.51/DESCR | 5 ++
unison2.51/Makefile | 62 ++++++++++++++++++++++
unison2.51/PLIST | 9 ++++
unison2.51/TODO | 16 ++++++
unison2.51/distinfo | 11 ++++
unison2.51/options.mk | 15 ++++++
unison2.51/patches/patch-src_Makefile | 41 ++++++++++++++
unison2.51/patches/patch-src_Makefile.OCaml | 45 ++++++++++++++++
unison2.51/patches/patch-src_fs.ml | 14 +++++
unison2.51/patches/patch-src_system_system_intf.ml | 14 +++++
unison2.51/patches/patch-src_uigtk2.ml | 14 +++++
11 files changed, 246 insertions(+)
diffs:
diff --git a/unison2.51/DESCR b/unison2.51/DESCR
new file mode 100644
index 0000000000..a1fcb2e594
--- /dev/null
+++ b/unison2.51/DESCR
@@ -0,0 +1,5 @@
+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.
diff --git a/unison2.51/Makefile b/unison2.51/Makefile
new file mode 100644
index 0000000000..67586bb05e
--- /dev/null
+++ b/unison2.51/Makefile
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile,v 1.121 2018/04/17 22:29:47 wiz Exp $
+
+DISTNAME= unison-2.51.2
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= tonio%NetBSD.org@localhost
+HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
+COMMENT= File-synchronization tool
+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
+
+# docs: unison-manual.pdf/html/ps/dvi
+#WRKSRC= ${WRKDIR}/src
+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
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
+
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/unison2.51/PLIST b/unison2.51/PLIST
new file mode 100644
index 0000000000..cb41766f15
--- /dev/null
+++ b/unison2.51/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:47 joerg 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
diff --git a/unison2.51/TODO b/unison2.51/TODO
new file mode 100644
index 0000000000..13c6c3b6cb
--- /dev/null
+++ b/unison2.51/TODO
@@ -0,0 +1,16 @@
+ocamlc -g -unsafe-string -I lwt -I ubase -I system -I fsmonitor -I fsmonitor/linux -I fsmonitor/windows -I system/generic -I lwt/generic -I /usr/pkg/lib/ocaml/site-lib/lablgtk2 -custom -g -c .../work/unison-2.51.2/src/ubase/util.ml
+STATIC = false
+OSTYPE =
+OSARCH = NetBSD
+File ".../work/unison-2.51.2/src/system.ml", line 1:
+Error: The implementation .../work/unison-2.51.2/src/system.ml
+ does not match the interface system.cmi:
+ Values do not match:
+ val symlink : string -> string -> unit
+ is not included in
+ val symlink : ?to_dir:bool -> string -> fspath -> unit
+ File ".../work/unison-2.51.2/src/system/system_intf.ml", line 23, characters 0-54:
+ Expected declaration
+ File ".../work/unison-2.51.2/src/system/system_generic.ml", line 61, characters 4-11:
+ Actual declaration
+ocamlc: ubase/uarg.ml ---> ubase/uarg.cmo
diff --git a/unison2.51/distinfo b/unison2.51/distinfo
new file mode 100644
index 0000000000..e1d1d7a30f
--- /dev/null
+++ b/unison2.51/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.29 2018/01/22 10:35:44 wiz Exp $
+
+SHA1 (unison-2.51.2.tar.gz) = 63e3b526254ab6356a3fabf74be533982c2962c2
+RMD160 (unison-2.51.2.tar.gz) = d73c88be2a5c3c677939f4adede4c0f772ecff33
+SHA512 (unison-2.51.2.tar.gz) = 4ec4a1603ce5e561084dcd59621a0cc72c1ea40e3e23e36408c436c51bde3eb82774f671aba85c016f87982417800e8a27b978be59c92aa62ce9e4be1a072011
+Size (unison-2.51.2.tar.gz) = 1398790 bytes
+SHA1 (patch-src_Makefile) = 3172ed284bea2d21ccb475439c53ce65a45b79f6
+SHA1 (patch-src_Makefile.OCaml) = 6c959562b218459e5986cb3d2af18261c6098b44
+SHA1 (patch-src_fs.ml) = 1d02f83d245466c0aad45a3261bba8149ed3db56
+SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
+SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d
diff --git a/unison2.51/options.mk b/unison2.51/options.mk
new file mode 100644
index 0000000000..0d8b949726
--- /dev/null
+++ b/unison2.51/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.4 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
+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/unison2.51/patches/patch-src_Makefile b/unison2.51/patches/patch-src_Makefile
new file mode 100644
index 0000000000..0f5ba11e14
--- /dev/null
+++ b/unison2.51/patches/patch-src_Makefile
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_Makefile,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+Correct installation procedure
+--- src/Makefile.orig 2018-01-27 21:12:13.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
+@@ -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
+@@ -86,9 +86,7 @@ doinstall: buildexecutable
+ echo "makefile variable NAME not bound"; \
+ exit 1 \
+ ; fi
+- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
+ cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
+- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
+
+ ######################################################################
+ # Demo
+@@ -344,7 +342,6 @@ tags:
+ *Makefile* \
+ ; fi
+
+-all:: TAGS
+
+ TAGS:
+ $(MAKE) tags
diff --git a/unison2.51/patches/patch-src_Makefile.OCaml b/unison2.51/patches/patch-src_Makefile.OCaml
new file mode 100644
index 0000000000..861bac4666
--- /dev/null
+++ b/unison2.51/patches/patch-src_Makefile.OCaml
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/01/22 10:35:45 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 2018-01-27 21:12:13.000000000 +0000
++++ src/Makefile.OCaml
+@@ -73,8 +73,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)
+@@ -272,7 +272,7 @@ 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
+@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfin
+
+ ifeq ($(UISTYLE), gtk2)
+ ifndef OCAMLFIND
+- CAMLFLAGS+=-I +lablgtk2
++ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2
+ else
+ CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 )
+ endif
+@@ -370,7 +370,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/unison2.51/patches/patch-src_fs.ml b/unison2.51/patches/patch-src_fs.ml
new file mode 100644
index 0000000000..81ca148853
--- /dev/null
+++ b/unison2.51/patches/patch-src_fs.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_fs.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+System symlink definition has changed
+--- src/fs.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/fs.ml
+@@ -21,7 +21,7 @@ type fspath = Fspath.t
+ type dir_handle = System.dir_handle
+ = { readdir : unit -> string; closedir : unit -> unit }
+
+-let symlink l f = System.symlink l (Fspath.toString f)
++let symlink ?to_dir l f = System.symlink l (Fspath.toString f)
+
+ let readlink f = System.readlink (Fspath.toString f)
+
diff --git a/unison2.51/patches/patch-src_system_system_intf.ml b/unison2.51/patches/patch-src_system_system_intf.ml
new file mode 100644
index 0000000000..e1172590bc
--- /dev/null
+++ b/unison2.51/patches/patch-src_system_system_intf.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system_system_intf.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+System symlink definition has changed
+--- src/system/system_intf.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/system/system_intf.ml
+@@ -20,7 +20,7 @@ module type Core = sig
+ type fspath
+ type dir_handle = { readdir : unit -> string; closedir : unit -> unit }
+
+-val symlink : string -> fspath -> unit
++val symlink : ?to_dir:bool -> string -> fspath -> unit
+ val readlink : fspath -> string
+ val chown : fspath -> int -> int -> unit
+ val chmod : fspath -> int -> unit
diff --git a/unison2.51/patches/patch-src_uigtk2.ml b/unison2.51/patches/patch-src_uigtk2.ml
new file mode 100644
index 0000000000..ee3e01ef4e
--- /dev/null
+++ b/unison2.51/patches/patch-src_uigtk2.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uigtk2.ml,v 1.1 2017/11/14 13:03:35 jaapb 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 =
Home |
Main Index |
Thread Index |
Old Index