patch from seb@ to pass --split-size to gtexinfo >= 4.6.

thanks seb :)

3 files changed, 20 insertions, 8 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 3eb10d101ab..07e74ecd4bd 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.158 2003/06/30 07:34:37 jlam Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.159 2003/07/02 16:07:01 grant Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1162,7 +1162,9 @@ MAJORDOMO_USER?= majordom
 # flags to be passed to makeinfo(1), if any.  Warning: only use if you
 # know what you're doing, may break PLISTs.
 # Possible: any valid flag for makeinfo(1)
-# Default: defaults for various machine_archs may be set in mk/defs.${OPSYS}.mk
+# Default: may set info files size for consistency across platforms and
+# makeinfo version, also various machine_archs arguments may be set in
+# mk/defs.${OPSYS}.mk with the _OPSYS_MAKEINFO_ARGS variable.
 
 MOZILLA_USE_XFT?=	NO
 # Used by mozilla packages to enable Xft support where available.
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index a5fc793f3a9..3fde33a8bcc 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.28 2003/06/29 21:25:50 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.29 2003/07/02 16:07:02 grant Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -124,10 +124,6 @@ _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
 _USE_GNU_GETTEXT=	no		# Don't use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
-.if defined(ABI) && ${ABI} == "64"
-_OPSYS_MAKEINFO_ARGS=   --split-size=50000  # flags to be passed to makeinfo(1)
-.endif
-
 # flags passed to the linker to extract all symbols from static archives.
 # XXX:
 # These flags are for the IRIX linker.  If GNU ld is used, these would need
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 296f3025e3b..932ee3aa016 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.13 2003/07/01 14:56:25 seb Exp $
+# $NetBSD: texinfo.mk,v 1.14 2003/07/02 16:07:02 grant Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES and
 # USE_NEW_TEXINFO are defined.
@@ -79,6 +79,15 @@ USE_MAKEINFO?=		NO
 
 .if empty(USE_MAKEINFO:M[nN][oO])
 
+# Argument to specify maximum info files size for newer versions
+# of makeinfo. This argument is supported since makeinfo 4.1.
+_MAKEINFO_SPLIT_SIZE_ARG+=	--split-size=50000
+
+# The minimum version of makeinfo for which the default info files size
+# was bumped from 50000.
+_MAKEINFO_SPLIT_SIZE_VERSION=	4.6
+
+# Add OPSYS specific flags if any.
 MAKEINFO_ARGS+=         ${_OPSYS_MAKEINFO_ARGS}
 
 # Does the system has a makeinfo command?
@@ -116,8 +125,13 @@ _NEED_TEXINFO=		NO
 BUILD_DEPENDS+=		gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
 _GTEXINFO_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		_GTEXINFO_PREFIX=gtexinfo
+# assume devel/gtexinfo version is >= ${_MAKEINFO_SPLIT_SIZE_VERSION}
+MAKEINFO_ARGS+=		${_MAKEINFO_SPLIT_SIZE_ARG}
 MAKEINFO=		${_GTEXINFO_PREFIX}/bin/makeinfo ${MAKEINFO_ARGS}
 .  else
+.    if defined(MAKEINFO_VERSION) && ${MAKEINFO_VERSION} >= ${_MAKEINFO_SPLIT_SIZE_VERSION}
+MAKEINFO_ARGS+=		${_MAKEINFO_SPLIT_SIZE_ARG}
+.    endif
 MAKEINFO=		${_MAKEINFO} ${MAKEINFO_ARGS}
 .  endif