From owner-svn-ports-head@freebsd.org Fri Oct 12 17:58:05 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02B5110C56CF; Fri, 12 Oct 2018 17:58:05 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A79A88E4C8; Fri, 12 Oct 2018 17:58:04 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2945F220B8; Fri, 12 Oct 2018 13:58:04 -0400 (EDT) Received: from web6 ([10.202.2.216]) by compute4.internal (MEProxy); Fri, 12 Oct 2018 13:58:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=uK97h3clvGPhedB4LwXlyOYzkxRIgivn8+L1LCX+H wQ=; b=NzKSl/91UaZNEy7nR4gBcaJszg91XZ95zPzT6uvIFTfQ5D9AmxgDn3+RZ g3A6zj6nhegd+BSxKSty1Ei9ljnCgxelX6wqpcb1aGKP2nEbrfRuazLhjBU3W7B3 QvkkrcWZdiza2KLe3RjcerO74ay3UghzFljTQ+k6ZjBab0HUakRtcJI3Sm0WaoPv NnEPNNU/ekfLCvotMszq4N3nqxEQCelkwdyzFEpKdex/WBe4UfyWv/GIrbLIYzkp ag4M00as0j71G6nHqtjVkwF8pxakFfZ1H2MFn91qkItXuQXF72pIaOSgRTqz7ies 7A4TRIEB2eagJBcKEENV7fe9QHAuQ== X-ME-Sender: X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 99) id CEC4C414F; Fri, 12 Oct 2018 13:58:03 -0400 (EDT) Message-Id: <1539367083.328758.1540102872.2C88E8B9@webmail.messagingengine.com> From: Tobias Kortkamp To: Sean Bruno , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-6804a824 Date: Fri, 12 Oct 2018 19:58:03 +0200 In-Reply-To: <201810121751.w9CHpbfM070987@repo.freebsd.org> References: <201810121751.w9CHpbfM070987@repo.freebsd.org> Subject: Re: svn commit: r481915 - in head/sysutils/ipmitool: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2018 17:58:05 -0000 On Fri, Oct 12, 2018, at 19:51, Sean Bruno wrote: > Author: sbruno > Date: Fri Oct 12 17:51:37 2018 > New Revision: 481915 > URL: https://svnweb.freebsd.org/changeset/ports/481915 > > Log: > sysutils/ipmitool: unbreak with openssl 1.1.1 import > - Only apply openssl patch if we are on a version of FreeBSD with > openssl 1.1.1 > - Don't bump portrevision as we don't change anything except on broken > systems > > It should be noted that this is a functional way to fix this port and > is the method > used upstream. There are most likely better ways to do this. > > Reviewed by: 0mp (Makefile changes) > Obtained from > Sponsored by: Limelight Networks > > Added: > head/sysutils/ipmitool/files/extra-patch- > src_plugins_lanplus_lanplus__crypt__impl.c (contents, props changed) > Modified: > head/sysutils/ipmitool/Makefile > > Modified: head/sysutils/ipmitool/Makefile > ============================================================================== > --- head/sysutils/ipmitool/Makefile Fri Oct 12 17:03:07 2018 (r481914) > +++ head/sysutils/ipmitool/Makefile Fri Oct 12 17:51:37 2018 (r481915) > @@ -49,6 +49,12 @@ FREEIPMI_CPPFLAGS= -I${LOCALBASE}/include > FREEIPMI_LDFLAGS= -L${LOCALBASE}/lib > FREEIPMI_CONFIGURE_ENABLE= intf-free > > +.include > + > +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 > +EXTRA_PATCHES= ${PATCHDIR}/extra-patch- > src_plugins_lanplus_lanplus__crypt__impl.c > +.endif > + When the port is built with DOCS=off EXTRA_PATCHES has already been set earlier. This is overwriting it. You must use EXTRA_PATCHES+= here.