net/unison240 depends on lang/ocaml-nox11

[Jeremie Le Hen]

Actually, I've just realized that I fixed net/unison232 in my local tree :o).

Would you mind submitting it and applying the same for unison240?

Here is the patch:

Index: Makefile
===================================================================
--- Makefile    (revision 381259)
+++ Makefile    (working copy)
@@ -34,20 +34,18 @@

 .include <bsd.port.options.mk>

+BUILD_DEPENDS+=        ocamlc:${PORTSDIR}/lang/ocaml
 .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



On Mon, Mar 16, 2015 at 10:33 PM, Jeremie Le Hen <jlh at freebsd.org> wrote:
> Hi Guido,
>
> I saw you recently submitted net/unison240 but it depends on
> lang/ocaml-nox11.  This is a problem with using poudriere:
>
> [00:00:58] ====>> Error: Duplicated origin for ocaml-nox11-4.01.0_4:
> lang/ocaml-nox11 AND lang/ocaml. Rerun with -vv to see which ports are
> depending on these.
>
> Would you mind making it similar to www/unison232?  This one works correctly.
>
> Thanks a lot.
> Cheers,
> --
> Jeremie Le Hen
> jlh at FreeBSD.org



-- 
Jeremie Le Hen
jlh at FreeBSD.org