head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.10 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.8 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.6 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.4 pkgsrc-2011Q2-base:1.10 pkgsrc-2009Q4:1.10.0.2 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.9.0.24 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.22 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.20 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.18 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.16 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.14 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.12 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.10 pkgsrc-2008Q1:1.9.0.8 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.6 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.4 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.2 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.6.0.12 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.10 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.8 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.6 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.4 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.2 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.5.0.2 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.10 date 2009.11.20.20.22.08; author wiz; state dead; branches; next 1.9; 1.9 date 2007.05.30.12.46.58; author tonio; state Exp; branches; next 1.8; 1.8 date 2007.04.13.14.54.41; author tonio; state Exp; branches; next 1.7; 1.7 date 2007.04.08.22.46.36; author tonio; state Exp; branches; next 1.6; 1.6 date 2005.09.27.14.44.18; author tonio; state Exp; branches; next 1.5; 1.5 date 2005.08.06.12.44.26; author rillig; state Exp; branches; next 1.4; 1.4 date 2005.08.03.12.45.27; author tonio; state Exp; branches; next 1.3; 1.3 date 2005.07.30.22.07.38; author rillig; state Exp; branches; next 1.2; 1.2 date 2005.04.24.13.06.03; author adrianp; state Exp; branches; next 1.1; 1.1 date 2004.01.27.11.05.42; author jlam; state Exp; branches; next ; desc @@ 1.10 log @Remove unison-devel, unison is now newer. @ text @$NetBSD: patch-ac,v 1.9 2007/05/30 12:46:58 tonio Exp $ --- pty.c.orig 2007-04-13 16:30:01.000000000 +0200 +++ pty.c @@@@ -15,7 +15,7 @@@@ extern void uerror (char * cmdname, valu #define HAS_OPENPTY 1 #endif -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__NetBSD__) #include #define HAS_OPENPTY 1 #endif @ 1.9 log @update net/unison-devel to 2.27.29 Small bugfixes, in particular for windows @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Fix build under FreeBSD @ text @d3 1 a3 1 --- pty.c.orig Mon Apr 2 05:03:20 2007 d5 1 a5 1 @@@@ -15,12 +15,13 @@@@ extern void uerror (char * cmdname, valu a13 6 #ifdef __FreeBSD__ +#include #include #define HAS_OPENPTY 1 #endif @ 1.7 log @update net/unison-devel to 2.27.10 Changes since 2.17: * The native OS X user interface has been enormously improved by Ben Willmore and Trevor Jim. * The backup functionality has been completely rewritten. The external interface has not changed, but numerous bugs, irregular behaviors, and cross-platform inconsistencies have been corrected. * Some important safety improvements: + Added a new mountpoint preference, which can be used to specify a path that must exist in both replicas at the end of update detection (otherwise Unison aborts). + The confirmation of "big deletes" is now controlled by a boolean preference confirmbigdeletes. Default is true, which gives the same behavior as previously. + If Unison is asked to "follow" a symbolic link but there is nothing at the other end of the link, it will now flag this path as an error, rather than treating the symlink itself as missing or deleted. * Smaller changes: + Added forcepartial and preferpartial preferences + Refined debugging code so that the verbosity of individual modules can be controlled separately. Instead of just putting '-debug verbose' on the command line, you can put '-debug update+', which causes all the extra messages in the Update module, but not other modules, to be printed. Putting '-debug verbose' causes all modules to print with maximum verbosity. + Rewrote some of the merging functionality, for better cooperation with external Harmony instances. + Changed the temp file prefix from .# to .unison. + Compressed the output from the text user interface + Added .mpp files to the "never fastcheck" list * Many small bugfixes, including: + Fixed a bug that would occasionally cause the archives to be left in non-identical states on the two hosts after synchronization. + Fixed a bug that prevented Unison from communicating correctly between 32- and 64-bit architectures. + Set read-only file to R/W on OSX before attempting to change other attributes. + Fixed bug resulting in spurious "Aborted" errors during transport (thanks to Jerome Vouillon) + Enable diff if file contents have changed in one replica, but only properties in the other. + Removed misleading documentation for 'repeat' preference. + Fixed a bug in merging code where Unison could sometimes deadlock with the external merge program, if the latter produced large amounts of output. + Workaround for a bug compiling gtk2 user interface against current versions of gtk2+ libraries. + Added a better error message for "ambiguous paths". + Squashed a longstanding bug that would cause file transfer to fail with the message "Failed: Error in readWrite: Is a directory." @ text @d3 1 a3 1 --- pty.c.orig 2007-04-02 05:03:20.000000000 +0200 d5 1 a5 1 @@@@ -15,7 +15,7 @@@@ extern void uerror (char * cmdname, valu d14 6 @ 1.6 log @update net/unison-devel to 2.17.1 @ text @d3 1 a3 1 --- pty.c.orig 2005-08-12 02:26:59.000000000 +0200 a13 12 @@@@ -40,9 +40,10 @@@@ CAMLprim value setControllingTerminal(va /* c_openpty: unit -> (int * Unix.file_descr) */ CAMLprim value c_openpty() { int master,slave; + value pair; if (openpty(&master,&slave,NULL,NULL,NULL) < 0) uerror("openpty", (value) 0); - value pair = alloc_tuple(2); + pair = alloc_tuple(2); Store_field(pair,0,Val_int(master)); Store_field(pair,1,Val_int(slave)); return pair; @ 1.5 log @Added a chunk to patch-ac to fix non-ISO-C90 code. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2005/08/03 12:45:27 tonio Exp $ d3 2 a4 2 --- pty.c.orig Mon May 30 14:15:43 2005 +++ pty.c Sat Aug 6 14:41:44 2005 @ 1.4 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2005/07/30 22:07:38 rillig Exp $ d3 3 a5 3 --- 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 @@@@ d14 12 @ 1.3 log @Copied the patch to #include from net/unison. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2005/07/30 21:57:42 rillig Exp $ d3 5 a7 4 --- 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) { } a8 9 #include // failwith +#include // errno #include // errno #include // strerror #include // alloc_tuple @@@@ -29,7 +30,7 @@@@ CAMLprim value dumpFd(value fdVal) { #ifdef __linux__ #include // openpty #endif d11 2 a12 1 #include // openpty a13 1 @ 1.2 log @- 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 @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- pty.c.orig 2005-04-24 09:14:08.000000000 +0100 +++ pty.c @@@@ -18,7 +18,11 @@@@ CAMLprim value dumpFd(value fdVal) { a8 1 +#ifdef __NetBSD__ a9 1 +#else a10 1 +#endif d13 6 a18 3 #include // Store_field @@@@ -32,6 +36,9 @@@@ CAMLprim value dumpFd(value fdVal) { #ifdef __APPLE__ a20 3 +#ifdef __NetBSD__ +#include // openpty +#endif a21 2 /* c_openpty: unit -> (int * Unix.file_descr) */ CAMLprim value c_openpty() { @ 1.1 log @Teach unison that NetBSD != MacOS X without printing a warning every time unison is executed. @ text @d3 24 a26 11 --- 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" @