svn commit: r481915 - in head/sysutils/ipmitool: . files

[Tobias Kortkamp]

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 <bsd.port.options.mk>
> +
> +.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.