* remove snapshot port, move net/unison/stable to net/unison
* patch to retain backtrace on uncaught exceptions * add readme warning about incompadibilities between different OCaml versions.
This commit is contained in:
chrisz
parent
2cc5d4cacf
commit
902ef08796
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.867 2014/10/12 20:51:59 juanfra Exp $
|
||||
# $OpenBSD: Makefile,v 1.868 2014/10/16 16:07:51 chrisz Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += GeoIP
|
||||
@ -609,6 +609,7 @@
|
||||
SUBDIR += uhttpmock
|
||||
SUBDIR += unifi
|
||||
SUBDIR += unison
|
||||
SUBDIR += unison,no_x11
|
||||
SUBDIR += unworkable
|
||||
SUBDIR += ushare
|
||||
SUBDIR += uucp
|
||||
|
||||
@ -1,9 +1,65 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2010/02/01 17:00:14 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2014/10/16 16:07:51 chrisz 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 <giovanni@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>
|
||||
|
||||
@ -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 <giovanni@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
|
||||
@ -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>
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (unison-2.40.102.tar.gz) = PUqS8CtpmPFWy3FNIC0DWN0oRu+9zp3jDixmbXfB6FQ=
|
||||
SIZE (unison-2.40.102.tar.gz) = 2694761
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user