Date: Thu, 19 Mar 2015 20:11:13 -0400 From: Geoffrey Mainland <mainland@apeiron.net> To: freebsd-ports@freebsd.org Cc: freebsd-ports@freebsd.org Subject: Re: net/unison240 depends on lang/ocaml-nox11 Message-ID: <550B65A1.9080402@apeiron.net> In-Reply-To: <55080F30.9010104@FreeBSD.org> References: <CAGSa5y3KPuEsGHPztA4k_ejfvHnREMHysynHY%2B4ephA44rw-bg@mail.gmail.com> <CAGSa5y1ye0tAkF3Yjcd4yHA1_RjZxW025PaK3pexMChVW0c3eg@mail.gmail.com> <5507555C.7030508@FreeBSD.org> <CAGSa5y2h3T5RoEoGekJCHmRwS82hQHvhGTHpTVMHhcYM-e9awQ@mail.gmail.com> <5507F80F.70609@FreeBSD.org> <CAGSa5y1RTkoK7u1soQmMB9Sh_YEYe2hM1Hxfrf9LoOd3NF=Z%2Bg@mail.gmail.com> <55080F30.9010104@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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@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@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?550B65A1.9080402>