Changes 4.68:

* Bug fixes

5 files changed, 16 insertions, 61 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7b3d91a64e7..0d0b1b03aa4 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2007/09/11 18:16:01 abs Exp $
+# $NetBSD: Makefile,v 1.87 2007/10/14 19:14:57 adam Exp $
 
-DISTNAME=	exim-4.67
-PKGREVISION=	1
+DISTNAME=	exim-4.68
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -60,14 +59,14 @@ USE_DB185?=		no
 BDB_ACCEPTED?=		db1 db2 db3 db4
 
 post-extract:
-	${MKDIR} ${WRKSRC}/Local
-	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
-	${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
-	${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
+	mkdir ${WRKSRC}/Local
+	cp ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
+	cp ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
+	cp ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
 		${WRKSRC}/OS/
 
 pre-configure:
-	${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	sed	-e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 		-e 's:@EXIM_USER@:${EXIM_USER}:' \
 		-e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
@@ -89,18 +88,18 @@ pre-configure:
 .if !empty(EXIM_MAX_INCLUDE_SIZE)
 	${ECHO} MAX_INCLUDE_SIZE=${EXIM_MAX_INCLUDE_SIZE} >> ${WRKSRC}/Local/Makefile
 .endif
-	${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	sed -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
 	    > ${WRKSRC}/Local/eximon.conf
 # CFLAGS is already set by pkgsrc
-	@for f in ${WRKSRC}/OS/Makefile-*; do \
-		${SED} -e 's/^CFLAGS=.*//' $$f > $$f.subst; \
-		${MV} -f $$f.subst $$f; \
+	for f in ${WRKSRC}/OS/Makefile-*; do \
+		sed -e 's/^CFLAGS=.*//' $$f > $$f.subst; \
+		mv -f $$f.subst $$f; \
 	done
 
 post-build:
-	${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	sed -e 's:@PREFIX@:${PREFIX}:' \
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${WRKDIR}/mailer.conf
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 45db07847b4..e12de6e49d1 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.37 2007/06/24 10:55:41 abs Exp $
+$NetBSD: distinfo,v 1.38 2007/10/14 19:14:57 adam Exp $
 
-SHA1 (exim-4.67.tar.bz2) = f162a8663308f62ec5586204d08f344ce92b6859
-RMD160 (exim-4.67.tar.bz2) = 22823f27ff7ce3fea5dba8b826c4fa06210b50be
-Size (exim-4.67.tar.bz2) = 1615325 bytes
+SHA1 (exim-4.68.tar.bz2) = 510df6a2c38094a55ea54b19dd0e61b88ed78325
+RMD160 (exim-4.68.tar.bz2) = 764cc258ee969bb27975d8009bacb6489103e3a5
+Size (exim-4.68.tar.bz2) = 1641636 bytes
 SHA1 (patch-aa) = 93dca43408fb837deb95d2b22502c64559780f7c
 SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
-SHA1 (patch-ac) = a3ecdafc44ad2212b00e49de594efb26612b0b75
-SHA1 (patch-ad) = 52c768378483bf02295d46c01d55f955697834eb
 SHA1 (patch-ae) = 6cb0f00d159de7c342a55b09fb87ab533c5670bf
-SHA1 (patch-af) = f4dd3bad1b67a1ae27c14c3f92f338d3280f390c
 SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
deleted file mode 100644
index de97d440e42..00000000000
--- a/mail/exim/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/08/08 15:24:01 abs Exp $
-
---- OS/Makefile-NetBSD-a.out.orig	2006-04-28 11:32:21.000000000 +0100
-+++ OS/Makefile-NetBSD-a.out
-@@ -3,7 +3,7 @@
- # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
- 
- CHOWN_COMMAND=/usr/sbin/chown
--CFLAGS=-O
-+CFLAGS?=-O2
- 
- HAVE_SA_LEN=YES
- HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
deleted file mode 100644
index eb0af548f8c..00000000000
--- a/mail/exim/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2006/08/08 15:24:01 abs Exp $
-
---- OS/Makefile-NetBSD.orig	2006-04-28 11:32:21.000000000 +0100
-+++ OS/Makefile-NetBSD
-@@ -3,7 +3,7 @@
- # Exim: OS-specific make file for NetBSD (ELF object format)
- 
- CHOWN_COMMAND=/usr/sbin/chown
--CFLAGS=-O
-+CFLAGS?=-O2
- 
- HAVE_SA_LEN=YES
- HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
deleted file mode 100644
index 236e8155c9e..00000000000
--- a/mail/exim/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/08/08 15:24:01 abs Exp $
-
---- OS/os.h-NetBSD.orig	2006-04-28 11:32:21.000000000 +0100
-+++ OS/os.h-NetBSD
-@@ -12,4 +12,10 @@ typedef struct flock flock_t;
- #define os_strsignal strsignal
- #define OS_STRSIGNAL
- 
-+#include <sys/param.h>
-+
-+#if __NetBSD_Version__ >= 299000900
-+#define HAVE_SYS_STATVFS_H
-+#endif
-+
- /* End */