From 3fa6844b90128e447a14b987ba3a0092109b8aa3 Mon Sep 17 00:00:00 2001 From: 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/xcursor/builtin.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'x11/xcursor') diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index 0e9077c2620..71a0716e7a6 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.14 2009/03/20 19:25:52 joerg Exp $ +# $NetBSD: builtin.mk,v 1.15 2012/03/19 12:34:22 joerg Exp $ BUILTIN_PKG:= xcursor @@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XCURSOR= ${X11BASE}/include/X11/Xcursor/Xcursor.h ### set IS_BUILTIN. appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.xcursor) -IS_BUILTIN.xcursor= no . if empty(H_XCURSOR:M__nonexistent__) -BUILTIN_IMAKE_CHECK:= xcursor:BuildXcursorLibrary -. include "../../mk/buildlink3/imake-check.mk" -IS_BUILTIN.xcursor= ${BUILTIN_IMAKE_CHECK.xcursor} +IS_BUILTIN.xcursor= yes +. else +IS_BUILTIN.xcursor= no . endif .endif MAKEVARS+= IS_BUILTIN.xcursor -- cgit v1.2.3