New version that uses /etc/mail/mailer.conf as a more sane location

5 files changed, 95 insertions, 3 deletions

diff --git a/net-mail/mailwrapper/ChangeLog b/net-mail/mailwrapper/ChangeLog
index 3f1263ef8fb5..968df885d5bb 100644
--- a/net-mail/mailwrapper/ChangeLog
+++ b/net-mail/mailwrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailwrapper
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailwrapper/ChangeLog,v 1.15 2004/04/25 08:52:32 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailwrapper/ChangeLog,v 1.16 2004/05/30 18:45:06 g2boojum Exp $
+
+*mailwrapper-0.2 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> +files/mailer.conf,
+  +mailwrapper-0.2.ebuild:
+  New version that uses /etc/mail/mailer.conf.
 
   25 Apr 2004; Joshua Kinard <kumba@gentoo.org> mailwrapper-0.1.ebuild:
   Marked stable on mips.
diff --git a/net-mail/mailwrapper/Manifest b/net-mail/mailwrapper/Manifest
index 7d6ec33247f2..4df08bb3067c 100644
--- a/net-mail/mailwrapper/Manifest
+++ b/net-mail/mailwrapper/Manifest
@@ -1,4 +1,6 @@
-MD5 e12f843189ba4a3b6f9a1d94877da1f3 files/digest-mailwrapper-0.1 63
-MD5 a7048b78c133de8714a261672ce39931 ChangeLog 2075
+MD5 58e70f9d6f501cd0f80571aea8ea78e1 mailwrapper-0.2.ebuild 823
 MD5 58e70f9d6f501cd0f80571aea8ea78e1 mailwrapper-0.1.ebuild 823
+MD5 a7048b78c133de8714a261672ce39931 ChangeLog 2075
 MD5 400acb577753ba81c395228d89ff8d10 metadata.xml 221
+MD5 e12f843189ba4a3b6f9a1d94877da1f3 files/digest-mailwrapper-0.1 63
+MD5 d76e8c5f2021c29c172a082cd83135e7 files/digest-mailwrapper-0.2 63
diff --git a/net-mail/mailwrapper/files/digest-mailwrapper-0.2 b/net-mail/mailwrapper/files/digest-mailwrapper-0.2
new file mode 100644
index 000000000000..6fdd23fd77ee
--- /dev/null
+++ b/net-mail/mailwrapper/files/digest-mailwrapper-0.2
@@ -0,0 +1 @@
+MD5 9755aad585ec0273c31c525caed12ade mailwrapper-0.2.tbz2 8384
diff --git a/net-mail/mailwrapper/files/mailer.conf b/net-mail/mailwrapper/files/mailer.conf
new file mode 100644
index 000000000000..dfba09bd1c38
--- /dev/null
+++ b/net-mail/mailwrapper/files/mailer.conf
@@ -0,0 +1,43 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailwrapper/files/mailer.conf,v 1.1 2004/05/30 18:45:06 g2boojum Exp $
+# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+#
+# Execute the "real" sendmail program from ssmtp, 
+# named /usr/sbin/ssmtp
+#
+sendmail	/usr/sbin/ssmtp
+send-mail	/usr/sbin/ssmtp
+mailq		/usr/sbin/ssmtp
+newaliases	/usr/sbin/ssmtp
+
+# Execute the "real" sendmail program from exim, 
+# named /usr/sbin/exim
+#
+#sendmail	/usr/sbin/exim
+#send-mail	/usr/sbin/exim
+#mailq		/usr/sbin/exim
+#newaliases	/usr/sbin/exim
+#rsmtp		/usr/sbin/exim
+#rmail		/usr/sbin/exim
+#mail		/usr/sbin/exim
+
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+#sendmail	/usr/sbin/sendmail.nullmailer
+#mailq		/usr/bin/mailq.nullmailer
+
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+#sendmail	/usr/sbin/sendmail.postfix
+#send-mail	/usr/sbin/sendmail.postfix
+#mailq		/usr/sbin/sendmail.postfix
+#newaliases	/usr/sbin/sendmail.postfix
+
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/mailwrapper/mailwrapper-0.2.ebuild b/net-mail/mailwrapper/mailwrapper-0.2.ebuild
new file mode 100644
index 000000000000..80d6206fe8bc
--- /dev/null
+++ b/net-mail/mailwrapper/mailwrapper-0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailwrapper/mailwrapper-0.2.ebuild,v 1.1 2004/05/30 18:45:06 g2boojum Exp $
+
+inherit gcc
+
+DESCRIPTION="Program to invoke an appropriate MTA based on a config file"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tbz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	$(gcc-getCC) ${CFLAGS} \
+		-o mailwrapper \
+		mailwrapper.c fparseln.c fgetln.c \
+		|| die "build failed"
+}
+
+src_install() {
+	newsbin mailwrapper sendmail || die "mailwrapper binary not installed"
+	doman mailer.conf.5 mailwrapper.8
+	insinto /etc/mail
+	doins ${FILESDIR}/mailer.conf || die "mailer.conf not installed"
+}
+
+pkg_postinst() {
+	if [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "The mailwrapper config file has moved to /etc/mail/mailer.conf,"
+		einfo "so the /etc/mailer.conf file on your system is no longer used."
+		einfo
+	fi
+}