diff options
| author | dillo <dillo@pkgsrc.org> | 2007-04-17 19:07:49 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2007-04-17 19:07:49 +0000 |
| commit | dcc6b8ead70d2a7a054328293e6cf9844a3c9deb (patch) | |
| tree | 48e38407ad50d7466cd08e5c7161770201ca3556 | |
| parent | 067e9ded0c1251158eee1305fb6e2a92d551a585 (diff) | |
| download | pkgsrc-dcc6b8ead70d2a7a054328293e6cf9844a3c9deb.tar.gz | |
Rename option glx to dri; it will be used by MesaLib shortly, and
dri seems more natural there.
Okayed by wiz and joerg.
| -rw-r--r-- | mk/defaults/options.description | 2 | ||||
| -rw-r--r-- | x11/modular-xorg-server/Makefile | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mk/defaults/options.description b/mk/defaults/options.description index b2aecc1931e..467cce1867f 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -65,6 +65,7 @@ djbware-errno-hack Patch to #include <errno.h> for correctness. 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 @@ gif Enable GIF support. gimp1-helpbrowser Link against gnome1 to get a help browser. glib1 glpk -glx Enable support for direct rendering. gnome gnupg gnuplot diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 5c3fd4fac1e..304e76b4c6b 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -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 @@ USE_TOOLS+= perl 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 @@ BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 .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 |