svn commit: r517341 - head/x11-wm/e16

[Pietro Cerutti]

On Nov 13 2019, 09:34 UTC, Alexey Dokuchaev <danfe at freebsd.org> wrote:
>On Wed, Nov 13, 2019 at 10:25:34AM +0100, Tobias Kortkamp wrote:
>> On Tue, Nov 12, 2019 at 05:00:41PM +0000, Pietro Cerutti wrote:
>> > Author: gahr
>> > Date: Tue Nov 12 17:00:40 2019
>> > New Revision: 517341
>> > URL: https://svnweb.freebsd.org/changeset/ports/517341
>> >
>> > Log:
>> >   x11-wm/e16: update to 1.0.21, rework OPTIONS
>> >
>> > ...
>> > -OPTIONS_DEFINE=		DOCS NLS PANGO SOUND
>> > +OPTIONS_DEFINE=		DOCS NLS PANGO
>> > +OPTIONS_RADIO=		SOUND SOUNDLOADER
>> > +OPTIONS_RADIO_SOUND=	PULSEAUDIO SNDIO
>> > +OPTIONS_RADIO_SOUNDLOADER=	SNDFILE AUDIOFILE
>> >  OPTIONS_SUB=		yes
>> > ...
>> > +# Double check SOUND and SOUNDLOADER
>> > +E16_SOUND=	${PORT_OPTIONS:MPULSEAUDIO}${PORT_OPTIONS:MSNDIO}
>> > +E16_SNDLDR=	${PORT_OPTIONS:MSNDFILE}${PORT_OPTIONS:MAUDIOFILE}
>> > +.if !empty(E16_SOUND) && empty(E16_SNDLDR)
>> > +IGNORE=	sound support requires a sound loader
>> > +.endif
>> > +.if empty(E16_SOUND) && !empty(E16_SNDLDR)
>> > +IGNORE=	sound loader only makes sense with sound support
>> > +.endif
>>
>> could you please look this over again:
>>
>> - USES is set twice which does not make sense
>> - None of the *_CONFIGURE_{ENABLE,OFF,ON} or *_USES helpers do 
>> anything
>>   since CONFIGURE_ARGS and USES are overwritten again after including
>>   bsd.port.options.mk.

Yep - a bad merge after r517000 and an oversight wrt = instead of +=.

>The entire "rework OPTIONS" code is a mess and should be fixed for 
>good. Perhaps Pietro might want to find an extra pair of eyes to review 
>his work prior to committing, or at leaset rehash 
>/usr/ports/Mk/bsd.options.mk.

Thanks for the constructive criticism of yours, which we're all well 
used to. I'm not exactly sure which part of the OPTIONS you find a 
"mess", and even less sure how you'd fix it. I haven't found a more 
direct way to specify logical dependecies between two RADIO groups, if 
that's what you don't like.

-- 
Pietro Cerutti