Re: unison: warn about OCaml version incompatibilities
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/16/14 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. what about putting the MESSAGE in a README file ? The patch is just for my convenience when debugging. Is it ok to commit this patch, too? ok giovanni@ Unison comes in stable and snapshot versions. The snapshot version is outdated and broken. Can it be removed? Should it be updated? I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. Cheers Giovanni -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBAgAGBQJUP7pqAAoJEI7Sc79XDlKKWs0H/ijO67vLmT/ScguY92EHqWB3 Qi0386frakxCylEBhN7hJJflYOQTYNlWVxa98tfUyFQZJrtguzxrG6NK36KYNQKS 5Y+93tzS9a+wSG9mwhgVNoKrYeHJNQniji7H84WpBMwdquvBQrHNQrShPP6Dwm7y tt9ZnAjCZJxB6SlJI/9Xk2AwRbtsOn01ElC04xHDeOIW+18bOLIajkSN+dHfwvAm mMRbUCXkn/CuzqFlsz0+PkJZ1WtCdwhgcLzky8OSYuf+0VNjDJUngoh7BBm8Yjad MPctiUqYOpaHt95aFEWO7s2mkwk/T9bVD/UxtRRryD07PnNrfOscL7/TBFM4cJ8= =cD0V -END PGP SIGNATURE-
Re: unison: warn about OCaml version incompatibilities
On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Ciao! David -- If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will. -- Stewart Nelson
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 14:32, David Coppa wrote: On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Probably makes sense to move net/unison/stable/* to net/unison/* as well (this will need @pkgpath net/unison/stable adding to plist).
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead?
Re: unison: warn about OCaml version incompatibilities
On Thu, Oct 16, 2014 at 2:40 PM, Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 14:32, David Coppa wrote: On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Probably makes sense to move net/unison/stable/* to net/unison/* as well (this will need @pkgpath net/unison/stable adding to plist). Yes, like you did with mutt.
Re: unison: warn about OCaml version incompatibilities
On Thu, 16 Oct 2014 14:41:37 +0200 David Coppa dco...@gmail.com wrote:
On Thu, Oct 16, 2014 at 2:40 PM, Stuart Henderson st...@openbsd.org
wrote:
On 2014/10/16 14:32, David Coppa wrote:
On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis
giova...@paclan.it wrote:
I am not using unison,-snapshot, it is unhooked since a lot, I
think it can be removed.
+1
Probably makes sense to move net/unison/stable/* to net/unison/* as
well (this will need @pkgpath net/unison/stable adding to plist).
Yes, like you did with mutt.
Thanks for the hints! So is the following diff OK? Someone told me CVS
will clean up the empty directories on its own, doesn't it?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.865
diff -u -p -r1.865 Makefile
--- Makefile4 Oct 2014 18:50:55 - 1.865
+++ Makefile16 Oct 2014 13:06:27 -
@@ -609,6 +609,7 @@
SUBDIR += uhttpmock
SUBDIR += unifi
SUBDIR += unison
+ SUBDIR += unison,no_x11
SUBDIR += unworkable
SUBDIR += ushare
SUBDIR += uucp
Index: unison/Makefile
===
RCS file: /cvs/ports/net/unison/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- unison/Makefile 1 Feb 2010 17:00:14 - 1.7
+++ unison/Makefile 16 Oct 2014 13:06:27 -
@@ -1,9 +1,65 @@
-# $OpenBSD: Makefile,v 1.7 2010/02/01 17:00:14 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2014/06/28 21:08:09 kili Exp $
-SUBDIR =
-# SUBDIR +=snapshot
-# SUBDIR +=snapshot,no_x11
-SUBDIR += stable
-SUBDIR += stable,no_x11
+COMMENT= multi-platform file synchronization tool
+CATEGORIES=net
-.include bsd.port.subdir.mk
+V= 2.40.102
+REVISION = 5
+DISTNAME= unison-${V}
+MASTER_SITES= ${HOMEPAGE}download/releases/stable/
+
+HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
+MAINTAINER=Giovanni Bechis giova...@openbsd.org
+
+# GPLv3
+PERMIT_PACKAGE_CDROM= Yes
+
+WANTLIB= c m util
+
+MODULES= lang/ocaml
+
+USE_GMAKE= Yes
+
+FLAVORS= no_x11
+FLAVOR?=
+
+FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}
+SUBST_VARS= FLAVOR_COMMA
+
+.if ${FLAVOR:Mno_x11}
+MAKE_FLAGS=UISTYLE=text
+.else
+MODULES += devel/gettext
+BUILD_DEPENDS+=x11/lablgtk2
+LIB_DEPENDS= x11/gtk+2
+MAKE_FLAGS=UISTYLE=gtk2
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender fontconfig freetype
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo z
+WANTLIB += pthread
+.endif
+
+# CFLAGS _must_ be empty. This is an OCaml compiler.
+MAKE_FLAGS+= NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
+ OCAMLOPT=ocamlopt.opt \
+ CFLAGS=
+
+TEST_TARGET= selftest
+PORTHOME= ${WRKDIR}
+
+# Avoid multiple all:: entries and use the real target entry.
+ALL_TARGET=unison
+
+DOCS= BUGS.txt NEWS README
+
+# Avoid the nightmare of their Makefile install target.
+# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/unison ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
+ @cd ${WRKSRC} ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
+
+
+.include bsd.port.mk
Index: unison/Makefile.inc
===
RCS file: unison/Makefile.inc
diff -N unison/Makefile.inc
--- unison/Makefile.inc 28 Jun 2014 21:08:09 - 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.24 2014/06/28 21:08:09 kili Exp $
-
-DISTNAME= unison-$V
-CATEGORIES=net
-
-HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
-MAINTAINER=Giovanni Bechis giova...@openbsd.org
-
-# GPLv3
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB= c m util
-
-MODULES= lang/ocaml
-
-USE_GMAKE= Yes
-
-FLAVORS= no_x11
-FLAVOR?=
-
-.if ${FLAVOR:Mno_x11}
-MAKE_FLAGS=UISTYLE=text
-.else
-MODULES += devel/gettext
-BUILD_DEPENDS+=x11/lablgtk2
-LIB_DEPENDS= x11/gtk+2
-MAKE_FLAGS=UISTYLE=gtk2
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender expat fontconfig freetype pixman-1 pthread-stubs
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo png xcb z
-WANTLIB += GL Xxf86vm drm gthread-2.0 pthread xcb-render xcb-shm
-.endif
-
-# CFLAGS _must_ be empty. This is an OCaml compiler.
-MAKE_FLAGS+= NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
- OCAMLOPT=ocamlopt.opt \
- CFLAGS=
-
-TEST_TARGET= selftest
-PORTHOME= ${WRKDIR}
-
-# Avoid multiple
Re: unison: warn about OCaml version incompatibilities
On Thu, 16 Oct 2014 13:41:43 +0100 Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead? I guess this was about this svn commit: * Use hash function from OCaml 3.x for comparing archives, even when compiled with OCaml 4.x git-svn-id: https://webdav.seas.upenn.edu/svn/unison/trunk@514 4bce34ff-96ee-0310-b826-95abcfff6e26 This does not seem to be about marshalling, but is also a case of relying on OCaml stdlib functionality that is not meant to be included in portable protocols. Sorry to say, but I'm not motivated to fix this design bug of unison. (would take me about a days work). Christopher -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE signature.asc Description: PGP signature
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 15:15, Christopher Zimmermann wrote: On Thu, 16 Oct 2014 13:41:43 +0100 Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead? I guess this was about this svn commit: * Use hash function from OCaml 3.x for comparing archives, even when compiled with OCaml 4.x git-svn-id: https://webdav.seas.upenn.edu/svn/unison/trunk@514 4bce34ff-96ee-0310-b826-95abcfff6e26 This does not seem to be about marshalling, but is also a case of relying on OCaml stdlib functionality that is not meant to be included in portable protocols. Sorry to say, but I'm not motivated to fix this design bug of unison. (would take me about a days work). Christopher -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE Ah, OK.
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 15:08, Christopher Zimmermann wrote: Thanks for the hints! So is the following diff OK? yep. Someone told me CVS will clean up the empty directories on its own, doesn't it? It cleans them at checkout/update time as long as you use -p, there's no real way (short of messing with the repository) to remove them.
Re: unison: warn about OCaml version incompatibilities
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/16/14 15:08, Christopher Zimmermann wrote: Thanks for the hints! So is the following diff OK? ok giovanni@ Someone told me CVS will clean up the empty directories on its own, doesn't it? sthen@ has been exhaustive. Cheers Giovanni -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBAgAGBQJUP+Y3AAoJEI7Sc79XDlKKBwkH/0cvnzbOuiVBWaFhYEG/8pQ+ UdOwBR/ssU8x8TVbTTY4wBrfLXhQeLKKwd3+kzgjs0aVrTJ/87z4TK+6f7tzUl/C DX/OcWZMAjFGFTIBxr3Yt8ENGYEJaqdp6rGvVYvCC5QupllEtluWye8UGOk6XP0g +zcxGQfMhTAaPSuPfv83O+pNDDelX/jeLWKcHDlo0tzTc4ozyUahMRGX/dGhPgqQ EXjD7c4GLpXucxkJJoFHHZmBdRjQmMSpmj5z7N/a4EfzljruoInSkbshzzwFr/7Z oX6rJoLe0sdWBwIWvsGyuFIrunZDkLNpEltV8/EEgzW4QWDdXsvTkEJQk4SaxWg= =mjP3 -END PGP SIGNATURE-
