[pkgsrc/trunk]: pkgsrc Rename option glx to dri; it will be used by MesaLib s...

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71768070e477
branches:  trunk
changeset: 527983:71768070e477
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Tue Apr 17 19:07:49 2007 +0000

description:
Rename option glx to dri; it will be used by MesaLib shortly, and
dri seems more natural there.
Okayed by wiz and joerg.

diffstat:

 mk/defaults/options.description  |  2 +-
 x11/modular-xorg-server/Makefile |  9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 93046b1a1e00 -r 71768070e477 mk/defaults/options.description
--- a/mk/defaults/options.description   Tue Apr 17 18:52:47 2007 +0000
+++ b/mk/defaults/options.description   Tue Apr 17 19:07:49 2007 +0000
@@ -65,6 +65,7 @@
 doc                    Include the documentation.
 domainscale    
 drac                   Enable DRAC support.
+dri                    Enable Direct Rendering support.
 drupal-xmlservices     Enable XML-based services.
 dts                    Enable DTS Coherent Acoustics support.
 dv                     Enable usage of the libdv library.
@@ -112,7 +113,6 @@
 gimp1-helpbrowser      Link against gnome1 to get a help browser.
 glib1  
 glpk   
-glx                    Enable support for direct rendering.
 gnome  
 gnupg  
 gnuplot        
diff -r 93046b1a1e00 -r 71768070e477 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Tue Apr 17 18:52:47 2007 +0000
+++ b/x11/modular-xorg-server/Makefile  Tue Apr 17 19:07:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/04/03 20:25:44 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2007/04/17 19:07:49 dillo Exp $
 
 DISTNAME=      xorg-server-1.2.0
 PKGREVISION=   2
@@ -22,11 +22,12 @@
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --enable-dri
 
-PKG_SUPPORTED_OPTIONS= glx
+PKG_SUPPORTED_OPTIONS= dri
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xorg-server
+PKG_OPTIONS_LEGACY_OPTS=glx:dri
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mglx)
+.if !empty(PKG_OPTIONS:Mdri)
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=            MesaLib-6.5.2.tar.bz2
 SITES.MesaLib-6.5.2.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
@@ -63,7 +64,7 @@
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
-.if empty(PKG_OPTIONS:Mglx)
+.if empty(PKG_OPTIONS:Mdri)
 # for GLX we already have the Mesa source
 .include "../../graphics/MesaLib/buildlink3.mk"
 .endif