From ad2bf164272bde84fc59271276f26d61b4d62e93 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 19 Mar 2012 12:34:12 +0000
Subject: Drop imake-check logic from X11 components' builtin.mk. Always use
 xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man
 pages, not cat pages when using imake. Unify the various imake PLIST
 variables in preparation for dropping. Adjust xbattbar for the new
 expectations.

---
 x11/Xcomposite/builtin.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'x11/Xcomposite')

diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 4fa85e8fedb..a8caba066f8 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:32 cube Exp $
+# $NetBSD: builtin.mk,v 1.14 2012/03/19 12:34:20 joerg Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -13,11 +13,10 @@ BUILTIN_FIND_FILES.H_XCOMPOSITE=	\
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.Xcomposite)
-IS_BUILTIN.Xcomposite=	no
 .  if empty(H_XCOMPOSITE:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	Xcomposite:BuildCompositeLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xcomposite=	${BUILTIN_IMAKE_CHECK.Xcomposite}
+IS_BUILTIN.Xcomposite=	yes
+.  else
+IS_BUILTIN.Xcomposite=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xcomposite
-- 
cgit v1.2.3