svn commit: r455079 - in head/net-im/ricochet: . files

[Alexey Dokuchaev]

On Tue, Nov 28, 2017 at 09:37:15PM +0000, Yuri Victorovich wrote:
> Author: yuri
> Date: Tue Nov 28 21:37:15 2017
> New Revision: 455079
> URL: https://svnweb.freebsd.org/changeset/ports/455079
> 
> Log:
>   net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic; Fixed order

(On an unrelated note: could you please wrap your commit logs so they fit
80-char displays?  Thank you.)

> -OPTIONS_DEFINE=	TOR
> -OPTIONS_DEFAULT=	TOR
> -TOR_DESC=	Install Tor: it is required for ${PORTNAME} to run
> -
>  USES=		compiler:c++11-lib gmake pkgconfig qmake ssl
>  USE_GITHUB=	yes
>  GH_ACCOUNT=	ricochet-im
> @@ -29,17 +25,19 @@ USE_QT5=	core gui multimedia network qml quick quickco
>  USE_GL=		gl
>  QMAKE_ARGS+=	DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
>  
> +OPTIONS_DEFINE=	TOR
> +OPTIONS_DEFAULT=	TOR
> +TOR_DESC=	Install Tor: it is required for ${PORTNAME} to run
> +
> +TOR_RUN_DEPENDS=	tor:security/tor

I don't get it: if Tor is *required* for ${PORTNAME} to run (per TOR_DESC),
why not simply remove the option and use normal RUN_DEPENDS?

If it, under some circumstances, is *not required* to run, then TOR_DESC
should be reworded.  Now it is just plain confusing.

./danfe