Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25149
Modified Files: unison.info unison.patch Log Message: OK for 10.3 Index: unison.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/unison.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- unison.patch 6 Sep 2005 17:49:51 -0000 1.3 +++ unison.patch 8 Sep 2005 19:49:03 -0000 1.4 @@ -1,6 +1,6 @@ diff -u -aruN unison.orig/unison-2.10.2/Makefile.OCaml unison/unison-2.10.2/Makefile.OCaml --- unison.orig/unison-2.10.2/Makefile.OCaml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/Makefile.OCaml 2005-08-29 20:28:48.000000000 -0700 ++++ unison/unison-2.10.2/Makefile.OCaml 2005-09-06 09:00:16.000000000 -0700 @@ -25,7 +25,7 @@ ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C @@ -106,7 +106,7 @@ diff -u -aruN unison.orig/unison-2.10.2/copy.ml unison/unison-2.10.2/copy.ml --- unison.orig/unison-2.10.2/copy.ml 2004-09-06 12:15:47.000000000 -0700 -+++ unison/unison-2.10.2/copy.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/copy.ml 2005-09-06 09:00:16.000000000 -0700 @@ -10,14 +10,16 @@ let openFileIn fspath path kind = @@ -187,7 +187,7 @@ diff -u -aruN unison.orig/unison-2.10.2/files.ml unison/unison-2.10.2/files.ml --- unison.orig/unison-2.10.2/files.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/files.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/files.ml 2005-09-06 09:00:16.000000000 -0700 @@ -356,18 +356,20 @@ debug (fun() -> Util.msg "Creating directory %s/%s\n" (root2string rootTo) (Path.toString pTo)); @@ -254,7 +254,7 @@ (Fspath.concat workingDir realPath); diff -u -aruN unison.orig/unison-2.10.2/fingerprint.ml unison/unison-2.10.2/fingerprint.ml --- unison.orig/unison-2.10.2/fingerprint.ml 2004-09-06 12:15:47.000000000 -0700 -+++ unison/unison-2.10.2/fingerprint.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/fingerprint.ml 2005-09-06 09:00:16.000000000 -0700 @@ -22,7 +22,7 @@ Util.convertUnixErrorsToTransient "digesting subfile" @@ -266,7 +266,7 @@ let res = Digest.channel inch (Uutil.Filesize.toInt len) in diff -u -aruN unison.orig/unison-2.10.2/os.ml unison/unison-2.10.2/os.ml --- unison.orig/unison-2.10.2/os.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/os.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/os.ml 2005-09-06 09:00:16.000000000 -0700 @@ -150,10 +150,23 @@ loop newChildren directory in @@ -320,7 +320,7 @@ let pathDouble = Osx.appleDoubleFile fspath path in diff -u -aruN unison.orig/unison-2.10.2/osxsupport.c unison/unison-2.10.2/osxsupport.c --- unison.orig/unison-2.10.2/osxsupport.c 2004-09-06 12:15:47.000000000 -0700 -+++ unison/unison-2.10.2/osxsupport.c 2005-08-29 20:28:48.000000000 -0700 ++++ unison/unison-2.10.2/osxsupport.c 2005-09-06 09:00:16.000000000 -0700 @@ -6,6 +6,8 @@ #include <caml/alloc.h> #include <caml/memory.h> @@ -353,7 +353,7 @@ CAMLreturn (Val_unit); diff -u -aruN unison.orig/unison-2.10.2/props.ml unison/unison-2.10.2/props.ml --- unison.orig/unison-2.10.2/props.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/props.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/props.ml 2005-09-06 09:00:16.000000000 -0700 @@ -421,7 +421,7 @@ let iCanWrite p = @@ -377,7 +377,7 @@ Perm.init someHostIsRunningWindows; diff -u -aruN unison.orig/unison-2.10.2/recon.ml unison/unison-2.10.2/recon.ml --- unison.orig/unison-2.10.2/recon.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/recon.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/recon.ml 2005-09-06 09:00:16.000000000 -0700 @@ -30,6 +30,10 @@ d := Replica1ToReplica2 else @@ -391,7 +391,7 @@ () diff -u -aruN unison.orig/unison-2.10.2/transport.ml unison/unison-2.10.2/transport.ml --- unison.orig/unison-2.10.2/transport.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/transport.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/transport.ml 2005-09-06 09:00:16.000000000 -0700 @@ -15,7 +15,8 @@ match uiFrom, uiTo with _, Updates (File (props, ContentsUpdated (_, _, ress)), _) -> @@ -404,7 +404,7 @@ assert false diff -u -aruN unison.orig/unison-2.10.2/ubase/util.ml unison/unison-2.10.2/ubase/util.ml --- unison.orig/unison-2.10.2/ubase/util.ml 2004-09-06 12:15:47.000000000 -0700 -+++ unison/unison-2.10.2/ubase/util.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/ubase/util.ml 2005-09-06 09:00:16.000000000 -0700 @@ -244,14 +244,18 @@ convertUnixErrorsToTransient "time" Unix.time @@ -468,7 +468,7 @@ (* "Upcall" for building pathnames in the .unison dir *) diff -u -aruN unison.orig/unison-2.10.2/uicommon.ml unison/unison-2.10.2/uicommon.ml --- unison.orig/unison-2.10.2/uicommon.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/uicommon.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/uicommon.ml 2005-09-06 09:00:16.000000000 -0700 @@ -268,26 +268,28 @@ | c -> buf.[!pos] <- c; pos := !pos + 1 @@ -508,7 +508,7 @@ if theRegExp = "Path " then diff -u -aruN unison.orig/unison-2.10.2/uigtk.ml unison/unison-2.10.2/uigtk.ml --- unison.orig/unison-2.10.2/uigtk.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/uigtk.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/uigtk.ml 2005-09-06 09:00:16.000000000 -0700 @@ -1606,7 +1606,7 @@ catch (fun () -> Transport.transportItem @@ -537,7 +537,7 @@ *********************************************************************) diff -u -aruN unison.orig/unison-2.10.2/uigtk2.ml unison/unison-2.10.2/uigtk2.ml --- unison.orig/unison-2.10.2/uigtk2.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/uigtk2.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/uigtk2.ml 2005-09-06 09:00:16.000000000 -0700 @@ -745,8 +745,7 @@ match Uicommon.sshParse s with Uicommon.Password account -> getPassword account @@ -550,7 +550,7 @@ diff -u -aruN unison.orig/unison-2.10.2/uitext.ml unison/unison-2.10.2/uitext.ml --- unison.orig/unison-2.10.2/uitext.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/uitext.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/uitext.ml 2005-09-06 09:00:16.000000000 -0700 @@ -423,6 +423,8 @@ (["n";"q";"x"], ("Exit"), @@ -562,7 +562,7 @@ (fun()-> display "Press return to continue.") diff -u -aruN unison.orig/unison-2.10.2/update.ml unison/unison-2.10.2/update.ml --- unison.orig/unison-2.10.2/update.ml 2004-09-06 12:15:46.000000000 -0700 -+++ unison/unison-2.10.2/update.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/update.ml 2005-09-06 09:00:16.000000000 -0700 @@ -347,13 +347,25 @@ let fto = Fspath.toString (Os.fileInUnisonDir toname) in debug (fun() -> Util.msg "Copying archive %s to %s\n" ffrom fto); @@ -643,7 +643,7 @@ (* for the given path, find the archive and compute the list of update diff -u -aruN unison.orig/unison-2.10.2/uutil.ml unison/unison-2.10.2/uutil.ml --- unison.orig/unison-2.10.2/uutil.ml 2004-09-06 12:15:47.000000000 -0700 -+++ unison/unison-2.10.2/uutil.ml 2005-08-29 20:27:41.000000000 -0700 ++++ unison/unison-2.10.2/uutil.ml 2005-09-06 09:00:16.000000000 -0700 @@ -83,7 +83,7 @@ (* Copy bytes from one file_desc to another *) (*****************************************************************************) @@ -655,7 +655,7 @@ diff -u -aruN unison.orig/unison-2.13.16/Makefile.OCaml unison/unison-2.13.16/Makefile.OCaml --- unison.orig/unison-2.13.16/Makefile.OCaml 2005-06-27 10:38:25.000000000 -0700 -+++ unison/unison-2.13.16/Makefile.OCaml 2005-08-29 20:28:48.000000000 -0700 ++++ unison/unison-2.13.16/Makefile.OCaml 2005-09-06 09:00:16.000000000 -0700 @@ -143,7 +143,7 @@ # NOTE: the OCAMLLIBDIR is not getting passed correctly? macexecutable: $(NAME)-blob.o @@ -667,7 +667,7 @@ # File extensions will be substituted for the native code version diff -u -aruN unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 2005-03-18 15:33:18.000000000 -0800 -+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 2005-08-31 16:46:32.000000000 -0700 ++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 2005-09-06 09:01:00.000000000 -0700 @@ -45,7 +45,11 @@ preferencesController = PreferencesController; preferencesView = NSView; @@ -682,7 +682,7 @@ updatesView = NSView; diff -u -aruN unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib 2005-03-21 12:22:18.000000000 -0800 -+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib 2005-08-31 16:46:32.000000000 -0700 ++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib 2005-09-06 09:01:00.000000000 -0700 @@ -3,34 +3,34 @@ <plist version="1.0"> <dict> @@ -696,7 +696,7 @@ + <string>320 335 383 326 0 0 1024 746 </string> <key>198</key> - <string>307 297 669 515 0 0 1280 832 </string> -+ <string>423 231 669 515 0 0 1024 746 </string> ++ <string>177 221 669 515 0 0 1024 746 </string> <key>29</key> - <string>72 209 280 44 0 0 1280 832 </string> + <string>-23 199 294 44 0 0 1024 746 </string> @@ -713,17 +713,17 @@ <key>IBOpenObjects</key> <array> - <integer>423</integer> - <integer>198</integer> - <integer>29</integer> -- <integer>402</integer> +- <integer>198</integer> +- <integer>29</integer> + <integer>402</integer> - <integer>234</integer> ++ <integer>29</integer> ++ <integer>198</integer> <integer>21</integer> -- <integer>307</integer> -+ <integer>423</integer> -+ <integer>234</integer> -+ <integer>402</integer> + <integer>307</integer> <integer>197</integer> -+ <integer>307</integer> ++ <integer>234</integer> ++ <integer>423</integer> </array> <key>IBSystem Version</key> - <string>7U16</string> @@ -732,21 +732,19 @@ </plist> diff -u -aruN unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 2005-03-21 12:22:18.000000000 -0800 -+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 2005-08-31 16:46:32.000000000 -0700 -@@ -1,49 +1,45 @@ ++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 2005-09-06 09:01:00.000000000 -0700 +@@ -1,49 +1,53 @@ [EMAIL PROTECTED])@@NSMutableStringNSString+ NSApplication if NSTableColumn)[EMAIL PROTECTED]@@ccprofilesC½B=èsèNSTableHeaderCellNSTextFieldCell> NSActionCellNSCellAiiþ @@@@ProfilesNSFont$[36c] þÿ L u c i d a G r a n d e fc ¦¦ ¦ i: c@@ NSColor ¦ff>ªª¦¦@@@[EMAIL PROTECTED] [EMAIL PROTECTED] NSControl)NSView)NSResponder -NSClipView:²NSScrollView â²NSCustomView)² @@@@ffffffffNSMutableArray NSArray NSTextField±¸ - µ # Ü#, #,[EMAIL PROTECTED]@ ¢?Welcome to Unison! [EMAIL PROTECTED])@@NSMutableStringNSString+ NSApplication ifNSTextField NSControl)NSView)NSResponder NSBox*NSCustomView) @@@@ffffffffNSMutableArray NSArray ¡¢ ¡¥§ ¡¥NSMatrix>© ¡ 'F&