diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-10 18:35:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-10 18:35:32 +0000 |
| commit | a76db493787303d194b482dda0275baebb325898 (patch) | |
| tree | 6a5add7c0918e4c8370b063c74083e20ac8cb4cd | |
| parent | 6919591c46649e16c0427c45b036379008e2e2ec (diff) | |
| download | pkgsrc-a76db493787303d194b482dda0275baebb325898.tar.gz | |
Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN.
| -rw-r--r-- | graphics/xpm/Makefile | 8 | ||||
| -rw-r--r-- | pkgtools/x11-links/xfree.mk | 27 |
2 files changed, 14 insertions, 21 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 09675e88e86..8ced1ad1d63 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/21 11:18:44 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2004/03/10 18:35:32 jlam Exp $ DISTNAME= xpm-3.4k PKGREVISION= 1 @@ -13,11 +13,11 @@ COMMENT= The X Pixmap library USE_BUILDLINK3= # defined USE_IMAKE= # defined -BUILDLINK_CHECK_BUILTIN.xpm= YES +CHECK_BUILTIN.xpm= yes -.include "buildlink3.mk" +.include "builtin.mk" -.if ${BUILDLINK_IS_BUILTIN.xpm} == "YES" +.if !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" .endif diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index fd1396ffc10..4c5226aba6c 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,21 +1,7 @@ -# $NetBSD: xfree.mk,v 1.7 2004/02/17 16:50:26 jlam Exp $ +# $NetBSD: xfree.mk,v 1.8 2004/03/10 18:35:32 jlam Exp $ FILES_LIST= ${FILESDIR}/xfree -X11_MODULES= MesaLib glu -X11_MODULES+= freetype2 -X11_MODULES+= xpm -X11_MODULES+= Xft2 Xrender expat fontconfig render -X11_MODULES+= Xrandr randrext -X11_MODULES+= xcursor - -# Check if any headers and libraries for ${X11_MODULES} found in -# ${X11BASE} actually belong to the base XFree86 or not. -# -.for _module_ in ${X11_MODULES} -BUILDLINK_CHECK_BUILTIN.${_module_}= YES -.endfor - .include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -29,8 +15,15 @@ BUILDLINK_CHECK_BUILTIN.${_module_}= YES .include "../../x11/randrext/buildlink3.mk" .include "../../x11/xcursor/buildlink3.mk" -.for _module_ in ${X11_MODULES} -. if !empty(BUILDLINK_IS_BUILTIN.${_module_}:M[yY][eE][sS]) +# Check if any headers and libraries for ${X11_MODULES} found in +# ${X11BASE} actually belong to the base XFree86 or not. +# +.for _module_ in ${BUILDLINK_PACKAGES} +CHECK_BUILTIN.${_module_}= yes +. if exists(${BUILDLINK_PKGSRCDIR.${_module_}}/builtin.mk) +. include "${BUILDLINK_PKGSRCDIR.${_module_}}/builtin.mk" +. if !empty(IS_BUILTIN.${_module_}:M[yY][eE][sS]) FILES_LIST+= ${FILESDIR}/xfree.${_module_} +. endif . endif .endfor |