[pkgsrc/trunk]: pkgsrc/mk modification to increase imake handling flexibility...

[schwarz <schwarz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/02ff2dd53752
branches:  trunk
changeset: 501098:02ff2dd53752
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun Oct 16 19:38:05 2005 +0000

description:
modification to increase imake handling flexibility for IRIX (in particular
with respect to IRIX 5).
Changes approved by jschauma and recht.

diffstat:

 mk/platform/IRIX.mk |  21 ++++++++++++---------
 mk/tools/replace.mk |   7 +++++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r 1b2d1051cba4 -r 02ff2dd53752 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Sun Oct 16 19:29:30 2005 +0000
+++ b/mk/platform/IRIX.mk       Sun Oct 16 19:38:05 2005 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: IRIX.mk,v 1.16 2005/08/02 00:23:31 reed Exp $
+# $NetBSD: IRIX.mk,v 1.17 2005/10/16 19:38:05 schwarz Exp $
 #
 # Variable definitions for the IRIX operating system.
 
 ECHO_N?=       ${ECHO} -n
+.if exists(/usr/bin/X11/imake)
+IMAKE?=                /usr/bin/X11/imake # IRIX 5.3 location
+.endif
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 IMAKEOPTS+=    -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
 IMAKEOPTS+=    -DManUsr=${PREFIX}
@@ -27,14 +30,14 @@
 ULIMIT_CMD_memorysize?=        ulimit -v `ulimit -H -v`
 
 # imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH= catman/u_man/cat
-IMAKE_MAN_SUFFIX=      1
-IMAKE_LIBMAN_SUFFIX=   3
-IMAKE_FILEMAN_SUFFIX=  5
-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_MANNEWSUFFIX=    z
+IMAKE_MAN_SOURCE_PATH?=        catman/u_man/cat
+IMAKE_MAN_SUFFIX?=     1
+IMAKE_LIBMAN_SUFFIX?=  3
+IMAKE_FILEMAN_SUFFIX?= 5
+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_MANNEWSUFFIX?=   z
 
 _DO_SHLIB_CHECKS=      yes             # fixup PLIST for shared libs
 .if exists(/usr/include/netinet6)
diff -r 1b2d1051cba4 -r 02ff2dd53752 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sun Oct 16 19:29:30 2005 +0000
+++ b/mk/tools/replace.mk       Sun Oct 16 19:38:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.128 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: replace.mk,v 1.129 2005/10/16 19:38:05 schwarz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -691,7 +691,10 @@
 TOOLS_DEPENDS.imake?=          xorg-imake>=6.8:../../x11/xorg-imake
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.imake=xorg-imake
 TOOLS_PATH.imake=              ${TOOLS_PREFIX.imake}/${X11ROOT_PREFIX}/bin/imake
-.    else # !empty(X11_TYPE:Mnative)
+# !empty(X11_TYPE:Mnative)
+.    elif defined(IMAKE)
+TOOLS_PATH.imake=              ${IMAKE}
+.    else
 TOOLS_PATH.imake=              ${X11BASE}/bin/imake
 .    endif
 .  endif