diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xrandr-mixedcase/builtin.mk | 23 | ||||
| -rw-r--r-- | x11/Xrender/builtin.mk | 22 | ||||
| -rw-r--r-- | x11/randrext/builtin.mk | 18 | ||||
| -rw-r--r-- | x11/render/builtin.mk | 18 | ||||
| -rw-r--r-- | x11/xcursor/builtin.mk | 21 |
5 files changed, 60 insertions, 42 deletions
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk index 26eeb68d4d2..cec185a9a22 100644 --- a/x11/Xrandr-mixedcase/builtin.mk +++ b/x11/Xrandr-mixedcase/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -47,7 +47,7 @@ _XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} _XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} . endif . endif -MAKEFLAGS+= _XF86_VERSION=${_XF86_VERSION} +BUILDLINK_VARS+= _XF86_VERSION . endif . for _xrandr_version_ in ${_XRANDR_VERSIONS} . for _pattern_ in ${_XRANDR_${_xrandr_version_}} @@ -58,15 +58,17 @@ _XRANDR_VERSION?= ${_xrandr_version_} . endfor _XRANDR_VERSION?= 1.0 BUILTIN_PKG.Xrandr= Xrandr-${_XRANDR_VERSION} -MAKEFLAGS+= BUILTIN_PKG.Xrandr=${BUILTIN_PKG.Xrandr} +BUILDLINK_VARS+= BUILTIN_PKG.Xrandr . endif . endif -MAKEFLAGS+= IS_BUILTIN.Xrandr=${IS_BUILTIN.Xrandr} -.endif +BUILDLINK_VARS+= IS_BUILTIN.Xrandr +.endif # IS_BUILTIN.Xrandr -CHECK_BUILTIN.Xrandr?= no -.if !empty(CHECK_BUILTIN.Xrandr:M[yY][eE][sS]) -USE_BUILTIN.Xrandr= yes +.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO]) +USE_BUILTIN.Xrandr= no +.endif +.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) +USE_BUILTIN.Xrandr= no .endif .if !defined(USE_BUILTIN.Xrandr) @@ -87,6 +89,9 @@ USE_BUILTIN.Xrandr!= \ . endif .endif # USE_BUILTIN.Xrandr +CHECK_BUILTIN.Xrandr?= no +.if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO]) + .if !empty(USE_BUILTIN.Xrandr:M[nN][oO]) BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 @@ -97,3 +102,5 @@ BUILDLINK_PREFIX.Xrandr= ${X11BASE} USE_BUILTIN.randrext= yes USE_BUILTIN.Xrender= yes .endif + +.endif # CHECK_BUILTIN.Xrandr diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index b7a1940bc8c..bfd222e00b4 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -49,7 +49,7 @@ _XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} _XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} . endif . endif -MAKEFLAGS+= _XF86_VERSION=${_XF86_VERSION} +BUILDLINK_VARS+= _XF86_VERSION . endif . for _xrender_version_ in ${_XRENDER_VERSIONS} . for _pattern_ in ${_XRENDER_${_xrender_version_}} @@ -60,16 +60,15 @@ _XRENDER_VERSION?= ${_xrender_version_} . endfor _XRENDER_VERSION?= 0.1 BUILTIN_PKG.Xrender= Xrender-${_XRENDER_VERSION} -MAKEFLAGS+= BUILTIN_PKG.Xrender=${BUILTIN_PKG.Xrender} +BUILDLINK_VARS+= BUILTIN_PKG.Xrender . endif . endif -MAKEFLAGS+= IS_BUILTIN.Xrender=${IS_BUILTIN.Xrender} -.endif +BUILDLINK_VARS+= IS_BUILTIN.Xrender +.endif # IS_BUILTIN.Xrender -CHECK_BUILTIN.Xrender?= no -.if !empty(CHECK_BUILTIN.Xrender:M[yY][eE][sS]) -USE_BUILTIN.Xrender= yes -.endif +#.if defined(USE_BUILTIN.render) && !empty(USE_BUILTIN.render:M[nN][oO]) +#USE_BUILTIN.Xrender= no +#.endif .if !defined(USE_BUILTIN.Xrender) USE_BUILTIN.Xrender?= ${IS_BUILTIN.Xrender} @@ -89,6 +88,9 @@ USE_BUILTIN.Xrender!= \ . endif .endif # USE_BUILTIN.Xrender +CHECK_BUILTIN.Xrender?= no +.if !empty(CHECK_BUILTIN.Xrender:M[nN][oO]) + .if !empty(USE_BUILTIN.Xrender:M[nN][oO]) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 BUILDLINK_DEPENDS.render+= render>=0.8 @@ -98,3 +100,5 @@ BUILDLINK_DEPENDS.render+= render>=0.8 BUILDLINK_PREFIX.Xrender= ${X11BASE} USE_BUILTIN.render= yes .endif + +.endif # CHECK_BUILTIN.Xrender diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk index af142fe125d..1ccb6e9655c 100644 --- a/x11/randrext/builtin.mk +++ b/x11/randrext/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ _X11_EXTENSIONS_RANDR_H= ${X11BASE}/include/X11/extensions/randr.h @@ -20,15 +20,10 @@ _RANDR_MINOR!= \ ${_X11_EXTENSIONS_RANDR_H} _RANDR_VERSION= ${_RANDR_MAJOR}${_RANDR_MINOR} BUILTIN_PKG.randrext= randrext-${_RANDR_VERSION} -MAKEFLAGS+= BUILTIN_PKG.randrext=${BUILTIN_PKG.randrext} +BUILDLINK_VARS+= BUILTIN_PKG.randrext . endif -MAKEFLAGS+= IS_BUILTIN.randrext=${IS_BUILTIN.randrext} -.endif - -CHECK_BUILTIN.randrext?= no -.if !empty(CHECK_BUILTIN.randrext:M[yY][eE][sS]) -USE_BUILTIN.randrext= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.randrext +.endif # IS_BUILTIN.randrext .if !defined(USE_BUILTIN.randrext) USE_BUILTIN.randrext?= ${IS_BUILTIN.randrext} @@ -48,6 +43,9 @@ USE_BUILTIN.randrext!= \ . endif .endif # USE_BUILTIN.randrext +CHECK_BUILTIN.randrext?= no +.if !empty(CHECK_BUILTIN.randrext:M[nN][oO]) + .if !empty(USE_BUILTIN.randrext:M[nN][oO]) BUILDLINK_DEPENDS.randrext+= randrext>=1.0 .endif @@ -56,3 +54,5 @@ BUILDLINK_DEPENDS.randrext+= randrext>=1.0 BUILDLINK_PREFIX.randrext= ${X11BASE} USE_X11= yes .endif + +.endif # CHECK_BUILTIN.randrext diff --git a/x11/render/builtin.mk b/x11/render/builtin.mk index 61bf829dc13..e80d1e3e2f1 100644 --- a/x11/render/builtin.mk +++ b/x11/render/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ _X11_EXTENSIONS_RENDER_H= ${X11BASE}/include/X11/extensions/render.h @@ -20,15 +20,10 @@ _RENDER_MINOR!= \ ${_X11_EXTENSIONS_RENDER_H} _RENDER_VERSION= ${_RENDER_MAJOR}${_RENDER_MINOR} BUILTIN_PKG.render= render-${_RENDER_VERSION} -MAKEFLAGS+= BUILTIN_PKG.render=${BUILTIN_PKG.render} +BUILDLINK_VARS+= BUILTIN_PKG.render . endif -MAKEFLAGS+= IS_BUILTIN.render=${IS_BUILTIN.render} -.endif - -CHECK_BUILTIN.render?= no -.if !empty(CHECK_BUILTIN.render:M[yY][eE][sS]) -USE_BUILTIN.render= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.render +.endif # IS_BUILTIN.render .if !defined(USE_BUILTIN.render) USE_BUILTIN.render?= ${IS_BUILTIN.render} @@ -48,6 +43,9 @@ USE_BUILTIN.render!= \ . endif .endif # USE_BUILTIN.render +CHECK_BUILTIN.render?= no +.if !empty(CHECK_BUILTIN.render:M[nN][oO]) + .if !empty(USE_BUILTIN.render:M[nN][oO]) BUILDLINK_DEPENDS.render+= render>=0.8 .endif @@ -56,3 +54,5 @@ BUILDLINK_DEPENDS.render+= render>=0.8 BUILDLINK_PREFIX.render= ${X11BASE} USE_X11= yes .endif + +.endif # CHECK_BUILTIN.render diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index 56563881777..db2aa2ba2de 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:36 jlam Exp $ _X11_XCURSOR_XCURSOR_H= ${X11BASE}/include/X11/Xcursor/Xcursor.h @@ -23,14 +23,16 @@ _XCURSOR_REVISION!= \ ${_X11_XCURSOR_XCURSOR_H} _XCURSOR_VERSION= ${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION} BUILTIN_PKG.xcursor= xcursor-${_XCURSOR_VERSION} -MAKEFLAGS+= BUILTIN_PKG.xcursor=${BUILTIN_PKG.xcursor} +BUILDLINK_VARS+= BUILTIN_PKG.xcursor . endif -MAKEFLAGS+= IS_BUILTIN.xcursor=${IS_BUILTIN.xcursor} -.endif +BUILDLINK_VARS+= IS_BUILTIN.xcursor +.endif # IS_BUILTIN.xcursor -CHECK_BUILTIN.xcursor?= no -.if !empty(CHECK_BUILTIN.xcursor:M[yY][eE][sS]) -USE_BUILTIN.xcursor= yes +.if defined(USE_BUILTIN.Xfixes) && !empty(USE_BUILTIN.Xfixes:M[nN][oO]) +USE_BUILTIN.xcursor= no +.endif +.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) +USE_BUILTIN.xcursor= no .endif .if !defined(USE_BUILTIN.xcursor) @@ -51,6 +53,9 @@ USE_BUILTIN.xcursor!= \ . endif .endif # USE_BUILTIN.xcursor +CHECK_BUILTIN.xcursor?= no +.if !empty(CHECK_BUILTIN.xcursor:M[nN][oO]) + .if !empty(USE_BUILTIN.xcursor:M[nN][oO]) BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 @@ -68,3 +73,5 @@ BUILDLINK_PREFIX.xcursor= ${X11BASE} BUILDLINK_FILES.xcursor+= lib/pkgconfig/xcursor.pc USE_BUILTIN.Xrender= yes .endif + +.endif # CHECK_BUILTIN.xcursor |