summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2005-07-04 14:29:58 +0000
committerAndrej Kacian <ticho@gentoo.org>2005-07-04 14:29:58 +0000
commit7bfdae6d7df245fccda62226871c74a3e18f3a34 (patch)
treecccacb84e9f237d96814766986f352e0ccff673b /mail-mta
parentMade compatible with mailer-config-0.2 - bug #97589. (diff)
downloadgentoo-2-7bfdae6d7df245fccda62226871c74a3e18f3a34.tar.gz
gentoo-2-7bfdae6d7df245fccda62226871c74a3e18f3a34.tar.bz2
gentoo-2-7bfdae6d7df245fccda62226871c74a3e18f3a34.zip
Added compatibility with mailer-config-0.2 - bug #97589.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/esmtp/ChangeLog6
-rw-r--r--mail-mta/esmtp/Manifest14
-rw-r--r--mail-mta/esmtp/esmtp-0.5.1.ebuild16
-rw-r--r--mail-mta/esmtp/files/mailer.conf10
4 files changed, 24 insertions, 22 deletions
diff --git a/mail-mta/esmtp/ChangeLog b/mail-mta/esmtp/ChangeLog
index 8b87aafc587e..2e6ae8677e66 100644
--- a/mail-mta/esmtp/ChangeLog
+++ b/mail-mta/esmtp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-mta/esmtp
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.13 2005/05/30 17:37:58 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.14 2005/07/04 14:29:58 ticho Exp $
+
+ 04 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/mailer.conf,
+ esmtp-0.5.1.ebuild:
+ Added compatibility with mailer-config-0.2. See bug #97589.
30 May 2005; Fernando J. Pereda <ferdy@gentoo.org> esmtp-0.5.0-r1.ebuild:
Stable on alpha
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index e81cb29a9fcd..61240b28f731 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 7d631acde6e333a3a8185b42a4c947b7 esmtp-0.5.0-r1.ebuild 1045
-MD5 63eea91d01a4eeab8f0575835e9bc909 esmtp-0.5.1.ebuild 902
+MD5 34fd345db87a032773000ca10d28580f esmtp-0.5.1.ebuild 1174
MD5 08bfc725ae2eb5026a2090bfbf014fb4 esmtp-0.5.0-r2.ebuild 905
MD5 79efed36d6f536f2fb7f5181c52f19b7 ChangeLog 1957
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
MD5 c99a26bd6ed6b3b450d77f9c3ef0e823 files/digest-esmtp-0.5.0-r1 64
MD5 c99a26bd6ed6b3b450d77f9c3ef0e823 files/digest-esmtp-0.5.0-r2 64
-MD5 42fb8e733cb3c85a6d1de97c8f27df34 files/mailer.conf 290
+MD5 72d7ee5eceeb9ce441871fdc9e363a60 files/mailer.conf 295
MD5 433d95b25f4a17a0a18016d70781396a files/digest-esmtp-0.5.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCm0+OViELBEf1JB0RAo34AJ95RT/Fkc81YOohe3/YoxlWGvnVRwCfeFYO
-xqDEF5UgUv+lTD5Xt9Qb3cw=
-=vHgV
------END PGP SIGNATURE-----
diff --git a/mail-mta/esmtp/esmtp-0.5.1.ebuild b/mail-mta/esmtp/esmtp-0.5.1.ebuild
index 35ae81d8aa45..c7b6a27bee9c 100644
--- a/mail-mta/esmtp/esmtp-0.5.1.ebuild
+++ b/mail-mta/esmtp/esmtp-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.1.ebuild,v 1.1 2005/05/27 13:02:10 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.1.ebuild,v 1.2 2005/07/04 14:29:58 ticho Exp $
inherit mailer
@@ -20,9 +20,17 @@ src_install() {
dodoc AUTHORS COPYING ChangeLog NEWS README TODO
if use mailwrapper ; then
- mv ${D}/usr/sbin/sendmail ${D}/usr/bin/sendmail.esmtp
- mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.esmtp
- mv ${D}/usr/bin/newaliases ${D}/usr/bin/newaliases.esmtp
+ rm "${D}/usr/sbin/sendmail"
+ rm "${D}/usr/lib/sendmail"
+ dosym "/usr/bin/esmtp" "/usr/sbin/sendmail.esmtp"
+ rm "${D}/usr/bin/mailq"
+ rm "${D}/usr/bin/newaliases"
+ mv "${D}/usr/share/man/man1/newaliases.1" \
+ "${D}/usr/share/man/man1/newaliases-esmtp.1"
+ mv "${D}/usr/share/man/man1/mailq.1" \
+ "${D}/usr/share/man/man1/mailq-esmtp.1"
+ mv "${D}/usr/share/man/man1/sendmail.1" \
+ "${D}/usr/share/man/man1/sendmail-esmtp.1"
mailer_install_conf
fi
}
diff --git a/mail-mta/esmtp/files/mailer.conf b/mail-mta/esmtp/files/mailer.conf
index 9f306b4da7ba..d4909bae06d5 100644
--- a/mail-mta/esmtp/files/mailer.conf
+++ b/mail-mta/esmtp/files/mailer.conf
@@ -1,8 +1,8 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/files/mailer.conf,v 1.2 2005/04/26 18:06:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/files/mailer.conf,v 1.3 2005/07/04 14:29:58 ticho Exp $
# Execute the "real" sendmail program from esmtp
#
-sendmail /usr/bin/sendmail.esmtp
-send-mail /usr/bin/sendmail.esmtp
-mailq /usr/bin/mailq.esmtp
-newaliases /usr/bin/newaliases.esmtp
+sendmail /usr/sbin/sendmail.esmtp
+send-mail /usr/sbin/sendmail.esmtp
+mailq /usr/sbin/sendmail.esmtp
+newaliases /usr/sbin/sendmail.esmtp