Upgrade to 2.054 (Testing release!).

Patches incorporated by the author were removed. One new patch created
to prevent core dumps when running non-listening queue-runners.

Handle the difference in BINOWN between stable (bin) and current (root),
obviating the need for an INSTALL script.

Don't install shell script "place-holders" for eximon when built without
USE_XLIB, just touch the files for package-friendliness. Graceful.

Improve out-of-the-box relay handling; localhost symoblic name was weak,
use private subnet numerical net instead.

Submitted by:	maintainer

4 files changed, 37 insertions, 125 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index c7e01a9f753a..6ed86d410098 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,38 +1,43 @@
 # New ports collection makefile for:	exim
-# Version required:	2.053
+# Version required:	2.054
 # Date created:		23 June 1996
-# Whom:			axl@iafrica.com
+# Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.22 1998/11/28 05:38:56 asami Exp $
+# $Id: Makefile,v 1.23 1998/11/29 12:21:58 asami Exp $
 #
 
-DISTNAME=	exim-2.053
+DISTNAME=	exim-2.054
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.quite.net/pub/exim/Testing/ \
-		http://www.exim.org/ftp/Testing/ \
 		ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/Testing/ \
+		http://www.exim.org/ftp/Testing/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/Testing/
-DISTFILES=	exim-testing-2.053.tar.gz exim-texinfo-2.00.tar.gz
+DISTFILES=	exim-testing-2.054.tar.gz exim-texinfo-2.00.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
+# If USE_XLIB is defined, the eximon monitor, which requires X, will be
+# built.
 USE_XLIB=	YES
+
 USE_PERL5=	YES
 
 do-configure:
 	${MKDIR} ${WRKSRC}/Local
-	if [ -d ${X11BASE} ] ; then \
-		${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
-		    < ${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
+.if defined(USE_XLIB)
+	${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
+	    < ${FILESDIR}/Makefile \
+	    > ${WRKSRC}/Local/Makefile
+.else
+	${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
+	    -e "s/^EXIM_MONITOR/#EXIM_MONITOR/" \
+	    < ${FILESDIR}/Makefile \
+	    > ${WRKSRC}/Local/Makefile
+.endif
+
 	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	${CP} ${FILESDIR}/configure.default ${WRKSRC}/src
+	${SED} -e "s#XX_BINOWN_XX#${BINOWN}#" \
+	    < ${FILESDIR}/configure.default > ${WRKSRC}/src/configure.default
 	cd ${WRKSRC}/doc && \
 	for i in ../../exim-texinfo-2.00/doc/* ; do \
 		ln -sf $$i ; \
@@ -40,14 +45,12 @@ do-configure:
 
 post-build:
 	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${WRKSRC}/build-FreeBSD-i386
+	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon.bin
+	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon
 
 pre-install:
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} ${PERL5} ${PKGDIR}/INSTALL \
-	    exim-2.053 POST-INSTALL
-
 .include <bsd.port.mk>
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index 3f337debf45a..a9de942845e6 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-testing-2.053.tar.gz) = 22c6b0f8553c1df5e25a6c2690680796
+MD5 (exim-testing-2.054.tar.gz) = 559653b34a40039ea5f03ace48dffcda
 MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
diff --git a/mail/exim-devel/files/configure.default b/mail/exim-devel/files/configure.default
index 962fb9579aca..6548c319e057 100644
--- a/mail/exim-devel/files/configure.default
+++ b/mail/exim-devel/files/configure.default
@@ -99,7 +99,7 @@ host_lookup_nets = 0.0.0.0/0
 # 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
+sender_net_accept_relay = 127.0.0.1/32
 
 
 # If you want Exim to support the "percent hack" for all your local domains,
diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa
index f75b135d69dd..3dc16f46f560 100644
--- a/mail/exim-devel/files/patch-aa
+++ b/mail/exim-devel/files/patch-aa
@@ -1,33 +1,15 @@
---- scripts/exim_install.orig	Mon Nov  9 19:01:40 1998
-+++ scripts/exim_install	Wed Nov 18 13:22:51 1998
-@@ -121,18 +121,4 @@
- fi
- 
--# 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 @@
- 
+--- scripts/exim_install.orig	Tue Dec  8 16:05:07 1998
++++ scripts/exim_install	Tue Dec  8 16:09:49 1998
+@@ -186,25 +186,39 @@
+   fi
+ done
  
 +# 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.
 +
 +echo $com ""
-+
+ 
 +if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
 +  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
 +else
@@ -41,10 +23,9 @@
 +    exit 1
 +  fi
 +fi
-+
  
- # If there is no configuration file, install the default,
-@@ -208,9 +214,8 @@
+ # If there is no configuration file, install the default.
+ 
  echo $com ""
  
 -if [ ! -f ${CONFIGURE_FILE} ]; then
@@ -58,84 +39,12 @@
 +  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
    if [ $? -ne 0 ]; then
      echo $com ""
-@@ -218,44 +223,44 @@
+     echo $com "**** Exim installation ${ver}failed ****"
      exit 1
    fi
 -else
 -  echo $com Configuration file ${CONFIGURE_FILE} already exists
 -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 ""
-+  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 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
+ # Install info files if the directory is defined and the Texinfo
+ # source documentation is present.