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.

2 files changed, 0 insertions, 192 deletions

diff --git a/mk/buildlink3/imake-check b/mk/buildlink3/imake-check
deleted file mode 100755
index 089fbc762ef..00000000000
--- a/mk/buildlink3/imake-check
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: imake-check,v 1.5 2006/09/10 16:39:31 tron Exp $
-#
-# Copyright (c) 2005 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Johnny C. Lam.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-# This is the symbol whose value we want to test in the imake config
-# files, e.g. NormalLibXpm, BuildXftLibrary, etc.
-#
-imake_symbol="$1"
-
-: ${X11BASE:=/usr/X11R6}
-: ${IMAKE:=${X11BASE}/bin/imake}
-
-: ${CAT:=cat}
-: ${ECHO:=echo}
-: ${GREP:=grep}
-: ${IMAKE_MAKE:=make}
-: ${MKDIR:=mkdir}
-: ${RM:=rm}
-: ${TEST:=test}
-
-# Extract the first word of ${IMAKE}.
-for i in ${IMAKE}; do
-	imake_cmd="$i"; break
-done
-${TEST} -f "$imake_cmd" || exit 1
-
-# Create a secure temporary directory.
-: ${TMPDIR:=/tmp}
-tmpdir="${TMPDIR}/imake-check.$$"
-umask 077
-${MKDIR} "$tmpdir" || exit 1
-
-# Construct an Imakefile that will show whether $imake_symbol is
-# true or false.
-#
-cd "$tmpdir"
-${CAT} > Imakefile << EOF
-#if $imake_symbol
-builtin-test:
-	@${ECHO} yes
-#else
-builtin-test:
-	@${ECHO} no
-#endif
-EOF
-
-# Reset command path to avoid calling wrapper scripts.
-if [ -n "$_PATH_ORIG" ]
-then
-	PATH="$_PATH_ORIG"; export PATH
-fi
-
-# Run imake to process the Imakefile.
-${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config -s - |
-${IMAKE_MAKE} -f - builtin-test |
-${GREP} -q yes
-exitcode="$?"
-
-# Clean up after ourselves.
-cd "${TMPDIR}"
-${RM} -rf "$tmpdir"
-exit "$exitcode"
diff --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk
deleted file mode 100644
index 8dd51ca279e..00000000000
--- a/mk/buildlink3/imake-check.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-# $NetBSD: imake-check.mk,v 1.9 2011/09/08 20:17:15 abs Exp $
-#
-# Copyright (c) 2005 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Johnny C. Lam.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# This is a "subroutine" that can be included to detect whether the
-# X11 distribution we are using with pkgsrc has certain X11 components
-# built-in to the distribution.
-#
-# The following variables must be defined before including this file:
-#
-#    BUILTIN_IMAKE_CHECK is a list of <pkg>:<symbol> pairs, where <pkg>
-#	is the package to check for, and <symbol> is the imake symbol
-#	to check in the imake config files.
-#
-# After including this file, the following variables are defined:
-#
-#    BUILTIN_IMAKE_CHECK.<pkg> is "yes" or "no" depending on whether the
-#	specified imake symbol is "true" in the imake config files.
-#
-# An example use is:
-#
-# BUILTIN_IMAKE_CHECK:=	Xft2:BuildXftLibrary
-# .include "../../mk/buildlink3/imake-check.mk"
-#
-
-.if defined(IMAKE)
-_TMP_IMAKE=	${IMAKE}
-.else
-_TMP_IMAKE=	${X11BASE}/bin/imake
-.endif
-
-.for _pair_ in ${BUILTIN_IMAKE_CHECK}
-.  for pkg in ${_pair_:C/\:[^:]*$//}
-.  for symbol in ${_pair_:C/^[^:]*\://}
-.  if ${X11_TYPE} == "modular" || !exists(${_TMP_IMAKE})
-BUILTIN_IMAKE_CHECK.${pkg}=	no
-.  else
-USE_TOOLS+=	cat:pkgsrc echo:pkgsrc grep:pkgsrc mkdir:pkgsrc		\
-		rm:pkgsrc test:pkgsrc
-USE_TOOLS+=	imake:pkgsrc ${IMAKE_TOOLS:S/$/:pkgsrc/}
-IMAKE?=		${X11BASE}/bin/imake
-
-.    if !defined(BUILTIN_IMAKE_CHECK.${pkg})
-BUILTIN_IMAKE_CHECK.${pkg}!=				\
-	if ${PKGSRC_SETENV} CAT=${CAT:Q} ECHO=${ECHO:Q} GREP=${GREP:Q}	\
-		IMAKE=${IMAKE:Q} IMAKE_MAKE=${IMAKE_MAKE:Q}		\
-		MKDIR=${MKDIR:Q} PATH_ORIG=${_PATH_ORIG:Q}		\
-		RM=${RM:Q} TEST=${TEST:Q}				\
-		X11BASE=${X11BASE:Q}					\
-	   ${SH} ${.CURDIR}/../../mk/buildlink3/imake-check ${symbol};	\
-	then								\
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.    endif
-MAKEVARS+=	BUILTIN_IMAKE_CHECK.${pkg}
-.  endif
-.  endfor
-.  endfor
-.endfor