Adding fix for tail use and amd64 keyword to exim

5 files changed, 41 insertions, 20 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
index edb07cee59cd..542f29c30e52 100644
--- a/net-mail/exim/ChangeLog
+++ b/net-mail/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/exim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.34 2003/07/08 23:07:30 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.35 2003/07/19 23:08:53 tester Exp $
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> exim-4.14.ebuild,
+  exim-4.20-r1.ebuild, files/exim-4.14-tail.patch:
+  Posixify tail and add amd64
 
   08 Jul 2003; Todd Berman <tberman@gentoo.org> exim-4.12.ebuild,
   exim-4.14.ebuild, exim-4.20-r1.ebuild, exim-4.20.ebuild:
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
index 8127fe509b2b..f201c867d2f6 100644
--- a/net-mail/exim/Manifest
+++ b/net-mail/exim/Manifest
@@ -1,22 +1,23 @@
-MD5 68424d4392b2b20ed3deed5040ab1760 ChangeLog 5914
-MD5 7d994463bbcad62d72ca937683c170fb exim-4.10.ebuild 6211
 MD5 4d7cabe7d5b81708f2717fafd847ba2b exim-4.12.ebuild 5436
-MD5 e3cc051eb595add57c29891a3a44075a exim-4.14.ebuild 5433
-MD5 f36100cd98e78992799271d7d927d267 exim-4.20-r1.ebuild 6185
+MD5 b0ca08f26ccf5a73829c0169ad70c528 exim-4.14.ebuild 5483
+MD5 f37a9cb0060d8e3df038d704a933dcc9 exim-4.20-r1.ebuild 6234
 MD5 fb49b47a884b048542837810acb08633 exim-4.20.ebuild 5569
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 a7e2b970e4c33e787d5796ed30f73011 ChangeLog 6062
+MD5 7d994463bbcad62d72ca937683c170fb exim-4.10.ebuild 6211
+MD5 5898fa2e00e85c771cffe741f3198c07 files/exiscan-acl-4.20-09.patch 263216
+MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
-MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
-MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
-MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
-MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
 MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-MD5 f0676c8d629efaa211aebbe01750eb41 files/exim.rc5 585
-MD5 c90e5fcc2a5dfdd3095c5619d9dcc389 files/exim.rc6 509
-MD5 5898fa2e00e85c771cffe741f3198c07 files/exiscan-acl-4.20-09.patch 263216
+MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
 MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
+MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
+MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
+MD5 f0676c8d629efaa211aebbe01750eb41 files/exim.rc5 585
+MD5 c90e5fcc2a5dfdd3095c5619d9dcc389 files/exim.rc6 509
+MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
+MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
+MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
+MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
diff --git a/net-mail/exim/exim-4.14.ebuild b/net-mail/exim/exim-4.14.ebuild
index 75e828368f94..e69334917f0c 100644
--- a/net-mail/exim/exim-4.14.ebuild
+++ b/net-mail/exim/exim-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.14.ebuild,v 1.4 2003/07/13 13:32:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.14.ebuild,v 1.5 2003/07/19 23:08:53 tester Exp $
 
 IUSE="tcpd ssl postgres mysql ldap pam"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 ~sparc amd64"
 
 PROVIDE="virtual/mta"
 
@@ -39,6 +39,8 @@ src_unpack() {
 	cd ${S}
 	einfo "Patching exiscan support into exim ${PV}.."
 	epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
+
+	epatch ${FILESDIR}/exim-4.14-tail.patch
 	
 	sed -e "48i\CFLAGS=${CFLAGS}" \
 		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
diff --git a/net-mail/exim/exim-4.20-r1.ebuild b/net-mail/exim/exim-4.20-r1.ebuild
index ebfbd8f21b31..aa1ce18539e3 100644
--- a/net-mail/exim/exim-4.20-r1.ebuild
+++ b/net-mail/exim/exim-4.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.20-r1.ebuild,v 1.5 2003/07/16 14:25:25 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.20-r1.ebuild,v 1.6 2003/07/19 23:08:53 tester Exp $
 
 IUSE="tcpd ssl postgres mysql ldap pam exiscan exiscan-acl maildir lmtp"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc hppa ~ppc"
+KEYWORDS="~x86 ~sparc hppa ~ppc ~amd64"
 
 PROVIDE="virtual/mta"
 
@@ -41,6 +41,9 @@ src_unpack() {
 	local myconf
 
 	cd ${S}
+
+	epatch ${FILESDIR}/exim-4.14-tail.patch
+	
 	if use maildir; then
 		einfo "Patching maildir support into exim.conf"
 		epatch ${FILESDIR}/exim-${PV}-maildir.patch
diff --git a/net-mail/exim/files/exim-4.14-tail.patch b/net-mail/exim/files/exim-4.14-tail.patch
new file mode 100644
index 000000000000..481dca9b80d4
--- /dev/null
+++ b/net-mail/exim/files/exim-4.14-tail.patch
@@ -0,0 +1,11 @@
+--- scripts/Configure-config.h.orig	2003-07-17 18:01:19.000000000 -0400
++++ scripts/Configure-config.h	2003-07-17 18:01:25.000000000 -0400
+@@ -41,7 +41,7 @@
+ 
+ # Double-check that config.h is complete.
+ 
+-if [ "`tail -1 config.h`" != "/* End of config.h */" ] ; then
++if [ "`tail -n 1 config.h`" != "/* End of config.h */" ] ; then
+   echo "*** config.h appears to be incomplete"
+   echo "*** unexpected failure in buildconfig program"
+   exit 1