ports/121428: [patch] x11/xlockmore: fix Mesa/GL modes

[Oliver Fromme]

>Number:         121428
>Category:       ports
>Synopsis:       [patch] x11/xlockmore: fix Mesa/GL modes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 06 15:10:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Fromme
>Release:        FreeBSD 7.0-STABLE-20080305 i386
>Organization:
secnetix GmbH & Co. KG
		http://www.secnetix.de/bsd
>Environment:

FreeBSD 7.0-STABLE-20080305 i386,
ports collection up to date.

>Description:

The options switch "Enable Mesa 3D (for GL modes)" is broken.
In fact it's broken in a very interesting way.  :-)

It turns out that these lines are the culprit:

    OPTIONS=MESAGL   "Enable Mesa 3D (for GL modes)"   off

    .if ${ARCH} == amd64
    WITH_MESAGL=    no
    .else
    WITH_MESAGL?=   yes
    .endif
    .if ${WITH_MESAGL} == yes
    CONFIGURE_ARGS+=        --with-mesa

First case:  options MESAGL is *disabled*.  Then the options
framework sets the variable WITHOUT_MESAGL=true.  The above
code (running on non-amd64) then sets WITH_MESAGL=yes anyway
enabling Mesa support even though the user didn't want it.

Second case:  options MESAGL is *enabled*.  As a result, the
variable WITH_MESAGL is set to "true" (not "yes"!).  The
above code only checks for the value "yes", therefore *not*
enabling Mesa support.



>How-To-Repeat:

On a FreeBSD/i386 machine:

cd /usr/ports/x11/xlockmore
make config
make

Notice that Mesa/GL modes are *not* included if you enabled
them in the config menu.  Notice that they *are* included
if you disabled them.


>Fix:

--- x11/xlockmore/Makefile.orig	2007-10-17 12:41:25.000000000 +0200
+++ x11/xlockmore/Makefile	2008-03-06 16:01:51.000000000 +0100
@@ -50,11 +50,10 @@
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-WITH_MESAGL=	no
-.else
-WITH_MESAGL?=	yes
+.undef WITH_MESAGL
 .endif
-.if ${WITH_MESAGL} == yes
+
+.if defined(WITH_MESAGL)
 CONFIGURE_ARGS+=	--with-mesa
 MESALIB=${PTHREAD_LIBS}
 USE_GL=	yes
>Release-Note:
>Audit-Trail:
>Unformatted: