pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/unison2.51
Module Name: pkgsrc
Committed By: wiz
Date: Mon Apr 30 10:14:29 UTC 2018
Added Files:
pkgsrc/net/unison2.51: DESCR Makefile PLIST distinfo options.mk
pkgsrc/net/unison2.51/patches: patch-src_Makefile
patch-src_Makefile.OCaml patch-src_fs.ml
patch-src_system_system__generic.ml patch-src_system_system_intf.ml
patch-src_uigtk2.ml
Log Message:
net/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.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.51/DESCR \
pkgsrc/net/unison2.51/Makefile pkgsrc/net/unison2.51/PLIST \
pkgsrc/net/unison2.51/distinfo pkgsrc/net/unison2.51/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.51/patches/patch-src_Makefile \
pkgsrc/net/unison2.51/patches/patch-src_Makefile.OCaml \
pkgsrc/net/unison2.51/patches/patch-src_fs.ml \
pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml \
pkgsrc/net/unison2.51/patches/patch-src_system_system_intf.ml \
pkgsrc/net/unison2.51/patches/patch-src_uigtk2.ml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: pkgsrc/net/unison2.51/DESCR
diff -u /dev/null pkgsrc/net/unison2.51/DESCR:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/DESCR Mon Apr 30 10:14:29 2018
@@ -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.
Index: pkgsrc/net/unison2.51/Makefile
diff -u /dev/null pkgsrc/net/unison2.51/Makefile:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/Makefile Mon Apr 30 10:14:29 2018
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile,v 1.1 2018/04/30 10:14:29 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"
Index: pkgsrc/net/unison2.51/PLIST
diff -u /dev/null pkgsrc/net/unison2.51/PLIST:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/PLIST Mon Apr 30 10:14:29 2018
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2018/04/30 10:14:29 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
Index: pkgsrc/net/unison2.51/distinfo
diff -u /dev/null pkgsrc/net/unison2.51/distinfo:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/distinfo Mon Apr 30 10:14:29 2018
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1 2018/04/30 10:14:29 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__generic.ml) = f1965308ec5da5fa0e55c449e263985a64c6f09f
+SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
+SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d
Index: pkgsrc/net/unison2.51/options.mk
diff -u /dev/null pkgsrc/net/unison2.51/options.mk:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/options.mk Mon Apr 30 10:14:29 2018
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2018/04/30 10:14:29 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
Index: pkgsrc/net/unison2.51/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_Makefile:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_Makefile Mon Apr 30 10:14:29 2018
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_Makefile,v 1.1 2018/04/30 10:14:29 wiz 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
Index: pkgsrc/net/unison2.51/patches/patch-src_Makefile.OCaml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_Makefile.OCaml:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_Makefile.OCaml Mon Apr 30 10:14:29 2018
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_Makefile.OCaml,v 1.1 2018/04/30 10:14:29 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
Index: pkgsrc/net/unison2.51/patches/patch-src_fs.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_fs.ml:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_fs.ml Mon Apr 30 10:14:29 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_fs.ml,v 1.1 2018/04/30 10:14:29 wiz 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)
+
Index: pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml Mon Apr 30 10:14:29 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_system_system__generic.ml,v 1.1 2018/04/30 10:14:29 wiz Exp $
+
+Adapt for API change.
+
+--- src/system/system_generic.ml.orig 2018-01-27 21:12:13.000000000 +0000
++++ src/system/system_generic.ml
+@@ -58,7 +58,7 @@ let readdir = Unix.readdir
+ let closedir = Unix.closedir
+ let readlink = Unix.readlink
+ (* BCP 5/16: Eta-expand for backward compatibility with OCaml <=4.02 *)
+-let symlink s1 s2 = Unix.symlink s1 s2
++let symlink ?to_dir s1 s2 = Unix.symlink ?to_dir s1 s2
+ let chdir = Sys.chdir
+ let getcwd = Sys.getcwd
+
Index: pkgsrc/net/unison2.51/patches/patch-src_system_system_intf.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_system_system_intf.ml:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_system_system_intf.ml Mon Apr 30 10:14:29 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system_system_intf.ml,v 1.1 2018/04/30 10:14:29 wiz 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
Index: pkgsrc/net/unison2.51/patches/patch-src_uigtk2.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_uigtk2.ml:1.1
--- /dev/null Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/patches/patch-src_uigtk2.ml Mon Apr 30 10:14:29 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uigtk2.ml,v 1.1 2018/04/30 10:14:29 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 =
Home |
Main Index |
Thread Index |
Old Index