security/pinentry patch for WINOUT_X11 systems

[Dewayne Geraghty]

On 19/12/2014 11:26 PM, Dmitry Morozovsky wrote:
> Max,
>
> pinentry currently brokes if WITHOUT_X11 (or, by new world orderm 
> OPTIONS_UNSET+=X11) is set.
>
> what do you think about the following patch?
>
> marck at castor:/FreeBSD/ports/ports/security/pinentry> svn diff
> Index: Makefile
> ===================================================================
> --- Makefile    (revision 374940)
> +++ Makefile    (working copy)
> @@ -25,7 +25,11 @@
>  .if !defined(PINENTRY_SLAVE)
>  OPTIONS_MULTI= FRONTEND
>  OPTIONS_MULTI_FRONTEND=        NCURSES GTK2 QT4
> +. if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11}
> +OPTIONS_DEFAULT=       NCURSES
> +. else
>  OPTIONS_DEFAULT=       ${OPTIONS_MULTI_FRONTEND}
> +. endif
>
>  NCURSES_DESC=  Curses frontend
>  GTK2_DESC=     Gtk+ 2 frontend
>
>
Max,
That's a good idea and ensures a correct build but it adds complexity if
packages are built for other target environments.  The use of src.conf
was "meant" to be guidence for the buildworld/buildkernel experience, 
its expedient use in ports adds unintented logic to Makefiles and we've
learnt to rename src.conf when ports are built to minimise this.

The change to pinentry options (removing GTK) caused a problem for us
too, when we rebuilt our package set.  Ensuring that the appropriate
front-end is selected, in our case ncurses, as an option is the better,
more general solution.

Regards, Dewayne.

-- 
For the talkers: “The superior man acts before he speaks, and afterwards speaks according to his action.”
For everyone else: “Life is really simple, but we insist on making it complicated.”