diff options
author | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
commit | 6d92080aa240757729992f43156b2924bbda71c4 (patch) | |
tree | 2684bb3d4a41538be1b78668954f44c69a49033d /graphics/MesaLib | |
parent | 82cd68d38a1d8bd0262376d4a40e4c201e6c55b3 (diff) | |
download | pkgsrc-6d92080aa240757729992f43156b2924bbda71c4.tar.gz |
Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
Diffstat (limited to 'graphics/MesaLib')
-rw-r--r-- | graphics/MesaLib/builtin.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk index d6e52a3cc84..1ed8a68b14a 100644 --- a/graphics/MesaLib/builtin.mk +++ b/graphics/MesaLib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:38:10 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $ _GL_GLX_H= ${X11BASE}/include/GL/glx.h _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -21,16 +21,11 @@ IS_BUILTIN.MesaLib!= \ # Mesa software distributed with the built-in XFree86. # BUILTIN_PKG.MesaLib= MesaLib-${_MESA_VERSION} -MAKEFLAGS+= BUILTIN_PKG.MesaLib=${BUILTIN_PKG.MesaLib} +BUILDLINK_VARS+= BUILTIN_PKG.MesaLib . endif . endif -MAKEFLAGS+= IS_BUILTIN.MesaLib=${IS_BUILTIN.MesaLib} -.endif - -CHECK_BUILTIN.MesaLib?= no -.if !empty(CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) -USE_BUILTIN.MesaLib= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.MesaLib +.endif # IS_BUILTIN.MesaLib .if !defined(USE_BUILTIN.MesaLib) USE_BUILTIN.MesaLib?= ${IS_BUILTIN.MesaLib} @@ -50,6 +45,9 @@ USE_BUILTIN.MesaLib!= \ . endif .endif # USE_BUILTIN.MesaLib +CHECK_BUILTIN.MesaLib?= no +.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO]) + .if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.0 .endif @@ -59,3 +57,5 @@ BUILDLINK_PREFIX.MesaLib= ${X11BASE} USE_X11= yes _MESA_REQD= ${_MESA_VERSION} .endif + +.endif # CHECK_BUILTIN.MesaLib |