[pkgsrc/trunk]: pkgsrc Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc1b2fe2d9d5
branches:  trunk
changeset: 470600:fc1b2fe2d9d5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 10 18:35:32 2004 +0000

description:
Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN.

diffstat:

 graphics/xpm/Makefile       |   8 ++++----
 pkgtools/x11-links/xfree.mk |  27 ++++++++++-----------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diffs (68 lines):

diff -r 9fd9c01858db -r fc1b2fe2d9d5 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile     Wed Mar 10 18:35:13 2004 +0000
+++ b/graphics/xpm/Makefile     Wed Mar 10 18:35:32 2004 +0000
@@ -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 @@
 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 -r 9fd9c01858db -r fc1b2fe2d9d5 pkgtools/x11-links/xfree.mk
--- a/pkgtools/x11-links/xfree.mk       Wed Mar 10 18:35:13 2004 +0000
+++ b/pkgtools/x11-links/xfree.mk       Wed Mar 10 18:35:32 2004 +0000
@@ -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 @@
 .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