Subject: Re: net/unison, net/unison-devel updates in progress?
To: None <tech-pkg@NetBSD.org>
From: Antoine Reilles <Antoine.Reilles@loria.fr>
List: tech-pkg
Date: 04/20/2005 16:24:05
--Apple-Mail-2-408375546
Content-Type: multipart/mixed; boundary=Apple-Mail-1-408375524
--Apple-Mail-1-408375524
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
On Apr 20, 2005, at 15:18, Antoine Reilles wrote:
> On Apr 19, 2005, at 18:29, Jeff Rizzo wrote:
>> I have a need for unison 2.10 or newer, due to support for resource
>> forks in newer versions. unison is currently at 2.9.1, with
>> unison-devel at 2.9.20; I see unison-2.12.0 in TODO.
>>
>> Is anyone currently working on these? I'm hesitant to touch ocaml
>> unless
>> it's absolutely necessary. :-)
> I just tried to update unison-devel to 2.12.0
>
> Here is my diff. If you can test it, it would be great.
> I will soon try to do the same with unison to 2.10
Oups, i forgot to include the patch ;-(
So this time i can send you a patch for unison to 2.10.2, and another
one for unison-devel to 2.12.0
I did not send-pr those patches since i had to tweak a few things in
the makefiles, and i'm not sure this will work fine on all supported
architectures.
Feedback is welcome.
Best regards,
antoine
--Apple-Mail-1-408375524
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="unison.diff"
Content-Disposition: attachment;
filename=unison.diff
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 11 Apr 2005 21:47:01 -0000 1.24
+++ Makefile 20 Apr 2005 14:15:07 -0000
@@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:01 tv Exp $
-DISTNAME= src
-PKGNAME= unison-2.9.1
-PKGREVISION= 4
+DISTNAME= unison-2.10.2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 24 Feb 2005 12:14:06 -0000 1.8
+++ distinfo 20 Apr 2005 14:15:07 -0000
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.8 2005/02/24 12:14:06 agc Exp $
-SHA1 (unison-2.9.1/src.tar.gz) = d355639b8191f5c74e652fe257fd98dcf76d4cc0
-RMD160 (unison-2.9.1/src.tar.gz) = f00ae5ab3e6e9bd04e184b3c1bc6a4c78b84fdc1
-Size (unison-2.9.1/src.tar.gz) = 319081 bytes
-SHA1 (patch-aa) = bb844e8070faab7d4c8aac30345881c1c66ca8d2
-SHA1 (patch-ab) = 0d391ffc0c47a16d24cda5e9f219665eeafb1553
-SHA1 (patch-ac) = e04d12ec7a25ff343bd0af41754508bc81326098
+SHA1 (unison-2.10.2/unison-2.10.2.tar.gz) = 1d378292d944981fb41504c8cea92cd3e1913c49
+RMD160 (unison-2.10.2/unison-2.10.2.tar.gz) = 593d71c39b49f30e82df58f62891d6d5540c2af7
+Size (unison-2.10.2/unison-2.10.2.tar.gz) = 458032 bytes
+SHA1 (patch-aa) = 78f27a3c5ad5a0c164ba3ec9d532305a4813c11a
+SHA1 (patch-ab) = 2ff8c171f63b4e9547b71d066a85967ffbc71e72
+SHA1 (patch-ac) = 5cf05b512206c987b74dc214f93cab509eba2d87
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa 1 Jun 2002 04:41:31 -0000 1.3
+++ patches/patch-aa 20 Apr 2005 14:15:07 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2002/06/01 04:41:31 deberg Exp $
-
---- Makefile.orig Thu Apr 11 01:13:23 2002
-+++ Makefile Sat Jun 1 00:29:22 2002
-@@ -62,14 +62,12 @@
+--- Makefile.orig 2005-04-20 15:59:39.000000000 +0200
++++ Makefile 2005-04-20 16:00:51.000000000 +0200
+@@ -60,14 +60,10 @@
######################################################################
# Installation
@@ -15,17 +13,15 @@
- 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
######################################################################
-@@ -231,7 +229,7 @@
+@@ -345,7 +341,7 @@
tags:
- -$(ETAGS) {*,*/*}.mli {*,*/*}.ml *.txt
+ -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
-all:: TAGS
-+# all:: TAGS
++#all:: TAGS
- TAGS:
+ TAGS:
$(MAKE) tags
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- patches/patch-ab 29 Jun 2003 23:52:05 -0000 1.1
+++ patches/patch-ab 20 Apr 2005 14:15:07 -0000
@@ -1,44 +1,33 @@
-$NetBSD: patch-ab,v 1.1 2003/06/29 23:52:05 jtb Exp $
-
---- Makefile.OCaml.orig
-+++ Makefile.OCaml
-@@ -42,7 +42,7 @@
- ifeq ($(shell hostname),saul.cis.upenn.edu)
- OSARCH=solaris
+--- Makefile.OCaml.orig 2004-09-06 21:15:46.000000000 +0200
++++ Makefile.OCaml 2005-04-20 16:09:48.000000000 +0200
+@@ -47,6 +47,8 @@
else
-- OSARCH=linux
+ ifeq ($(shell uname),OpenBSD)
+ OSARCH=OpenBSD
++else
+ OSARCH=bsd
endif
- ETAGS=etags
endif
-@@ -157,7 +157,7 @@
- ifeq ($(OSARCH), win32gnuc)
- GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs
endif
--ifeq ($(OSARCH), linux)
-+ifeq ($(OSARCH), bsd)
- X11LIBDIR=/usr/X11R6/lib
- endif
-
-@@ -243,7 +243,7 @@
- # libcurses is not in a standard place in older Solaris releases.
- STATICLIBS+=-cclib -R/usr/xpg4/lib
+@@ -390,6 +392,9 @@
+ ifeq ($(OSARCH), linux)
+ STATICLIBS+=-cclib -static
endif
-- ifeq ($(OSARCH), linux)
+ ifeq ($(OSARCH), bsd)
++ STATICLIBS+=-cclib -static
++ endif
+ ifeq ($(OSARCH), OpenBSD)
STATICLIBS+=-cclib -static
endif
- CLIBS=$(STATICLIBS)
-@@ -255,9 +255,9 @@
- # Include an automatically generated list of dependencies
- include .depend
-
--ifeq ($(shell echo type -t ocamldot | bash), file)
-- OCAMLDOT=true
--endif
-+#ifeq ($(shell echo type -t ocamldot | bash), file)
-+ OCAMLDOT=false
-+#endif
-
- # Rebuild dependencies (must be invoked manually)
- .PHONY: depend
+@@ -431,6 +436,11 @@
+ ifeq ($(shell echo type ocamldot | ksh), file)
+ OCAMLDOT=true
+ endif
++endif
++ifeq ($(OSARCH), bsd)
++ ifeq ($(shell echo type ocamldot | sh), file)
++ OCAMLDOT=true
++ endif
+ else
+ ifeq ($(shell echo type -t ocamldot | bash), file)
+ OCAMLDOT=true
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/patches/patch-ac,v
retrieving revision 1.1
diff -u -r1.1 patch-ac
--- patches/patch-ac 4 Feb 2005 22:54:52 -0000 1.1
+++ patches/patch-ac 20 Apr 2005 14:15:07 -0000
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2005/02/04 22:54:52 adrianp Exp $
-
---- ubase/uprintf.ml.orig 2005-01-12 18:52:27.000000000 +0100
-+++ ubase/uprintf.ml 2005-01-12 18:52:53.000000000 +0100
-@@ -10,8 +10,8 @@
- (* *)
- (***********************************************************************)
+--- pty.c.orig 2005-03-12 17:17:59.000000000 +0100
++++ pty.c 2005-04-20 14:51:32.000000000 +0200
+@@ -32,6 +32,10 @@
+ #ifdef __APPLE__
+ #include <util.h> // openpty
+ #endif
++#ifdef __NetBSD__
++#include <util.h> // openpty
++#include <errno.h> // errno
++#endif
--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
+ /* c_openpty: unit -> (int * Unix.file_descr) */
+ CAMLprim value c_openpty() {
--Apple-Mail-1-408375524
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="unison-devel.diff"
Content-Disposition: attachment;
filename=unison-devel.diff
? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 11 Apr 2005 21:47:01 -0000 1.7
+++ Makefile 20 Apr 2005 13:08:50 -0000
@@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:01 tv 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/
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 24 Feb 2005 12:14:06 -0000 1.4
+++ distinfo 20 Apr 2005 13:08:50 -0000
@@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.4 2005/02/24 12:14:06 agc 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) = aab13b724a4b2b4aef034a37262f3871ba61271d
+SHA1 (patch-ab) = 29b35bbcae331c208cc2dbfb85f846b37e6d61f0
+SHA1 (patch-ac) = 5cf05b512206c987b74dc214f93cab509eba2d87
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa 27 Jan 2004 10:56:57 -0000 1.1.1.1
+++ patches/patch-aa 20 Apr 2005 13:08:50 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $
-
---- Makefile.orig Mon Aug 19 17:15:04 2002
-+++ Makefile Tue Jan 27 05:50:28 2004
-@@ -65,14 +65,12 @@
+--- Makefile.orig 2005-04-20 11:16:17.000000000 +0200
++++ Makefile 2005-04-20 11:19:08.000000000 +0200
+@@ -67,14 +67,10 @@
######################################################################
# Installation
@@ -15,17 +13,15 @@
- 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
######################################################################
-@@ -234,7 +232,7 @@
+@@ -352,7 +348,7 @@
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
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab 27 Jan 2004 10:56:57 -0000 1.1.1.1
+++ patches/patch-ab 20 Apr 2005 13:08:50 -0000
@@ -1,44 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/27 10:56:57 jlam 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-03-12 17:17:59.000000000 +0100
++++ Makefile.OCaml 2005-04-20 15:02:49.000000000 +0200
+@@ -29,6 +29,8 @@
else
-- OSARCH=linux
+ ifeq ($(shell uname),OpenBSD)
+ OSARCH=OpenBSD
++else
+ OSARCH=bsd
endif
endif
- ETAGS=etags
-@@ -178,7 +178,7 @@
- ifeq ($(OSARCH), win32gnuc)
- GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs
endif
--ifeq ($(OSARCH), linux)
-+ifeq ($(OSARCH), bsd)
- 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)
+@@ -383,6 +385,9 @@
+ ifeq ($(OSARCH), osx)
STATICLIBS+=-cclib -static
endif
- ifeq ($(OSARCH), osx)
-@@ -304,9 +304,9 @@
- # Include an automatically generated list of dependencies
- include .depend
-
--ifeq ($(shell echo type -t ocamldot | bash), file)
-- OCAMLDOT=true
--endif
-+#ifeq ($(shell echo type -t ocamldot | bash), file)
-+ OCAMLDOT=false
-+#endif
++ ifeq ($(OSARCH), bsd)
++ STATICLIBS+=-cclib -static
++ endif
+ CLIBS=$(STATICLIBS)
+ endif
- # Rebuild dependencies (must be invoked manually)
- .PHONY: depend
+@@ -418,6 +423,11 @@
+ ifeq ($(shell echo type ocamldot | ksh), file)
+ OCAMLDOT=true
+ endif
++ endif
++ifeq ($(OSARCH), bsd)
++ ifeq ($(shell type ocamldot), file)
++ OCAMLDOT=true
++ endif
+ else
+ ifeq ($(shell echo type -t ocamldot | bash), file)
+ OCAMLDOT=true
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/patches/patch-ac,v
retrieving revision 1.1
diff -u -r1.1 patch-ac
--- patches/patch-ac 27 Jan 2004 11:05:42 -0000 1.1
+++ patches/patch-ac 20 Apr 2005 13:08:50 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/01/27 11:05:42 jlam 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-03-12 17:17:59.000000000 +0100
++++ pty.c 2005-04-20 14:51:32.000000000 +0200
+@@ -32,6 +32,10 @@
+ #ifdef __APPLE__
+ #include <util.h> // openpty
+ #endif
++#ifdef __NetBSD__
++#include <util.h> // openpty
++#include <errno.h> // errno
++#endif
+
+ /* c_openpty: unit -> (int * Unix.file_descr) */
+ CAMLprim value c_openpty() {
--Apple-Mail-1-408375524
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-1-408375524--
--Apple-Mail-2-408375546
content-type: application/pgp-signature; x-mac-type=70674453;
name=PGP.sig
content-description: This is a digitally signed message part
content-disposition: inline; filename=PGP.sig
content-transfer-encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFCZmYH4VqmoGDE/mwRAvoGAJ9Hvg3+XWUK34jZzveE2e8EUwZdqgCfWbXT
Ac0QOw3QJDwvwGjE5AV44Hk=
=nbyz
-----END PGP SIGNATURE-----
--Apple-Mail-2-408375546--