net/unison240 depends on lang/ocaml-nox11

[Guido Falsi]

On 03/21/15 18:58, Geoffrey Mainland wrote:
> On 3/21/15 10:41 AM, Guido Falsi wrote:
>> On 03/20/15 01:11, Geoffrey Mainland wrote:
>>> On 03/17/2015 07:25 AM, Guido Falsi wrote:
>>>> On 03/17/15 11:44, Jeremie Le Hen wrote:
>>>>> On Tue, Mar 17, 2015 at 10:46 AM, Guido Falsi <madpilot at freebsd.org> wrote:
>>>>>> On 03/17/15 09:31, Jeremie Le Hen wrote:
>>>>>>> On Mon, Mar 16, 2015 at 11:12 PM, Guido Falsi <madpilot at freebsd.org> wrote:
>>>>>>>> On 03/16/15 22:37, Jeremie Le Hen wrote:
>>>>>>>>> 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?
>>>>>>>>>
>>>>>>>> I never noticed this since it never happened to me and nobody else
>>>>>>>> reported it.
>>>>>>>>
>>>>>>>> Anyway now that you draw my attention, yes, it needs fixing.
>>>>>>>>
>>>>>>>> Your patch looks correct, but please allow me a little time for some
>>>>>>>> testing.
>>>>>>> OK thanks! :)
>>>>>> Just committed it. Thanks again for reporting the issue!
>>>>> Thanks!
>>>>>
>>>>> I don't want to abuse your time, but "make checksum" is broken on
>>>>> net/unison240 :).
>>>>>
>>>> Looks like distfiles were rerolled. 2.48 has the same problem.
>>>>
>>>> Will commit updated checksums shortly!
>>>>
>>>> Thanks again.
>>> I still get the same error Jeremie was getting with poudriere.
>>>
>>> I think the BUILD_DEPENDS should not be set unconditionally. The below
>>> patch fixes the problem for me.
>>>
>>> Does this look correct to you?
>>>
>>> Thanks,
>>> Geoff
>>>
>>> diff --git a/net/unison/Makefile b/net/unison/Makefile
>>> index 7404beb..461ebab 100644
>>> --- a/net/unison/Makefile
>>> +++ b/net/unison/Makefile
>>> @@ -15,7 +15,7 @@ COMMENT?=     User-level file synchronization tool
>>>
>>>  LICENSE=       GPLv3
>>>
>>> -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
>>> +
>>>
>>>  PLIST_SUB=     PORTVERSION=${PORTVERSION}
>>>  USES=          gmake
>>> @@ -38,11 +38,13 @@ OPTIONS_DEFAULT?=        DOCS X11
>>>  .if ${PORT_OPTIONS:MX11}
>>>  MAKE_ARGS+=    UISTYLE=gtk2
>>>  PLIST_SUB+=    TEXT=""
>>> +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
>>>  BUILD_DEPENDS+=        lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
>>>                 icotool:${PORTSDIR}/graphics/icoutils
>>>  RUN_DEPENDS+=  lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
>>>  SUB_FILES+=    ${PORTNAME}.desktop
>>>  .else
>>> +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml-nox11
>>>  MAKE_ARGS+=    UISTYLE=text
>>>  PLIST_SUB+=    TEXT="@comment "
>>>  PKGMESSAGE=    ${PKGDIR}/pkg-message.nox11
>>>
>> This is the same as the port was before the latest patch.
>>
>> (having BUILD_DEPENDS= followed by BUILD_DEPENDS+= is semantically the
>> same as one unified BUILD_DEPENDS+=)
>>
>> Please send me your build log. I need to understand what is going on.
>> Can you also tell me what other ports you are building in the same
>> poudriere run together with unison? I'm interested in other ports which
>> depend on ocaml. Maybe there is some other port in the tree with the
>> same problem unison had, which are unmasked by my latest patch.
>>
>> BTW I'm going to investigate the option of modifying ocaml port
>> behavior, I'm not sure it is really correct anymore.
>>
> 
> I can send you the build logs, but no, it's not the same as before the
> patch.
> 
> Note the dependency is changed to lang/ocaml-nox11 instead of
> lang/ocaml. That is, we depend on lang/ocaml when the X11 option is
> enabled, and lang/ocaml-nox11 when the X11 option is not enabled.

It is not the same as teh port is now, but it is the same as the port
was before r381478, you can check this diff:

https://svnweb.freebsd.org/ports/head/net/unison240/Makefile?r1=381478&r2=381477

(other changes are there too, but irrelevant for the depends matter)

> 
> If you still think there is no difference, I will send you full build
> logs both with and without the patch.

I'd need the logs anyway, since I don't know what the cause of the error
you are seeing is.

I also need to know if in the same poudriere run you were building any
other port depending on ocaml.

-- 
Guido Falsi <madpilot at FreeBSD.org>