1 files changed, 25 insertions, 10 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 1bc84125ee77..241d569a5960 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unison
 PORTVERSION=	2.48.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -16,14 +16,13 @@ COMMENT?=	User-level file synchronization tool
 LICENSE=	GPLv3
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-USES=		gmake
+USES=		gmake localbase
 USE_OCAML=	yes
 WRKSRC=		${WRKDIR}/src
 NO_OCAML_RUNDEPENDS=yes
 WANT_GNOME=	yes
-MAKE_ARGS=	CFLAGS=""
 CONFLICTS?=	unison-devel-[0-9]* unison-nox11-[0-9]*
-
+MAKE_ENV=	CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
@@ -31,28 +30,41 @@ DOCS=		BUGS.txt NEWS README
 EXTRA_DOCS=	${DISTNAME}-manual.html \
 		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
-OPTIONS_DEFINE=		DOCS X11
-OPTIONS_DEFAULT?=	X11
+OPTIONS_DEFINE=		DOCS FSMONITOR X11
+OPTIONS_DEFAULT?=	FSMONITOR X11
+
+FSMONITOR_DESC=		Compile and install fsmonitor plugin
+
+OPTIONS_SUB=		YES
+
+FSMONITOR_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 X11_MAKE_ARGS=		UISTYLE=gtk2
-X11_PLIST_SUB=		TEXT=""
 X11_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2 \
 			icotool:graphics/icoutils
 X11_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 X11_SUB_FILES=		${PORTNAME}.desktop
 
 X11_MAKE_ARGS_OFF=	UISTYLE=text
-X11_PLIST_SUB_OFF=	TEXT="@comment "
 X11_VARS_OFF=		PKGMESSAGE=${PKGDIR}/pkg-message.nox11
 
+post-patch-FSMONITOR-off:
+	@${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \
+		${WRKSRC}/Makefile.OCaml
+
+post-patch-X11-off:
+	@${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \
+		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
+
 post-patch-X11-on:
 	@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
-		${WRKSRC}/Makefile.OCaml
+			-e 's/CFLAGS/COFLAGS/g' \
+		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
 
 post-build-X11-on:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text
 	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 
 do-install:
@@ -61,6 +73,9 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
 
+do-install-FSMONITOR-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin
+
 do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}