Update to 2.02; set Sheldon Hearn as maintainer.

*NOTE* Configure file is not backward compatible!!
The new configure file is installed as configure.sample.

6 files changed, 462 insertions, 66 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 2fbc2fd5cc90..af7f48ca5724 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,27 +1,46 @@
 # New ports collection makefile for:	exim
-# Version required:	1.92
+# Version required:	2.02
 # Date created:		23 June 1996
-# Whom:			markm
+# Whom:			axl@iafrica.com
 #
-# $Id: Makefile,v 1.12 1998/02/09 14:32:28 markm Exp $
+# $Id$
 #
 
-DISTNAME=	exim-1.92
+DISTNAME=	exim-2.02
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-1.92.tar.gz exim-texinfo-1.90.tar.gz
+DISTFILES=	exim-2.02.tar.gz exim-texinfo-2.00.tar.gz
 
-MAINTAINER=	markm@FreeBSD.ORG
+MAINTAINER=	axl@iafrica.com
 
 USE_PERL5=	YES
 
 do-configure:
-	@${MKDIR} ${WRKSRC}/Local
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
-	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	@(cd ${WRKSRC}/doc ; \
-	for i in ../../exim-texinfo-1.90/doc/* ; do \
+	${MKDIR} ${WRKSRC}/Local
+	if [ ! -d ${X11BASE} ] ; then \
+		${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
+		    < ${FILESDIR}/Makefile.no_eximon \
+		    > ${WRKSRC}/Local/Makefile ; \
+	else \
+		${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
+		    < ${FILESDIR}/Makefile \
+		    > ${WRKSRC}/Local/Makefile ; \
+	fi
+	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	${CP} ${FILESDIR}/configure.default ${WRKSRC}/src
+	cd ${WRKSRC}/doc && \
+	for i in ../../exim-texinfo-2.00/doc/* ; do \
 		ln -sf $$i ; \
-	done )
+	done
+
+post-build:
+	if [ ! -d ${X11BASE} ] ; then \
+		${INSTALL_SCRIPT} ${FILESDIR}/eximon ${FILESDIR}/eximon.bin \
+		    ${WRKSRC}/build-FreeBSD-i386 ; \
+	fi
+
+post-install:
+	@${SETENV} ${SCRIPTS_ENV} ${PERL5} ${PKGDIR}/INSTALL \
+	    exim-2.02 POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 20e2ee75e65c..dcc7dff357bc 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-1.92.tar.gz) = b3e59441cc6ef13ce5e12cae4d08c15d
-MD5 (exim-texinfo-1.90.tar.gz) = d17b88257aea5a4393d9a8fdab7466d3
+MD5 (exim-2.02.tar.gz) = dff637a5d3a6788b6f88ea7ecded2fc2
+MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index e62503f0e260..07e6066e2acf 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -34,16 +34,43 @@
 # default it assumes ndbm; this often works with gdbm or db, provided they
 # are correctly installed, via their compatibility interfaces. However, Exim
 # can also be configured to use the native calls for Berkeley db 1.85, and
-# there are some locking actions that can be varied by changing the
-# configuration. The defaults are set in OS/Makefile-Default, and can be
-# changed by putting things into an OS-specific Makefile, or indeed into the
-# main Local/Makefile if Exim is being compiled for a single OS only.
+# this is defaulted for some operating systems. There are some locking actions
+# that can be varied by changing the configuration. The defaults are set in
+# OS/Makefile-Default, and can be changed by putting things into an OS-specific
+# Makefile, or indeed into the main Local/Makefile if Exim is being compiled
+# for a single OS only.
 
 # See also the file doc/dbm.discuss.txt for discussion about different dbm
 # libraries.
 ###############################################################################
 
 
+# /bin/sh is normally used as the shell in which to run commands that are
+# defined in the makefiles. This can be changed if necessary, but note that
+# a Bourne-compatible shell is expected.
+
+# MAKE_SHELL=/bin/sh
+
+
+# The following commands live in different places in some OS. The OS-specific
+# files should normally point to the right place, but they can be overridden
+# here if necessary. Perl is not necessary for running Exim, but there are
+# some Perl utilities for processing log files. If you haven't got Perl,
+# Exim will still build and run; you just won't be able to run those utilities.
+
+# CHOWN_COMMAND=/usr/bin/chown
+# CHGRP_COMMAND=/usr/bin/chgrp
+# MV_COMMAND=/bin/mv
+# RM_COMMAND=/bin/rm
+# PERL_COMMAND=/usr/bin/perl
+
+
+# The following macro can be used to change the command for building a library
+# of functions. By default the "ar" command is used, with options "cq".
+
+# AR=ar cq
+
+
 # The binary directory: This variable defines where the exim binary will be
 # installed by "make install" or "exim_install". It is also used internally
 # by exim when it needs to re-invoke itself, either to send an error message,
@@ -51,26 +78,13 @@
 # installed in this directory. There is no default for this variable built into
 # the source files; it must be set in one of the local configuration files.
 
-BIN_DIRECTORY=/usr/local/sbin
+BIN_DIRECTORY=XX_PREFIX_XX/sbin
 
 
 # The info directory: This variable defines where the exim info file will be
 # installed by "make install" or "exim_intall".
 
-INFO_DIRECTORY=/usr/local/info
-
-
-# The following commands live in different places in some OS. The OS-specific
-# files should normally point to the right place, but they can be overridden
-# here if necessary. Perl is not necessary for running Exim, but there are
-# some Perl utilities for processing log files. If you haven't got Perl,
-# Exim will still build and run; you just won't be able to run those utilities.
-
-CHOWN_COMMAND=/usr/sbin/chown
-CHGRP_COMMAND=/usr/sbin/chgrp
-MV_COMMAND=/bin/mv
-RM_COMMAND=/bin/rm
-PERL_COMMAND=/usr/local/bin/perl
+INFO_DIRECTORY=XX_PREFIX_XX/info
 
 
 # The compress command is used by the exicyclog script to compress old log
@@ -87,7 +101,7 @@ COMPRESS_SUFFIX=gz
 # location of all other runtime files and directories can be changed in the
 # runtime configuration file.
 
-CONFIGURE_FILE=/usr/local/etc/exim/configure
+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
 
 
 # In some installations there may be multiple machines sharing file systems,
@@ -140,26 +154,26 @@ DIRECTOR_SMARTUSER=yes
 # determines the mode of the created directory. The default value in the
 # source is 0750.
 
-DB_DIRECTORY_MODE=0750
+# DB_DIRECTORY_MODE=0750
 
 
 # Database file mode: The mode of files created in the "db" directory defaults
 # to 0640 in the source, and can be changed here.
 
-DB_MODE=0640
+# DB_MODE=0640
 
 
 # Database lock file mode: The mode of zero-length files created in the "db"
 # directory to use for locking purposes defaults to 0640 in the source, and
 # can be changed here.
 
-DB_LOCKFILE_MODE=0640
+# DB_LOCKFILE_MODE=0640
 
 
 # Cycling log files: this variable specifies the maximum number of old
 # log files that are kept by the exicyclog log-cycling script.
 
-EXICYCLOG_MAX=7
+EXICYCLOG_MAX=10
 
 
 # Running Exim not as root: A uid and gid for Exim can be specified here. These
@@ -196,14 +210,14 @@ EXIM_MONITOR=eximon.bin
 # the SMTP port, start off a header line, and then just pump junk for ever
 # at it. The default is 8192.
 
-HEADER_MAXLENGTH=8192
+# HEADER_MAXLENGTH=8192
 
 
 # The mode of the input directory: The input directory is where messages are
 # kept while awaiting delivery. Exim creates it if necessary, using a mode
 # which can be defined here (default 0750).
 
-INPUT_DIRECTORY_MODE=0750
+# INPUT_DIRECTORY_MODE=0750
 
 
 # Exim log directory and files: Exim creates several log files inside a
@@ -244,14 +258,17 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # LOG_MODE=0640
 
 
-# Included file and database lookup methods. DBM and lsearch (linear search)
+# Included file and database lookup methods. See the manual chapter entitled
+# "File and database lookups" for discussion. DBM and lsearch (linear search)
 # are included by default. LOOKUP_DNSDB does *not* refer to general mail
 # routing using the DNS. It is for the specialist case of using the DNS as
-# a general database facility (not common).
+# a general database facility (not common). For details of cdb files and the
+# tools to build them, see http://www.pobox.com/~djb/cdb.html.
 
 LOOKUP_DBM=yes
 LOOKUP_LSEARCH=yes
 
+# LOOKUP_CDB=yes
 # LOOKUP_DNSDB=yes
 # LOOKUP_LDAP=yes
 # LOOKUP_NIS=yes
@@ -272,7 +289,7 @@ LOOKUP_LSEARCH=yes
 # transports for returning data to a message's sender (see the "return_output"
 # option for transports).
 
-MSGLOG_DIRECTORY_MODE=0750
+# MSGLOG_DIRECTORY_MODE=0750
 
 
 # Identifying the daemon: When an Exim daemon starts up, it writes its pid to
@@ -285,7 +302,7 @@ MSGLOG_DIRECTORY_MODE=0750
 # the file name, allowing sites that run two separate daemons to distinguish
 # them. Some installations may want something like this
 
-PID_FILE_PATH=/var/run/exim%s.pid
+# PID_FILE_PATH=/var/lock/exim%s.pid
 
 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
 # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
@@ -350,7 +367,7 @@ SPOOL_DIRECTORY=/var/spool/exim
 # If Exim creates the spool directory, it is given this mode, defaulting in the
 # source to 0750.
 
-SPOOL_DIRECTORY_MODE=0750
+# SPOOL_DIRECTORY_MODE=0750
 
 
 # The mode of files on the input spool which hold the contents of message can
@@ -359,7 +376,7 @@ SPOOL_DIRECTORY_MODE=0750
 # member of the Exim group, change the value to 0640. This is particularly
 # relevant if you are going to run the Exim monitor.
 
-SPOOL_MODE=0600
+# SPOOL_MODE=0600
 
 
 # If STDERR_FILE is defined then the -df command line option causes Exim to
@@ -369,6 +386,14 @@ SPOOL_MODE=0600
 # STDERR_FILE=
 
 
+# The appendfile transport can write messages as individual files in a number
+# of formats. The code for two specialist formats, maildir and mailstore,
+# is included only when requested by the following settings:
+
+# SUPPORT_MAILDIR=yes
+# SUPPORT_MAILSTORE=yes
+
+
 # Included transports: These variables determine which individual transport
 # drivers are included in the Exim binary. There are no defaults; those that
 # are wanted must be defined here by setting the appropriate variables to the
@@ -389,4 +414,9 @@ TRANSPORT_SMTP=yes
 
 # TRANSPORT_DEBUG=
 
+
+# TCP wrappers:
+
+# USE_TCP_WRAPPERS=yes
+
 # End of EDITME
diff --git a/mail/exim/files/configure.default b/mail/exim/files/configure.default
new file mode 100644
index 000000000000..962fb9579aca
--- /dev/null
+++ b/mail/exim/files/configure.default
@@ -0,0 +1,328 @@
+######################################################################
+#                  Runtime configuration file for Exim               #
+######################################################################
+
+
+# This is a default configuration file which will operate correctly in
+# uncomplicated installations. Please see the manual for a complete list
+# of all the runtime configuration options that can be included in a
+# configuration file.
+
+
+# This file is divided into several parts, all but the last of which are
+# terminated by a line containing the word "end". The parts must appear
+# in the correct order, and all must be present (even if some of them are
+# in fact empty). Blank lines, and lines starting with # are ignored.
+
+
+
+######################################################################
+#                    MAIN CONFIGURATION SETTINGS                     #
+######################################################################
+
+# Specify your host's canonical name here. If this option is not set, the
+# uname() function is called to obtain the name.
+
+# primary_hostname =
+
+
+# Specify the domain you want to be added to all unqualified addresses
+# here. Unqualified addresses are accepted only from local callers by
+# default. See the receiver_unqualified_{hosts,nets} options if you want
+# to permit unqualified addresses from remote sources. If this option is
+# not set, the primary_hostname value is used for qualification.
+
+# qualify_domain =
+
+
+# If you want unqualified recipient addresses to be qualified with a different
+# domain to unqualified sender addresses, specify the recipient domain here.
+# If this option is not set, the qualify_domain value is used.
+
+# qualify_recipient =
+
+
+# Specify your local domains as a colon-separated list here. If this option
+# is not set (i.e. not mentioned in the configuration file), the
+# qualify_recipient value is used as the only local domain. If you do not want
+# to do any local deliveries, uncomment the following line, but do not supply
+# any data for it. This sets local_domains to an empty string, which is not
+# the same as not mentioning it at all. An empty string specifies that there
+# are no local domains; not setting it at all causes the default value (the
+# setting of qualify_recipient) to be used.
+
+# local_domains =
+
+
+# If you want to accept mail addressed to your host's literal IP address, for
+# example, mail addressed to "user@[111.111.111.111]", then uncomment the
+# following line, or supply the literal domain(s) as part of "local_domains"
+# above.
+
+# local_domains_include_host_literals
+
+
+# No local deliveries will ever be run under the uids of these users (a colon-
+# separated list). An attempt to do so gets changed so that it runs under the
+# uid of "nobody" instead. This is a paranoic safety catch. Note the default
+# setting means you cannot deliver mail addressed to root as if it were a
+# normal user. This isn't usually a problem, as most sites have an alias for
+# root that redirects such mail to a human administrator.
+
+exim_user = bin
+exim_group = mail
+never_users = root
+
+
+# The setting below causes Exim to do a reverse DNS lookup on all incoming
+# IP calls, in order to get the true host name. If you feel this is too
+# expensive, you can specify the networks for which a lookup is done, or
+# remove the setting entirely.
+
+host_lookup_nets = 0.0.0.0/0
+
+
+# Exim contains support for the Realtime Blocking List (RBL) that is being
+# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
+# Uncommenting the following line will make Exim reject mail from any
+# host whose IP address is blacklisted in the RBL at maps.vix.com.
+
+# rbl_domains = rbl.maps.vix.com
+
+
+# The setting below locks out the use of your host as a mail relay by any
+# other host. If you want to permit relaying through your host from certain
+# hosts or IP networks, you need to vary this option and/or make use of the
+# other three options in the set sender_{host,net}_{accept,reject}_relay.
+# See the section of the manual entitled "Control of relaying" for more info.
+# Removing this setting altogether is not recommended, because there are many
+# unscrupulous people out there who will make use of open relays to try to
+# disguise the source of unsolicited bulk mail.
+
+sender_host_accept_relay = localhost
+
+
+# If you want Exim to support the "percent hack" for all your local domains,
+# uncomment the following line. This is the feature by which mail addressed
+# to x%y@z (where z is one of your local domains) is locally rerouted to
+# x@y and sent on. Otherwise x%y is treated as an ordinary local part.
+
+# percent_hack_domains=*
+
+pid_file_path = /var/run/exim%s.pid
+
+
+end
+
+
+
+######################################################################
+#                      TRANSPORTS CONFIGURATION                      #
+######################################################################
+#                       ORDER DOES NOT MATTER                        #
+#     Only one appropriate transport is called for each delivery.    #
+######################################################################
+
+# A transport is used only when referenced from a director or a router that
+# successfully handles an address.
+
+
+# This transport is used for delivering messages over SMTP connections.
+
+remote_smtp:
+  driver = smtp
+
+
+# This transport is used for local delivery to user mailboxes. By default
+# it will be run under the uid and gid of the local user, and requires
+# the sticky bit to be set on the /var/mail directory. Some systems use
+# the alternative approach of running mail deliveries under a particular
+# group instead of using the sticky bit. The commented options below show
+# how this can be done.
+
+local_delivery:
+  driver = appendfile
+  file = /var/mail/${local_part}
+  delivery_date_add
+  envelope_to_add
+  return_path_add
+  group = mail
+  mode = 0660
+
+
+# This transport is used for handling pipe addresses generated by alias
+# or .forward files. It has a conventional name, since it is not actually
+# mentioned elsewhere in this configuration file. (A different name *can*
+# be specified via the "address_pipe_transport" option if you really want
+# to.) If the pipe generates any standard output, it is returned to the sender
+# of the message as a delivery error. Set return_fail_output instead if you
+# want this to happen only when the pipe fails to complete normally.
+
+address_pipe:
+  driver = pipe
+  return_output
+
+
+# This transport is used for handling file addresses generated by alias
+# or .forward files. It has a conventional name, since it is not actually
+# mentioned elsewhere in this configuration file.
+
+address_file:
+  driver = appendfile
+  delivery_date_add
+  envelope_to_add
+  return_path_add
+
+
+# This transport is used for handling file addresses generated by alias
+# or .forward files if the path ends in "/", which causes it to be treated
+# as a directory name rather than a file name. Each message is then delivered
+# to a unique file in the directory. If instead you want all such deliveries to
+# be in the "maildir" format that is used by some other mail software,
+# uncomment the final option below. If this is done, the directory specified
+# in the .forward or alias file is the base maildir directory.
+#
+# Should you want to be able to specify either maildir or non-maildir
+# directory-style deliveries, then you must set up yet another transport,
+# called address_directory2. This is used if the path ends in "//" so should
+# be the one used for maildir, as the double slash suggests another level
+# of directory. In the absence of address_directory2, paths ending in //
+# are passed to address_directory.
+
+address_directory:
+  driver = appendfile
+  delivery_date_add
+  envelope_to_add
+  return_path_add
+  no_from_hack
+  prefix = ""
+  suffix = ""
+# maildir_format
+
+
+# This transport is used for handling autoreplies generated by the filtering
+# option of the forwardfile director. It has a conventional name, since it
+# is not actually mentioned elsewhere in this configuration file.
+
+address_reply:
+  driver = autoreply
+
+
+end
+
+
+
+######################################################################
+#                      DIRECTORS CONFIGURATION                       #
+#             Specifies how local addresses are handled              #
+######################################################################
+#                          ORDER DOES MATTER                         #
+#   A local address is passed to each in turn until it is accepted.  #
+######################################################################
+
+# Local addresses are those with a domain that matches some item in the
+# "local_domains" setting above, or those which are passed back from the
+# routers because of a "self=local" setting (not used in this configuration).
+
+
+# This director handles aliasing using a traditional /etc/aliases file.
+# If any of your aliases expand to pipes or files, you will need to set
+# up a user and a group for these deliveries to run under. You can do
+# this by uncommenting the "user" option below (changing the user name
+# as appropriate) and adding a "group" option if necessary.
+
+system_aliases:
+  driver = aliasfile
+  file = /etc/aliases
+  search_type = lsearch
+# user = bin
+
+
+# This director handles forwarding using traditional .forward files.
+# If you want it also to allow mail filtering when a forward file
+# starts with the string "# Exim filter", uncomment the "filter" option.
+# The check_ancestor option means that if the forward file generates an
+# address that is an ancestor of the current one, the current one gets
+# passed on instead. This covers the case where A is aliased to B and B
+# has a .forward file pointing to A.
+
+userforward:
+  driver = forwardfile
+  file = .forward
+  no_verify
+  check_ancestor
+# filter
+
+
+# This director matches local user mailboxes.
+
+localuser:
+  driver = localuser
+  transport = local_delivery
+
+
+end
+
+
+
+######################################################################
+#                      ROUTERS CONFIGURATION                         #
+#            Specifies how remote addresses are handled              #
+######################################################################
+#                          ORDER DOES MATTER                         #
+#  A remote address is passed to each in turn until it is accepted.  #
+######################################################################
+
+# Remote addresses are those with a domain that does not match any item
+# in the "local_domains" setting above.
+
+
+# This router routes to remote hosts over SMTP using a DNS lookup with
+# default options.
+
+lookuphost:
+  driver = lookuphost
+  transport = remote_smtp
+
+
+# This router routes to remote hosts over SMTP by explicit IP address,
+# given as a "domain literal" in the form [nnn.nnn.nnn.nnn]. The RFCs
+# require this facility, which is why it is enabled by default in Exim.
+# If you want to lock it out, set forbid_domain_literals in the main
+# configuration section above.
+
+literal:
+  driver = ipliteral
+  transport = remote_smtp
+
+
+end
+
+
+
+######################################################################
+#                      RETRY CONFIGURATION                           #
+######################################################################
+
+# This single retry rule applies to all domains and all errors. It specifies
+# retries every 15 minutes for 2 hours, then increasing retry intervals,
+# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# hours, then retries every 8 hours until 4 days have passed since the first
+# failed delivery.
+
+# Domain               Error       Retries
+# ------               -----       -------
+
+*                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
+
+end
+
+
+
+######################################################################
+#                      REWRITE CONFIGURATION                         #
+######################################################################
+
+# There are no rewriting specifications in this default configuration file.
+
+# End of Exim configuration file
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index 5a81897caf5d..f7f0fdb4e1c0 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.orig	Wed Apr 29 10:55:08 1998
-+++ scripts/exim_install	Thu May 21 16:14:48 1998
+--- scripts/exim_install.orig	Mon Aug  3 12:27:33 1998
++++ scripts/exim_install	Wed Oct  7 11:49:23 1998
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -51,10 +51,12 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -179,12 +198,39 @@
+@@ -179,23 +198,44 @@
    fi
  done
  
+-# If there is no configuration file, install the default,
+-# building the lib directory if necessary.
 +echo $com ""
 +echo $com Installation directory is ${INFO_DIRECTORY}
 +echo $com ""
@@ -63,31 +65,48 @@
 +    makeinfo --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" \
++    install-info --section="Exim" \
++        --entry "* 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
 +    echo ${CP} exim.info ${INFO_DIRECTORY}
 +    ${real} ${CP} exim.info ${INFO_DIRECTORY}
-+    install-info --section="EXIM" \
++    install-info --section="Exim" \
 +        --entry "* User guide: (exim).           Exim manual" \
 +        ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
 +    makeinfo --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" \
++    install-info --section="Exim" \
++        --entry "* Filtering: (exim_filter).     Filtering mail with Exim" \
 +        ${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
 +fi
 +
- # If there is no configuration file, install the default,
- # building the lib directory if necessary.
++# Install a sample configuration file
  
  echo $com ""
  
- if [ ! -f ${CONFIGURE_FILE} ]; then
-+  echo mkdir -p `dirname ${CONFIGURE_FILE}`
-+  ${real} mkdir -p `dirname ${CONFIGURE_FILE}`
-   echo $com Installing default configuration in ${CONFIGURE_FILE}
-   echo $com because there is no existing configuration file.
-   echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
+-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}
+-  if [ $? -ne 0 ]; then
+-    echo $com ""
+-    echo $com "**** Exim installation ${ver}failed ****"
+-    exit 1
+-  fi
+-else
+-  echo $com Configuration file ${CONFIGURE_FILE} already exists
++echo mkdir -p `dirname ${CONFIGURE_FILE}`
++${real} mkdir -p `dirname ${CONFIGURE_FILE}`
++echo $com Installing a sample configuration in ${CONFIGURE_FILE}.sample
++echo ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
++${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
++if [ $? -ne 0 ]; then
++  echo $com ""
++  echo $com "**** Exim installation ${ver}failed ****"
++  exit 1
+ fi
+ 
+ echo $com ""
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 096d9111c863..0038be5ae940 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -11,7 +11,7 @@ sbin/exicyclog
 sbin/exigrep
 sbin/eximstats
 sbin/exiqsumm
-etc/exim/configure
+etc/exim/configure.sample
 @unexec install-info --delete %D/info/exim_overview.info %D/info/dir
 @unexec install-info --delete %D/info/exim.info %D/info/dir
 @unexec install-info --delete %D/info/exim_filter.info %D/info/dir
@@ -19,6 +19,6 @@ info/exim_overview.info
 info/exim.info
 info/exim_filter.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/exim_overview.info %D/info/dir
-@exec install-info %D/info/exim.info %D/info/dir
-@exec install-info %D/info/exim_filter.info %D/info/dir
+@exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
+@exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
+@exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir