Fix maildirs - bug 22961

5 files changed, 101 insertions, 3 deletions

diff --git a/net-mail/procmail/ChangeLog b/net-mail/procmail/ChangeLog
index 4cf0bf6be08d..516cc1156dc6 100644
--- a/net-mail/procmail/ChangeLog
+++ b/net-mail/procmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/procmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.19 2003/06/17 21:02:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.20 2003/06/21 18:57:10 lostlogic Exp $
+
+*procmail-3.22-r6 (21 Jun 2003)
+
+  21 Jun 2003; Brandon Low <lostlogic@gentoo.org> procmail-3.22-r6.ebuild:
+  Fix USE=maildir
 
   05 Feb 2003; Aron Griffis <agriffis@gentoo.org> procmail-3.22-r5.ebuild :
   Mark stable on alpha
diff --git a/net-mail/procmail/Manifest b/net-mail/procmail/Manifest
index 4e523ed1935a..6038ac6782ab 100644
--- a/net-mail/procmail/Manifest
+++ b/net-mail/procmail/Manifest
@@ -2,8 +2,8 @@ MD5 51d6ec854f6bdcb2c1bf65920b500af2 procmail-3.22-r3.ebuild 1832
 MD5 392784d20a3ab646e1844a96aebb7a78 procmail-3.22-r5.ebuild 1799
 MD5 6831716f3d33d83c0b90e6c4a128df35 procmail-3.22-r2.ebuild 1701
 MD5 d314d9738c34a62ab68c6a6f170a9779 procmail-3.22-r4.ebuild 1855
-MD5 b85d134e522f0c51a8bbbdb9aee789dc procmail-3.22-r6.ebuild 1800
-MD5 ee6f05332b792b4a2c4d6e9bfee718ec ChangeLog 4001
+MD5 618cbe71d9c13067076682eec29920a7 procmail-3.22-r6.ebuild 1802
+MD5 6dad1cc3ee902796e4210225eb6dea58 ChangeLog 4004
 MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r2 65
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r3 65
diff --git a/net-mail/procmail/files/digest-procmail-3.22-r6 b/net-mail/procmail/files/digest-procmail-3.22-r6
new file mode 100644
index 000000000000..d14b9662a1d7
--- /dev/null
+++ b/net-mail/procmail/files/digest-procmail-3.22-r6
@@ -0,0 +1 @@
+MD5 1678ea99b973eb77eda4ecf6acae53f1 procmail-3.22.tar.gz 226817
diff --git a/net-mail/procmail/files/gentoo-maildir2.diff b/net-mail/procmail/files/gentoo-maildir2.diff
new file mode 100644
index 000000000000..e3b6e75600a0
--- /dev/null
+++ b/net-mail/procmail/files/gentoo-maildir2.diff
@@ -0,0 +1,20 @@
+--- procmail-3.22/src/authenticate.c.orig	2002-07-26 20:38:52.000000000 -0400
++++ procmail-3.22/src/authenticate.c	2002-07-26 20:57:56.000000000 -0400
+@@ -39,7 +39,7 @@
+ #include "authenticate.h"
+ 
+ #ifndef MAILSPOOLDIR
+-#define MAILSPOOLDIR	"/var/spool/mail/"	     /* watch the trailing / */
++#define MAILSPOOLDIR	""	     /* watch the trailing / */
+ #endif
+ #ifndef MAILSPOOLSUFFIX
+ #define MAILSPOOLSUFFIX ""	      /* suffix to force maildir or MH style */
+@@ -47,7 +47,7 @@
+ #ifndef MAILSPOOLHASH
+ #define MAILSPOOLHASH	0      /* 2 would deliver to /var/spool/mail/b/a/bar */
+ #endif
+-/*#define MAILSPOOLHOME "/.mail"		      /* watch the leading / */
++#define MAILSPOOLHOME "/.maildir/"		      /* watch the leading / */
+ 						  /* delivers to $HOME/.mail */
+ #define STRLEN(x)	(sizeof(x)-1)
+ 
diff --git a/net-mail/procmail/procmail-3.22-r6.ebuild b/net-mail/procmail/procmail-3.22-r6.ebuild
new file mode 100644
index 000000000000..6f9b14187806
--- /dev/null
+++ b/net-mail/procmail/procmail-3.22-r6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r6.ebuild,v 1.1 2003/06/21 18:57:10 lostlogic Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Mail delivery agent/filter"
+SRC_URI="http://www.procmail.org/${P}.tar.gz"
+HOMEPAGE="http://www.procmail.org/"
+
+IUSE=""
+
+DEPEND="virtual/glibc
+	virtual/mta"
+
+RDEPEND="virtual/glibc"
+
+PROVIDE="virtual/mda"
+
+SLOT="0"
+LICENSE="Artistic | GPL-2"
+KEYWORDS="x86 ppc sparc alpha arm hppa"
+
+src_compile() {
+
+	cp Makefile Makefile.orig
+# Added a -O2 at the end of CFLAGS to overcome what seems to be a 
+# gcc-3.1 strstr() bug with more aggressive optimization flags
+# The order of the flags matters as the last flag passed clobbers
+# the first flag.  i.e. if -O2 was placed before ${CFLAGS},
+# whatever optimization that is in ${CFLAGS} would clobber -O2    
+	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS} -O2:" \
+        -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
+        -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" Makefile.orig > Makefile
+
+	if [ -z "`use mbox`" ];
+	then
+		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
+		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
+		cd ${S}
+		patch -p1 <${FILESDIR}/gentoo-maildir2.diff
+
+	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 () {
+	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
+
+	insinto /etc
+	doins procmailrc
+
+	docinto examples
+	dodoc examples/*
+}
+