1 files changed, 102 insertions, 100 deletions

diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 7a703c689a52..9b3056643ede 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -27,14 +27,15 @@
 %%SUB_LDAP%%@unexec cmp -s %D/etc/courier/ldapaliasrc %D/etc/courier/ldapaliasrc.dist && rm -f %D/etc/courier/ldapaliasrc 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null || true
+bin/addcr
 bin/cancelmsg
 bin/courier-config
 bin/couriermlm
 bin/couriertls
 bin/deliverquota
 bin/dotforward
-bin/dotlock
 bin/imapd
+bin/lockmail
 bin/mailbot
 bin/maildirmake
 bin/maildrop
@@ -591,106 +592,107 @@ share/courier/sqwebmail/webgpg
 @dirrm share/courier/sqwebmail
 share/courier/userdb
 share/courier/vchkpw2userdb
-share/courier/webgpg
 @dirrm share/courier
-%%PORTDOCS%%share/doc/courier/AUTHORS
-%%PORTDOCS%%share/doc/courier/BENCHMARKS
-%%PORTDOCS%%share/doc/courier/BUGS.webmail
-%%PORTDOCS%%share/doc/courier/BUGS.webmail.html
-%%PORTDOCS%%share/doc/courier/FAQ.imap
-%%PORTDOCS%%share/doc/courier/FAQ.imap.html
-%%PORTDOCS%%share/doc/courier/INSTALL
-%%PORTDOCS%%share/doc/courier/NEWS
-%%PORTDOCS%%share/doc/courier/README
-%%PORTDOCS%%share/doc/courier/README.authmysql.html
-%%PORTDOCS%%share/doc/courier/README.couriertls
-%%PORTDOCS%%share/doc/courier/README.gpglib.html
-%%PORTDOCS%%share/doc/courier/README.imap
-%%PORTDOCS%%share/doc/courier/README.imap.html
-%%PORTDOCS%%share/doc/courier/README.ldap
-%%PORTDOCS%%share/doc/courier/README.maildirfilter.html
-%%PORTDOCS%%share/doc/courier/README.maildirquota.html
-%%PORTDOCS%%share/doc/courier/README.maildirquota.txt
-%%PORTDOCS%%share/doc/courier/README.maildrop.html
-%%PORTDOCS%%share/doc/courier/README.pcp.html
-%%PORTDOCS%%share/doc/courier/README.sharedfolders.html
-%%PORTDOCS%%share/doc/courier/README.sharedfolders.txt
-%%PORTDOCS%%share/doc/courier/SECURITY.webmail
-%%PORTDOCS%%share/doc/courier/SECURITY.webmail.html
-%%PORTDOCS%%share/doc/courier/html/FAQ.html
-%%PORTDOCS%%share/doc/courier/html/aliases.html
-%%PORTDOCS%%share/doc/courier/html/authlib.html
-%%PORTDOCS%%share/doc/courier/html/cancelmsg.html
-%%PORTDOCS%%share/doc/courier/html/courier.html
-%%PORTDOCS%%share/doc/courier/html/courierd.html
-%%PORTDOCS%%share/doc/courier/html/courierdsn.html
-%%SUB_FAX%%%%PORTDOCS%%share/doc/courier/html/courierfax.html
-%%PORTDOCS%%share/doc/courier/html/courierfilter.html
-%%PORTDOCS%%share/doc/courier/html/courierldapaliasd.html
-%%PORTDOCS%%share/doc/courier/html/couriermlm.html
-%%PORTDOCS%%share/doc/courier/html/courierperlfilter.html
-%%PORTDOCS%%share/doc/courier/html/courierpop3d.html
-%%PORTDOCS%%share/doc/courier/html/couriertcpd.html
-%%PORTDOCS%%share/doc/courier/html/couriertls.html
-%%PORTDOCS%%%%SUB_UUCP%%share/doc/courier/html/courieruucp.html
-%%PORTDOCS%%share/doc/courier/html/deliverquota.html
-%%PORTDOCS%%share/doc/courier/html/dot-courier.html
-%%PORTDOCS%%share/doc/courier/html/dot-forward.html
-%%PORTDOCS%%share/doc/courier/html/dotlock.html
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-exdata-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-security-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-verp-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/dupfilter.html
-%%PORTDOCS%%share/doc/courier/html/esmtp.html
-%%PORTDOCS%%share/doc/courier/html/esmtpd.html
-%%PORTDOCS%%share/doc/courier/html/history.html
-%%PORTDOCS%%share/doc/courier/html/icon.gif
-%%PORTDOCS%%share/doc/courier/html/imapd.html
-%%PORTDOCS%%share/doc/courier/html/index.html
-%%PORTDOCS%%share/doc/courier/html/install.html
-%%PORTDOCS%%share/doc/courier/html/intro.html
-%%PORTDOCS%%share/doc/courier/html/layout.html
-%%PORTDOCS%%share/doc/courier/html/links.html
-%%PORTDOCS%%share/doc/courier/html/local.html
-%%PORTDOCS%%share/doc/courier/html/localmailfilter.html
-%%PORTDOCS%%share/doc/courier/html/mailbot.html
-%%PORTDOCS%%share/doc/courier/html/maildirmake.html
-%%PORTDOCS%%share/doc/courier/html/maildirquota.html
-%%PORTDOCS%%share/doc/courier/html/maildrop.README.html
-%%PORTDOCS%%share/doc/courier/html/maildrop.html
-%%PORTDOCS%%share/doc/courier/html/maildropex.html
-%%PORTDOCS%%share/doc/courier/html/maildropfilter.html
-%%PORTDOCS%%share/doc/courier/html/maildropgdbm.html
-%%PORTDOCS%%share/doc/courier/html/maildroptips.html
-%%PORTDOCS%%share/doc/courier/html/mailq.html
-%%PORTDOCS%%share/doc/courier/html/makeacceptmailfor.html
-%%PORTDOCS%%share/doc/courier/html/makealiases.html
-%%PORTDOCS%%share/doc/courier/html/makedat.html
-%%PORTDOCS%%share/doc/courier/html/makehosteddomains.html
-%%PORTDOCS%%share/doc/courier/html/makemime.html
-%%PORTDOCS%%share/doc/courier/html/makepercentrelay.html
-%%PORTDOCS%%share/doc/courier/html/makesmtpaccess.html
-%%PORTDOCS%%share/doc/courier/html/makeuserdb.html
-%%PORTDOCS%%share/doc/courier/html/mimegpg.html
-%%PORTDOCS%%share/doc/courier/html/mkesmtpdcert.html
-%%PORTDOCS%%share/doc/courier/html/mkimapdcert.html
-%%PORTDOCS%%share/doc/courier/html/mkpop3dcert.html
-%%PORTDOCS%%share/doc/courier/html/modules.html
-%%PORTDOCS%%share/doc/courier/html/pcp_README.html
-%%PORTDOCS%%share/doc/courier/html/pop3d.html
-%%PORTDOCS%%share/doc/courier/html/preline.html
-%%PORTDOCS%%share/doc/courier/html/queue.html
-%%PORTDOCS%%share/doc/courier/html/reformail.html
-%%PORTDOCS%%share/doc/courier/html/reformime.html
-%%PORTDOCS%%share/doc/courier/html/sendmail.html
-%%PORTDOCS%%share/doc/courier/html/status.html
-%%PORTDOCS%%share/doc/courier/html/structures.html
-%%PORTDOCS%%share/doc/courier/html/submit.html
-%%PORTDOCS%%share/doc/courier/html/testmxlookup.html
-%%PORTDOCS%%share/doc/courier/html/userdb.html
-%%PORTDOCS%%share/doc/courier/html/userdbpw.html
-%%PORTDOCS%%@dirrm share/doc/courier/html
-%%PORTDOCS%%@dirrm share/doc/courier
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.webmail
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.imap
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.imap.html
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
+%%PORTDOCS%%%%DOCSDIR%%/README.couriertls
+%%PORTDOCS%%%%DOCSDIR%%/README.gpglib.html
+%%PORTDOCS%%%%DOCSDIR%%/README.imap
+%%PORTDOCS%%%%DOCSDIR%%/README.imap.html
+%%PORTDOCS%%%%DOCSDIR%%/README.ldap
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.maildrop.html
+%%PORTDOCS%%%%DOCSDIR%%/README.pcp.html
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.html
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY.webmail
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aliases.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courier.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html
+%%SUB_FAX%%%%PORTDOCS%%%%DOCSDIR%%/html/courierfax.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierldapaliasd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriermlm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierperlfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
+%%PORTDOCS%%%%SUB_UUCP%%%%DOCSDIR%%/html/courieruucp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-exdata-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-security-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-verp-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/dupfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/esmtp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/esmtpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/imapd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/layout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/links.html
+%%PORTDOCS%%%%DOCSDIR%%/html/local.html
+%%PORTDOCS%%%%DOCSDIR%%/html/localmailfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lockmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailbot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildir.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirmake.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildrop.README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildrop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropgdbm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildroptips.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeacceptmailfor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makealiases.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makedat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makehosteddomains.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makemime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepercentrelay.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makesmtpaccess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeuserdb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manpage.css
+%%PORTDOCS%%%%DOCSDIR%%/html/mimegpg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkesmtpdcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkimapdcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkpop3dcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pcp_README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pop3d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/preline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/queue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reformail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reformime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sendmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/status.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/submit.html
+%%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userdb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userdbpw.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
 @exec chown %%BINOWN%%:mail %D/bin/maildrop
 @exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq