diff options
author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2001-06-14 18:52:28 +0000 |
---|---|---|
committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2001-06-14 18:52:28 +0000 |
commit | ea514ed21783b8159457d1e35341b23b55f9c8fd (patch) | |
tree | a56d7af2e410a7fd02a3a533c864eb747d07e6fb /mail/exim-devel/files/patch-scripts::exim_install | |
parent | Retire our local copy of configure.default, which is a maintenance pain. (diff) |
Rename patch-scripts::exim_install to patch-aa without a repo-copy.
A continuum in the history for this file isn't necessary. What _is_
important is the purpose of the patch today:
*) Changes the test used to determine whether a file should be installed
to cope with files which we "touch" to zero bytes for packaging
purposes.
*) Causes the configure file to be installed as a sample only. The
administrator needs to rename this file to "activate" exim.
*) Changes the invocation of make-info to be less prone to fail on
silly errors and fixes the info(1) titles so that, for example
``info exim'' actually enters the exim.info file.
Notes
Notes:
svn path=/head/; revision=44005
Diffstat (limited to 'mail/exim-devel/files/patch-scripts::exim_install')
-rw-r--r-- | mail/exim-devel/files/patch-scripts::exim_install | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/mail/exim-devel/files/patch-scripts::exim_install b/mail/exim-devel/files/patch-scripts::exim_install new file mode 100644 index 000000000000..46d752cd5e34 --- /dev/null +++ b/mail/exim-devel/files/patch-scripts::exim_install @@ -0,0 +1,91 @@ +This patch makes three changes to the exim_install script: + +*) Changes the test used to determine whether a file should be installed + to cope with files which we "touch" to zero bytes for packaging + purposes. + +*) Causes the configure file to be installed as a sample only. The + administrator needs to rename this file to "activate" exim. + +*) Changes the invocation of make-info to be less prone to fail on + silly errors and fixes the info(1) titles so that, for example + ``info exim'' actually enters the exim.info file. + +--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999 ++++ scripts/exim_install Tue Aug 3 14:31:20 1999 +@@ -146,9 +146,9 @@ + from=../util/ + fi + +- if [ ! -s ${from}${name} ]; then ++ if [ ! -r ${from}${name} ]; then + echo $com "" +- echo $com "*** `pwd`/${from}${name} does not exist or is empty" ++ echo $com "*** `pwd`/${from}${name} does not exist" + echo $com "*** Have you built Exim successfully?" + echo $com "*** Exim installation ${ver}failed ***" + exit 1 +@@ -199,25 +199,20 @@ + fi + done + +- +- +-# If there is no configuration file, install the default. ++# Install only a sample configuration, which encourages the admin to look ++# at it, since Exim won't run without a configure file. + + echo $com "" + +-if [ ! -f ${CONFIGURE_FILE} ]; then +- echo $com Installing default configuration in ${CONFIGURE_FILE} +- echo $com because there is no existing configuration file. +- echo ${CP} ../src/configure.default ${CONFIGURE_FILE} +- ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE} ++ echo $com Installing default configuration file in ${CONFIGURE_FILE%/*}/configure.default ++ ${real} mkdir -p ${CONFIGURE_FILE%/*} ++ echo ${CP} ../src/configure.default ${CONFIGURE_FILE%/*} ++ ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE%/*} + if [ $? -ne 0 ]; then + echo $com "" + echo $com "*** Exim installation ${ver}failed ***" + exit 1 + fi +-else +- echo $com Configuration file ${CONFIGURE_FILE} already exists +-fi + + # Install info files if the directory is defined and the Texinfo + # source documentation is present. +@@ -239,23 +234,25 @@ + echo $com Info installation directory is ${INFO_DIRECTORY} + echo $com "" + +- makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo ++ makeinfo --no-validate --no-split --output exim_overview.info \ ++ ../doc/oview.texinfo + echo ${CP} exim_overview.info ${INFO_DIRECTORY} + ${real} ${CP} exim_overview.info ${INFO_DIRECTORY} + install-info --section="Exim" \ +- --entry "* Overview: (exim_overview). Overview of the Exim system" \ ++ --entry "* Exim Overview: (exim_overview). Overview of the Exim system" \ + ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir +- makeinfo --no-split --output exim.info ../doc/spec.texinfo ++ makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo + echo ${CP} exim.info ${INFO_DIRECTORY} + ${real} ${CP} exim.info ${INFO_DIRECTORY} + install-info --section="Exim" \ +- --entry "* User guide: (exim). Exim manual" \ ++ --entry "* Exim Specification: (exim). Exim manual" \ + ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir +- makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo ++ makeinfo --no-validate --no-split --output exim_filter.info \ ++ ../doc/filter.texinfo + echo ${CP} exim_filter.info ${INFO_DIRECTORY} + ${real} ${CP} exim_filter.info ${INFO_DIRECTORY} + install-info --section="Exim" \ +- --entry "* Filtering: (exim_filter). Filtering mail with Exim" \ ++ --entry "* Exim Filtering: (exim_filter). Filtering mail with Exim" \ + ${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir + fi + |