24 files changed, 41 insertions, 563 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 9ed82b98d50..ce6b598b47f 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.50 2009/12/20 12:32:55 jmmv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.51 2012/03/19 12:34:14 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -102,14 +102,3 @@ BUILD_DEPENDS+=		libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../dev
 CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 .endif
-
-### USE_XPKGWEDGE
-
-.if (defined(USE_X11BASE) || \
-     defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) || \
-     !empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \
-    empty(USE_TOOLS:Mitools) && \
-    empty(PKGPATH:Mpkgtools/xpkgwedge) && \
-    !empty(USE_XPKGWEDGE:M[yY][eE][sS])
-BUILD_DEPENDS+=		xpkgwedge>=${_XPKGWEDGE_REQD:U1.15}:../../pkgtools/xpkgwedge
-.endif
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 67779f0706c..252238779dd 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.320 2012/01/17 20:43:25 sbd Exp $
+# $NetBSD: bsd.prefs.mk,v 1.321 2012/03/19 12:34:15 joerg Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -552,18 +552,6 @@ X11BASE?=	/usr/X11R6
 .endif
 CROSSBASE?=	${LOCALBASE}/cross
 
-# If xpkgwedge.def is found, then clearly we're using xpkgwedge.
-.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
-    exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
-USE_XPKGWEDGE=  yes
-.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
-USE_XPKGWEDGE=		yes
-.elif ${X11_TYPE} == "modular"
-USE_XPKGWEDGE=	no
-.else
-USE_XPKGWEDGE?=	yes
-.endif
-
 .if defined(FIX_SYSTEM_HEADERS) && ${FIX_SYSTEM_HEADERS} == "yes" && \
     !defined(BOOTSTRAP_PKG) && \
     exists(../../pkgtools/compat_headers/buildlink3.mk)
@@ -574,15 +562,27 @@ USE_XPKGWEDGE?=	yes
 X11BASE=		${LOCALBASE}
 .endif
 
-.if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss])
 X11PREFIX=		${LOCALBASE}
-.else
-X11PREFIX=		${X11BASE}
-.endif
 
 # Default directory for font encodings
 X11_ENCODINGSDIR?=	${X11BASE}/lib/X11/fonts/encodings
 
+IMAKE_MAN_SOURCE_PATH=	man/man
+IMAKE_MAN_SUFFIX=	1
+IMAKE_LIBMAN_SUFFIX=	3
+IMAKE_KERNMAN_SUFFIX=	4
+IMAKE_FILEMAN_SUFFIX=	5
+IMAKE_GAMEMAN_SUFFIX=	6
+IMAKE_MISCMAN_SUFFIX=	7
+IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
+IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
+IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
+IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+IMAKE_MANINSTALL?=	maninstall
+
 DEPOT_SUBDIR?=		packages
 DEPOTBASE=		${LOCALBASE}/${DEPOT_SUBDIR}
 
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
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 7a0f08a2295..6171147f3fb 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.204 2012/02/24 13:36:20 obache Exp $
+# $NetBSD: mk.conf,v 1.205 2012/03/19 12:34:16 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -300,14 +300,6 @@ PKGMANDIR?=	man
 #
 #	See also: PKGINFODIR
 
-# USE_XPKGWEDGE?=	yes
-# Whether we should use xpkgwedge or not to install all packages into
-# ${LOCALBASE}.
-# Possible: yes, no
-# This is not set here as X11_TYPE=modular does not use USE_XPKGWEDGE
-# at all and the existence of xpkgwedge in the system overrides the
-# user setting.
-
 BSDSRCDIR?=	/usr/src
 # Where the NetBSD src module source tree is located
 #  used in the emulators/plex86, emulators/vmware-module{,3}, net/arla,
@@ -695,9 +687,8 @@ BIND_USER?=		named
 #BULK_PREREQ=
 # Used during bulk package builds.  Packages listed in this variable are
 # assumed to be required to build all packages.  Only a very limited number
