pkg/37495: Inconsistent value of PKG_OPTIONS_VAR in x11/modular-xorg-server

[Per Amund Amundsen <pa%bsd-amundsen.ux.uis.no@localhost>]

>Number:         37495
>Category:       pkg
>Synopsis:       Inconsistent value of PKG_OPTIONS_VAR in 
>x11/modular-xorg-server
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 07 08:05:00 +0000 2007
>Originator:     Per Amund Amundsen
>Release:        NetBSD 3.1_STABLE
>Organization:
University of Stavanger
-- 
Per Amund Amundsen                              per-am%ux.uis.no@localhost
Department of Mathematics and Natural Science   per.a.amundsen%uis.no@localhost
University of Stavanger                         Tlf: (+47) 51 83 18 77
N-4036 Stavanger                                Fax: (+47) 51 83 17 50
>Environment:
        
        
System: NetBSD bsd-amundsen 3.1_STABLE NetBSD 3.1_STABLE (BSDA4) #11: Mon Sep 3 
12:05:34 CEST 2007 pa@bsd-amundsen:/usr/src/sys/arch/i386/compile/BSDA4 i386
Architecture: i386
Machine: i386
>Description:
        The value of PKG_OPTIONS_VAR is set to
        "PKG_OPTIONS.modular-xorg-server", but in the Makefile it is
        tested for "PKG_OPTIONS.xorg-server"
>How-To-Repeat:
        Run "make show-options" in x11/modular-xorg-server and learn
        that you can set option PKG_OPTIONS.modular-xorg-server=dri in
        mk.conf. Do that, and observe that it has no effect.
 
>Fix:
        Correct the value in the Makefile (or alternatively in options.mk)


*** Makefile    9 Nov 2007 11:34:47 -0000       1.22
--- Makefile    7 Dec 2007 07:49:23 -0000
***************
*** 22,28 ****
  CONFIGURE_ARGS+=      --enable-dri
  
  PKG_SUPPORTED_OPTIONS=        dri
! PKG_OPTIONS_VAR=      PKG_OPTIONS.xorg-server
  PKG_OPTIONS_LEGACY_OPTS=glx:dri
  .include "../../mk/bsd.options.mk"
  
--- 22,28 ----
  CONFIGURE_ARGS+=      --enable-dri
  
  PKG_SUPPORTED_OPTIONS=        dri
! PKG_OPTIONS_VAR=      PKG_OPTIONS.modular-xorg-server
  PKG_OPTIONS_LEGACY_OPTS=glx:dri
  .include "../../mk/bsd.options.mk"

>Unformatted: