From f916fbb3b99b248589cd14bc3c51918de1aa102b Mon Sep 17 00:00:00 2001 From: tonio Date: Wed, 3 Aug 2005 12:45:27 +0000 Subject: update unison-devel to the latest beta-release version 2.13.0 Main changelog entries: - GUI improvements - Improved error handling code. In particular, make sure all files are closed in case of a transient failure - Improvements to syncing resource forks between Macs via a non-Mac system. --- net/unison-devel/Makefile | 7 +++---- net/unison-devel/PLIST | 3 +-- net/unison-devel/distinfo | 14 +++++++------- net/unison-devel/patches/patch-aa | 27 +++++++++++++++------------ net/unison-devel/patches/patch-ab | 31 ++++++------------------------- net/unison-devel/patches/patch-ac | 24 ++++++++---------------- 6 files changed, 40 insertions(+), 66 deletions(-) (limited to 'net') diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile index 511398f84bf..f02e62ab97e 100644 --- a/net/unison-devel/Makefile +++ b/net/unison-devel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:26 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/03 12:45:27 tonio Exp $ -DISTNAME= unison-2.12.0 +DISTNAME= unison-2.13.0 CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/latest/ +MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ @@ -47,7 +47,6 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/DEPENDENCIES.ps ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/NEWS ${PREFIX}/share/doc/unison ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/unison diff --git a/net/unison-devel/PLIST b/net/unison-devel/PLIST index d16f554b69c..15679a7420a 100644 --- a/net/unison-devel/PLIST +++ b/net/unison-devel/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/08/03 12:45:27 tonio Exp $ bin/unison share/doc/unison/BUGS.txt share/doc/unison/CONTRIB share/doc/unison/COPYING -share/doc/unison/DEPENDENCIES.ps share/doc/unison/INSTALL share/doc/unison/NEWS share/doc/unison/README diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo index be1558b0f8c..9dcc0fe33e3 100644 --- a/net/unison-devel/distinfo +++ b/net/unison-devel/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/07/30 22:07:38 rillig Exp $ +$NetBSD: distinfo,v 1.7 2005/08/03 12:45:27 tonio Exp $ -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) = f5e703b5b509b8976efbd7f435c3db1de714427e +SHA1 (unison-2.13.0/unison-2.13.0.tar.gz) = c6eebdff8cd103fd560288b9fbff92703edf29f8 +RMD160 (unison-2.13.0/unison-2.13.0.tar.gz) = 423d354806d5c4d982113740c16be99ede4a170c +Size (unison-2.13.0/unison-2.13.0.tar.gz) = 390341 bytes +SHA1 (patch-aa) = 9e10cd0cd5369955c8494d03dedd73116d334aab +SHA1 (patch-ab) = 1718f7648403ca617d562b632260d64632fc462b +SHA1 (patch-ac) = 0f99bc55a3341493df33812e4a647d24772b6c66 diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa index d9f0519e572..f1d688aabc2 100644 --- a/net/unison-devel/patches/patch-aa +++ b/net/unison-devel/patches/patch-aa @@ -1,35 +1,38 @@ -$NetBSD: patch-aa,v 1.2 2005/04/24 13:06:03 adrianp Exp $ +$NetBSD: patch-aa,v 1.3 2005/08/03 12:45:27 tonio Exp $ ---- Makefile.orig Sat Mar 12 16:17:58 2005 -+++ Makefile -@@ -38,7 +38,7 @@ all:: strings.ml buildexecutable - all:: INSTALL +--- Makefile.orig 2005-07-29 17:30:08.000000000 +0200 ++++ Makefile 2005-07-29 17:34:14.000000000 +0200 +@@ -39,7 +39,7 @@ INSTALL: $(NAME)$(EXEC_EXT) -- ./$(NAME) -doc install > INSTALL -+## ./$(NAME) -doc install > INSTALL + # 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 -@@ -67,14 +67,12 @@ include Makefile.OCaml +@@ -68,17 +68,15 @@ ###################################################################### # Installation -INSTALLDIR = $(HOME)/bin/ +INSTALLDIR = $(PREFIX)/bin/ - install: $(NAME)$(EXEC_EXT) + # This has two names because on OSX the file INSTALL shadows the target 'install'! + install: doinstall + + doinstall: $(NAME)$(EXEC_EXT) - -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) - cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) - @# If we're running at Penn, install a public version too - if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi -+#HF# @# If we're running at Penn, install a public version too -+#HF# if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi ++ #HF# @# If we're running at Penn, install a public version too ++ #HF# if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi ###################################################################### -@@ -352,7 +350,7 @@ testmerge: +@@ -357,7 +355,7 @@ tags: -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt diff --git a/net/unison-devel/patches/patch-ab b/net/unison-devel/patches/patch-ab index 9f92a78e5e4..fb2920356c5 100644 --- a/net/unison-devel/patches/patch-ab +++ b/net/unison-devel/patches/patch-ab @@ -1,39 +1,20 @@ -$NetBSD: patch-ab,v 1.2 2005/04/24 13:06:03 adrianp Exp $ +$NetBSD: patch-ab,v 1.3 2005/08/03 12:45:27 tonio Exp $ ---- Makefile.OCaml.orig 2005-04-24 09:08:08.000000000 +0100 -+++ Makefile.OCaml -@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin) +--- Makefile.OCaml.orig 2005-07-29 17:34:34.000000000 +0200 ++++ Makefile.OCaml 2005-07-29 17:42:53.000000000 +0200 +@@ -29,6 +29,11 @@ else ifeq ($(shell uname),OpenBSD) OSARCH=OpenBSD +else +ifeq ($(shell uname),NetBSD) + OSARCH=NetBSD ++ STATIC=true +endif endif endif endif -@@ -240,6 +244,9 @@ endif - ifeq ($(OSARCH), osx) - X11LIBDIR=/usr/X11R6/lib - endif -+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), NetBSD) -+ STATICLIBS+=-cclib -static -+ endif - CLIBS=$(STATICLIBS) - endif - -@@ -424,6 +434,10 @@ else +@@ -242,6 +247,10 @@ endif endif diff --git a/net/unison-devel/patches/patch-ac b/net/unison-devel/patches/patch-ac index 8493be53b54..7bf77509163 100644 --- a/net/unison-devel/patches/patch-ac +++ b/net/unison-devel/patches/patch-ac @@ -1,21 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2005/07/30 22:07:38 rillig Exp $ +$NetBSD: patch-ac,v 1.4 2005/08/03 12:45:27 tonio Exp $ ---- pty.c.orig Mon Sep 6 21:15:47 2004 -+++ pty.c Sat Jul 30 23:55:49 2005 -@@ -18,6 +18,7 @@ CAMLprim value dumpFd(value fdVal) { - } - - #include // failwith -+#include // errno - #include // errno - #include // strerror - #include // alloc_tuple -@@ -29,7 +30,7 @@ CAMLprim value dumpFd(value fdVal) { - #ifdef __linux__ - #include // openpty +--- pty.c.orig 2005-08-03 11:31:38.000000000 +0200 ++++ pty.c 2005-08-03 11:33:07.000000000 +0200 +@@ -15,7 +15,7 @@ + #define HAS_OPENPTY 1 #endif + -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__NetBSD__) - #include // openpty + #include + #define HAS_OPENPTY 1 #endif - -- cgit v1.2.3