Added patch to remove MAILSPOOLDIR and define MAILSPOOLHOME when we are delivering to Maildir style mailboxes (USE="maildir") (see bug #5630). Added ppc to KEYWORDS. Added RDEPEND

4 files changed, 112 insertions, 19 deletions

diff --git a/net-mail/procmail/ChangeLog b/net-mail/procmail/ChangeLog
index fe527d46adc1..6dd382656bf0 100644
--- a/net-mail/procmail/ChangeLog
+++ b/net-mail/procmail/ChangeLog
@@ -1,9 +1,28 @@
 # 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.4 2002/07/16 14:12:56 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.5 2002/07/27 02:46:21 cselkirk Exp $
 
+*procmail-3.22-r3 (26 Jul 2002)
+
+  26 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> procmail-3.22-r3.ebuild 
+  files/gentoo-maildir.patch digest-procmail-3.22-r3 :
+
+  Added patch to remove MAILSPOOLDIR and define MAILSPOOLHOME when
+  we are delivering to Maildir style mailboxes (USE="maildir"). The 
+  /etc/procmailrc soultion (below) doesn't seem to work, procmail still
+  attempts to deliver to /var/spool/mail (see bug #5630).
+  Added ppc to KEYWORDS
+  Added RDEPEND 
+  
 *procmail-3.22-r2 (16 Jul 2002)
 
+  26 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> procmail-3.22-r2.ebuild :
+  
+  Added ppc to KEYWORDS
+  Added RDEPEND
+  Fixed Copyright year .. s/2000/2002
+  Fixed illegal space characters
+  
   16 Jul 2002; Nick Hadaway <raker@gentoo.org> procmail-3.22-r2.ebuild :
 
   Updated sed statement to include a "-O2" so procmail doesn't barf
diff --git a/net-mail/procmail/files/digest-procmail-3.22-r3 b/net-mail/procmail/files/digest-procmail-3.22-r3
new file mode 100644
index 000000000000..d14b9662a1d7
--- /dev/null
+++ b/net-mail/procmail/files/digest-procmail-3.22-r3
@@ -0,0 +1 @@
+MD5 1678ea99b973eb77eda4ecf6acae53f1 procmail-3.22.tar.gz 226817
diff --git a/net-mail/procmail/procmail-3.22-r2.ebuild b/net-mail/procmail/procmail-3.22-r2.ebuild
index dce4265f2a8a..ed00b994e3b9 100644
--- a/net-mail/procmail/procmail-3.22-r2.ebuild
+++ b/net-mail/procmail/procmail-3.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.5 2002/07/27 02:46:21 cselkirk Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -10,49 +10,51 @@ HOMEPAGE="http://www.procmail.org/"
 DEPEND="virtual/glibc
         virtual/mta"
 
+RDEPEND="virtual/glibc"
+
 SLOT="0"
 LICENSE="Artistic | GPL"
 KEYWORDS="x86"
 
 src_compile() {
 
-    cp Makefile Makefile.orig
+	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:" \
+	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
+	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
+	fi
 
-    emake || die
+	emake || die
 }
 
 src_install () {
-    cd ${S}/new
-    insinto /usr/bin
-    insopts -m 6755
-    doins procmail
+	cd ${S}/new
+	insinto /usr/bin
+	insopts -m 6755
+	doins procmail
 
-    insopts -m 2755
-    doins lockfile
+	insopts -m 2755
+	doins lockfile
 
-    dobin formail mailstat
+	dobin formail mailstat
 
-    doman *.1 *.5
+	doman *.1 *.5
 
-    cd ${S}
-    dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
+	cd ${S}
+	dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
 
 	insinto /etc
 	doins procmailrc
diff --git a/net-mail/procmail/procmail-3.22-r3.ebuild b/net-mail/procmail/procmail-3.22-r3.ebuild
new file mode 100644
index 000000000000..b5a60263b52b
--- /dev/null
+++ b/net-mail/procmail/procmail-3.22-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r3.ebuild,v 1.1 2002/07/27 02:46:21 cselkirk Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Mail delivery agent/filter"
+SRC_URI="http://www.procmail.org/${P}.tar.gz"
+HOMEPAGE="http://www.procmail.org/"
+
+DEPEND="virtual/glibc
+		virtual/mta"
+
+RDEPEND="virtual/glibc"
+
+SLOT="0"
+LICENSE="Artistic | GPL"
+KEYWORDS="x86 ppc"
+
+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
+		
+		# the above doesn't seem to work as MAILSPOOLDIR is still defined .. so
+
+	cd ${S}
+	patch -p1 <${FILESDIR}/gentoo-maildir.patch
+
+	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/*
+}
+