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 /x11/xcursor | |
| 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 'x11/xcursor')
| -rw-r--r-- | x11/xcursor/builtin.mk | 21 |
1 files changed, 14 insertions, 7 deletions
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 |