- Move the previous block of code down in the file so that all used variables
are defined (specially PKG_SYSCONFDIR). Fixes a problem noticed by
kristerw@'s bulk build in comms/minicom.
- Ignore diff's return code, which aborts make in NetBSD 1.6.2. Also noticed
by kristerw@'s bulk build.
- Use full paths to do the checks, instead of relative to ${PREFIX}. Less
ambiguity. Matches should be turned into regular expressions that anchor
to a whole line (tried that, but found some problems).
- Turn CHECK_FILES to NO by default. As said in the previous point, there
are still some problems that have to be fixed and minor improvements to
be done. And I have no time to fix this ATM. Yes, this definitely needs
more testing. I'm sorry for all the noise. (But hey! you should set and
try this feature locally! ;-)
Introduce private variables _{MAKEINFO,TEXINFO_REQD}_{MAJOR,MINOR}
holding the major and minor number version numbers of available makeinfo
and of the minimum required version.
Use these to sort out if devel/gtexinfo is needed as dependency.
from texinfo.mk. Only set them there from tools.mk: this way they are
always set whatever the value of INFO_FILES and USE_MAKEINFO as
texinfo.mk is included only if INFO_FILES is not empty or USE_MAKEINFO is
not "no".
Please note that now with tools.mk install-info and makeinfo usage by a
package build and installation process is always caught by the
overriding scripts in ${TOOLS_DIR}/bin/{install-info,makeinfo} even if
the package does not use the buildlink framework.
Many thanks to Johnny for that!
XXX: I think I'm going to sweep over packages marked with INFO_FILES
and USE_MAKEINFO to remove the need of INSTALL_INFO and MAKEINFO in
environment and thus only relying on the overriding scripts.
This will clear a bit the clutter in {MAKE,CONFIGURE}_ENV.
INFO_FILES is now defined by default to the empty value.
If it is not empty it means that install-info -or a suitable
replacement like pkg_install-info- is required.
USE_MAKEINFO is now defined by default to the 'no' value.
If it has any other value it means that makeinfo is required.
Note that as before simply defining USE_MAKEINFO in a package
Makefile is enough to trigger the use of makeinfo. I.e. it is not
required to be '[yY][eE][sS]'.
As a side effect when using buildlink2 always create install-info and
makeinfo wrappers in ${BUILDLINK_DIR}/bin. This could help
package maintainer to catch spurious/hidden install-info and makeinfo
usage.
Note that for now this nice feature is not really enabled as the relevant
part of bsd.buildlink2.mk is still conditional upon USE_NEW_TEXINFO.
It will really be when USE_NEW_TEXINFO will be removed from pkgsrc.
in `makeinfo --version'.
This is needed for older makeinfo which output thing like:
makeinfo (GNU texinfo 3.12) 1.68
Copyright (C) 1998 Free Software Foundation, Inc.
....
This should fix the problem encountered by Thorsten Frueauf on 1.5.4_ALPHA
(I reproduced it on stock 1.5.3) and reported in private email via
jschauma@.
arguments to makeinfo(1). This was made necessary by the fact that under
IRIX64 makeinfo(1) does not use a default split-size of 50000, which breaks
our PLISTs. After feedback from seb@, initialize MAKEINFO_ARGS per default
to _OPSYS_MAKEINFO_ARGS, which is set in defs.<OPSYS>.mk (currently only
for IRIX using 64-bit ABI).
makeinfo commands.
The goal of the new framework is twofold:
- reduce the number of '@exec' and '@unexec' in PLIST by
using INSTALL/DEINSTALL scripts to handle entries addition/removal
Info directory file.
- achieve lighter dependencies by avoiding unnecessary run-time
dependency on the gtexinfo package and if needed with the help of the
standalone install-info command provided by the recently imported package
pkgtools/pkg_install-info.
A package must be sightly updated to use this new framework and
must define the variable USE_NEW_TEXINFO. This variable will
be removed from the pkgsrc tree when all package would have been
updated.
For details see section 10.24 of Packages.txt, comments in
mk/{texinfo.mk,buildlink2/bsd.buildlink2.mk} and upcoming mail to
<tech-pkg at netbsd dot org>.
Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
removal of USE_GTEXINFO
INSTALL_INFO added to PLIST_SUBST
`${INSTALL_INFO}' replace `install-info' in target rules
print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
makeinfo command usage
See -newly added by this commit- section 10.24 of Packages.txt for
further information.
