From be9155ac37152fe5dd40c156968f26da4d45f965 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sat, 8 Oct 2005 22:02:37 +0000
Subject: [PATCH] Update to 4.54

---
 mail/exim/Makefile                      |  2 +-
 mail/exim/distinfo                      |  4 ++--
 mail/exim/files/patch-src_pcre_Makefile | 14 --------------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 mail/exim/files/patch-src_pcre_Makefile

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9409841955cb..60e7c02508f2 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -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.53
+EXIM_VERSION=	4.54
 SA_EXIM_VERSION=4.2
 
 IGNOREFILES=	FAQ.txt.bz2
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 9e23efcdcf8c..3a5960e63788 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,5 +1,5 @@
-MD5 (exim/exim-4.53.tar.bz2) = 674cd9e25c8e1e45351a1ea262776fb3
-SIZE (exim/exim-4.53.tar.bz2) = 1547374
+MD5 (exim/exim-4.54.tar.bz2) = f3cdf5292f4bbb1ee2de42d4338b3b9f
+SIZE (exim/exim-4.54.tar.bz2) = 1547608
 MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
 MD5 (exim/FAQ.txt.bz2) = IGNORE
diff --git a/mail/exim/files/patch-src_pcre_Makefile b/mail/exim/files/patch-src_pcre_Makefile
deleted file mode 100644
index 594edc96689d..000000000000
--- a/mail/exim/files/patch-src_pcre_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pcre/Makefile.orig
-+++ src/pcre/Makefile
-@@ -57,7 +57,7 @@
- 		@echo "$(CC) pcre_get.c"
- 		$(FE)$(CC) -c $(CFLAGS) pcre_get.c
- 
--pcre_globals.:  pcre_globals.c pcre.h config.h pcre_internal.h Makefile
-+pcre_globals.o: pcre_globals.c pcre.h config.h pcre_internal.h Makefile
- 		@echo "$(CC) pcre_globals.c"
- 		$(FE)$(CC) -c $(CFLAGS) pcre_globals.c
-