update to exim-2.12; peter.galbavy@knowledge.com

mail/exim/Makefile

@@ -1,25 +1,39 @@
-# OpenBSD makefile for: exim 
+# $OpenBSD: Makefile,v 1.4 1999/03/31 22:39:43 marc Exp $
-# Version required: 	1.71 
-# Date created: 	10 Nov 1997
-# Whom: 		ejovi  
-#
-# $OpenBSD: Makefile,v 1.3 1997/12/31 11:34:26 tacho Exp $
 #
 
-DISTNAME=	exim-1.82
+DISTNAME=	exim-2.12
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-1.82.tar.gz exim-texinfo-1.80.tar.gz
 
-MAINTAINER=	joey@OpenBSD.ORG
+MAINTAINER=	peter.galbavy@knowledge.com
+
+MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
+DISTFILES=	exim-2.12.tar.gz exim-texinfo-2.10.tar.gz
 
 do-configure:
 	@${MKDIR} ${WRKSRC}/Local
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
-	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+#	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
 	@(cd ${WRKSRC}/doc ; \
-	for i in ../../exim-texinfo-1.71/doc/* ; do \
+	for i in ../../exim-texinfo-2.10/doc/* ; do \
 		ln -sf $$i ; \
 	done )
 
+pre-install:
+	${INSTALL} -d /etc/exim
+	${INSTALL} -d /var/log/exim
+
+post-install:
+	@echo "EXIM is installed. You must now edit /etc/exim/configure"
+	@echo "and set the correct values for your system."
+	@echo
+	@echo "It is strongly advised that you configure exim to use"
+	@echo "a UID and GID other that 0/0. You can do this by adding"
+	@echo "lines to the configure file like this:"
+	@echo
+	@echo "\texim_user = \"nobody\""
+	@echo "\texim_group = \"nogroup\""
+	@echo
+	@echo "but you must remember to allow that user write"
+	@echo "permissions to /var/log/exim and /var/spool/exim"
+
 .include <bsd.port.mk>

mail/exim/files/Makefile

@@ -7,42 +7,83 @@
 # 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
+# Things that depend on the operating system have default settings in
-# use the # character to add a comment to a setting, for example
+# OS/Makefile-Default, but these are overridden for some OS by files called
-#
+# called OS/Makefile-<osname>. You can further override these by creating files
-# EXIM_GID=42   # the "mail" group
+# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-#
+# operating system - look at the names in the OS directory to see which names
-# Consequently, it is not possible to have the # character present in any
+# are recognized.
-# 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
+# However, if you are building Exim for a single OS only, you can place all the
-# called OS/Makefile-<osname>. These can be overridden by creating files
+# configuration settings in the one file called Local/Makefile; only if you are
-# called Local/Makefile-<osname>. In particular, the location of the X11
+# building for several OS from the same source files do you need to worry
-# libraries is something that is quite variable between different versions
+# about splitting off the OS-dependent settings into separate files.
-# of the same operation system (and indeed there are different versions of
+
-# X11 as well, of course). The three settings concerned here are X11, XINCLUDE,
+# One OS-specific thing is the C compiler; the overall default is gcc, but
-# and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which
+# some OS Makefiles specify cc. You can override anything that is set by
-# are overridden for some operating systems in the OS/Makefile-<osname> file.
+# putting CC=whatever in your Local/Makefile.
-# 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
+# NOTE: You should never need to edit any of the distributed Makefiles; all
-# your operating system - look at the names in the OS directory to see which
+# overriding can be done in your Local/Makefile(s). This will make it easier
-# names are recognized.
+# for you when the next release comes along.
+
+# The location of the X11 libraries is something else that is quite variable
+# even between different versions of the same operation system (and indeed
+# there are different versions of X11 as well, of course). The four settings
+# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
+# (dynamic run-time library).
 
 # 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
+# this is defaulted for some operating systems. The defaults are set in
-# configuration. The defaults are set in OS/Makefile-Default, and can be
+# OS/Makefile-Default, and can be changed by putting things into an OS-specific
-# changed by putting things into an OS-specific Makefile, or indeed into the
+# Makefile, or indeed into the main Local/Makefile if Exim is being compiled
-# main Local/Makefile if Exim is being compiled for a single OS only.
+# for a single OS only.
 
 # See also the file doc/dbm.discuss.txt for discussion about different dbm
 # libraries.
+
+# In Local/Makefiles 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.
 ###############################################################################
 
 
+# /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 unless you set
+# EXIM_PERL (see below) to get it embedded, 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,
@@ -53,22 +94,17 @@
 BIN_DIRECTORY=/usr/local/sbin
 
 
-# The info directory: This variable defines where the exim info file will be
+# The default distribution of Exim contains only the plain text form of the
-# installed by "make install" or "exim_intall".
+# documentation. Other forms are available separately. If you want to install
+# the documentation in "info" format, first fetch the Texinfo documentation
+# sources from the ftp directory and unpack them, which should create files
+# with the extension "texinfo" in the doc directory. Then set INFO_DIRECTORY to
+# your info directory; "make install" will then build the info files and
+# install them there.
 
 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.
@@ -83,7 +119,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=/etc/exim/configure
 
 
 # In some installations there may be multiple machines sharing file systems,
@@ -94,7 +130,7 @@ CONFIGURE_FILE=/usr/local/etc/exim/configure
 # period (for example, /usr/exim/configure.host.in.some.domain. If this file
 # does not exist, then the bare configuration file name is tried.
 
-# CONFIGURE_FILE_USE_NODE=yes
+CONFIGURE_FILE_USE_NODE=yes
 
 
 # In some esoteric configurations two different versions of Exim are run,
@@ -145,6 +181,13 @@ DIRECTOR_SMARTUSER=yes
 # 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
+
+
 # Cycling log files: this variable specifies the maximum number of old
 # log files that are kept by the exicyclog log-cycling script.
 
@@ -177,7 +220,24 @@ EXICYCLOG_MAX=10
 # are defaulted in the OS/Makefile-Default file, and can be overridden
 # in local OS-specific make files.
 
-EXIM_MONITOR=eximon.bin
+# EXIM_MONITOR=eximon.bin
+
+
+# Compiling in support for embedded Perl: If you want to be able to
+# use Perl code in Exim's string manipulation language and you have Perl
+# (version 5.004 or later) installed, set EXIM_PERL to perl.o.
+
+EXIM_PERL=perl.o
+
+
+# There are also three options which are used when compiling the Perl interface
+# and when linking with Perl. The default values for these are placed
+# automatically at the head of the Makefile by the script which builds it.
+# However, if you want to override them, you can do so here.
+
+# PERL_CC=
+# PERL_CCOPTS=
+# PERL_LIBS=
 
 
 # The maximum length of header line that Exim is prepared to process. There
@@ -202,7 +262,7 @@ EXIM_MONITOR=eximon.bin
 # "panic", "process" or "reject" to form the final file name. For example,
 # some installations may want something like this:
 
-LOG_FILE_PATH=/var/log/exim_%slog
+LOG_FILE_PATH=/var/log/exim/%s.log
 
 # which results in files with names /var/log/exim_mainlog, etc. The directory
 # in which the log files are placed must exist; Exim does not try to create
@@ -233,6 +293,29 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # LOG_MODE=0640
 
 
+# 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). 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
+# LOOKUP_NISPLUS=yes
+
+# The TESTDB lookup is for performing tests on the handling of lookup
+# results, and is not useful for general running. It should be included
+# only when debugging the code of Exim.
+
+# LOOKUP_TESTDB=yes
+
+
 # Per-message logs: While a message is in the process of being delivered,
 # comments on its progress are written to a message log, for the benefit of
 # human administrators. These logs are held in a directory called "msglog"
@@ -249,8 +332,10 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # specified here. It must contain precisely one occurrence of "%s". When
 # a daemon is run on the default SMTP port, this is replaced with the null
 # string, but when it is run with some explicit port specified, "%s" is
-# replaced with the port number preceded by a dot. Some installations may
+# replaced with the port number preceded by a dot. If a daemon is run with
-# want something like this
+# only one of -bd and -q<time>, then that option is added on to the end of
+# 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
 
@@ -293,28 +378,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, or in the runtime configuration. It
+# defined in a local compile-time configuration file, or in the runtime
-# is recommended that you define it here if it is a fixed path, especially if
+# configuration. It is recommended (but not mandatory) that you define it here
-# you have not defined LOG_FILE_PATH. Log files are then written in a sub-
+# if it is a fixed path, especially if you have not defined LOG_FILE_PATH. Log
-# directory of the spool directory, and it is helpful to have this defined
+# files are then written in a sub-directory of the spool directory, and it is
-# right from the start of execution so that, for example, errors in reading
+# helpful to have this defined right from the start of execution so that, for
-# the runtime configuration file can be logged.
+# example, errors in reading the runtime configuration file can be logged.
 
-# Exim creates the spool directory if it does not exist, using the mode
+# Exim creates the spool directory if it does not exist. If a non-root uid and
-# required for the sub-directory that it is trying to create at the time. If a
+# gid have been defined for Exim (either in this configuration file, or by the
-# non-root uid and gid have been defined for Exim (either in this configuration
+# runtime configuration options), then this directory and all sub-directories
-# file, or by the runtime configuration options), then this directory and all
+# and their files will be created with their owners and groups set to Exim's
-# sub-directories and their files will be created with their owners and groups
+# uid and gid.
-# set to Exim's uid and gid.
 
 # Many installations will want something like this:
-# SPOOL_DIRECTORY=/var/spool/exim
+SPOOL_DIRECTORY=/var/spool/exim
 
 # Others may prefer to keep all Exim things under one directory:
 # SPOOL_DIRECTORY=/usr/exim/spool
 
-SPOOL_DIRECTORY=/var/spool/exim
-
 
 # If Exim creates the spool directory, it is given this mode, defaulting in the
 # source to 0750.
@@ -338,6 +420,15 @@ SPOOL_DIRECTORY=/var/spool/exim
 # STDERR_FILE=
 
 
+# The appendfile transport can write messages as individual files in a number
+# of formats. The code for three specialist formats, maildir, mailstore, and
+# MBX, is included only when requested by the following settings:
+
+# SUPPORT_MAILDIR=yes
+# SUPPORT_MAILSTORE=yes
+# SUPPORT_MBX=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
@@ -351,11 +442,9 @@ TRANSPORT_AUTOREPLY=yes
 TRANSPORT_PIPE=yes
 TRANSPORT_SMTP=yes
 
-# The Debug transport is special, and should be included only when low-level
-# debugging is being performed. In conjunction with the "debug_transport"
-# configuration option, it permits the subversion of all mail deliveries to
-# a given file.
 
-# TRANSPORT_DEBUG=
+# TCP wrappers:
+
+# USE_TCP_WRAPPERS=yes
 
 # End of EDITME

mail/exim/files/eximon.conf

@@ -1,191 +0,0 @@
-##################################################
-#                The Exim Monitor                #
-##################################################
-
-# This is the template for the Exim monitor's main build-time configuration
-# file. It contains settings that are independent of any operating system. It
-# should be edited and then saved to a file called Local/eximon.conf before
-# running the make command to build the monitor, if any settings are required.
-# Local/eximon.conf can be empty if no changes are needed. The examples given
-# here (commented out) are the default settings.
-
-# Any settings made in the configuration file can be overridden at run time
-# by setting up an environment variable with the same name as any of these
-# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE.
-
-
-##################################################################
-#      Set these variables as appropriate for your system        #
-##################################################################
-
-# The qualifying name for your domain. The only use made of this is for
-# testing that certain addresses are the same when displaying the
-# log tail, and for shortening sender addresses in the queue display.
-
-# QUALIFY_DOMAIN=
-
-# The default minimum width and height for the whole window are 103 and
-# 162 pixels respectively. This is enough to hold the left-most stripchart
-# and the quit button. The values can be changed here.
-
-# MIN_HEIGHT=162
-# MIN_WIDTH=103
-
-# The title for eximon's main display window. It is possible to have
-# host name of the machine you are running on substituted into the
-# title string. If you include the string ${fullhostname} then the
-# complete name is used. If you include ${hostname} then the full
-# host name will have the string contained in the DOMAIN variable
-# stripped from its right-hand end before being substituted. Any other
-# shell or environment variables may also be included.
-
-# If you use any substitutions, remember to ensure that the $ and {}
-# characters are escaped from the shell, e.g. by using single quotes.
-
-# WINDOW_TITLE='${hostname} eximon'
-
-# The domain that you want to be stripped from the machine's full hostname
-# when forming the short host name for the eximon window title, as
-# described above.
-
-# DOMAIN=
-
-# Parameters for the rolling display of the tail of the exim log file.
-# The width and depth are measured in pixels; LOG_BUFFER specifies the
-# amount of store to set aside for holding the log tail, which is displayed
-# in a scrolling window. When this store is full, the earlier 50% of it
-# is discarded - this is much more efficient that throwing it away line
-# by line. The number given can be followed by the letter K to indicate
-# that the value is in kilobytes. A minimum value of 1K is enforced.
-
-# LOG_DEPTH=300
-# LOG_WIDTH=950
-# LOG_BUFFER=20K
-
-# The font which is used in the log tail display. This is defined in
-# the normal X manner. It must be a "character cell" font, because this
-# is required by the text widget.
-
-# LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1
-
-# Parameters for the display of message that are on the exim queue.
-# The width and depth are measured in pixels.
-
-# QUEUE_DEPTH=200
-# QUEUE_WIDTH=950
-
-# The font which is used in the queue display.
-
-# QUEUE_FONT=$LOG_FONT
-
-# When a message has more than one undelivered address, they are listed
-# one below the other. A limit can be placed on the number of addresses
-# displayed for any one message. If there are more, then "..." is used
-# to indicate this.
-
-# QUEUE_MAX_ADDRESSES=10
-
-# The display of the contents of the queue is updated every QUEUE_INTERVAL
-# seconds by default (there is a button to request update).
-
-# 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
-# X way of naming these things. With the default configuration for the monitor,
-# individuals can override this by setting the EXIMON_MENU_EVENT environment
-# variable.
-
-# MENU_EVENT=Shift<Btn1Down>
-
-# When the menu is used to perform an operation on a message, the output
-# from the exim command that is generated is displayed in a separate window
-# by default. Set this option to "no" if you don't want to see the output -
-# the result of the operation is normally visible in the log window in any
-# case. This does not apply to the output generated from attempting to
-# deliver a message. That is always shown.
-
-# ACTION_OUTPUT=yes
-
-# When some action is taken on a message, such as freezing it, or changing
-# its recipients, the queue display is normally automatically updated. On
-# systems that have very large queues, this can take some time and be dis-
-# tracting. If this option is set to "no", the queue display is no longer
-# automatically updated after an action is applied to a message.
-
-# 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
-
-# The following variable contains a specification of which stripcharts
-# you want eximon to display based on log entries. The string consists of
-# pairs of strings, delimited by slash characters. The first string in each
-# pair is a regular expression that matches some distinguishing feature in a
-# exim log entry.
-
-# Entries that match the expression will be counted and displayed in a
-# stripchart whose title is given by the second string. The string may
-# be continued over several input lines, provided that it is split
-# after a slash, and an additional slash (optionally preceded by white
-# space) is included at the start of the continuation line.
-
-# The regular expression syntax supported by eximon is as follows:
-
-# A regular expression is zero or more branches, separated by `|'. It
-# matches anything that matches one of the branches. A branch is zero or
-# more pieces, concatenated. It matches a match for the first, followed by
-# a match for the second, etc. A piece is an atom possibly followed by
-# `*', `+', or `?'.
-#
-# An atom followed by `*' matches a sequence of 0 or more matches of the atom.
-# An atom followed by `+' matches a sequence of 1 or more matches of the atom.
-# An atom followed by `?' matches a match of the atom, or the null string.
-#
-# An atom is a regular expression in parentheses (matching a match for the
-# regular expression), a range (see below), `.' (matching any single
-# character), `^' (matching the null string at the beginning of the input
-# string), `$' (matching the null string at the end of the input string),
-# a `\' followed by a single character (matching that character), or a
-# single character with no other significance (matching that character).
-#
-# A range is a sequence of characters enclosed in `[]'. It normally
-# matches any single character from the sequence. If the sequence begins
-# with `^', it matches any single character not from the rest of the
-# sequence. If two characters in the sequence are separated by `-', this
-# is shorthand for the full list of ASCII characters between them (e.g.
-# `[0-9]' matches any decimal digit). To include a literal `]' in the
-# sequence, make it the first character (following a possible `^'). To
-# include a literal `-', make it the first or last character.
-
-# A stripchart showing the count of messages in the queue is always
-# displayed on the left of eximon's window. Stripcharts configured
-# by this parameter are displayed to its right, in the order defined
-# here.
-
-# LOG_STRIPCHARTS='/ <= /in/
-#                  / => /out/
-#                  / => .+ D=/local/
-#                  / => .+ 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
-# will be displayed as the second stripchart. This can be used to keep
-# a display of a mail spool partition on the screen.
-
-# SIZE_STRIPCHART=/var/mail
-
-# End of exim_monitor/EDITME

mail/exim/files/list

@@ -1 +0,0 @@
-  498953 exim-0.41.tar.gz

mail/exim/files/md5

@@ -1,6 +1,6 @@
-MD5 (exim-1.82.tar.gz) = bb6bd60919899b35de3ee1f3aab7510d
+SHA1 (exim-2.12.tar.gz) = 967633516821410fcd066bd7b7ef8565d25fcb72
-MD5 (exim-texinfo-1.80.tar.gz) = d2ff03a917e8a55d62ec07df7c1c8799
+RMD160 (exim-2.12.tar.gz) = 8bd688bc9d037599d7c7f1ff740f73b46338fd09
-RMD160 (exim-1.82.tar.gz) = fc337aa0d2768cc09e01b62be86c97fd6e368bb8
+MD5 (exim-2.12.tar.gz) = 0fb2147e34752cb84d450b61ac89e3fc
-RMD160 (exim-texinfo-1.80.tar.gz) = 95fcbfe276443ea3d2fa4f39dfc4f610da0e7bff
+SHA1 (exim-texinfo-2.10.tar.gz) = 30432018d0e53cb3dacfd99b26f288082dc558c2
-SHA1 (exim-1.82.tar.gz) = 1b409b250d131f90d9c664657ce2a4c4cd6fe3b9
+RMD160 (exim-texinfo-2.10.tar.gz) = 99c16c19cc562cc06eb1e1a5a17f83bbc43c5d05
-SHA1 (exim-texinfo-1.80.tar.gz) = 3e4af978a87ee13e4f70b7368d6574702d4eac01
+MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c

mail/exim/patches/patch-aa

@@ -1,93 +1,25 @@
---- scripts/exim_install.orig	Tue Sep  9 15:07:22 1997
+--- scripts/exim_install.orig	Fri Feb 26 15:55:44 1999
-+++ scripts/exim_install	Mon Sep 22 15:22:15 1997
++++ scripts/exim_install	Fri Feb 26 15:56:58 1999
-@@ -8,6 +8,8 @@
+@@ -226,19 +226,19 @@
- # This script also installs a default configuration file in CONFIGURE_FILE
+   echo $com Info installation directory is ${INFO_DIRECTORY}
- # if there is no configuration file there.
+   echo $com ""
  
-+# This script also installs a .info file in INFO_DIRECTORY if required.
+-  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
-+
++  makeinfo --force --no-split --output exim_overview.info ../doc/oview.texinfo
- # The script can be made to output what it would do, without actually doing
+   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
- # anything, by giving it the option "-n" (cf make). Arguments are the names
+   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
- # of things to install. No arguments installs everything.
+   install-info --section="Exim" \
-@@ -65,10 +67,12 @@
+       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
- fi
+       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
- 
+-  makeinfo --no-split --output exim.info ../doc/spec.texinfo
- BIN_DIRECTORY=`grep "^ *BIN_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c15-99`
++  makeinfo --force --no-split --output exim.info ../doc/spec.texinfo
-+INFO_DIRECTORY=`grep "^ *INFO_DIRECTORY=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
+   echo ${CP} exim.info ${INFO_DIRECTORY}
- CONFIGURE_FILE=`grep "^ *CONFIGURE_FILE=" $files | tail -1 | cut -f2-99 -d: | cut -c16-99`
+   ${real} ${CP} exim.info ${INFO_DIRECTORY}
- 
+   install-info --section="Exim" \
- # Allow INST_xx to over-ride xx
+       --entry "* User guide: (exim).           Exim manual" \
- case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
+       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
-+case "$INST_INFO_DIRECTORY" in ?*) INFO_DIRECTORY="$INST_INFO_DIRECTORY";; esac
+-  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
- case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
++  makeinfo --force --no-split --output exim_filter.info ../doc/filter.texinfo
- case "$INST_CP" in '') CP=cp;; *) CP="$INST_CP";; esac
+   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
- case "$INST_MV" in '') MV=mv;; *) MV="$INST_MV";; esac
+   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
-@@ -76,6 +80,7 @@
+   install-info --section="Exim" \
- 
- # Allow the user to over-ride xx
- case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac
-+case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac
- case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac
- case "$inst_cp"   in ?*) CP="$inst_cp";; esac
- case "$inst_mv"   in ?*) MV="$inst_mv";; esac
-@@ -101,6 +106,20 @@
-   fi
- fi
- 
-+# If info directory doesn't exist, try to create it
-+
-+if [ ! -d ${INFO_DIRECTORY} ]; then
-+  echo mkdir -p ${INFO_DIRECTORY}
-+  ${real} mkdir -p ${INFO_DIRECTORY}
-+  if [ $? -ne 0 ]; then
-+    echo $com ""
-+    echo $com "**** Exim installation ${ver}failed ****"
-+    exit 1
-+  else
-+    echo $com ${INFO_DIRECTORY} created
-+  fi
-+fi              
-+
- # If no arguments, install everything
- 
- if [ $# -gt 0 ]; then
-@@ -167,12 +186,39 @@
-   fi
- done
- 
-+echo $com ""
-+echo $com Installation directory is ${INFO_DIRECTORY}
-+echo $com ""
-+
-+if [ -f ../doc/spec.texinfo ]; then
-+    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" \
-+        ${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" \
-+        --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" \
-+        ${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
-+fi
-+
- # If there is no configuration file, install the default,
- # building the lib directory if necessary.
- 
- 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}

mail/exim/patches/patch-ab

@@ -1,11 +0,0 @@
---- scripts/Configure-eximon.orig	Mon Nov 10 13:35:16 1997
-+++ scripts/Configure-eximon	Mon Nov 10 13:35:27 1997
-@@ -8,7 +8,7 @@
- 
- # First off, get the OS type, and check that there is a make file for it.
- 
--os=`$scripts/os-type` || exit 1
-+os=`uname -s` || exit 1
- 
- if	test ! -r ../OS/Makefile-$os
- then    echo ""

mail/exim/patches/patch-ac

@@ -1,11 +0,0 @@
---- scripts/Configure-makefile.orig	Mon Nov 10 13:33:19 1997
-+++ scripts/Configure-makefile	Mon Nov 10 13:33:03 1997
-@@ -8,7 +8,7 @@
- 
- # First off, get the OS type, and check that there is a make file for it.
- 
--os=`$scripts/os-type` || exit 1
-+os=`uname -s` || exit 1
- 
- if	test ! -r ../OS/Makefile-$os
- then    echo ""

mail/exim/patches/patch-ad

@@ -1,11 +0,0 @@
---- scripts/Configure-os.h.orig	Mon Nov 10 13:33:19 1997
-+++ scripts/Configure-os.h	Mon Nov 10 13:33:03 1997
-@@ -8,7 +8,7 @@
- 
- # First off, get the OS type, and check that there is a make file for it.
- 
--os=`$scripts/os-type` || exit 1
-+os=`uname -s` || exit 1
- 
- if	test ! -r ../OS/Makefile-$os
- then    echo ""

mail/exim/patches/patch-ae

@@ -1,11 +0,0 @@
---- scripts/Configure-os.c.orig	Mon Nov 10 13:33:19 1997
-+++ scripts/Configure-os.c	Mon Nov 10 13:33:03 1997
-@@ -8,7 +8,7 @@
- 
- # First off, get the OS type, and check that there is a make file for it.
- 
--os=`$scripts/os-type` || exit 1
-+os=`uname -s` || exit 1
- 
- if	test ! -r ../OS/Makefile-$os
- then    echo ""

mail/exim/pkg/PLIST

@@ -1,6 +1,4 @@
 sbin/exim
-sbin/eximon
-sbin/eximon.bin
 sbin/exim_dumpdb
 sbin/exim_fixdb
 sbin/exim_tidydb
@@ -10,14 +8,18 @@ sbin/exim_dbmbuild
 sbin/exicyclog
 sbin/exigrep
 sbin/eximstats
-etc/exim/configure
+sbin/exiqsumm
+sbin/exim_lock
 @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
+/etc/exim/configure
 @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 [ -d /etc/exim ] || install -d /etc/exim
+@exec [ -f /etc/exim/configure ] || install -m 644 %D/src/configure.default /etc/exim/configure