- Fix dependency on ocaml to avoid conflicting oringins when building

  in poudriere [1]
- While here, remove an old uneeded PATCH_DEPENDS
- Bump PORTREVISION also in slave port due to changes in conflicts
  and dependencies

Submitted by:	jlh@ (via email) [1]
Approved by:	mandree (implicit, for net/unison232)

1 files changed, 4 insertions, 6 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index b7d3d930b098..7404beb02dfa 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	unison
 PORTVERSION=	2.48.3
+PORTREVISION?=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -14,6 +15,8 @@ COMMENT?=	User-level file synchronization tool
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USES=		gmake
 WANT_GNOME=	yes
@@ -35,18 +38,13 @@ OPTIONS_DEFAULT?=        DOCS X11
 .if ${PORT_OPTIONS:MX11}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
-BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
+BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
 		icotool:${PORTSDIR}/graphics/icoutils
 RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-PATCH_DEPENDS+=	${BUILD_DEPENDS}
-CONFLICTS+=	ocaml-nox11*
 SUB_FILES+=	${PORTNAME}.desktop
 .else
 MAKE_ARGS+=	UISTYLE=text
 PLIST_SUB+=	TEXT="@comment "
-BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
-PATCH_DEPENDS+=	${BUILD_DEPENDS}
 PKGMESSAGE=	${PKGDIR}/pkg-message.nox11
 .endif