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
--- Makefile 4 Oct 2014 18:50:55 -0000 1.865
+++ Makefile 16 Oct 2014 13:06:27 -0000
@@ -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 -0000 1.7
+++ unison/Makefile 16 Oct 2014 13:06:27 -0000
@@ -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 -0000 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 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
Index: unison/distinfo
===================================================================
RCS file: unison/distinfo
diff -N unison/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/distinfo 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,2 @@
+SHA256 (unison-2.40.102.tar.gz) = PUqS8CtpmPFWy3FNIC0DWN0oRu+9zp3jDixmbXfB6FQ=
+SIZE (unison-2.40.102.tar.gz) = 2694761
Index: unison/patches/patch-ubase_util_ml
===================================================================
RCS file: unison/patches/patch-ubase_util_ml
diff -N unison/patches/patch-ubase_util_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/patches/patch-ubase_util_ml 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,18 @@
+$OpenBSD: patch-ubase_util_ml,v 1.3 2014/09/19 12:56:23 chrisz Exp $
+
+The Uprintf module is broken since OCaml 4.02.
+The OCaml stdlib provides a similar function since 3.09.
+Use this function instead.
+
+--- ubase/util.ml.orig Fri Sep 19 12:38:42 2014
++++ ubase/util.ml Fri Sep 19 12:39:27 2014
+@@ -62,7 +62,8 @@ let set_infos s =
+ if s <> !infos then begin clear_infos (); infos := s; show_infos () end
+
+ let msg f =
+- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f
++ clear_infos ();
++ Printf.kfprintf (fun _ -> flush stderr; show_infos ()) stderr f
+
+ let msg : ('a, out_channel, unit) format -> 'a = msg
+
Index: unison/patches/patch-uicommon_ml
===================================================================
RCS file: unison/patches/patch-uicommon_ml
diff -N unison/patches/patch-uicommon_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/patches/patch-uicommon_ml 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Don't discard backtraces for uncaught exceptions.
+
+--- uicommon.ml.orig Tue Sep 23 11:23:39 2014
++++ uicommon.ml Tue Sep 23 11:37:20 2014
+@@ -309,7 +309,8 @@ let reconItem2string oldPath theRI status =
+ let (r1, action, r2, path) = reconItem2stringList oldPath theRI in
+ Format.sprintf "%s %s %s %s %s" r1 (action2niceString action) r2 status path
+
+-let exn2string = function
++let exn2string exn =
++ let s = match exn with
+ Sys.Break -> "Terminated!"
+ | Util.Fatal(s) -> Printf.sprintf "Fatal error: %s" s
+ | Util.Transient(s) -> Printf.sprintf "Error: %s" s
+@@ -323,6 +324,9 @@ let exn2string = function
+ | _ -> "")
+ | Invalid_argument s -> Printf.sprintf "Invalid argument: %s" s
+ | other -> Printf.sprintf "Uncaught exception %s" (Printexc.to_string other)
++ in
++ s ^
++ if Printexc.backtrace_status () then "\n" ^ Printexc.get_backtrace () else
""
+
+ (* precondition: uc = File (Updates(_, ..) on both sides *)
+ let showDiffs ri printer errprinter id =
Index: unison/pkg/DESCR
===================================================================
RCS file: unison/pkg/DESCR
diff -N unison/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/pkg/DESCR 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,8 @@
+Unison is a file-synchronization tool for Unix and Windows. It allows
+two replicas of a collection of files and directories to be stored on
+different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes in
+each replica to the other.
+
+Flavors:
+ no_x11 - build without X support
Index: unison/pkg/PLIST
===================================================================
RCS file: unison/pkg/PLIST
diff -N unison/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/pkg/PLIST 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST,v 1.3 2012/11/20 15:18:31 giovanni Exp $
+@pkgpath net/unison/stable${FLAVOR_COMMA}
+@pkgpath net/unison/snapshot${FLAVOR_COMMA}
+@bin bin/unison
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/doc/unison/
+share/doc/unison/BUGS.txt
+share/doc/unison/NEWS
+share/doc/unison/README
Index: unison/pkg/README
===================================================================
RCS file: unison/pkg/README
diff -N unison/pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ unison/pkg/README 16 Oct 2014 13:06:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+Unison uses native OCaml marshalling in its prococol. This
+means that unison might not work when the OCaml versions of
+two instances are out of sync.
+One way to work around this limitation of unison is to use
+the OPAM OCaml package and compiler manager to sync the
+OCaml versions on your machines.
Index: unison/snapshot/Makefile
===================================================================
RCS file: unison/snapshot/Makefile
diff -N unison/snapshot/Makefile
--- unison/snapshot/Makefile 30 Nov 2012 19:38:09 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.11 2012/11/30 19:38:09 chrisz Exp $
-
-COMMENT= multi-platform file synchronization tool, beta version
-
-V= 2.27.57
-REVISION= 5
-
-MASTER_SITES= ${HOMEPAGE}download/releases/beta/
-
-.include <bsd.port.mk>
Index: unison/snapshot/distinfo
===================================================================
RCS file: unison/snapshot/distinfo
diff -N unison/snapshot/distinfo
--- unison/snapshot/distinfo 13 Feb 2008 23:13:27 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (unison-2.27.57.tar.gz) = S6Cj5L9LStDAY/hjkTcfeA==
-RMD160 (unison-2.27.57.tar.gz) = FTiOPyubWTq6FAQWIWg3xJ5IAMA=
-SHA1 (unison-2.27.57.tar.gz) = mJJoDYvT48UAMUUcxud+tUMXaOo=
-SHA256 (unison-2.27.57.tar.gz) = SSmewUIWqEZ7LGuhSPgUW+wx+nh0M/nOOFHC1i8ANa4=
-SIZE (unison-2.27.57.tar.gz) = 617253
Index: unison/snapshot/pkg/DESCR
===================================================================
RCS file: unison/snapshot/pkg/DESCR
diff -N unison/snapshot/pkg/DESCR
--- unison/snapshot/pkg/DESCR 22 May 2005 17:44:41 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows
-two replicas of a collection of files and directories to be stored on
-different hosts (or different disks on the same host), modified
-separately, and then brought up to date by propagating the changes in
-each replica to the other.
-
-This is the "beta" version of Unison.
-The "stable" version is also available.
-
-Flavors:
- no_x11 - build without X support
Index: unison/snapshot/pkg/PLIST
===================================================================
RCS file: unison/snapshot/pkg/PLIST
diff -N unison/snapshot/pkg/PLIST
--- unison/snapshot/pkg/PLIST 22 May 2005 17:44:41 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/22 17:44:41 sturm Exp $
-bin/unison
-share/doc/unison/
-share/doc/unison/BUGS.txt
-share/doc/unison/NEWS
-share/doc/unison/README
Index: unison/stable/Makefile
===================================================================
RCS file: unison/stable/Makefile
diff -N unison/stable/Makefile
--- unison/stable/Makefile 19 Sep 2014 12:56:23 -0000 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.23 2014/09/19 12:56:23 chrisz Exp $
-
-COMMENT= multi-platform file synchronization tool
-
-V= 2.40.102
-REVISION = 4
-
-MASTER_SITES= ${HOMEPAGE}download/releases/stable/
-
-.include <bsd.port.mk>
Index: unison/stable/distinfo
===================================================================
RCS file: unison/stable/distinfo
diff -N unison/stable/distinfo
--- unison/stable/distinfo 20 Nov 2012 15:18:31 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (unison-2.40.102.tar.gz) = PUqS8CtpmPFWy3FNIC0DWN0oRu+9zp3jDixmbXfB6FQ=
-SIZE (unison-2.40.102.tar.gz) = 2694761
Index: unison/stable/patches/patch-ubase_util_ml
===================================================================
RCS file: unison/stable/patches/patch-ubase_util_ml
diff -N unison/stable/patches/patch-ubase_util_ml
--- unison/stable/patches/patch-ubase_util_ml 19 Sep 2014 12:56:23 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-ubase_util_ml,v 1.3 2014/09/19 12:56:23 chrisz Exp $
-
-The Uprintf module is broken since OCaml 4.02.
-The OCaml stdlib provides a similar function since 3.09.
-Use this function instead.
-
---- ubase/util.ml.orig Fri Sep 19 12:38:42 2014
-+++ ubase/util.ml Fri Sep 19 12:39:27 2014
-@@ -62,7 +62,8 @@ let set_infos s =
- if s <> !infos then begin clear_infos (); infos := s; show_infos () end
-
- let msg f =
-- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f
-+ clear_infos ();
-+ Printf.kfprintf (fun _ -> flush stderr; show_infos ()) stderr f
-
- let msg : ('a, out_channel, unit) format -> 'a = msg
-
Index: unison/stable/pkg/DESCR
===================================================================
RCS file: unison/stable/pkg/DESCR
diff -N unison/stable/pkg/DESCR
--- unison/stable/pkg/DESCR 22 May 2005 17:44:41 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows
-two replicas of a collection of files and directories to be stored on
-different hosts (or different disks on the same host), modified
-separately, and then brought up to date by propagating the changes in
-each replica to the other.
-
-Flavors:
- no_x11 - build without X support
Index: unison/stable/pkg/PLIST
===================================================================
RCS file: unison/stable/pkg/PLIST
diff -N unison/stable/pkg/PLIST
--- unison/stable/pkg/PLIST 20 Nov 2012 15:18:31 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/11/20 15:18:31 giovanni Exp $
-@bin bin/unison
-lib/ocaml/
-lib/ocaml/stublibs/
-share/doc/unison/
-share/doc/unison/BUGS.txt
-share/doc/unison/NEWS
-share/doc/unison/README
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
