When using imake, add a bunch of variables to the PLIST_SUBST list, in

order to simplify man-page handling across platforms:
If your application installs man pages on NetBSD into
man/cat1/foo.0
but in
man/man1/foo.1x
on Linux, simply use
${IMAKE_MAN_DIR}/foo.${IMAKE_MANNEWSUFFIX}

Definitions for Darwin provided by grant, others from
/usr/X11R6/lib/X11/config/*

This allows us to put away with having multiple PLISTs just for the different
man page locations.

PKGREVISION bumps of `grep -l USE_IMAKE pkgsrc/*/*/Makefile` coming up after
revision and adjusting.

5 files changed, 57 insertions, 6 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7e3aeba22a4..259dfc4ccd3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1145 2003/02/23 14:36:57 jmmv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1146 2003/02/24 19:49:47 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -66,6 +66,14 @@ BUILDLINK_X11_DIR?=	${X11BASE}
 
 .if defined(USE_IMAKE)
 USE_X11BASE?=		implied
+PLIST_SUBST+=          IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}  \
+                       IMAKE_MAN_DIR=${IMAKE_MAN_DIR}                  \
+                       IMAKE_LIBMAN_DIR=${IMAKE_LIBMAN_DIR}            \
+                       IMAKE_FILEMAN_DIR=${IMAKE_FILEMAN_DIR}          \
+                       IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}            \
+                       IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX}      \
+                       IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX}    \
+                       IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
 .endif
 .if defined(USE_X11BASE)
 USE_X11?=		implied
@@ -4287,7 +4295,6 @@ ${DESCR}: ${DESCR_SRC}
 	${ECHO} '${HOMEPAGE}'	>>${DESCR}	
 .endif
 
-
 #
 # For bulk build targets (bulk-install, bulk-package), the
 # BATCH variable must be set in /etc/mk.conf:
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index cf78c91676b..44d409f7e72 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.44 2003/01/21 22:48:58 grant Exp $
+# $NetBSD: defs.Darwin.mk,v 1.45 2003/02/24 19:49:47 jschauma Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -83,6 +83,17 @@ ZOULARISBASE?=		${LOCALBASE}
 
 PKG_CREATE_USERGROUP?=	NO				# XXX - Until then
 
+# 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_MAN_DIR=         ${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR=      ${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_FILEMAN_DIR=     ${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_MANNEWSUFFIX=    ${IMAKE_MAN_SUFFIX}
+
 _DO_SHLIB_CHECKS=	yes	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 645850f6dd7..007d417ec25 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.44 2003/01/15 20:55:39 jlam Exp $
+# $NetBSD: defs.Linux.mk,v 1.45 2003/02/24 19:49:47 jschauma Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -85,6 +85,17 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/usr/sbin/useradd
 ZOULARISBASE?=		/usr/pkg
 
+# 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_FILEMAN_SUFFIX=	5x
+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_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 110aba4cd74..7e014a853de 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.44 2003/01/15 20:55:39 jlam Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.45 2003/02/24 19:49:47 jschauma Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -95,6 +95,17 @@ 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_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_MANNEWSUFFIX=	0
+
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 3af3228e0f9..12047051bf2 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.13 2003/01/15 20:55:39 jlam Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.14 2003/02/24 19:49:47 jschauma Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -95,6 +95,17 @@ 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/OpenBSD.cf
+IMAKE_MAN_SOURCE_PATH=	man/cat
+IMAKE_MAN_SUFFIX=	1
+IMAKE_LIBMAN_SUFFIX=	3
+IMAKE_FILEMAN_SUFFIX=	5
+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_MANNEWSUFFIX=	0
+
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard