diff options
| author | rh <rh@pkgsrc.org> | 2000-10-15 11:31:41 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2000-10-15 11:31:41 +0000 |
| commit | bdd5ffc77d811fa18d8c59f01b61b2069f1125ec (patch) | |
| tree | 9bbfbc9102977916b86e5ab2921e662269c9a556 /mk/bsd.pkg.mk | |
| parent | 02799eef44367d4d9a27da79aebf330fcaf3cd51 (diff) | |
| download | pkgsrc-bdd5ffc77d811fa18d8c59f01b61b2069f1125ec.tar.gz | |
Add USE_MESA and USE_GLX mechanism similar to USE_XPM that detects and
handles a builtin XFree86-4.x Mesa.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 68eee410c55..9285f6f8a92 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.585 2000/10/13 23:18:00 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.586 2000/10/15 11:31:41 rh Exp $ # # This file is in the public domain. # @@ -757,7 +757,7 @@ DEPENDS+= ${LESSTIF_DEPENDS} .else DEPENDS+= ${LESSTIF_DEPENDS} .endif -.endif +.endif # USE_MOTIF # Check if we got Xpm distributed with XFree86 4.0 or newer or if we # need to use the package. @@ -775,7 +775,18 @@ XPMDIR_DEFAULT= ${X11BASE} DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} .endif +.endif # USE_XPM + +# If USE_MESA is set, depend on Mesa (or Mesa-glx if USE_GLX is defined and +# Mesa/GLX is not included in XFree86) +.if defined(USE_MESA) +.if (defined(USE_GLX) && ${HAVE_BUILTIN_MESA} == "NO") +DEPENDS+= Mesa-glx>=20000813:../../graphics/Mesa-glx +.else +DEPENDS+= Mesa>=3.2.1:../../graphics/Mesa .endif +.undef __BUILTIN_MESA +.endif # USE_MESA # Popular master sites MASTER_SITE_XCONTRIB+= \ |