6 files changed, 131 insertions, 104 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index cc4ab55637c0..da014238bb1a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	exim
-# Version required:	2.05
+# Version required:	2.053
 # Date created:		23 June 1996
 # Whom:			axl@iafrica.com
 #
-# $Id: Makefile,v 1.17 1998/10/12 18:48:52 jseger Exp $
+# $Id: Makefile,v 1.18 1998/10/13 04:16:21 jseger Exp $
 #
 
-DISTNAME=	exim-2.05
+DISTNAME=	exim-2.053
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
-DISTFILES=	exim-2.05.tar.gz exim-texinfo-2.00.tar.gz
+MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/Testing/
+DISTFILES=	exim-testing-2.053.tar.gz exim-texinfo-2.00.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
@@ -17,13 +17,14 @@ USE_PERL5=	YES
 
 do-configure:
 	${MKDIR} ${WRKSRC}/Local
-	if [ ! -d ${X11BASE} ] ; then \
+	if [ -d ${X11BASE} ] ; then \
 		${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
-		    < ${FILESDIR}/Makefile.no_eximon \
+		    < ${FILESDIR}/Makefile \
 		    > ${WRKSRC}/Local/Makefile ; \
 	else \
 		${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
 		    < ${FILESDIR}/Makefile \
+		    | ${SED} -e "s/^EXIM_MONITOR/#EXIM_MONITOR/" \
 		    > ${WRKSRC}/Local/Makefile ; \
 	fi
 	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
@@ -34,13 +35,10 @@ do-configure:
 	done
 
 post-build:
-	if [ ! -d ${X11BASE} ] ; then \
-		${INSTALL_SCRIPT} ${FILESDIR}/eximon ${FILESDIR}/eximon.bin \
-		    ${WRKSRC}/build-FreeBSD-i386 ; \
-	fi
+	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${WRKSRC}/build-FreeBSD-i386
 
 post-install:
 	@${SETENV} ${SCRIPTS_ENV} ${PERL5} ${PKGDIR}/INSTALL \
-	    exim-2.02 POST-INSTALL
+	    exim-2.053 POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index bb4732130394..3f337debf45a 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-2.05.tar.gz) = 4e67bbc2c4889b500f611b828986917e
+MD5 (exim-testing-2.053.tar.gz) = 22c6b0f8553c1df5e25a6c2690680796
 MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index 07e6066e2acf..bace824bee8a 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -101,7 +101,7 @@ COMPRESS_SUFFIX=gz
 # location of all other runtime files and directories can be changed in the
 # runtime configuration file.
 
-CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure.sample
 
 
 # In some installations there may be multiple machines sharing file systems,
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
new file mode 100644
index 000000000000..af298538e310
--- /dev/null
+++ b/mail/exim/files/exim.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+args='-bd -q30m'
+[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index f7f0fdb4e1c0..26f5d7479738 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -1,112 +1,137 @@
---- 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.
- 
-+# This script also installs a .info file in INFO_DIRECTORY if required.
-+
- # The script can be made to output what it would do, without actually doing
- # anything, by giving it the option "-n" (cf make). Arguments are the names
- # of things to install. No arguments installs everything.
-@@ -65,10 +67,12 @@
+--- scripts/exim_install.orig	Mon Nov  9 19:01:40 1998
++++ scripts/exim_install	Thu Nov 12 15:26:57 1998
+@@ -121,18 +121,4 @@
  fi
  
- 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`
+-# If info directory is needed and doesn't exist, try to create it
+-
+-if [ "${INFO_DIRECTORY}" != "" -a ! -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
+ 
+@@ -202,4 +188,24 @@
  
- # Allow INST_xx to over-ride xx
- case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
-+case "$INST_INFO_DIRECTORY" in ?*) INFO_DIRECTORY="$INST_INFO_DIRECTORY";; esac
- case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
- case "$INST_UID"   in '') INST_UID=root;; *) INST_UID="$INST_UID";; esac
- case "$INST_CP"    in '') CP=cp;;         *) CP="$INST_CP";; esac
-@@ -79,6 +83,7 @@
- # Allow the user to over-ride xx
- case "$inst_dest"  in ?*) BIN_DIRECTORY="$inst_dest";; esac
- case "$inst_conf"  in ?*) CONFIGURE_FILE="$inst_conf";; esac
-+case "$inst_info"  in ?*) INFO_DIRECTORY="$inst_info";; esac
- case "$inst_uid"   in ?*) INST_UID="$inst_uid";; esac
- case "$inst_cp"    in ?*) CP="$inst_cp";; esac
- case "$inst_mv"    in ?*) MV="$inst_mv";; esac
-@@ -113,6 +118,20 @@
-   fi
- fi
  
-+# If info directory doesn't exist, try to create it
++# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that
++# exim will start up on boot once sendmail is disabled and
++# ${PREFIX}/etc/exim/configure is in place.
 +
-+if [ ! -d ${INFO_DIRECTORY} ]; then
-+  echo mkdir -p ${INFO_DIRECTORY}
-+  ${real} mkdir -p ${INFO_DIRECTORY}
++echo $com ""
++
++if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
++  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
++else
++  echo $com "Installing exim.sh startup script in $PREFIX/etc/rc.d"
++  ${real} mkdir -p ${PREFIX}/etc/rc.d
++  echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
++  ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
 +  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
-@@ -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 ""
-+
-+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
 +
-+# Install a sample configuration file
  
+ # If there is no configuration file, install the default,
+@@ -208,7 +214,6 @@
  echo $com ""
  
 -if [ ! -f ${CONFIGURE_FILE} ]; then
 -  echo $com Installing default configuration in ${CONFIGURE_FILE}
 -  echo $com because there is no existing configuration file.
--  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
--  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
--  if [ $? -ne 0 ]; then
--    echo $com ""
--    echo $com "**** Exim installation ${ver}failed ****"
--    exit 1
--  fi
++  echo $com Installing sample configuration file
++  ${real} mkdir -p ${CONFIGURE_FILE%/*}
+   echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
+   ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
+@@ -218,44 +223,44 @@
+     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
+-fi
+ 
+-# Install info files if required; the existence of the directory is
+-# tested above.
++# Install info files if the directory is defined and the Texinfo
++# source documentation is present.
+ 
+-##### This enhancement is awaiting a shell equivalent of FreeBSD's
+-##### 'install-info' command.
++if [ "${INFO_DIRECTORY}" != "" -a -f ../doc/spec.texinfo ] ; then
 +  echo $com ""
-+  echo $com "**** Exim installation ${ver}failed ****"
-+  exit 1
- fi
++  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
  
- echo $com ""
++  echo $com Info installation directory is ${INFO_DIRECTORY}
++  echo $com ""
+ 
+-# if [ "${INFO_DIRECTORY}" != "" ] ; then
+-#   echo $com ""
+-#   echo $com Info 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
+-#   else
+-#     echo $com "**** Texinfo documentation not found in doc directory ****"
+-#     exit 1
+-#   fi
+-# fi
++  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
+ 
+ # Everything OK
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 359e55b70b33..08eab00d0d2b 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -12,6 +12,7 @@ sbin/exigrep
 sbin/eximstats
 sbin/exiqsumm
 etc/exim/configure.sample
+etc/rc.d/exim.sh
 @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