Upgrade to 1.70. (Lotsa bug fixes, improved macros, improved filtering)

21 files changed, 330 insertions, 144 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index b844be9dd884..6957671c7d91 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,24 +1,27 @@
 # New ports collection makefile for:	exim
-# Version required:	1.60
+# Version required:	1.61
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1996/12/01 07:12:08 markm Exp $
+# $Id: Makefile,v 1.8 1997/02/26 13:45:02 markm Exp $
 #
 
-DISTNAME=	exim-1.60
+DISTNAME=	exim-1.70
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-1.60.tar.gz exim-texinfo-1.60.tar.gz
+DISTFILES=	exim-1.70.tar.gz exim-texinfo-1.70.tar.gz
+
+PATCH_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
+PATCHFILES=	exim-1.70.patches
 
 MAINTAINER=	markm@FreeBSD.ORG
 
 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.60/doc/* ; do \
+	@${MKDIR} ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	@(cd ${WRKSRC}/doc ; \
+	for i in ../../exim-texinfo-1.70/doc/* ; do \
 		ln -sf $$i ; \
 	done )
 
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index d31932d6b3ec..8fc4e1fa4e8f 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
-MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
+MD5 (exim-1.70.tar.gz) = f2c71bb01595c3d0bcd060e5b0e8910e
+MD5 (exim-texinfo-1.70.tar.gz) = 47c705fa36cf7a179131c009f4ff2bd9
+MD5 (exim-1.70.patches) = b5f298db52e25b7248594e7ecf4f98be
diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile
index 43498e492bda..30c94d5a832b 100644
--- a/mail/exim-devel/files/Makefile
+++ b/mail/exim-devel/files/Makefile
@@ -7,6 +7,14 @@
 # be edited and then saved to a file called Local/Makefile before first running
 # the make command.
 
+# Blank lines and lines starting with # are ignored. It is also permitted to
+# use the # character to add a comment to a setting, for example
+#
+# EXIM_GID=42   # the "mail" group
+#
+# Consequently, it is not possible to have the # character present in any
+# setting, but I can't think of any cases where this would be wanted.
+
 # Things that depend on the operating system have default settings in files
 # called OS/Makefile-<osname>. These can be overridden by creating files
 # called Local/Makefile-<osname>. In particular, the location of the X11
@@ -16,9 +24,22 @@
 # and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which
 # are overridden for some operating systems in the OS/Makefile-<osname> file.
 # If these are not right for you, put appropriate settings into a file called
-# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of
+# Local/Makefile-<osname>. In all cases "<osname>" stands for the name of
 # your operating system - look at the names in the OS directory to see which
-# names are recognized.]
+# names are recognized.
+
+# Another area of variability between systems is the type and location of the
+# dbm library package. Exim has support for ndbm, gdbm, and Berkeley db. By
+# 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.
+
+# See also the file doc/dbm.discuss.txt for discussion about different dbm
+# libraries.
 ###############################################################################
 
 
@@ -38,6 +59,16 @@ BIN_DIRECTORY=/usr/local/sbin
 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.
+
+# CHOWN_COMMAND=/usr/bin/chown
+# CHGRP_COMMAND=/usr/bin/chgrp
+# MV_COMMAND=/bin/mv
+# RM_COMMAND=/bin/rm
+
+
 # The compress command is used by the exicyclog script to compress old log
 # files. Both the name of the command and the suffix that it adds to files
 # need to be defined here. See also the EXICYCLOG_MAX configuration.
@@ -108,14 +139,6 @@ DIRECTOR_SMARTUSER=yes
 # DB_DIRECTORY_MODE=0750
 
 
-# Database locking: When trying to obtain a lock on one of its database files,
-# there is a limit to the number of retries (default 10) and a time between
-# retries (default 5 seconds). These can be altered here.
-
-# DB_LOCK_RETRIES=10
-# DB_LOCK_SLEEP=5
-
-
 # Database file mode: The mode of files created in the "db" directory defaults
 # to 0640 in the source, and can be changed here.
 
@@ -130,9 +153,9 @@ EXICYCLOG_MAX=10
 
 # Running Exim not as root: A uid and gid for Exim can be specified here. These
 # are compiled into the binary, but can be changed by settings in the runtime
-# configuration file. The default in the code is -1, which means "unset" -
-# i.e. run as root unless specified otherwise at run time. Specifying 0 at
-# run time has the effect of unsetting any configured values.
+# configuration file. If EXIM_UID is not defined, the default in the code is to
+# run as root unless specified otherwise at run time. Specifying 0 at
+# run time has the effect of unsetting the values build into the binary.
 
 # The settings here must be numeric; the run time file allows names to
 # be used. When this uid and gid are set, the Exim binary still has to be
@@ -140,10 +163,10 @@ EXICYCLOG_MAX=10
 # 25 is to be run, but it gives up its privilege when possible. There is a
 # trade-off between security and efficiency, controlled by the runtime
 # "security" setting, which controls how privilege is released (setuid vs
-# seteuid). The default value of -1 here means "unset".
+# seteuid).
 
-# EXIM_GID=-1
-# EXIM_UID=-1
+# EXIM_UID=
+# EXIM_GID=
 
 
 # Compiling the Exim monitor: If you want to compile the Exim monitor,
@@ -188,11 +211,17 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # EXIM_GID above, then that uid and gid must be able to create files in the
 # directory you have specified.
 
+# You do not have to define the log file path here; an option in the runtime
+# configuration file can also set it, and that overrides any setting here.
+# However, it is recommended that you set it here if it is a fixed path, so
+# that it is available right from the start of Exim's execution. Otherwise,
+# errors detected early on, for example errors in the configuration file,
+# cannot be logged.
 
-# If you do not set LOG_FILE_PATH, then Exim creates a directory called
-# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that
-# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but
-# that can be changed here.
+# If you do not set LOG_FILE_PATH here or in the runtime configuration, Exim
+# creates a directory called "log" inside its spool directory (see
+# SPOOL_DIRECTORY below) and uses that with filenames "mainlog", "paniclog",
+# etc. Its mode defaults to 0750 but that can be changed here.
 
 # LOG_DIRECTORY_MODE=0750
 
@@ -238,6 +267,10 @@ PID_FILE_PATH=/var/run/exim%s.pid
 # create and write to the files. If the attempt to open the file fails, Exim
 # just refrains from trying to write the data.
 
+# The pid file path does not have to be set here; it can be also be set by an
+# option in the runtime configuration file, which takes precedence over any
+# setting here.
+
 
 # Included routers: These variables determine which individual router drivers
 # are included in the Exim binary. There are no defaults; those that are
@@ -260,17 +293,25 @@ ROUTER_QUERYPROGRAM=yes
 
 # The spool directory: This directory is where all the data for messages in
 # transit is kept. There is no default in the source, so its location must be
-# defined in a local configuration file. Exim creates it if it does not exist,
-# using the mode required for the sub-directory that it is trying to create at
-# the time. If a non-root uid and gid have been defined for Exim (either in
-# this configuration file, or by the runtime configuration options), then this
-# directory and all sub-directories and their files will be created with their
-# owners and groups set to Exim's uid and gid.
-
-# Many installations will want something like this
+# defined in a local configuration file, or in the runtime configuration. It
+# is recommended that you define it here if it is a fixed path, especially if
+# you have not defined LOG_FILE_PATH. Log files are then written in a sub-
+# directory of the spool directory, and it is helpful to have this defined
+# right from the start of execution so that, for example, errors in reading
+# the runtime configuration file can be logged.
+
+# Exim creates the spool directory if it does not exist, using the mode
+# required for the sub-directory that it is trying to create at the time. If a
+# non-root uid and gid have been defined for Exim (either in this configuration
+# file, or by the runtime configuration options), then this directory and all
+# sub-directories and their files will be created with their owners and groups
+# set to Exim's uid and gid.
+
+# Many installations will want something like this:
 # SPOOL_DIRECTORY=/var/spool/exim
 
-# Others may prefer to keep all Exim things under one directory
+# Others may prefer to keep all Exim things under one directory:
+# SPOOL_DIRECTORY=/usr/exim/spool
 
 SPOOL_DIRECTORY=/var/spool/exim
 
diff --git a/mail/exim-devel/files/eximon.conf b/mail/exim-devel/files/eximon.conf
index 236bfbb2b853..5f9e20dc6426 100644
--- a/mail/exim-devel/files/eximon.conf
+++ b/mail/exim-devel/files/eximon.conf
@@ -90,6 +90,11 @@
 
 # QUEUE_INTERVAL=300
 
+# The size of the popup text window that is used for looking at the
+# contents of messages, etc.
+
+# TEXT_DEPTH=200
+
 # The keystroke/mouse-operation that is used to pop up the menu in the
 # queue window is configurable. The default is Shift with the lefthand
 # mouse button. The name of an alternative can be specified in the standard
@@ -116,6 +121,12 @@
 
 # ACTION_QUEUE_UPDATE=yes
 
+# When the menu item to display a message's body is invoked, the amount
+# of data is limited to BODY_MAX bytes. This limit is a safety precaution
+# to save the screen scrolling for ever on an enormous message.
+
+# BODY_MAX=20000
+
 # The stripcharts are updated every STRIPCHART_INTERVAL seconds.
 
 # STRIPCHART_INTERVAL=60
@@ -168,7 +179,7 @@
 # LOG_STRIPCHARTS='/ <= /in/
 #                  / => /out/
 #                  / => .+ D=/local/
-#                  / => .+ T=smtp/smtp/'
+#                  / => .+ T=[^ ]*smtp/smtp/'
 
 # The following variable may be set to the name of a disc partition. If
 # it is, a stripchart showing the percentage fullness of the partition
diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa
index 123517f32a26..3fcf8c16a004 100644
--- a/mail/exim-devel/files/patch-aa
+++ b/mail/exim-devel/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
-+++ scripts/exim_install	Wed Feb 26 15:17:09 1997
+--- scripts/exim_install.orig	Thu Aug 21 16:48:58 1997
++++ scripts/exim_install	Fri Aug 29 15:22:04 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -12,9 +12,9 @@
 @@ -65,10 +67,12 @@
  fi
  
- BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99`
-+INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99`
- CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99`
+ BIN_DIRECTORY=`grep "^ *BIN_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c15-99`
++INFO_DIRECTORY=`grep "^ *INFO_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
+ CONFIGURE_FILE=`grep "^ *CONFIGURE_FILE=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
  
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,30 @@
+@@ -167,12 +186,30 @@
    fi
  done
  
diff --git a/mail/exim-devel/pkg-descr b/mail/exim-devel/pkg-descr
index 591d2c48a225..5ab3f4fe30b2 100644
--- a/mail/exim-devel/pkg-descr
+++ b/mail/exim-devel/pkg-descr
@@ -15,4 +15,3 @@ Exim is a mail transfer agent for Unix systems connected to the Internet.
      are very good.
 
  .   Its requeuing and retry algorithms are very powerful.
-
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
index 15320d7afc08..b06b574934ca 100644
--- a/mail/exim-devel/pkg-plist
+++ b/mail/exim-devel/pkg-plist
@@ -11,6 +11,13 @@ sbin/exicyclog
 sbin/exigrep
 sbin/eximstats
 etc/exim/configure
+@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
 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
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index b844be9dd884..6957671c7d91 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,24 +1,27 @@
 # New ports collection makefile for:	exim
-# Version required:	1.60
+# Version required:	1.61
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1996/12/01 07:12:08 markm Exp $
+# $Id: Makefile,v 1.8 1997/02/26 13:45:02 markm Exp $
 #
 
-DISTNAME=	exim-1.60
+DISTNAME=	exim-1.70
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-1.60.tar.gz exim-texinfo-1.60.tar.gz
+DISTFILES=	exim-1.70.tar.gz exim-texinfo-1.70.tar.gz
+
+PATCH_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
+PATCHFILES=	exim-1.70.patches
 
 MAINTAINER=	markm@FreeBSD.ORG
 
 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.60/doc/* ; do \
+	@${MKDIR} ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	@(cd ${WRKSRC}/doc ; \
+	for i in ../../exim-texinfo-1.70/doc/* ; do \
 		ln -sf $$i ; \
 	done )
 
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index d31932d6b3ec..8fc4e1fa4e8f 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,3 @@
-MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
-MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
+MD5 (exim-1.70.tar.gz) = f2c71bb01595c3d0bcd060e5b0e8910e
+MD5 (exim-texinfo-1.70.tar.gz) = 47c705fa36cf7a179131c009f4ff2bd9
+MD5 (exim-1.70.patches) = b5f298db52e25b7248594e7ecf4f98be
diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile
index 43498e492bda..30c94d5a832b 100644
--- a/mail/exim-old/files/Makefile
+++ b/mail/exim-old/files/Makefile
@@ -7,6 +7,14 @@
 # be edited and then saved to a file called Local/Makefile before first running
 # the make command.
 
+# Blank lines and lines starting with # are ignored. It is also permitted to
+# use the # character to add a comment to a setting, for example
+#
+# EXIM_GID=42   # the "mail" group
+#
+# Consequently, it is not possible to have the # character present in any
+# setting, but I can't think of any cases where this would be wanted.
+
 # Things that depend on the operating system have default settings in files
 # called OS/Makefile-<osname>. These can be overridden by creating files
 # called Local/Makefile-<osname>. In particular, the location of the X11
@@ -16,9 +24,22 @@
 # and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which
 # are overridden for some operating systems in the OS/Makefile-<osname> file.
 # If these are not right for you, put appropriate settings into a file called
-# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of
+# Local/Makefile-<osname>. In all cases "<osname>" stands for the name of
 # your operating system - look at the names in the OS directory to see which
-# names are recognized.]
+# names are recognized.
+
+# Another area of variability between systems is the type and location of the
+# dbm library package. Exim has support for ndbm, gdbm, and Berkeley db. By
+# 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.
+
+# See also the file doc/dbm.discuss.txt for discussion about different dbm
+# libraries.
 ###############################################################################
 
 
@@ -38,6 +59,16 @@ BIN_DIRECTORY=/usr/local/sbin
 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.
+
+# CHOWN_COMMAND=/usr/bin/chown
+# CHGRP_COMMAND=/usr/bin/chgrp
+# MV_COMMAND=/bin/mv
+# RM_COMMAND=/bin/rm
+
+
 # The compress command is used by the exicyclog script to compress old log
 # files. Both the name of the command and the suffix that it adds to files
 # need to be defined here. See also the EXICYCLOG_MAX configuration.
@@ -108,14 +139,6 @@ DIRECTOR_SMARTUSER=yes
 # DB_DIRECTORY_MODE=0750
 
 
-# Database locking: When trying to obtain a lock on one of its database files,
-# there is a limit to the number of retries (default 10) and a time between
-# retries (default 5 seconds). These can be altered here.
-
-# DB_LOCK_RETRIES=10
-# DB_LOCK_SLEEP=5
-
-
 # Database file mode: The mode of files created in the "db" directory defaults
 # to 0640 in the source, and can be changed here.
 
@@ -130,9 +153,9 @@ EXICYCLOG_MAX=10
 
 # Running Exim not as root: A uid and gid for Exim can be specified here. These
 # are compiled into the binary, but can be changed by settings in the runtime
-# configuration file. The default in the code is -1, which means "unset" -
-# i.e. run as root unless specified otherwise at run time. Specifying 0 at
-# run time has the effect of unsetting any configured values.
+# configuration file. If EXIM_UID is not defined, the default in the code is to
+# run as root unless specified otherwise at run time. Specifying 0 at
+# run time has the effect of unsetting the values build into the binary.
 
 # The settings here must be numeric; the run time file allows names to
 # be used. When this uid and gid are set, the Exim binary still has to be
@@ -140,10 +163,10 @@ EXICYCLOG_MAX=10
 # 25 is to be run, but it gives up its privilege when possible. There is a
 # trade-off between security and efficiency, controlled by the runtime
 # "security" setting, which controls how privilege is released (setuid vs
-# seteuid). The default value of -1 here means "unset".
+# seteuid).
 
-# EXIM_GID=-1
-# EXIM_UID=-1
+# EXIM_UID=
+# EXIM_GID=
 
 
 # Compiling the Exim monitor: If you want to compile the Exim monitor,
@@ -188,11 +211,17 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # EXIM_GID above, then that uid and gid must be able to create files in the
 # directory you have specified.
 
+# You do not have to define the log file path here; an option in the runtime
+# configuration file can also set it, and that overrides any setting here.
+# However, it is recommended that you set it here if it is a fixed path, so
+# that it is available right from the start of Exim's execution. Otherwise,
+# errors detected early on, for example errors in the configuration file,
+# cannot be logged.
 
-# If you do not set LOG_FILE_PATH, then Exim creates a directory called
-# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that
-# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but
-# that can be changed here.
+# If you do not set LOG_FILE_PATH here or in the runtime configuration, Exim
+# creates a directory called "log" inside its spool directory (see
+# SPOOL_DIRECTORY below) and uses that with filenames "mainlog", "paniclog",
+# etc. Its mode defaults to 0750 but that can be changed here.
 
 # LOG_DIRECTORY_MODE=0750
 
@@ -238,6 +267,10 @@ PID_FILE_PATH=/var/run/exim%s.pid
 # create and write to the files. If the attempt to open the file fails, Exim
 # just refrains from trying to write the data.
 
+# The pid file path does not have to be set here; it can be also be set by an
+# option in the runtime configuration file, which takes precedence over any
+# setting here.
+
 
 # Included routers: These variables determine which individual router drivers
 # are included in the Exim binary. There are no defaults; those that are
@@ -260,17 +293,25 @@ ROUTER_QUERYPROGRAM=yes
 
 # The spool directory: This directory is where all the data for messages in
 # transit is kept. There is no default in the source, so its location must be
-# defined in a local configuration file. Exim creates it if it does not exist,
-# using the mode required for the sub-directory that it is trying to create at
-# the time. If a non-root uid and gid have been defined for Exim (either in
-# this configuration file, or by the runtime configuration options), then this
-# directory and all sub-directories and their files will be created with their
-# owners and groups set to Exim's uid and gid.
-
-# Many installations will want something like this
+# defined in a local configuration file, or in the runtime configuration. It
+# is recommended that you define it here if it is a fixed path, especially if
+# you have not defined LOG_FILE_PATH. Log files are then written in a sub-
+# directory of the spool directory, and it is helpful to have this defined
+# right from the start of execution so that, for example, errors in reading
+# the runtime configuration file can be logged.
+
+# Exim creates the spool directory if it does not exist, using the mode
+# required for the sub-directory that it is trying to create at the time. If a
+# non-root uid and gid have been defined for Exim (either in this configuration
+# file, or by the runtime configuration options), then this directory and all
+# sub-directories and their files will be created with their owners and groups
+# set to Exim's uid and gid.
+
+# Many installations will want something like this:
 # SPOOL_DIRECTORY=/var/spool/exim
 
-# Others may prefer to keep all Exim things under one directory
+# Others may prefer to keep all Exim things under one directory:
+# SPOOL_DIRECTORY=/usr/exim/spool
 
 SPOOL_DIRECTORY=/var/spool/exim
 
diff --git a/mail/exim-old/files/eximon.conf b/mail/exim-old/files/eximon.conf
index 236bfbb2b853..5f9e20dc6426 100644
--- a/mail/exim-old/files/eximon.conf
+++ b/mail/exim-old/files/eximon.conf
@@ -90,6 +90,11 @@
 
 # QUEUE_INTERVAL=300
 
+# The size of the popup text window that is used for looking at the
+# contents of messages, etc.
+
+# TEXT_DEPTH=200
+
 # The keystroke/mouse-operation that is used to pop up the menu in the
 # queue window is configurable. The default is Shift with the lefthand
 # mouse button. The name of an alternative can be specified in the standard
@@ -116,6 +121,12 @@
 
 # ACTION_QUEUE_UPDATE=yes
 
+# When the menu item to display a message's body is invoked, the amount
+# of data is limited to BODY_MAX bytes. This limit is a safety precaution
+# to save the screen scrolling for ever on an enormous message.
+
+# BODY_MAX=20000
+
 # The stripcharts are updated every STRIPCHART_INTERVAL seconds.
 
 # STRIPCHART_INTERVAL=60
@@ -168,7 +179,7 @@
 # LOG_STRIPCHARTS='/ <= /in/
 #                  / => /out/
 #                  / => .+ D=/local/
-#                  / => .+ T=smtp/smtp/'
+#                  / => .+ T=[^ ]*smtp/smtp/'
 
 # The following variable may be set to the name of a disc partition. If
 # it is, a stripchart showing the percentage fullness of the partition
diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa
index 123517f32a26..3fcf8c16a004 100644
--- a/mail/exim-old/files/patch-aa
+++ b/mail/exim-old/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
-+++ scripts/exim_install	Wed Feb 26 15:17:09 1997
+--- scripts/exim_install.orig	Thu Aug 21 16:48:58 1997
++++ scripts/exim_install	Fri Aug 29 15:22:04 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -12,9 +12,9 @@
 @@ -65,10 +67,12 @@
  fi
  
- BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99`
-+INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99`
- CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99`
+ BIN_DIRECTORY=`grep "^ *BIN_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c15-99`
++INFO_DIRECTORY=`grep "^ *INFO_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
+ CONFIGURE_FILE=`grep "^ *CONFIGURE_FILE=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
  
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,30 @@
+@@ -167,12 +186,30 @@
    fi
  done
  
diff --git a/mail/exim-old/pkg-descr b/mail/exim-old/pkg-descr
index 591d2c48a225..5ab3f4fe30b2 100644
--- a/mail/exim-old/pkg-descr
+++ b/mail/exim-old/pkg-descr
@@ -15,4 +15,3 @@ Exim is a mail transfer agent for Unix systems connected to the Internet.
      are very good.
 
  .   Its requeuing and retry algorithms are very powerful.
-
diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist
index 15320d7afc08..b06b574934ca 100644
--- a/mail/exim-old/pkg-plist
+++ b/mail/exim-old/pkg-plist
@@ -11,6 +11,13 @@ sbin/exicyclog
 sbin/exigrep
 sbin/eximstats
 etc/exim/configure
+@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
 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
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index b844be9dd884..6957671c7d91 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,24 +1,27 @@
 # New ports collection makefile for:	exim
-# Version required:	1.60
+# Version required:	1.61
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1996/12/01 07:12:08 markm Exp $
+# $Id: Makefile,v 1.8 1997/02/26 13:45:02 markm Exp $
 #
 
-DISTNAME=	exim-1.60
+DISTNAME=	exim-1.70
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-1.60.tar.gz exim-texinfo-1.60.tar.gz
+DISTFILES=	exim-1.70.tar.gz exim-texinfo-1.70.tar.gz
+
+PATCH_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
+PATCHFILES=	exim-1.70.patches
 
 MAINTAINER=	markm@FreeBSD.ORG
 
 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.60/doc/* ; do \
+	@${MKDIR} ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	@(cd ${WRKSRC}/doc ; \
+	for i in ../../exim-texinfo-1.70/doc/* ; do \
 		ln -sf $$i ; \
 	done )
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index d31932d6b3ec..8fc4e1fa4e8f 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,3 @@
-MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
-MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
+MD5 (exim-1.70.tar.gz) = f2c71bb01595c3d0bcd060e5b0e8910e
+MD5 (exim-texinfo-1.70.tar.gz) = 47c705fa36cf7a179131c009f4ff2bd9
+MD5 (exim-1.70.patches) = b5f298db52e25b7248594e7ecf4f98be
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index 43498e492bda..30c94d5a832b 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -7,6 +7,14 @@
 # be edited and then saved to a file called Local/Makefile before first running
 # the make command.
 
+# Blank lines and lines starting with # are ignored. It is also permitted to
+# use the # character to add a comment to a setting, for example
+#
+# EXIM_GID=42   # the "mail" group
+#
+# Consequently, it is not possible to have the # character present in any
+# setting, but I can't think of any cases where this would be wanted.
+
 # Things that depend on the operating system have default settings in files
 # called OS/Makefile-<osname>. These can be overridden by creating files
 # called Local/Makefile-<osname>. In particular, the location of the X11
@@ -16,9 +24,22 @@
 # and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which
 # are overridden for some operating systems in the OS/Makefile-<osname> file.
 # If these are not right for you, put appropriate settings into a file called
-# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of
+# Local/Makefile-<osname>. In all cases "<osname>" stands for the name of
 # your operating system - look at the names in the OS directory to see which
-# names are recognized.]
+# names are recognized.
+
+# Another area of variability between systems is the type and location of the
+# dbm library package. Exim has support for ndbm, gdbm, and Berkeley db. By
+# 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.
+
+# See also the file doc/dbm.discuss.txt for discussion about different dbm
+# libraries.
 ###############################################################################
 
 
@@ -38,6 +59,16 @@ BIN_DIRECTORY=/usr/local/sbin
 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.
+
+# CHOWN_COMMAND=/usr/bin/chown
+# CHGRP_COMMAND=/usr/bin/chgrp
+# MV_COMMAND=/bin/mv
+# RM_COMMAND=/bin/rm
+
+
 # The compress command is used by the exicyclog script to compress old log
 # files. Both the name of the command and the suffix that it adds to files
 # need to be defined here. See also the EXICYCLOG_MAX configuration.
@@ -108,14 +139,6 @@ DIRECTOR_SMARTUSER=yes
 # DB_DIRECTORY_MODE=0750
 
 
-# Database locking: When trying to obtain a lock on one of its database files,
-# there is a limit to the number of retries (default 10) and a time between
-# retries (default 5 seconds). These can be altered here.
-
-# DB_LOCK_RETRIES=10
-# DB_LOCK_SLEEP=5
-
-
 # Database file mode: The mode of files created in the "db" directory defaults
 # to 0640 in the source, and can be changed here.
 
@@ -130,9 +153,9 @@ EXICYCLOG_MAX=10
 
 # Running Exim not as root: A uid and gid for Exim can be specified here. These
 # are compiled into the binary, but can be changed by settings in the runtime
-# configuration file. The default in the code is -1, which means "unset" -
-# i.e. run as root unless specified otherwise at run time. Specifying 0 at
-# run time has the effect of unsetting any configured values.
+# configuration file. If EXIM_UID is not defined, the default in the code is to
+# run as root unless specified otherwise at run time. Specifying 0 at
+# run time has the effect of unsetting the values build into the binary.
 
 # The settings here must be numeric; the run time file allows names to
 # be used. When this uid and gid are set, the Exim binary still has to be
@@ -140,10 +163,10 @@ EXICYCLOG_MAX=10
 # 25 is to be run, but it gives up its privilege when possible. There is a
 # trade-off between security and efficiency, controlled by the runtime
 # "security" setting, which controls how privilege is released (setuid vs
-# seteuid). The default value of -1 here means "unset".
+# seteuid).
 
-# EXIM_GID=-1
-# EXIM_UID=-1
+# EXIM_UID=
+# EXIM_GID=
 
 
 # Compiling the Exim monitor: If you want to compile the Exim monitor,
@@ -188,11 +211,17 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # EXIM_GID above, then that uid and gid must be able to create files in the
 # directory you have specified.
 
+# You do not have to define the log file path here; an option in the runtime
+# configuration file can also set it, and that overrides any setting here.
+# However, it is recommended that you set it here if it is a fixed path, so
+# that it is available right from the start of Exim's execution. Otherwise,
+# errors detected early on, for example errors in the configuration file,
+# cannot be logged.
 
-# If you do not set LOG_FILE_PATH, then Exim creates a directory called
-# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that
-# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but
-# that can be changed here.
+# If you do not set LOG_FILE_PATH here or in the runtime configuration, Exim
+# creates a directory called "log" inside its spool directory (see
+# SPOOL_DIRECTORY below) and uses that with filenames "mainlog", "paniclog",
+# etc. Its mode defaults to 0750 but that can be changed here.
 
 # LOG_DIRECTORY_MODE=0750
 
@@ -238,6 +267,10 @@ PID_FILE_PATH=/var/run/exim%s.pid
 # create and write to the files. If the attempt to open the file fails, Exim
 # just refrains from trying to write the data.
 
+# The pid file path does not have to be set here; it can be also be set by an
+# option in the runtime configuration file, which takes precedence over any
+# setting here.
+
 
 # Included routers: These variables determine which individual router drivers
 # are included in the Exim binary. There are no defaults; those that are
@@ -260,17 +293,25 @@ ROUTER_QUERYPROGRAM=yes
 
 # The spool directory: This directory is where all the data for messages in
 # transit is kept. There is no default in the source, so its location must be
-# defined in a local configuration file. Exim creates it if it does not exist,
-# using the mode required for the sub-directory that it is trying to create at
-# the time. If a non-root uid and gid have been defined for Exim (either in
-# this configuration file, or by the runtime configuration options), then this
-# directory and all sub-directories and their files will be created with their
-# owners and groups set to Exim's uid and gid.
-
-# Many installations will want something like this
+# defined in a local configuration file, or in the runtime configuration. It
+# is recommended that you define it here if it is a fixed path, especially if
+# you have not defined LOG_FILE_PATH. Log files are then written in a sub-
+# directory of the spool directory, and it is helpful to have this defined
+# right from the start of execution so that, for example, errors in reading
+# the runtime configuration file can be logged.
+
+# Exim creates the spool directory if it does not exist, using the mode
+# required for the sub-directory that it is trying to create at the time. If a
+# non-root uid and gid have been defined for Exim (either in this configuration
+# file, or by the runtime configuration options), then this directory and all
+# sub-directories and their files will be created with their owners and groups
+# set to Exim's uid and gid.
+
+# Many installations will want something like this:
 # SPOOL_DIRECTORY=/var/spool/exim
 
-# Others may prefer to keep all Exim things under one directory
+# Others may prefer to keep all Exim things under one directory:
+# SPOOL_DIRECTORY=/usr/exim/spool
 
 SPOOL_DIRECTORY=/var/spool/exim
 
diff --git a/mail/exim/files/eximon.conf b/mail/exim/files/eximon.conf
index 236bfbb2b853..5f9e20dc6426 100644
--- a/mail/exim/files/eximon.conf
+++ b/mail/exim/files/eximon.conf
@@ -90,6 +90,11 @@
 
 # QUEUE_INTERVAL=300
 
+# The size of the popup text window that is used for looking at the
+# contents of messages, etc.
+
+# TEXT_DEPTH=200
+
 # The keystroke/mouse-operation that is used to pop up the menu in the
 # queue window is configurable. The default is Shift with the lefthand
 # mouse button. The name of an alternative can be specified in the standard
@@ -116,6 +121,12 @@
 
 # ACTION_QUEUE_UPDATE=yes
 
+# When the menu item to display a message's body is invoked, the amount
+# of data is limited to BODY_MAX bytes. This limit is a safety precaution
+# to save the screen scrolling for ever on an enormous message.
+
+# BODY_MAX=20000
+
 # The stripcharts are updated every STRIPCHART_INTERVAL seconds.
 
 # STRIPCHART_INTERVAL=60
@@ -168,7 +179,7 @@
 # LOG_STRIPCHARTS='/ <= /in/
 #                  / => /out/
 #                  / => .+ D=/local/
-#                  / => .+ T=smtp/smtp/'
+#                  / => .+ T=[^ ]*smtp/smtp/'
 
 # The following variable may be set to the name of a disc partition. If
 # it is, a stripchart showing the percentage fullness of the partition
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index 123517f32a26..3fcf8c16a004 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
-+++ scripts/exim_install	Wed Feb 26 15:17:09 1997
+--- scripts/exim_install.orig	Thu Aug 21 16:48:58 1997
++++ scripts/exim_install	Fri Aug 29 15:22:04 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -12,9 +12,9 @@
 @@ -65,10 +67,12 @@
  fi
  
- BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99`
-+INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99`
- CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99`
+ BIN_DIRECTORY=`grep "^ *BIN_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c15-99`
++INFO_DIRECTORY=`grep "^ *INFO_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
+ CONFIGURE_FILE=`grep "^ *CONFIGURE_FILE=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
  
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,30 @@
+@@ -167,12 +186,30 @@
    fi
  done
  
diff --git a/mail/exim/pkg-descr b/mail/exim/pkg-descr
index 591d2c48a225..5ab3f4fe30b2 100644
--- a/mail/exim/pkg-descr
+++ b/mail/exim/pkg-descr
@@ -15,4 +15,3 @@ Exim is a mail transfer agent for Unix systems connected to the Internet.
      are very good.
 
  .   Its requeuing and retry algorithms are very powerful.
-
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 15320d7afc08..b06b574934ca 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -11,6 +11,13 @@ sbin/exicyclog
 sbin/exigrep
 sbin/eximstats
 etc/exim/configure
+@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
 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