6 files changed, 70 insertions, 44 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 149126354848..3e74de040f44 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -6,45 +6,62 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.9.20
-PORTREVISION=	2
+PORTVERSION=	2.10.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	src.tar.gz
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	daniel+unison@pelleg.org
 COMMENT=	A user-level file synchronization tool
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
 PATCH_DEPENDS=	${BUILD_DEPENDS}
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USE_GMAKE=	yes
-MAKE_ARGS=	UISTYLE=text CFLAGS=""
+MAKE_ARGS=	CFLAGS=""
+
+.include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-manual.dvi unison-manual.html \
-		unison-manual.pdf unison-manual.ps
+EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
+		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+.endif
+
+.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) && exists(${LOCALBASE}/bin/lablgtk2)
+WITH_GTK2=	yes
 .endif
 
-pre-patch:
-	@if [ `ocamlc -version | ${SED} -e s/\\\.//g -e s/\\\+.*//` -gt 307 ] ; then \
-		if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/ocaml-external-patch-ab ; then \
-			${TRUE} ; \
-		else \
-			${ECHO_MSG} ">> Patch ocaml-external-patch-ab failed to apply cleanly." ; \
-			${FALSE} ; \
-		fi; \
-	fi
+.if defined(WITH_GTK2)
+MAKE_ARGS+=	UISTYLE=gtk2
+RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+PLIST_SUB+=	TEXT=""
+.else
+MAKE_ARGS+=	UISTYLE=text
+PLIST_SUB+=	TEXT="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+post-build:
+	@${ECHO} Building text-only version
+	@${ECHO} ${WRKSRC}
+	@${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
+.endif
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/unison
+.if defined(WITH_GTK2)
+	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 1044547f1238..994c5869f514 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,10 +1,8 @@
-MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960
-SIZE (unison-2.9.20/src.tar.gz) = 363079
-MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533
-SIZE (unison-2.9.20/unison-manual.dvi) = 248060
-MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851
-SIZE (unison-2.9.20/unison-manual.html) = 209167
-MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636
-SIZE (unison-2.9.20/unison-manual.pdf) = 332136
-MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed
-SIZE (unison-2.9.20/unison-manual.ps) = 440361
+MD5 (unison-2.10.2/unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5
+SIZE (unison-2.10.2/unison-2.10.2.tar.gz) = 458032
+MD5 (unison-2.10.2/unison-2.10.2-manual.html) = 46cac2b5b84e821d39cc5a100dd97e7a
+SIZE (unison-2.10.2/unison-2.10.2-manual.html) = 190911
+MD5 (unison-2.10.2/unison-2.10.2-manual.pdf) = 7e6b018d758b786d7cf5752413c08168
+SIZE (unison-2.10.2/unison-2.10.2-manual.pdf) = 354402
+MD5 (unison-2.10.2/unison-2.10.2-manual.ps) = 89cc36cf06d688f163a924fc8c1a47f9
+SIZE (unison-2.10.2/unison-2.10.2-manual.ps) = 490966
diff --git a/net/unison/files/ocaml-external-patch-ab b/net/unison/files/ocaml-external-patch-ab
deleted file mode 100644
index 247ae274f9f7..000000000000
--- a/net/unison/files/ocaml-external-patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- ubase/uprintf.ml.orig	Thu Jul 29 22:50:35 2004
-+++ ubase/uprintf.ml	Thu Jul 29 22:51:55 2004
-@@ -10,8 +10,8 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--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
diff --git a/net/unison/files/patch-pty.c b/net/unison/files/patch-pty.c
new file mode 100644
index 000000000000..833ac9b05ed4
--- /dev/null
+++ b/net/unison/files/patch-pty.c
@@ -0,0 +1,13 @@
+--- pty.c.orig	Sun Jan 23 19:55:28 2005
++++ pty.c	Sun Jan 23 19:56:28 2005
+@@ -32,6 +32,10 @@
+ #ifdef __APPLE__
+ #include <util.h>          // openpty
+ #endif
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <libutil.h>
++#endif
+ 
+ /* c_openpty: unit -> (int * Unix.file_descr) */
+ CAMLprim value c_openpty() {
diff --git a/net/unison/pkg-message b/net/unison/pkg-message
new file mode 100644
index 000000000000..61c81306e650
--- /dev/null
+++ b/net/unison/pkg-message
@@ -0,0 +1,11 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	ATTENTION:
+
+1) Unison archive format has changed since 2.9.20. The old archive
+won't be deleted automatically in case you want to downgrade it.
+
+2) Merge functionality has seriously changed. Check the manual.
+
+3) Together with gtk-enabled version, a text-only unison-text binary
+is installed as it depends on a smaller number of libraries.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/net/unison/pkg-plist b/net/unison/pkg-plist
index 5c8fc8567c8f..7fc5e3d995b4 100644
--- a/net/unison/pkg-plist
+++ b/net/unison/pkg-plist
@@ -1,9 +1,9 @@
 bin/unison
+%%TEXT%%bin/unison-text
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%