diff options
Diffstat (limited to 'x11/fixesext')
-rw-r--r-- | x11/fixesext/Makefile | 4 | ||||
-rw-r--r-- | x11/fixesext/builtin.mk | 60 |
2 files changed, 52 insertions, 12 deletions
diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index d8e9e2cdc00..a73005344c0 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fixesext-2.0.1 @@ -12,10 +12,10 @@ COMMENT= X Fixes extension headers and specification PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= fixesext.pc.in .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk index 8f9f7e911d7..5c2be9fd331 100644 --- a/x11/fixesext/builtin.mk +++ b/x11/fixesext/builtin.mk @@ -1,15 +1,55 @@ -# $NetBSD: builtin.mk,v 1.3 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:28 jlam Exp $ -_H_XFIXESPROTO= ${X11BASE}/include/X11/extensions/xfixesproto.h -_H_XFIXESWIRE= ${X11BASE}/include/X11/extensions/xfixeswire.h -_FIXESEXT_PC= ${X11BASE}/lib/pkgconfig/fixesext.pc +BUILTIN_PKG:= fixesext +BUILTIN_FIND_FILES_VAR:= H_XFIXESPROTO H_XFIXESWIRE +BUILTIN_FIND_FILES.H_XFIXESPROTO= \ + ${X11BASE}/include/X11/extensions/xfixesproto.h +BUILTIN_FIND_FILES.H_XFIXESWIRE= \ + ${X11BASE}/include/X11/extensions/xfixeswire.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.fixesext) -IS_BUILTIN.fixesext= no -. if exists(${_H_XFIXESPROTO}) && exists(${_H_XFIXESWIRE}) && \ - exists(${_FIXESEXT_PC}) -IS_BUILTIN.fixesext= yes +IS_BUILTIN.fixesext= no +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_XFIXESPROTO}) && exists(${H_XFIXESWIRE}) +IS_BUILTIN.fixesext= yes . endif -.endif # IS_BUILTIN.fixesext +.endif +MAKEVARS+= IS_BUILTIN.fixesext -USE_BUILTIN.fixesext?= ${IS_BUILTIN.fixesext} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.fixesext) +. if ${PREFER.fixesext} == "pkgsrc" +USE_BUILTIN.fixesext= no +. else +USE_BUILTIN.fixesext= ${IS_BUILTIN.fixesext} +. if defined(BUILTIN_PKG.fixesext) && \ + !empty(IS_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext= yes +. for _dep_ in ${BUILDLINK_DEPENDS.fixesext} +. if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.fixesext +.endif +MAKEVARS+= USE_BUILTIN.fixesext |