From owner-freebsd-ports@FreeBSD.ORG Sat Mar 21 17:58:24 2015 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8D13381; Sat, 21 Mar 2015 17:58:24 +0000 (UTC) Received: from newton.apeiron.net (newton.apeiron.net [208.79.95.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.apeiron.net", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B484C33D; Sat, 21 Mar 2015 17:58:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at apeiron.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=apeiron.net; s=newton; t=1426960703; bh=XtUfPY2z2gTEnfNU/TuZHfQ//39pLJ55ZdAE5gTDGrA=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=2Z2peMXCwKl7/5uhuwQRPa2FcvkdJOYQC8DYE0XoQFmt/onHzbO4fSFPO/n958mim IyLNasnMYSiroYMQhQ1oYUm/ez6gX1xbeNvkeE2WSn3Dimd9SYvebZ7aGGoexzDE+j uMhotK1aR3I6Wlp1kd5Gx3SLFXlWiV/OnBiyNtrI= Received: from [192.168.42.70] (70-36-146-244.dsl.dynamic.fusionbroadband.com [70.36.146.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mainland) by newton.apeiron.net (Postfix) with ESMTPSA id C6C1893DD; Sat, 21 Mar 2015 10:58:22 -0700 (PDT) Message-ID: <550DB13D.7020005@apeiron.net> Date: Sat, 21 Mar 2015 10:58:21 -0700 From: Geoffrey Mainland User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Guido Falsi , Jeremie Le Hen Subject: Re: net/unison240 depends on lang/ocaml-nox11 References: <5507555C.7030508@FreeBSD.org> <5507F80F.70609@FreeBSD.org> <55080F30.9010104@FreeBSD.org> <550B65A1.9080402@apeiron.net> <550DAD30.4080905@FreeBSD.org> In-Reply-To: <550DAD30.4080905@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2015 17:58:25 -0000 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 wrote: >>>>> On 03/17/15 09:31, Jeremie Le Hen wrote: >>>>>> On Mon, Mar 16, 2015 at 11:12 PM, Guido Falsi 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. If you still think there is no difference, I will send you full build logs both with and without the patch. Thanks, Geoff