-# of packages belong in this variable.  An example of an appropriate package
-# is pkgtools/xpkgwedge.  Currently pkgtools/digest is always added to this
-# list.
+# of packages belong in this variable.
+# Currently pkgtools/digest is always added to this list.
 # Possible: category/pkg
 # Default: not defined
 
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 99b69972a81..c054263bf29 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.37 2011/09/18 12:42:23 abs Exp $
+# $NetBSD: AIX.mk,v 1.38 2012/03/19 12:34:16 joerg Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -29,20 +29,6 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	0
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index f8759da555c..8cc89245ba3 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.30 2011/09/17 08:06:40 abs Exp $
+# $NetBSD: BSDOS.mk,v 1.31 2012/03/19 12:34:16 joerg Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -34,20 +34,6 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
-# imake installs manpages in weird places
-# XXX: assume NetBSD defaults until somebody determines correct values
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MANNEWSUFFIX=	0
-IMAKE_MAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index ea1881f394c..b3c95b6446d 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.47 2011/09/10 16:30:02 abs Exp $
+# $NetBSD: Darwin.mk,v 1.48 2012/03/19 12:34:16 joerg Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -69,20 +69,6 @@ USERADD?=		${LOCALBASE}/sbin/useradd
 _PKG_USER_HOME?=	/var/empty	# to match other system accounts
 _USER_DEPENDS=		user>=20040801:../../sysutils/user_darwin
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/Imake.tmpl
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.darwin=	# empty
 
 .if ${OS_VERSION:R} >= 6
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 3d57f4c0516..d429eb9d0e7 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.41 2011/12/17 16:20:01 marino Exp $
+# $NetBSD: DragonFly.mk,v 1.42 2012/03/19 12:34:16 joerg Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -24,23 +24,6 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.linux=	/compat/linux
 
 _OPSYS_SYSTEM_RPATH?=		/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index f3c4207691f..43d73a76a7d 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.27 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: FreeBSD.mk,v 1.28 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -29,23 +29,6 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.freebsd=	# empty
 _OPSYS_EMULDIR.linux=	/compat/linux
 
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index 7fc489b1901..92162bb5b39 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.19 2011/09/10 16:30:02 abs Exp $
+# $NetBSD: HPUX.mk,v 1.20 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -29,20 +29,6 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 # Fix broken system headers by using pkgtools/posix_headers
 FIX_SYSTEM_HEADERS?=	yes
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_FILEMAN_SUFFIX=	4
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	1
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.hpux=	# empty
 
 .if exists(/usr/include/netinet/ip6.h)
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index 231f81d6abe..0153f198c01 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.5 2011/09/10 16:30:02 abs Exp $
+# $NetBSD: Haiku.mk,v 1.6 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the Haiku operating system.
 
@@ -31,25 +31,6 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/bin/useradd
 
-# imake installs manpages in weird places
-# these values from /boot/common/X11/lib/X11/config/Haiku.cf
-#IMAKE_MAN_SOURCE_PATH=	man/man
-#IMAKE_MAN_SUFFIX=	1
-#IMAKE_LIBMAN_SUFFIX=	3
-#IMAKE_KERNMAN_SUFFIX=	4
-#IMAKE_FILEMAN_SUFFIX=	5
-#IMAKE_GAMEMAN_SUFFIX=	6
-#IMAKE_MISCMAN_SUFFIX=	7
-#IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-#IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-#IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-#IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-#IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-#IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-#IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-#IMAKE_MANINSTALL?=	maninstall catinstall
-#IMAKE_TOOLS=		gmake	# extra tools required when we use imake
-
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 8fd9ff4f47f..a0d59a41dd6 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.39 2011/09/17 08:13:06 abs Exp $
+# $NetBSD: IRIX.mk,v 1.40 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -35,38 +35,6 @@ GROUPADD?=		${LOCALBASE}/sbin/groupadd
 _PKG_USER_HOME?=	/dev/null # to match other system accounts
 _USER_DEPENDS=		user-[0-9]*:../../sysutils/user_irix
 
