- Cleanup MASTER_SITES and add my LOCAL as MASTER_SITES

- Remove five-year-old WITH_COURIER_MAILDIR_KLUDGE comment
- Simplify Makefile
- Respect PORTDOCS and PORTEXAMPLES
- Sort MAN1 and PLIST

3 files changed, 29 insertions, 63 deletions

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index b7d4c35f9fe1..2eaf7521e3eb 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -9,69 +9,38 @@ PORTNAME=	procmail
 PORTVERSION=	3.22
 PORTREVISION=	7
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/ \
-		ftp://ftp.psg.com/pub/unix/procmail/ \
-		ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
+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.net.ohio-state.edu/pub/networking/mail/procmail/ \
 		ftp://ftp.kfki.hu/pub/packages/mail/procmail/ \
-		ftp://giswitch.sggw.waw.pl/pub/unix/procmail/ \
 		http://www.ring.gr.jp/archives/net/mail/procmail/ \
 		ftp://ftp.ring.gr.jp/pub/net/mail/procmail/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/procmail/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.procmail.org/pub/procmail/
+		ftp://ftp.mirrorservice.org/sites/ftp.procmail.org/pub/procmail/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A local mail delivery agent
 
-MAKE_JOBS_UNSAFE=	yes
-
-#.if defined(WITH_COURIER_MAILDIR_KLUDGE)
-#PATCH_SITES=	http://www.john.net.au/pub/procmail-courier/
-#PATCHFILES=	procmail-authenticate.c-userMaildir.patch
-#PATCH_DIST_STRIP=-p
-#.endif
-
 INSTALL_TARGET=	install-suid install.man
+MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		procmail.1 formail.1 lockfile.1
-MAN5=		procmailex.5 procmailrc.5 procmailsc.5
-
-# Local variables
-#
-
-DOC_FILES=	FAQ FEATURES HISTORY KNOWN_BUGS README
-
-SAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
-SAMPLE_FILES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
+DOCS=		FAQ FEATURES HISTORY KNOWN_BUGS README
+EXAMPLES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
 		advanced dirname forward local_procmail_lmtp.m4 mailstat
+MAN1=		formail.1 lockfile.1 procmail.1
+MAN5=		procmailex.5 procmailrc.5 procmailsc.5
 
-# Post-configure
-#
-
-post-configure: patch-config
-
-patch-config:
+post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
 
-# Post-install
-#
-
-post-install: install-sample install-doc
-
-install-sample:
-	@${MKDIR} ${SAMPLESDIR}
-.for file in ${SAMPLE_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/examples/${file} ${SAMPLESDIR}
-.endfor
-
-install-doc:
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/
+	cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/procmail/distinfo b/mail/procmail/distinfo
index 239427bfc7e9..fd17abe678c5 100644
--- a/mail/procmail/distinfo
+++ b/mail/procmail/distinfo
@@ -1,4 +1,2 @@
 SHA256 (procmail-3.22.tar.gz) = 087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117
 SIZE (procmail-3.22.tar.gz) = 226817
-SHA256 (procmail-authenticate.c-userMaildir.patch) = 917109cf589cec322303a1258b231ef93c18138ea3ec4d32094abee8cf7086e8
-SIZE (procmail-authenticate.c-userMaildir.patch) = 468
diff --git a/mail/procmail/pkg-plist b/mail/procmail/pkg-plist
index dc6d31051250..ea0a7e5d0e53 100644
--- a/mail/procmail/pkg-plist
+++ b/mail/procmail/pkg-plist
@@ -1,23 +1,22 @@
-@comment $FreeBSD$
-bin/procmail
 bin/formail
 bin/lockfile
 bin/mailstat
+bin/procmail
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/FEATURES
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/examples/procmail/1procmailrc
-share/examples/procmail/1rmail
-share/examples/procmail/2procmailrc
-share/examples/procmail/2rmail
-share/examples/procmail/3procmailrc
-share/examples/procmail/3rmail
-share/examples/procmail/advanced
-share/examples/procmail/dirname
-share/examples/procmail/forward
-share/examples/procmail/local_procmail_lmtp.m4
-share/examples/procmail/mailstat
-@dirrm share/examples/procmail
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1procmailrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1rmail
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2procmailrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2rmail
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3procmailrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3rmail
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/advanced
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirname
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forward
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/local_procmail_lmtp.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailstat
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%