aboutsummaryrefslogtreecommitdiff
path: root/net/unison232
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2015-03-17 09:46:23 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2015-03-17 09:46:23 +0000
commitc1fdd19c8b1bdd27c34e285fa19713e5a75ddd0b (patch)
tree0491ce208ae132197fa7ebead2c048b7ebc0d844 /net/unison232
parentb385f58d0e0e9b43cb97eeee1950aab93d25f14e (diff)
downloadports-c1fdd19c8b1bdd27c34e285fa19713e5a75ddd0b.tar.gz
ports-c1fdd19c8b1bdd27c34e285fa19713e5a75ddd0b.zip
- 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)
Notes
Notes: svn path=/head/; revision=381478
Diffstat (limited to 'net/unison232')
-rw-r--r--net/unison232/Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 1663d8eaec79..53190fb7f399 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.32.52
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 232
@@ -17,6 +17,8 @@ COMMENT= User-level file synchronization tool
LICENSE= GPLv3
+BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
+
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
WANT_GNOME= yes
@@ -37,18 +39,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}
.endif
.if ${PORT_OPTIONS:MX11}