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.
author: joerg <joerg> 2012-03-19 12:34:12 +0000
committer: joerg <joerg> 2012-03-19 12:34:12 +0000
commit: b82f8b01349c21fb57f7a7179e42eff4a52db241 (patch)
tree: a3955afe4cc63c2b002bc7b453f7fdc618bce538
parent: b6ec3adac0a2019f6e0d32020b77faf4fd78653e (diff)
download: pkgsrc-b82f8b01349c21fb57f7a7179e42eff4a52db241.tar.gz
47 files changed, 408 insertions, 669 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 4c900dc738f..c6a49e18321 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:12 joerg Exp $
 
 BUILTIN_PKG:=	Xft2
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XFT2=	${X11BASE}/include/X11/Xft/Xft.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.Xft2)
-IS_BUILTIN.Xft2=	no
 .  if empty(H_XFT2:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	Xft2:BuildXftLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xft2=	${BUILTIN_IMAKE_CHECK.Xft2}
+IS_BUILTIN.Xft2=	yes
+.  else
+IS_BUILTIN.Xft2=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 82d5afb1cdd..01443e82012 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: builtin.mk,v 1.11 2012/03/19 12:34:13 joerg Exp $
 
 BUILTIN_PKG:=	fontconfig
 
@@ -13,11 +13,10 @@ BUILTIN_FIND_FILES.H_FONTCONFIG=	\
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.fontconfig)
-IS_BUILTIN.fontconfig=	no
 .  if empty(H_FONTCONFIG:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	fontconfig:BuildFontconfigLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.fontconfig=	${BUILTIN_IMAKE_CHECK.fontconfig}
+IS_BUILTIN.fontconfig=	yes
+.  else
+IS_BUILTIN.fontconfig=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.fontconfig
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index 59f7bb2d230..e67a773febb 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2009/03/20 19:24:36 joerg Exp $
+# $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:13 joerg Exp $
 
 BUILTIN_PKG:=	MesaLib
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_MESALIB=	${X11BASE}/include/GL/glx.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.MesaLib)
-IS_BUILTIN.MesaLib=	no
 .  if empty(H_MESALIB:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	MesaLib:BuildGLXLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.MesaLib=	${BUILTIN_IMAKE_CHECK.MesaLib}
+IS_BUILTIN.MesaLib=	yes
+.  else
+IS_BUILTIN.MesaLib=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.MesaLib
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index d2842992800..782f315adde 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: builtin.mk,v 1.13 2012/03/19 12:34:14 joerg Exp $
 
 BUILTIN_PKG:=	freetype2
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_FREETYPE2=	${X11BASE}/include/freetype2/freetype/freetype.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.freetype2)
-IS_BUILTIN.freetype2=	no
 .  if empty(H_FREETYPE2:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	freetype2:BuildFreetype2Library
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.freetype2=	${BUILTIN_IMAKE_CHECK.freetype2}
+IS_BUILTIN.freetype2=	yes
+.  else
+IS_BUILTIN.freetype2=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.freetype2
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 75e48502e16..9df82ba2b6d 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:36 cube Exp $
+# $NetBSD: builtin.mk,v 1.13 2012/03/19 12:34:14 joerg Exp $
 
 BUILTIN_PKG:=	glu
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_GLU=	${X11BASE}/include/GL/glu.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.glu)
-IS_BUILTIN.glu=	no
 .  if empty(H_GLU:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	glu:BuildGLULibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.glu=		${BUILTIN_IMAKE_CHECK.glu}
+IS_BUILTIN.glu=	yes
+.  else
+IS_BUILTIN.glu=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.glu
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
diff --git a/sysutils/xbattbar/PLIST b/sysutils/xbattbar/PLIST
index 85bd4f51da9..442bb5f1c88 100644
--- a/sysutils/xbattbar/PLIST
+++ b/sysutils/xbattbar/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 02:59:29 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/19 12:34:19 joerg Exp $
 bin/xbattbar
-${IMAKE_MAN_DIR}/xbattbar.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xbattbar.${IMAKE_MAN_SUFFIX}
diff --git a/sysutils/xbattbar/distinfo b/sysutils/xbattbar/distinfo
index 08f43b0bd22..d536e141c5d 100644
--- a/sysutils/xbattbar/distinfo
+++ b/sysutils/xbattbar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2008/01/04 01:43:58 pooka Exp $
+$NetBSD: distinfo,v 1.15 2012/03/19 12:34:20 joerg Exp $
 
 SHA1 (xbattbar_1.4.2.tar.gz) = 14e9aafd62919e4a625d3f84df3b074b9eef8279
 RMD160 (xbattbar_1.4.2.tar.gz) = f28a273a1865a0919e32144bbb5b16b3c0340061
 Size (xbattbar_1.4.2.tar.gz) = 14079 bytes
-SHA1 (patch-aa) = 3bd4b688ccaeebe766335245c1a8c5dde52768c2
+SHA1 (patch-aa) = cef5072e9fa9dd8beeceff41e6f2d1c1a45196eb
 SHA1 (patch-ab) = 17def14cb44ef4374aaa0e67e5bef3f1eeb042f7
 SHA1 (patch-ac) = 507cdf9b4e79dc577d020963142e262d04536527
diff --git a/sysutils/xbattbar/patches/patch-aa b/sysutils/xbattbar/patches/patch-aa
index beb84362321..ddbdef4481b 100644
--- a/sysutils/xbattbar/patches/patch-aa
+++ b/sysutils/xbattbar/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/01/26 01:28:26 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2012/03/19 12:34:20 joerg Exp $
 
 --- Imakefile.orig	Sat Dec  5 01:59:29 1998
 +++ Imakefile
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.2 2001/01/26 01:28:26 jlam Exp $
 -BINDIR = /usr/local/bin
 -MANDIR = /usr/local/man/cat1
 +BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/cat1
++MANDIR = ${PREFIX}/man/man1
  
  LOCAL_LIBRARIES = $(XLIB)
  
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index d7fa665369b..ec97b741d9d 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2010/07/04 16:34:46 obache Exp $
+# $NetBSD: builtin.mk,v 1.16 2012/03/19 12:34:20 joerg Exp $
 
 BUILTIN_PKG:=	expat
 
@@ -14,15 +14,10 @@ BUILTIN_FIND_FILES.H_EXPAT=	${X11BASE}/include/expat.h \
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.expat)
-IS_BUILTIN.expat=	no
 .  if empty(H_EXPAT:M__nonexistent__)
