diff options
| author | jlam <jlam> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-29 05:43:28 +0000 |
| commit | bdc005d46035e154e9ab9ada79f502e80e17e643 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /pkgtools | |
| parent | cd3720af313224c26d5eacfaeb6f053262932c5b (diff) | |
| download | pkgsrc-bdc005d46035e154e9ab9ada79f502e80e17e643.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 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/xfree.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index 265b131b4af..adddf84380a 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.9 2004/03/11 00:47:01 jlam Exp $ +# $NetBSD: xfree.mk,v 1.10 2004/03/29 05:43:32 jlam Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -18,13 +18,16 @@ FILES_LIST= ${FILESDIR}/xfree # 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]) && \ - exists(${FILESDIR}/xfree.${_module_}) -FILES_LIST+= ${FILESDIR}/xfree.${_module_} -. endif +.for _pkg_ in ${BUILDLINK_PACKAGES} +CHECK_BUILTIN.${_pkg_}= yes +USE_BUILTIN.${_pkg_}= yes +.endfor +.include "../../mk/buildlink3/bsd.builtin.mk" + +.for _pkg_ in ${BUILDLINK_PACKAGES} +IGNORE_PKG.${_pkg_}= yes +. if !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \ + exists(${FILESDIR}/xfree.${_pkg_}) +FILES_LIST+= ${FILESDIR}/xfree.${_pkg_} . endif .endfor |