From db9a6e2020b23ef7df4dc62e4aa8be1c53d0c131 Mon Sep 17 00:00:00 2001
From: krion <krion@FreeBSD.org>
Date: Thu, 4 May 2006 19:25:37 +0000
Subject: Update to 4.62.

---
 mail/exim/Makefile                        |  4 ++--
 mail/exim/distinfo                        |  6 +++---
 mail/exim/files/patch-OS_Makefile-FreeBSD | 14 --------------
 mail/exim/files/patch-src_acl.c           | 28 ----------------------------
 4 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 mail/exim/files/patch-OS_Makefile-FreeBSD
 delete mode 100644 mail/exim/files/patch-src_acl.c

(limited to 'mail')

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 88d706602ca7..7ea0d1e72dbf 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
@@ -28,7 +28,7 @@ MASTER_SITE_SUBDIR+=	sa-exim/:sa_exim
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 .endif
 
-EXIM_VERSION=	4.61
+EXIM_VERSION=	4.62
 SA_EXIM_VERSION=4.2
 
 IGNOREFILES=	FAQ.txt.bz2
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index bc5017acfbed..5efee3bf8241 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,6 +1,6 @@
-MD5 (exim/exim-4.61.tar.bz2) = f6bbf99a6f63c0f5045a1779e7e810c4
-SHA256 (exim/exim-4.61.tar.bz2) = e14ce72e125d9765a042ea52ba0859052118432c9df3d5ac068d80b12b2e0889
-SIZE (exim/exim-4.61.tar.bz2) = 1574711
+MD5 (exim/exim-4.62.tar.bz2) = a8efc92427192fd3b7b5e71decc8cc31
+SHA256 (exim/exim-4.62.tar.bz2) = b5438894807c560a7933af36d10b2951f890aece9bff14c95fe2b91b0398629b
+SIZE (exim/exim-4.62.tar.bz2) = 1577729
 MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a
 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
diff --git a/mail/exim/files/patch-OS_Makefile-FreeBSD b/mail/exim/files/patch-OS_Makefile-FreeBSD
deleted file mode 100644
index da023a3735b4..000000000000
--- a/mail/exim/files/patch-OS_Makefile-FreeBSD
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- OS/Makefile-FreeBSD.orig
-+++ OS/Makefile-FreeBSD
-@@ -12,7 +12,7 @@
- HAVE_SA_LEN=YES
- 
- # crypt() is in a separate library
--LIBS=-lcrypt -lm
-+LIBS=-lcrypt -lm -lutil
- 
- # FreeBSD always ships with Berkeley DB
- USE_DB=yes
diff --git a/mail/exim/files/patch-src_acl.c b/mail/exim/files/patch-src_acl.c
deleted file mode 100644
index d025a47dbb26..000000000000
--- a/mail/exim/files/patch-src_acl.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/acl.c.orig	Tue Apr  4 16:00:04 2006
-+++ src/acl.c	Wed Apr  5 20:39:34 2006
-@@ -1,4 +1,4 @@
--/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
-+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
- 
- /*************************************************
- *     Exim - an Internet mail transport agent    *
-@@ -202,8 +202,8 @@
- checking functions. */
- 
- static uschar cond_expand_at_top[] = {
--  TRUE,    /* add_header */
-   TRUE,    /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
-@@ -260,8 +260,8 @@
- /* Flags to identify the modifiers */
- 
- static uschar cond_modifiers[] = {
--  TRUE,    /* add_header */
-   FALSE,   /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
-- 
cgit