From owner-freebsd-ports@FreeBSD.ORG Fri Mar 20 00:26:34 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 751C8DE6 for ; Fri, 20 Mar 2015 00:26:34 +0000 (UTC) Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29B9B6D for ; Fri, 20 Mar 2015 00:26:33 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YYkX0-0000mr-Jd for freebsd-ports@freebsd.org; Fri, 20 Mar 2015 01:11:18 +0100 Received: from c-69-253-3-227.hsd1.pa.comcast.net ([69.253.3.227]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Mar 2015 01:11:18 +0100 Received: from mainland by c-69-253-3-227.hsd1.pa.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Mar 2015 01:11:18 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-ports@freebsd.org From: Geoffrey Mainland Subject: Re: net/unison240 depends on lang/ocaml-nox11 Date: Thu, 19 Mar 2015 20:11:13 -0400 Lines: 72 Message-ID: <550B65A1.9080402@apeiron.net> References: <5507555C.7030508@FreeBSD.org> <5507F80F.70609@FreeBSD.org> <55080F30.9010104@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@ger.gmane.org Cc: freebsd-ports@freebsd.org X-Gmane-NNTP-Posting-Host: c-69-253-3-227.hsd1.pa.comcast.net User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: <55080F30.9010104@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: Fri, 20 Mar 2015 00:26:34 -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