svn commit: r475110 - head/deskutils/calibre

[Mathieu Arnold]

On Sun, Jul 22, 2018 at 04:48:49PM +0000, Guido Falsi wrote:
> Author: madpilot
> Date: Sun Jul 22 16:48:48 2018
> New Revision: 475110
> URL: https://svnweb.freebsd.org/changeset/ports/475110
> 
> Log:
>   Fix build when using python 3 as default by propagating flavored
>   sip binary to make environment.

I do not understand when that can possibly be the case, whatever Python
is the default, it is the defaut, and calibre not being flavored, it
will bring in the default, which will have LOCAL/bin/sip.

>   PR:		229956
>   Submitted by:	fluffy
> 
> Modified:
>   head/deskutils/calibre/Makefile
> 
> Modified: head/deskutils/calibre/Makefile
> ==============================================================================
> --- head/deskutils/calibre/Makefile	Sun Jul 22 16:39:16 2018	(r475109)
> +++ head/deskutils/calibre/Makefile	Sun Jul 22 16:48:48 2018	(r475110)
> @@ -70,7 +70,8 @@ MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig
>  		XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
>  		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
>  		XDG_UTILS_INSTALL_MODE=system \
> -		QMAKE=${QMAKE}
> +		QMAKE=${QMAKE} \
> +		SIP_BIN=sip-${PYTHON_VER}
>  
>  post-patch:
>  	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
> 
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20180722/038f67d6/attachment.sig>