Closes bug #2862, thanks to Jose Jonseca.

5 files changed, 21 insertions, 47 deletions

diff --git a/net-mail/procmail/ChangeLog b/net-mail/procmail/ChangeLog
index c1fdb54344e0..c60742641cc5 100644
--- a/net-mail/procmail/ChangeLog
+++ b/net-mail/procmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/procmail
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.2 2002/05/04 01:15:49 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.3 2002/06/18 14:40:42 g2boojum Exp $
+
+  18 Jun 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  Thanks to Jose Fonseca procmail now uses /etc/procmailrc to determine the
+  default mailbox instead of patching the source.
 
 *procmail-3.22-r1 (1 Feb 2002)
   3 May 2002; J.Hudson <jhhudso@gentoo.org> procmail-3.22-r1.ebuild :
diff --git a/net-mail/procmail/files/digest-procmail-3.15.1 b/net-mail/procmail/files/digest-procmail-3.15.1
deleted file mode 100644
index 95c9d124e551..000000000000
--- a/net-mail/procmail/files/digest-procmail-3.15.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 757fb15bb92d7a81fc285645aa94145e procmail-3.15.1.tar.gz 201913
diff --git a/net-mail/procmail/files/digest-procmail-3.22 b/net-mail/procmail/files/digest-procmail-3.22-r2
index d14b9662a1d7..d14b9662a1d7 100644
--- a/net-mail/procmail/files/digest-procmail-3.22
+++ b/net-mail/procmail/files/digest-procmail-3.22-r2
diff --git a/net-mail/procmail/procmail-3.15.1.ebuild b/net-mail/procmail/procmail-3.15.1.ebuild
deleted file mode 100644
index 16fbadec3537..000000000000
--- a/net-mail/procmail/procmail-3.15.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.15.1.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Mail delivery agent/filter"
-SRC_URI="http://www.procmail.org/${A}"
-HOMEPAGE="http://www.procmail.org/"
-
-DEPEND="virtual/glibc
-        virtual/mta"
-
-src_compile() {
-
-    cp Makefile Makefile.orig
-    sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
-        -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
-        -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" Makefile.orig > Makefile
-    try make
-}
-
-src_install () {
-    cd ${S}/new
-    insinto /usr/bin
-    insopts -m 6755
-    doins procmail
-
-    insopts -m 2755
-    doins lockfile
-
-    dobin formail mailstat
-
-    doman *.1 *.5
-
-    cd ${S}
-    dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
-}
diff --git a/net-mail/procmail/procmail-3.22.ebuild b/net-mail/procmail/procmail-3.22-r2.ebuild
index 456e5afe5c0c..f1fa837f93a3 100644
--- a/net-mail/procmail/procmail-3.22.ebuild
+++ b/net-mail/procmail/procmail-3.22-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
 # Modified by $HOME/.maildir by Craig Joly <craig@taipan.mudshark.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22.ebuild,v 1.1 2001/10/23 13:19:48 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.1 2002/06/18 14:40:42 g2boojum Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -18,11 +18,17 @@ src_compile() {
     sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
         -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
         -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" Makefile.orig > Makefile
-	cd ${S}/src
-	cp authenticate.c authenticate.c.orig
-	sed -e "s:/\*#define MAILSPOOLHOME \"/.mail\":#define MAILSPOOLHOME \"/.maildir/\":" authenticate.c.orig > authenticate.c
-	cd ${S}
-   emake || die
+
+    if [ -z "`use mbox`" ];
+    then
+		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
+		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
+	else
+		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmail
+		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc
+    fi
+
+    emake || die
 }
 
 src_install () {
@@ -41,6 +47,9 @@ src_install () {
     cd ${S}
     dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
 
+	insinto /etc
+	doins procmailrc
+
 	docinto examples
 	dodoc examples/*
 }