-.    if !empty(H_EXPAT:M${X11BASE}/*)
-BUILTIN_IMAKE_CHECK:=	expat:BuildExpatLibrary
-.      include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.expat=	${BUILTIN_IMAKE_CHECK.expat}
-.    else
 IS_BUILTIN.expat=	yes
-.    endif
+.  else
+IS_BUILTIN.expat=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.expat
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
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index 55ab4fde4dd..e9c55553962 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2008/10/05 21:36:32 cube Exp $
+# $NetBSD: builtin.mk,v 1.12 2012/03/19 12:34:21 joerg Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XFIXES=	${X11BASE}/include/X11/extensions/Xfixes.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.Xfixes)
-IS_BUILTIN.Xfixes=	no
 .  if empty(H_XFIXES:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	Xfixes:BuildXfixesLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xfixes=	${BUILTIN_IMAKE_CHECK.Xfixes}
+IS_BUILTIN.Xfixes=	yes
+.  else
+IS_BUILTIN.Xfixes=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xfixes
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index 2b1caad1154..dfd8cfa25fb 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2009/05/26 21:59:57 rillig Exp $
+# $NetBSD: builtin.mk,v 1.20 2012/03/19 12:34:21 joerg Exp $
 
 BUILTIN_PKG:=	Xrender
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XRENDER=	${X11BASE}/include/X11/extensions/Xrender.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.Xrender)
-IS_BUILTIN.Xrender=	no
 .  if empty(H_XRENDER:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	Xrender:BuildRenderLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xrender=	${BUILTIN_IMAKE_CHECK.Xrender}
+IS_BUILTIN.Xrender=	yes
+.  else
+IS_BUILTIN.Xrender=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xrender
diff --git a/x11/liboldXrandr/builtin.mk b/x11/liboldXrandr/builtin.mk
index 35b9042dd59..f21a49de725 100644
--- a/x11/liboldXrandr/builtin.mk
+++ b/x11/liboldXrandr/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2012/03/19 12:34:21 joerg Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XRANDR=	${X11BASE}/include/X11/extensions/Xrandr.h
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.Xrandr)
-IS_BUILTIN.Xrandr=	no
 .  if empty(H_XRANDR:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:=	Xrandr:BuildRandRLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xrandr=	${BUILTIN_IMAKE_CHECK.Xrandr}
+IS_BUILTIN.Xrandr=	yes
+.  else
+IS_BUILTIN.Xrandr=	no
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xrandr
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.<pkg> 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
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 0b796561174..a0b6a2f0da2 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/02/15 15:25:15 hans Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/19 12:34:22 joerg Exp $
 #
 
 DISTNAME=		xorg-cf-files-1.0.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -38,6 +38,9 @@ pre-configure:
 		-e "s|@PKGMANDIR@|${PKGMANDIR}|"	\
 		-e "s|@MAKE@|${MAKE_PROGRAM}|"	${FILESDIR}/host.def > \
 		${WRKSRC}/host.def
+	if [ ${X11BASE} != ${PREFIX} ]; then \
+		echo '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \
+	fi
 
 .include "../../x11/xproto/buildlink3.mk"
 
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index a5e68f5d8c0..158faaba9a4 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.12 2012/02/15 15:25:15 hans Exp $
+$NetBSD: distinfo,v 1.13 2012/03/19 12:34:22 joerg Exp $
 
 SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
 Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes
+SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f
+SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
 SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3
 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
@@ -10,8 +12,9 @@ SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
 SHA1 (patch-af) = e48481afac82cd93e61a1f44dab84876d645ce09
 SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
-SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
-SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
-SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
-SHA1 (patch-ak) = ce8c0fa88f6fa4fb1207f95e6e1f3d5ca9018b8c
+SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
+SHA1 (patch-ai) = dc4791668610d56fad88dbc05088eb5257d52c7f
+SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
+SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
+SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
 SHA1 (patch-sv4Lib.rules) = 20bd05fe6e49cabb74317ded2f4b7565dd45c49d
diff --git a/x11/xorg-cf-files/patches/patch-X11.rules b/x11/xorg-cf-files/patches/patch-X11.rules
new file mode 100644
index 00000000000..ce6baa95fa2
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-X11.rules
@@ -0,0 +1,13 @@
+$NetBSD: patch-X11.rules,v 1.1 2012/03/19 12:34:23 joerg Exp $
+
+--- X11.rules.orig	2012-03-06 17:09:41.000000000 +0000
++++ X11.rules
+@@ -37,6 +37,8 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v
+ 
+ #if defined(X11ProjectRoot)
+ # define XBinDir	$(XPROJECTROOT)/bin
++#elif defined(RealProjectRoot)
++# define XBinDir	$(REALPROJECTROOT)/bin
+ #elif defined(ProjectRoot) 
+ # define XBinDir	$(PROJECTROOT)/bin
+ #else
diff --git a/x11/xorg-cf-files/patches/patch-X11.tmpl b/x11/xorg-cf-files/patches/patch-X11.tmpl
new file mode 100644
index 00000000000..1d94ba31746
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-X11.tmpl
@@ -0,0 +1,16 @@
+$NetBSD: patch-X11.tmpl,v 1.1 2012/03/19 12:34:23 joerg Exp $
+
+--- X11.tmpl.orig	2012-03-04 18:19:34.000000000 +0000
++++ X11.tmpl
+@@ -1657,7 +1657,11 @@ XCOMM X Window System make variables; th
+          SHAREDIR = ShareDir		/* rgb, XErrorDB, etc. */
+        LIBEXECDIR = LibexecDir
+         MODULEDIR = ModuleDir
++#ifdef RealProjectRoot
++   TOP_X_INCLUDES = TopXInclude -I $(REALPROJECTROOT)/include
++#else
+    TOP_X_INCLUDES = TopXInclude
++#endif
+           XBINDIR = XBinDir		/* BINDIR for X11ProjectRoot */
+ 
+        INSTSRCDIR = InstSrcDir		/* Installed source (kernel modules). */
diff --git a/x11/xorg-cf-files/patches/patch-ah b/x11/xorg-cf-files/patches/patch-ah
index 8bb855aac4b..6aa24d11ff8 100644
--- a/x11/xorg-cf-files/patches/patch-ah
+++ b/x11/xorg-cf-files/patches/patch-ah
@@ -1,8 +1,21 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2012/03/19 12:34:24 joerg Exp $
 
 --- bsdLib.rules.orig	2006-02-03 04:02:44.000000000 +0100
 +++ bsdLib.rules
-@@ -229,11 +229,7 @@ LintLibReferences(varname,libname,libsou
+@@ -192,7 +192,11 @@ LintLibReferences(varname,libname,libsou
+ #endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++#  ifdef RealProjectRoot
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++#  else
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++#  endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
+@@ -229,11 +233,7 @@ LintLibReferences(varname,libname,libsou
   * InstallSharedLibrary - generate rules to install the shared library.
   * NOTE: file must be executable, hence "INSTBINFLAGS"
   */
diff --git a/x11/xorg-cf-files/patches/patch-ai b/x11/xorg-cf-files/patches/patch-ai
index 7b894a2d5b8..9cfb28e9463 100644
--- a/x11/xorg-cf-files/patches/patch-ai
+++ b/x11/xorg-cf-files/patches/patch-ai
@@ -1,8 +1,19 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $
 
---- Imake.tmpl.orig	2006-12-18 01:09:37.000000000 +0100
+--- Imake.tmpl.orig	2009-10-16 21:45:42.000000000 +0000
 +++ Imake.tmpl
-@@ -1447,9 +1447,9 @@ TCLIBDIR = TclLibDir
+@@ -898,9 +898,8 @@ TCLIBDIR = TclLibDir
+ #ifndef ManPath
+ #define ManPath ManDirectoryRoot
+ #endif
+-#ifndef ManSourcePath
++#undef ManSourcePath
+ #define ManSourcePath $(MANPATH)/man
+-#endif
+ #ifndef ManDir
+ #define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
+ #endif
+@@ -1447,9 +1446,9 @@ TCLIBDIR = TclLibDir
  #ifndef DependCmd
  #if UseGccMakeDepend
  #ifdef UseInstalled		/* assume BINDIR in path */
@@ -14,3 +25,55 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #endif
  #elif UseCCMakeDepend
  #ifdef UseInstalled		/* assume BINDIR in path */
+@@ -1610,39 +1609,23 @@ TCLIBDIR = TclLibDir
+ #define SHsuf sh
+ #endif
+ #ifndef ManSuffix
+-#define ManSuffix	n		/* use just one tab or cpp will die */
++#define ManSuffix	1		/* use just one tab or cpp will die */
+ #endif
+ #ifndef LibManSuffix
+ #define LibManSuffix	3		/* use just one tab or cpp will die */
+ #endif
+ #ifndef FileManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define FileManSuffix	4		/* use just one tab or cpp will die */
+-#else
+ #define FileManSuffix	5		/* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef MiscManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define MiscManSuffix	5		/* use just one tab or cpp will die */
+-#else
+ #define MiscManSuffix	7		/* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef DriverManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define DriverManSuffix	7		/* use just one tab or cpp will die */
+-#else
+ #define DriverManSuffix	4		/* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef AdminManSuffix
+-#if SystemV || SystemV4
+-#define AdminManSuffix	1m		/* use just one tab or cpp will die */
+-#else
+ #define AdminManSuffix	8		/* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef ExpandManNames
+ #if SystemV
+ #define ExpandManNames NO
+@@ -2049,6 +2032,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
+      INSTDATFLAGS = InstDatFlags	/* install flags for data files */
+     INSTKMEMFLAGS = InstKmemFlags	/* install flags for /dev/kmem progs */
+ 
++#ifdef RealProjectRoot
++REALPROJECTROOT = RealProjectRoot
++#endif
++
+ #ifdef ProjectRoot
+       PROJECTROOT = ProjectRoot
+ #endif
diff --git a/x11/xorg-cf-files/patches/patch-aj b/x11/xorg-cf-files/patches/patch-aj
index 47b8f557e3c..504d600ebcc 100644
--- a/x11/xorg-cf-files/patches/patch-aj
+++ b/x11/xorg-cf-files/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2008/06/01 14:36:37 tnn Exp $
+$NetBSD: patch-aj,v 1.3 2012/03/19 12:34:24 joerg Exp $
 
 Force Rpath usage on Linux. For reasons analysed in details,
 the binutils detection seems to fail.
@@ -14,7 +14,20 @@ the binutils detection seems to fail.
  #endif
  
  #ifndef SharedOldX
-@@ -78,7 +78,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+@@ -69,7 +69,11 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+ # endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++#  ifdef RealProjectRoot
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++#  else
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++#  endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
+@@ -78,7 +82,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
  #define LibraryRpathLoadFlags RpathLoadFlags
  #endif
  # ifndef SharedLibraryLoadFlags
@@ -23,7 +36,7 @@ the binutils detection seems to fail.
  # endif
  # ifndef PositionIndependentCFlags
  #  define PositionIndependentCFlags -fPIC
-@@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+@@ -87,17 +91,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
  #  define PositionIndependentCplusplusFlags -fPIC
  # endif
  # ifndef ExtraLoadFlags
diff --git a/x11/xorg-cf-files/patches/patch-ak b/x11/xorg-cf-files/patches/patch-ak
index 2ba4e93bb6a..456758061bd 100644
--- a/x11/xorg-cf-files/patches/patch-ak
+++ b/x11/xorg-cf-files/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2009/07/14 06:19:43 dholland Exp $
+$NetBSD: patch-ak,v 1.2 2012/03/19 12:34:24 joerg Exp $
 
 The standard says that failing () doesn't stop the shell, even when -e
 is set, so () constructs need || exit $? on the end. (Which needs to be
 $$? when it's coming from inside make.)
 
---- Imake.rules~	2005-11-08 01:33:24.000000000 -0500
-+++ Imake.rules	2008-08-30 11:57:32.000000000 -0400
-@@ -534,9 +534,9 @@
+--- Imake.rules.orig	2009-10-16 21:45:42.000000000 +0000
++++ Imake.rules
+@@ -534,9 +534,9 @@ clean cleantc::								@@\
  		set +x; \						@@\
  	else \								@@\
  		if [ -h dir ]; then \					@@\
@@ -18,7 +18,7 @@ $$? when it's coming from inside make.)
  	fi
  #endif /* MakeDir */
  
-@@ -545,9 +545,9 @@
+@@ -545,9 +545,9 @@ clean cleantc::								@@\
  		:; \							@@\
  	else \								@@\
  		if [ -h dir ]; then \					@@\
@@ -30,7 +30,7 @@ $$? when it's coming from inside make.)
  	fi
  #endif /* MakeDirInline */
  
-@@ -571,7 +571,7 @@
+@@ -571,7 +571,7 @@ includes:: srclist							@@\
  	@(set -x; cd $(BUILDINCDIR) && for i in srclist; do \		@@\
  		RemoveFile($$i); \					@@\
  		$(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \		@@\
@@ -39,7 +39,7 @@ $$? when it's coming from inside make.)
  #endif /* BuildIncludesTop */
  
  #ifndef BuildIncludes
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ includes:: srclist							@@\
  	@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \	@@\
  		RemoveFile($$i); \					@@\
  		$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \	@@\
@@ -48,7 +48,7 @@ $$? when it's coming from inside make.)
  #endif /* BuildIncludes */
  
  /*
-@@ -604,7 +604,7 @@
+@@ -604,7 +604,7 @@ interfaces::								@@\
  	@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \	@@\
  		RemoveFile($$i); \					@@\
  		$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \	@@\
@@ -57,7 +57,30 @@ $$? when it's coming from inside make.)
  #endif /* BuildInterfaces */
  
  /*
-@@ -1302,7 +1302,7 @@
+@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,l
+  * (the limit for using source code control systems on files systems with
+  * short file names).
+  */
+-#ifndef InstallManPageLong
++#undef InstallManPageLong
+ #define	InstallManPageLong(file,destdir,dest)				@@\
+ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+ 									@@\
+ CppManTarget(file,$(EXTRAMANDEFS))					@@\
+ 									@@\
+ InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
+-#endif /* InstallManPageLong */
+-
+ 
+ /*
+  * InstallManPageAliases - generate rules to install manual page aliases.
+  */
+-#ifndef InstallManPageAliases
++#undef InstallManPageAliases
+ #define	InstallManPageAliases(file,destdir,aliases)			@@\
+ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+ 									@@\
+@@ -1302,17 +1300,15 @@ install.man::								@@\
  	RemoveFile($${TMP}); \						@@\
  	echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \	@@\
  	for i in aliases; do (set -x; \					@@\
@@ -65,8 +88,34 @@ $$? when it's coming from inside make.)
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)) || exit $$?; \ @@\
  	done; \								@@\
  	RemoveFile($${TMP}))
- #endif /* InstallManPageAliases */
-@@ -1337,7 +1337,7 @@
+-#endif /* InstallManPageAliases */
+-
+ 
+ /*
+  * InstallGenManPageLong - More general rules for installing manual pages --
+  * doesn't assume MANSUFFIX.
+  */
+-#ifndef InstallGenManPageLong
++#undef InstallGenManPageLong
+ #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ BuildInstallHtmlManPage(file,dest,suffix)				@@\
+ 									@@\
+@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX)					@
+ 	MakeDir($(DESTDIR)destdir)					@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+ 		$(DESTDIR)destdir/dest.suffix
+-#endif /* InstallGenManPageLong */
+-
+ 
+ /*
+  * InstallGenManPageAliases - general equivalent of InstallManPageAliases
+  */
+-#ifndef InstallGenManPageAliases
++#undef InstallGenManPageAliases
+ #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+ 									@@\
+@@ -1337,14 +1331,13 @@ install.man::								@@\
  	RemoveFile($${TMP}); \						@@\
  	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
  	for i in aliases; do (set -x; \					@@\
@@ -74,19 +123,105 @@ $$? when it's coming from inside make.)
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix) || exit $$?; \ @@\
  	done; \								@@\
  	RemoveFile($${TMP}))
- #endif /* InstallGenManPageAliases */
-@@ -1397,8 +1397,8 @@
+-#endif /* InstallGenManPageAliases */
+ 
+ #else /* CompressManPages */
+ 
+-#ifndef InstallManPageLong
++#undef InstallManPageLong
+ #define InstallManPageLong(file,destdir,dest)				@@\
+ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+ 									@@\
+@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX)					@
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+ 	  $(DESTDIR)destdir/dest.$(MANSUFFIX)				@@\
+ 	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
+-#endif
+ 
+-#ifndef InstallGenManPageLong
++#undef InstallGenManPageLong
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ BuildInstallHtmlManPage(file,dest,suffix)				@@\
+ 									@@\
+@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX)					@
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+ 	  $(DESTDIR)destdir/dest.suffix					@@\
+ 	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
+-#endif
+ 
+-#ifndef InstallMultipleMan
++#undef InstallMultipleMan
+ #define InstallMultipleMan(list,dest)					@@\
+ install.man:: list							@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+@@ -1385,39 +1376,35 @@ install.man:: list							@@\
+ 		  $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \		@@\
+ 		$(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\
+ 	done
+-#endif
+ 
+ /*
+  * InstallManPageAliases - install soft links for aliases.
+  */
+-#ifndef InstallManPageAliasesBase
++#undef InstallManPageAliasesBase
+ #define InstallManPageAliasesBase(file,destdir,aliases)			@@\
+ install.man::								@@\
+ 	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
  	for i in aliases; do (set -x; \					@@\
  	$(RM) $(DESTDIR)destdir/$$i.*; \				@@\
  	(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \			@@\
 -	$$i.$${SUFFIX})); \						@@\
 -	done)
+-#endif
 +	$$i.$${SUFFIX}) || exit $$?) || exit $$?; \			@@\
 +	done) || exit $$?
