From 249032938ec8bfb0faa40380f759c2c8b796ff33 Mon Sep 17 00:00:00 2001
From: rohee <rohee@openbsd.org>
Date: Thu, 26 Jul 2001 21:37:31 +0000
Subject: [PATCH] Add a patch for correct maildir delivery from krw@ and an
 lmtp flavor from jakob@.

---
 mail/procmail/Makefile               |  9 ++++++++-
 mail/procmail/patches/patch-exopen_c | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 mail/procmail/patches/patch-exopen_c

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 963cde765aa..f2f56867328 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2001/07/06 00:13:51 rohee Exp $
+# $OpenBSD: Makefile,v 1.22 2001/07/26 21:37:31 rohee Exp $
 
 COMMENT=	"filtering local mail delivery agent"
 
@@ -29,6 +29,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FLAVORS=	lmtp
+FLAVOR?=
+
+.if ${FLAVOR:L:Mlmtp}
+CFLAGS+=	-DLMTP
+.endif
+
 MAKE_FLAGS=	BASENAME="${PREFIX}" CFLAGS0="${CFLAGS}" LOCKINGTEST="110"
 
 do-install:
diff --git a/mail/procmail/patches/patch-exopen_c b/mail/procmail/patches/patch-exopen_c
new file mode 100644
index 00000000000..e008bc3c45b
--- /dev/null
+++ b/mail/procmail/patches/patch-exopen_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-exopen_c,v 1.1 2001/07/26 21:37:31 rohee Exp $
+
+In case of maildir format delivery, actually deliver in the right directory.
+
+--- src/exopen.c.orig	Thu Jul 26 23:28:10 2001
++++ src/exopen.c	Thu Jul 26 23:28:59 2001
+@@ -47,7 +47,7 @@ in:	if(flags&doMAILDIR)
+ 	   ultstr(0,(long)thepid,dot+1);
+ 	   *(dot=strchr(p,'\0'))='_';
+ 	   *(++dot+1)='.';
+-	   strlcat(dot+2,hostname(),end-dot);
++	   strlcpy(dot+2,hostname(),end-dot-2);
+ 	 }
+ 	else
+ 	 { p=ultoan((long)t,dot+1);