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.

17 files changed, 17 insertions, 305 deletions

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