- #endif
  
- #ifndef InstallManPageAliases
-@@ -1499,7 +1499,8 @@
+-#ifndef InstallManPageAliases
++#undef InstallManPageAliases
+ #define InstallManPageAliases(file,destdir,aliases)			@@\
+ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+ 									@@\
+ InstallManPageAliasesBase(file,destdir,aliases)
+-#endif
+ 
+ 
+ /*
+  * InstallGenManPageAliases - install soft links for aliases.
+  */
+-#ifndef InstallGenManPageAliases
++#undef InstallGenManPageAliases
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+ 									@@\
+ InstallManPageAliasesBase(file,destdir,aliases)
+-#endif
+ 
+ #endif /* CompressManPages */
+ 
+@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,a
+ /*
+  * InstallManPage - generate rules to install the indicated manual page.
+  */
+-#ifndef InstallManPage
++#undef InstallManPage
+ #define	InstallManPage(file,destdir)					@@\
+ InstallManPageLong(file,destdir,file)
+-#endif /* InstallManPage */
+ 
+ 
+ /*
+  * InstallGenManPage - general equivalent of InstallManPage
+  */
+-#ifndef InstallGenManPage
++#undef InstallGenManPage
+ #define	InstallGenManPage(file,destdir,suffix)				@@\
+ InstallGenManPageLong(file,destdir,file,suffix)
+-#endif /* InstallGenManPage */
+ 
+ 
+ /*
+@@ -1499,7 +1484,8 @@ install.man:: file.suffix.html						@@\
  	for i in aliases; do (set -x; \					@@\
  	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \		@@\
  	  (cd $(DESTDIR)$(DOCHTMLDIR); \				@@\
@@ -96,7 +231,7 @@ $$? when it's coming from inside make.)
  	done
  #else
  #define InstallHtmlManPageAliases(file,aliases,suffix) /**/
