From owner-freebsd-ports@FreeBSD.ORG Sat Mar 21 17:09:48 2015 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0EBA2BF1; Sat, 21 Mar 2015 17:09:48 +0000 (UTC) Received: from newton.apeiron.net (newton.apeiron.net [IPv6:2607:f2f8:ae14::2]) (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 DF7D8E1A; Sat, 21 Mar 2015 17:09:47 +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=1426810273; bh=BWYHtTPieNYu+uQF6SP/kn+Gp8GIo7Btj227XNguD/4=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=ooOfTJfnFJSEjzueiK9xBW0aquon4N8xDEHhZ1OGgjZXRUCenrBd3m2bBV4UxbZ4A mrOQcsoEAnvyy88CD+nX8a99m/2gsuiHPMhZWG4HaHNbxuE4zQMke+bh3YuRdCbk4g ludubcdHFT/1SJDIccROuVI6k9gFk9EOIhlqCm1Q= Received: from [10.207.0.16] (c-69-253-3-227.hsd1.pa.comcast.net [69.253.3.227]) (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 01E869D47; Thu, 19 Mar 2015 17:11:12 -0700 (PDT) Message-ID: <550B65A1.9080402@apeiron.net> Date: Thu, 19 Mar 2015 20:11:13 -0400 From: Geoffrey Mainland User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 Newsgroups: gmane.os.freebsd.devel.ports 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> In-Reply-To: <55080F30.9010104@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:09:48 -0000 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