Index: head/mail/procmail/Makefile
===================================================================
--- head/mail/procmail/Makefile	(revision 427389)
+++ head/mail/procmail/Makefile	(revision 427390)
@@ -1,42 +1,42 @@
 # Created by: Adam David <adam@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	procmail
 PORTVERSION=	3.22
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/ \
 		ftp://ftp.kfki.hu/pub/packages/mail/procmail/ \
 		http://www.ring.gr.jp/archives/net/mail/procmail/ \
 		ftp://ftp.ring.gr.jp/pub/net/mail/procmail/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.procmail.org/pub/procmail/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Local mail delivery agent
 
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 INSTALL_TARGET=	install.bin install.man
 USES=		cpe
 EXTRA_PATCHES=	${FILESDIR}/procmail-3.22-getline.patch:-p1
 
 PORTDOCS=	FAQ FEATURES HISTORY KNOWN_BUGS README
 PORTEXAMPLES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
 		advanced dirname forward local_procmail_lmtp.m4 mailstat
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf
 # Allow parallel builds (-jX) to work
 	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: head/mail/procmail/files/patch-config.h
===================================================================
--- head/mail/procmail/files/patch-config.h	(revision 427389)
+++ head/mail/procmail/files/patch-config.h	(revision 427390)
@@ -1,37 +1,37 @@
 --- config.h.orig	Tue Sep 11 08:53:50 2001
 +++ config.h	Sun Mar 30 20:23:47 2003
 @@ -52,7 +52,7 @@
  	is group writable or contained in a group writable home directory
  	if the group involved is the user's default group. */
  
 -/*#define LMTP					/* uncomment this if you
 +#define LMTP                                  /* uncomment this if you
  						   want to use procmail
  	as an LMTP (rfc2033) server, presumably for invocation by an MTA.
  	The file examples/local_procmail_lmtp.m4 contains info on how to
 @@ -75,9 +75,9 @@
     >From_ field will be added in the header */
  
  #define TRUSTED_IDS	{"root","daemon","uucp","mail","x400","network",\
 -			 "list","slist","lists","news",0}
 +			 "list","slist","lists","news","mailnull","majordom","majordomo",0}
  
 -/*#define NO_fcntl_LOCK		/* uncomment any of these three if you	     */
 +#define NO_fcntl_LOCK         /* uncomment any of these three if you       */
  /*#define NO_lockf_LOCK		/* definitely do not want procmail to make   */
  /*#define NO_flock_LOCK		/* use of those kernel-locking methods	     */
  				/* If you set LOCKINGTEST to a binary number
 @@ -116,11 +116,11 @@
  	is not found, maildelivery will proceed as normal to the default
  	system mailbox.	 This also must be an absolute path */
  
 -#define ETCRC	"/etc/procmailrc"	/* optional global procmailrc startup
-+#define ETCRC   "%%PREFIX%%/etc/procmailrc"       /* optional global procmailrc startup
++#define ETCRC   "/usr/local/etc/procmailrc"       /* optional global procmailrc startup
  					   file (will only be read if procmail
  	is started with no rcfile on the command line). */
  
 -#define ETCRCS	"/etc/procmailrcs/"	/* optional trusted path prefix for
-+#define ETCRCS  "%%PREFIX%%/etc/procmailrcs/"     /* optional trusted path prefix for
++#define ETCRCS  "/usr/local/etc/procmailrcs/"     /* optional trusted path prefix for
  					   rcfiles which will be executed with
  	the uid of the owner of the rcfile (this only happens if procmail is
  	called with the -m option, without variable assignments on the command
Index: head/mail/procmail/files/patch-src-autoconf
===================================================================
--- head/mail/procmail/files/patch-src-autoconf	(revision 427389)
+++ head/mail/procmail/files/patch-src-autoconf	(revision 427390)
@@ -1,20 +1,32 @@
 --- src/autoconf.orig	2001-09-10 21:55:46.000000000 -0700
 +++ src/autoconf	2010-12-23 11:53:07.000000000 -0800
 @@ -230,7 +230,8 @@
    echo ""
    if test -z "$LOCKINGTEST"
    then
 -     read b
 +     #read b
 +     b=""
    elif test dummy = "$LOCKINGTEST"
    then
       b=""
 @@ -977,6 +978,7 @@
  
  echo 'Checking realloc implementation'
  
 +$RM -f _autotst
  if $MAKE _autotst >$DEVNULL 2>&1
   test -f _autotst
  then
+@@ -1491,6 +1493,11 @@
+   fi
+ done
+ 
++case ":$lpath:" in
++    *:/usr/local/bin:*) ;;
++    *) lpath="$lpath:/usr/local/bin" ;;
++esac
++
+ echo "#define defPATH \"PATH=\$HOME/bin:$lpath\"" >>$ACONF
+ echo "#define defSPATH \"PATH=$lpath\"" >>$ACONF
+