From 68dd6188dc1bef0db4001b9679b8e9c435ee0436 Mon Sep 17 00:00:00 2001 From: hiramatsu Date: Tue, 12 May 2015 13:59:11 +0000 Subject: Converted to use mk/buildlink3/pkgconfig-builtin.mk to determine the version of system installed xproto. --- x11/xproto/builtin.mk | 51 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) (limited to 'x11') diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk index 5e79ac1ba63..6c69a39dfd0 100644 --- a/x11/xproto/builtin.mk +++ b/x11/xproto/builtin.mk @@ -1,51 +1,8 @@ -# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:34 cube Exp $ +# $NetBSD: builtin.mk,v 1.5 2015/05/12 13:59:11 hiramatsu Exp $ BUILTIN_PKG:= xproto +PKGCONFIG_FILE.xproto= ${X11BASE}/lib/pkgconfig/xproto.pc +PKGCONFIG_FILE.xproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xproto.pc -BUILTIN_FIND_FILES_VAR:= H_XFUNCPROTO -BUILTIN_FIND_FILES.H_XFUNCPROTO= ${X11BASE}/include/X11/Xfuncproto.h - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN. appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.xproto= no -.elif !defined(IS_BUILTIN.xproto) -IS_BUILTIN.xproto= no -. if empty(H_XFUNCPROTO:M__nonexistent__) -IS_BUILTIN.xproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.xproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.xproto) -. if ${PREFER.xproto} == "pkgsrc" -USE_BUILTIN.xproto= no -. else -USE_BUILTIN.xproto= ${IS_BUILTIN.xproto} -. if defined(BUILTIN_PKG.xproto) && \ - !empty(IS_BUILTIN.xproto:M[yY][eE][sS]) -USE_BUILTIN.xproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.xproto} -. if !empty(USE_BUILTIN.xproto:M[yY][eE][sS]) -USE_BUILTIN.xproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.xproto -.endif -MAKEVARS+= USE_BUILTIN.xproto - +.include "../../mk/buildlink3/pkgconfig-builtin.mk" .include "../../mk/x11.builtin.mk" -- cgit v1.2.3