-# imake installs manpages in weird places
-.if !empty(OS_VERSION:M6*)
-IMAKE_MAN_SOURCE_PATH?=	catman/u_man/cat
-IMAKE_MAN_SUFFIX?=	1
-IMAKE_LIBMAN_SUFFIX?=	3
-IMAKE_FILEMAN_SUFFIX?=	5
-IMAKE_GAMEMAN_SUFFIX?=	6
-IMAKE_MAN_DIR?=		${IMAKE_MAN_SOURCE_PATH}1/X11
-IMAKE_LIBMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}3/X11
-IMAKE_FILEMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}5/X11
-IMAKE_GAMEMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}6/X11
-IMAKE_MANNEWSUFFIX?=	z
-IMAKE_MANINSTALL?=	maninstall
-.else
-IMAKE_MAN_SOURCE_PATH?=	man/man
-IMAKE_MAN_SUFFIX?=	1.gz
-IMAKE_LIBMAN_SUFFIX?=	3.gz
-IMAKE_FILEMAN_SUFFIX?=	5.gz
-IMAKE_GAMEMAN_SUFFIX?=	6.gz
-IMAKE_MAN_DIR?=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX?=	${IMAKE_MAN_SUFFIX}
-. if defined(USE_IMAKE) && !empty(USE_IMAKE:M[Yy][Ee][Ss])
-MAKE_ENV+=		GZIP_CMD="${GZIP_CMD}"
-USE_TOOLS+=		gzip
-MANCOMPRESSED=		yes
-MANZ=			yes
-. endif
-.endif
-
 _OPSYS_EMULDIR.irix=	# empty
 
 .if exists(/usr/include/netinet6)
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index f1669bfd36f..7cd726d2341 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.66 2011/09/17 08:05:02 abs Exp $
+# $NetBSD: Interix.mk,v 1.67 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -105,23 +105,6 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	n
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}n
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index debebbf85b7..45500bcfa84 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.48 2012/03/05 07:53:42 sbd Exp $
+# $NetBSD: Linux.mk,v 1.49 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -45,24 +45,6 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/usr/sbin/useradd
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/linux.cf
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1x
-IMAKE_LIBMAN_SUFFIX=	3x
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5x
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.linux=	# empty
 _OPSYS_EMULDIR.linux32=	# empty
 
diff --git a/mk/platform/Minix.mk b/mk/platform/Minix.mk
index 9e01c4c1a3d..f1253f492f2 100644
--- a/mk/platform/Minix.mk
+++ b/mk/platform/Minix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Minix.mk,v 1.1 2011/11/05 17:09:15 tcort Exp $
+# $NetBSD: Minix.mk,v 1.2 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the Minix operating system.
 
@@ -25,24 +25,6 @@ SERIAL_DEVICES?=	/dev/null
 USERADD?=		/usr/bin/useradd
 ULIMIT_CMD_datasize?=	: 
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/linux.cf
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1x
-IMAKE_LIBMAN_SUFFIX=	3x
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5x
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/MirBSD.mk b/mk/platform/MirBSD.mk
index 3cd918c3f06..d9a492413ca 100644
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.4 2011/09/18 19:11:29 bsiegert Exp $
+# $NetBSD: MirBSD.mk,v 1.5 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the MirOS BSD operating system.
 