-@@ -1681,7 +1682,7 @@
+@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcn
  #ifndef MakeNamedTargetSubdir
  #define MakeNamedTargetSubdir(dir,flags,subname)\
  		(cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \	@@\
@@ -105,7 +240,7 @@ $$? when it's coming from inside make.)
  #endif
  
  /*
-@@ -1692,7 +1693,7 @@
+@@ -1692,7 +1678,7 @@ InstallNamedTargetNoClobber(install,srcn
  step::									@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	echo "	cd" dir; cd dir && \					@@\
@@ -114,7 +249,7 @@ $$? when it's coming from inside make.)
  #endif
  
  
-@@ -1809,7 +1810,7 @@
+@@ -1809,7 +1795,7 @@ step:: list								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \						@@\
@@ -123,7 +258,7 @@ $$? when it's coming from inside make.)
  	done
  #endif /* InstallMultipleDestFlags */
  
-@@ -1876,7 +1877,7 @@
+@@ -1876,7 +1862,7 @@ install.man::								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \						@@\
@@ -132,7 +267,7 @@ $$? when it's coming from inside make.)
  	done
  #endif /* InstallMultipleManSuffix */
  
-@@ -2601,7 +2602,8 @@
+@@ -2601,7 +2587,8 @@ clean::									@@\
  #define LinkBuildLibraryMaybe(lib,doit) MakeDir($(BUILDLIBDIR))		@@\
  	@if doit; then (set -x; \					@@\
  	  RemoveFile($(BUILDLIBDIR)/lib); \				@@\
@@ -142,7 +277,7 @@ $$? when it's coming from inside make.)
  #endif
  #endif /* LinkBuildLibraryMaybe */
  
-@@ -2615,7 +2617,9 @@
+@@ -2615,7 +2602,9 @@ clean::									@@\
  #else
  #define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\	@@\
  	(set -x; RemoveFile($(BUILDLIBDIR)/lib);\			@@\
@@ -153,7 +288,7 @@ $$? when it's coming from inside make.)
  #endif
  #endif /* LinkBuildSonameLibrary */
  
-@@ -2713,9 +2717,9 @@
+@@ -2713,9 +2702,9 @@ AllTarget(LibraryTargetName(libname))			
  									@@\
  LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS)	@@\
  	RemoveFile($@)							@@\
@@ -166,7 +301,7 @@ $$? when it's coming from inside make.)
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget3 */
-@@ -2952,7 +2956,7 @@
+@@ -2952,7 +2941,7 @@ step::  dir srclist							@@\
  	@-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \		@@\
  		set -x; cd dir && RemoveFiles($$list))			@@\
  	@for i in srclist; do \						@@\
@@ -175,7 +310,7 @@ $$? when it's coming from inside make.)
  	done								@@\
  									@@\
  dir::									@@\
-@@ -2974,8 +2978,9 @@
+@@ -2974,8 +2963,9 @@ name::									@@\
  	@MakeFlagsToShellFlags(ik,set +e); \				@@\
  	for i in dirs ;\						@@\
  	do \								@@\
@@ -187,7 +322,7 @@ $$? when it's coming from inside make.)
  	done
  #endif
  
-@@ -3384,7 +3389,7 @@
+@@ -3384,7 +3374,7 @@ clean::									@@\
  step::									@@\
  	DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \		@@\
  	for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \		@@\
@@ -196,7 +331,7 @@ $$? when it's coming from inside make.)
  	done
  #endif /* MakeDirectories */
  
-@@ -3610,7 +3615,7 @@
+@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libna
  	@$(CP) Concat3(libpath,/lib,libname.a) tmp			@@\
  	@(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \		@@\
  	  $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \			@@\
diff --git a/x11/xorg-cf-files/patches/patch-gnuLib.rules b/x11/xorg-cf-files/patches/patch-gnuLib.rules
new file mode 100644
index 00000000000..cdeb2c252a8
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-gnuLib.rules
@@ -0,0 +1,17 @@
+$NetBSD: patch-gnuLib.rules,v 1.1 2012/03/19 12:34:24 joerg Exp $
+
+--- gnuLib.rules.orig	2012-03-04 18:07:20.000000000 +0000
++++ gnuLib.rules
+@@ -45,7 +45,11 @@ XCOMM XXX To rpath or not to rpath...
+ #endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
++#  ifdef RealProjectRoot
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++#  else
++#  define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++#  endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
author	joerg <joerg>	2012-03-19 12:34:12 +0000
committer	joerg <joerg>	2012-03-19 12:34:12 +0000
commit	b82f8b01349c21fb57f7a7179e42eff4a52db241 (patch)
tree	a3955afe4cc63c2b002bc7b453f7fdc618bce538
parent	b6ec3adac0a2019f6e0d32020b77faf4fd78653e (diff)
download	pkgsrc-b82f8b01349c21fb57f7a7179e42eff4a52db241.tar.gz