diff options
author | adrianp <adrianp> | 2005-04-24 13:06:03 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2005-04-24 13:06:03 +0000 |
commit | 479fdbb8c5f87d24f54e00fd53bd2e5e7b85812d (patch) | |
tree | 50d684496892c0f6d0c31c71530267e61c8c2562 /net/unison-devel | |
parent | a8695ac45d8d0a4453cac6abb3ff1e6a6e11c935 (diff) | |
download | pkgsrc-479fdbb8c5f87d24f54e00fd53bd2e5e7b85812d.tar.gz |
- Update unison-devel to 2.12.0
- Lots of changes, in summary:
- Archive format has changed
- Major tidying and enhancement of 'merge' functionality
- Files larger than 2Gb are now supported
- support for ocaml >3.07
- Substantial reworking of the internal logic of the text UI
Diffstat (limited to 'net/unison-devel')
-rw-r--r-- | net/unison-devel/Makefile | 15 | ||||
-rw-r--r-- | net/unison-devel/distinfo | 15 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-aa | 23 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-ab | 64 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-ac | 37 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-ad | 15 |
6 files changed, 91 insertions, 78 deletions
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile index edbb72ec9d0..d84bf4c4d47 100644 --- a/net/unison-devel/Makefile +++ b/net/unison-devel/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:01 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/04/24 13:06:03 adrianp Exp $ -DISTNAME= src -PKGNAME= unison-2.9.20 -PKGREVISION= 3 +DISTNAME= unison-2.12.0 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/latest/ @@ -11,9 +9,9 @@ HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ COMMENT= File-synchronization tool PKG_INSTALLATION_TYPES= overwrite pkgviews -BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2 DIST_SUBDIR= ${PKGNAME_NOREV} +BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2 # docs: unison-manual.pdf/html/ps/dvi WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -37,7 +35,14 @@ MAKE_FLAGS+= THREADS=true INSTALLATION_DIRS= bin +SUBST_CLASSES= x11 +SUBST_STAGE.x11= post-patch +SUBST_FILES.x11= Makefile.OCaml +SUBST_SED.x11= -e "s|/usr/X11R6|${X11BASE}|g" +SUBST_MESSAGE.x11= "Fixing X11 paths." + post-install: + @cd ${WRKSRC} && ./unison -doc install > INSTALL ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${PREFIX}/share/doc/unison diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo index b8b34e3f729..8adcd4b0bd8 100644 --- a/net/unison-devel/distinfo +++ b/net/unison-devel/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:14:06 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/04/24 13:06:03 adrianp Exp $ -SHA1 (unison-2.9.20/src.tar.gz) = 23d48f8dbcb2064241518375185bd2e7f50ab30f -RMD160 (unison-2.9.20/src.tar.gz) = a67c27df8795887936468e3727058eeb65981796 -Size (unison-2.9.20/src.tar.gz) = 363079 bytes -SHA1 (patch-aa) = 0b11802fb208e10fa07792738935761a170c0242 -SHA1 (patch-ab) = 181f0e0823c3a27f91bf97726afd2ad91f18cbaf -SHA1 (patch-ac) = 254e997bfe7dff442722ad94a78c3a50f180dbc0 -SHA1 (patch-ad) = ad39edfff8ec01051ed1c72ac7337d4a6836e1b3 +SHA1 (unison-2.12.0/unison-2.12.0.tar.gz) = 71cc8abedf8e9434285a610c3f4090ddc05cdfa9 +RMD160 (unison-2.12.0/unison-2.12.0.tar.gz) = 89f215787df9b8f1d0edb367559be5dce810c215 +Size (unison-2.12.0/unison-2.12.0.tar.gz) = 841717 bytes +SHA1 (patch-aa) = ca1409cfd3ffe6ceb5a85c588e2d17e544133031 +SHA1 (patch-ab) = 2f796147ff5fa91ed6bf6b3fa3a760b6a153c8bd +SHA1 (patch-ac) = 663a051e39b52e474eb3016826f350291a51ea2a diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa index 88be2a4d1bf..d9f0519e572 100644 --- a/net/unison-devel/patches/patch-aa +++ b/net/unison-devel/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2005/04/24 13:06:03 adrianp Exp $ ---- Makefile.orig Mon Aug 19 17:15:04 2002 -+++ Makefile Tue Jan 27 05:50:28 2004 -@@ -65,14 +65,12 @@ +--- Makefile.orig Sat Mar 12 16:17:58 2005 ++++ Makefile +@@ -38,7 +38,7 @@ all:: strings.ml buildexecutable + all:: INSTALL + + INSTALL: $(NAME)$(EXEC_EXT) +- ./$(NAME) -doc install > INSTALL ++## ./$(NAME) -doc install > INSTALL + + ######################################################################## + ## Miscellaneous developer-only switches +@@ -67,14 +67,12 @@ include Makefile.OCaml ###################################################################### # Installation @@ -20,12 +29,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $ ###################################################################### -@@ -234,7 +232,7 @@ +@@ -352,7 +350,7 @@ testmerge: tags: - -$(ETAGS) *.mli */*.mli *.ml */*.ml *.txt + -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt -all:: TAGS +# all:: TAGS - TAGS: + TAGS: $(MAKE) tags diff --git a/net/unison-devel/patches/patch-ab b/net/unison-devel/patches/patch-ab index 2375293f6f2..9f92a78e5e4 100644 --- a/net/unison-devel/patches/patch-ab +++ b/net/unison-devel/patches/patch-ab @@ -1,44 +1,46 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2005/04/24 13:06:03 adrianp Exp $ ---- Makefile.OCaml.orig Mon Aug 19 17:15:04 2002 -+++ Makefile.OCaml Tue Jan 27 05:51:03 2004 -@@ -45,7 +45,7 @@ - ifeq ($(shell uname),Darwin) - OSARCH=osx +--- Makefile.OCaml.orig 2005-04-24 09:08:08.000000000 +0100 ++++ Makefile.OCaml +@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin) else -- OSARCH=linux -+ OSARCH=bsd + ifeq ($(shell uname),OpenBSD) + OSARCH=OpenBSD ++else ++ifeq ($(shell uname),NetBSD) ++ OSARCH=NetBSD ++endif endif endif - ETAGS=etags -@@ -178,7 +178,7 @@ - ifeq ($(OSARCH), win32gnuc) - GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs endif --ifeq ($(OSARCH), linux) -+ifeq ($(OSARCH), bsd) +@@ -240,6 +244,9 @@ endif + ifeq ($(OSARCH), osx) X11LIBDIR=/usr/X11R6/lib endif - ifeq ($(OSARCH), osx) -@@ -267,7 +267,7 @@ - # libcurses is not in a standard place in older Solaris releases. - STATICLIBS+=-cclib -R/usr/xpg4/lib - endif -- ifeq ($(OSARCH), linux) -+ ifeq ($(OSARCH), bsd) ++ifeq ($(OSARCH), NetBSD) ++ X11LIBDIR=/usr/X11R6/lib ++endif + + # Developer-only directories + ifeq ($(shell hostname), raptor.research.att.com) +@@ -383,6 +390,9 @@ ifeq ($(STATIC), true) + ifeq ($(OSARCH), osx) STATICLIBS+=-cclib -static endif - ifeq ($(OSARCH), osx) -@@ -304,9 +304,9 @@ - # Include an automatically generated list of dependencies - include .depend ++ ifeq ($(OSARCH), NetBSD) ++ STATICLIBS+=-cclib -static ++ endif + CLIBS=$(STATICLIBS) + endif --ifeq ($(shell echo type -t ocamldot | bash), file) -- OCAMLDOT=true --endif -+#ifeq ($(shell echo type -t ocamldot | bash), file) -+ OCAMLDOT=false -+#endif +@@ -424,6 +434,10 @@ else + endif + endif ++ifeq ($(OSARCH), NetBSD) ++ OCAMLDOT=false ++endif ++ # Rebuild dependencies (must be invoked manually) .PHONY: depend + depend:: diff --git a/net/unison-devel/patches/patch-ac b/net/unison-devel/patches/patch-ac index 8b2e79bf1da..785000a6079 100644 --- a/net/unison-devel/patches/patch-ac +++ b/net/unison-devel/patches/patch-ac @@ -1,13 +1,26 @@ -$NetBSD: patch-ac,v 1.1 2004/01/27 11:05:42 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2005/04/24 13:06:03 adrianp Exp $ ---- ubase/util.ml.orig Mon Aug 19 17:15:04 2002 -+++ ubase/util.ml Tue Jan 27 06:03:12 2004 -@@ -217,7 +217,7 @@ - close_in c; - match l with - "Darwin" -> true -- | "linux" | "FreeBSD" | "SunOS" -> false -+ | "linux" | "FreeBSD" | "NetBSD" | "SunOS" -> false - | _ -> - Printf.printf - "Warning: 'uname' returned unrecognized result (%s) in Util.isOSX.\n" +--- pty.c.orig 2005-04-24 09:14:08.000000000 +0100 ++++ pty.c +@@ -18,7 +18,11 @@ CAMLprim value dumpFd(value fdVal) { + } + + #include <caml/fail.h> // failwith ++#ifdef __NetBSD__ ++#include <errno.h> // errno ++#else + #include <sys/errno.h> // errno ++#endif + #include <string.h> // strerror + #include <caml/alloc.h> // alloc_tuple + #include <caml/memory.h> // Store_field +@@ -32,6 +36,9 @@ CAMLprim value dumpFd(value fdVal) { + #ifdef __APPLE__ + #include <util.h> // openpty + #endif ++#ifdef __NetBSD__ ++#include <util.h> // openpty ++#endif + + /* c_openpty: unit -> (int * Unix.file_descr) */ + CAMLprim value c_openpty() { diff --git a/net/unison-devel/patches/patch-ad b/net/unison-devel/patches/patch-ad deleted file mode 100644 index ee87a123977..00000000000 --- a/net/unison-devel/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/02/04 22:58:09 adrianp Exp $ - ---- ubase/uprintf.ml.orig 2005-01-12 18:56:29.000000000 +0100 -+++ ubase/uprintf.ml 2005-01-12 18:56:48.000000000 +0100 -@@ -10,8 +10,8 @@ - (* *) - (***********************************************************************) - --external format_int: string -> int -> string = "format_int" --external format_float: string -> float -> string = "format_float" -+external format_int: string -> int -> string = "caml_format_int" -+external format_float: string -> float -> string = "caml_format_float" - - let fprintf outchan doafter format = - let format = (Obj.magic format : string) in |