@@ -29,21 +29,6 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 X11_TYPE?=		modular
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/OpenBSD.cf
-# XXX verify against MirBSD.cf defns
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MANNEWSUFFIX=	0
-IMAKE_MAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# MANZ controls gzipping of man pages
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index fe28c0c5fcb..a140b227b1d 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.36 2012/02/28 19:35:58 tron Exp $
+# $NetBSD: NetBSD.mk,v 1.37 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -46,24 +46,6 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 X11_TYPE?=		native
 .endif
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MANNEWSUFFIX=	0
-IMAKE_MAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_KERNMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_MISCMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 _OPSYS_EMULDIR.aout=		/emul/aout
 _OPSYS_EMULDIR.darwin=		/emul/darwin
 _OPSYS_EMULDIR.freebsd=		/emul/freebsd
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 70f5a735b77..d4ca6235b5d 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.31 2011/09/10 16:30:02 abs Exp $
+# $NetBSD: OSF1.mk,v 1.32 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -25,19 +25,6 @@ ROOT_GROUP?=		system
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_FILEMAN_SUFFIX=	4
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	1
-IMAKE_MANINSTALL?=	maninstall catinstall
 
 # Fix broken system headers by using pkgtools/posix_headers
 FIX_SYSTEM_HEADERS?=    yes
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 1e2dff97c30..6df083afd62 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.32 2012/01/19 10:53:56 obache Exp $
+# $NetBSD: OpenBSD.mk,v 1.33 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -35,20 +35,6 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 X11_TYPE?=		native
 
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/OpenBSD.cf
-IMAKE_MAN_SOURCE_PATH=	man/cat
-IMAKE_MANNEWSUFFIX=	0
-IMAKE_MAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX=	${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?=	maninstall catinstall
-
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 4ebf8c25e61..3e93316a70f 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.42 2012/02/15 15:15:23 hans Exp $
+# $NetBSD: SunOS.mk,v 1.43 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -33,27 +33,6 @@ MOTIF_TYPE_DEFAULT?=	dt		# default 2.0 compatible libs type
 MOTIF_TYPE_DEFAULT?=	lesstif
 .endif
 
-# imake installs manpages in weird places
-.if !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-# openwindows
-IMAKE_MAN_SOURCE_PATH=	share/man/man
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-.else
-# xfree86, xorg
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	1x
-IMAKE_LIBMAN_SUFFIX=	3x
-.endif
-IMAKE_FILEMAN_SUFFIX=	4
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall
-
 _OPSYS_EMULDIR.solaris=		# empty
 _OPSYS_EMULDIR.solaris32=	# empty
 _OPSYS_EMULDIR.sunos=		# empty
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 0354aabf937..99be166a54c 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.31 2011/09/17 08:10:33 abs Exp $
+# $NetBSD: UnixWare.mk,v 1.32 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -27,19 +27,6 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 USERADD?=		/usr/sbin/useradd
 
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH=	share/man/man
-IMAKE_MAN_SUFFIX=	1
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_FILEMAN_SUFFIX=	4
-IMAKE_GAMEMAN_SUFFIX=	6
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?=	maninstall
-
 .if exists(/usr/include/netinet/in6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index ad000a7c4b3..cf3a1212cd0 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.245 2012/02/23 13:09:55 hans Exp $
+# $NetBSD: replace.mk,v 1.246 2012/03/19 12:34:19 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1203,18 +1203,10 @@ TOOLS_CREATE+=		${_t_}
 TOOLS_DEPENDS.${_t_}?=	nbitools>=6.3nb4:../../devel/nbitools
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=nbitools
 TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_}
-.      elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
+.      else
 TOOLS_DEPENDS.${_t_}?=	imake-[0-9]*:../../devel/imake
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=imake
 TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
-.      else # !empty(X11_TYPE:Mnative)
-.        if exists(${X11BASE}/bin/${_t_})
-TOOLS_PATH.${_t_}=	${X11BASE}/bin/${_t_}
-.        else # X11_TYPE native, but tool does not exist, so fall back
-TOOLS_DEPENDS.${_t_}?=	imake-[0-9]*:../../devel/imake
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=imake
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
-.        endif
 .      endif
 .    endif
 .  endif
@@ -1239,17 +1231,6 @@ TOOLS_PATH.makedepend=	${X11BASE}/bin/makedepend
 .    endif
 .  endif
 .endif
-#
-# If we're using xpkgwedge, then we need to invoke the special xmkmf
-# script that will find imake config files in both ${PREFIX} and in
-# ${X11BASE}.
-#
-.if !defined(TOOLS_IGNORE.xmkmf) && !empty(_USE_TOOLS:Mxmkmf)
-.  if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) && empty(_USE_TOOLS:Mitools)
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.xpkgwedge=xpkgwedge
-TOOLS_PATH.xmkmf=	${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf
-.  endif
-.endif
 
 ######################################################################
 
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index b988a6d1c17..f7b73caa259 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.19 2007/01/08 08:55:52 rillig Exp $
+# $NetBSD: tools.IRIX.mk,v 1.20 2012/03/19 12:34:19 joerg Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -37,9 +37,6 @@ TOOLS_PLATFORM.gzip?=		/usr/sbin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/usr/bsd/head
 TOOLS_PLATFORM.hostname?=	/usr/bsd/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) && exists(/usr/bin/X11/imake)
-TOOLS_PLATFORM.imake?=		/usr/bin/X11/imake
-.endif
 TOOLS_PLATFORM.ln?=		/sbin/ln
 TOOLS_PLATFORM.ls?=		/sbin/ls
 TOOLS_PLATFORM.m4?=		/sbin/m4