1 files changed, 52 insertions, 38 deletions
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 5ed49af..7bb0bf5 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -137,7 +137,7 @@ libexec/authlib/authdaemond
 %%SUB_MYSQL%%libexec/authlib/authdaemond.mysql
 %%SUB_PGSQL%%libexec/authlib/authdaemond.pgsql
 libexec/authlib/authdaemond.plain
-libexec/authlib/changepwd/authdaemon.passwd
+%%SUB_EXPECT%%libexec/authlib/changepwd/authdaemon.passwd
 libexec/authlib/changepwd/authsystem.passwd
 libexec/courier/aliascombine
 libexec/courier/aliascreate
@@ -159,6 +159,7 @@ libexec/courier/modules/local/courierlocal
 libexec/courier/modules/modules.ctl
 %%SUB_UUCP%%libexec/courier/modules/uucp/courieruucp
 libexec/courier/pcpd
+libexec/courier/sqwebmaild
 libexec/courier/submit
 libexec/courier/submitmkdir
 libexec/courier/webmail/webadmin
@@ -248,8 +249,8 @@ share/courier/courierwebadmin/admin-00machine.html
 share/courier/courierwebadmin/admin-00machine.pl
 share/courier/courierwebadmin/admin-05local.html
 share/courier/courierwebadmin/admin-05local.pl
-share/courier/courierwebadmin/admin-10password.pl
 share/courier/courierwebadmin/admin-10password.html
+share/courier/courierwebadmin/admin-10password.pl
 share/courier/courierwebadmin/admin-15ldap.html
 share/courier/courierwebadmin/admin-15ldap.pl
 share/courier/courierwebadmin/admin-15ldapa.html
@@ -258,8 +259,8 @@ share/courier/courierwebadmin/admin-15mysql.html
 share/courier/courierwebadmin/admin-15mysql.pl
 share/courier/courierwebadmin/admin-15pgsql.html
 share/courier/courierwebadmin/admin-15pgsql.pl
-share/courier/courierwebadmin/admin-20aliases.pl
 share/courier/courierwebadmin/admin-20aliases.html
+share/courier/courierwebadmin/admin-20aliases.pl
 share/courier/courierwebadmin/admin-30esmtp.html
 share/courier/courierwebadmin/admin-30esmtp.pl
 share/courier/courierwebadmin/admin-31esmtp.html
@@ -272,8 +273,8 @@ share/courier/courierwebadmin/admin-40imap.html
 share/courier/courierwebadmin/admin-40imap.pl
 share/courier/courierwebadmin/admin-45pop3.html
 share/courier/courierwebadmin/admin-45pop3.pl
-share/courier/courierwebadmin/admin-47webmail.pl
 share/courier/courierwebadmin/admin-47webmail.html
+share/courier/courierwebadmin/admin-47webmail.pl
 share/courier/courierwebadmin/admin-50bofh.html
 share/courier/courierwebadmin/admin-50bofh.pl
 share/courier/courierwebadmin/admin-cancel.pl
@@ -546,43 +547,56 @@ share/courier/sqwebmail/html/en-us/printredirect.html
 share/courier/sqwebmail/html/en-us/quickadd.html
 share/courier/sqwebmail/html/en-us/readmsg.html
 share/courier/sqwebmail/html/en-us/redirect.html
+share/courier/sqwebmail/html/en-us/smileys.txt
 share/courier/sqwebmail/html/en-us/spellchk.html
+share/courier/sqwebmail/html/en
 @dirrm share/courier/sqwebmail/html/en-us
-@exec [ -L %D/share/courier/sqwebmail/html/en ] || ln -sf en-us %D/share/courier/sqwebmail/html/en 2>/dev/null || true
-@unexec rm -f %D/share/courier/sqwebmail/html/en 2>/dev/null || true
 @dirrm share/courier/sqwebmail/html
-share/courier/sqwebmail/images/bg.gif
-share/courier/sqwebmail/images/bluebottomleft.gif
-share/courier/sqwebmail/images/bluebottomright.gif
-share/courier/sqwebmail/images/bluetopleft.gif
-share/courier/sqwebmail/images/bluetopright.gif
-share/courier/sqwebmail/images/calendar.gif
-share/courier/sqwebmail/images/cancel.gif
-share/courier/sqwebmail/images/folder.gif
-share/courier/sqwebmail/images/folder2.gif
-share/courier/sqwebmail/images/folders.gif
-share/courier/sqwebmail/images/forward.gif
-share/courier/sqwebmail/images/forwardatt.gif
-share/courier/sqwebmail/images/fullheaders.gif
-share/courier/sqwebmail/images/graybottomright.gif
-share/courier/sqwebmail/images/graybottomleft.gif
-share/courier/sqwebmail/images/graytopleft.gif
-share/courier/sqwebmail/images/graytopright.gif
-share/courier/sqwebmail/images/left.gif
-share/courier/sqwebmail/images/left2.gif
-share/courier/sqwebmail/images/logo.gif
-share/courier/sqwebmail/images/print.gif
-share/courier/sqwebmail/images/reply.gif
-share/courier/sqwebmail/images/replyall.gif
-share/courier/sqwebmail/images/replylist.gif
-share/courier/sqwebmail/images/right.gif
-share/courier/sqwebmail/images/right2.gif
-share/courier/sqwebmail/images/save.gif
-share/courier/sqwebmail/images/sep.gif
-share/courier/sqwebmail/images/signin.gif
+share/courier/sqwebmail/images/bg.png
+share/courier/sqwebmail/images/bluebottomleft.png
+share/courier/sqwebmail/images/bluebottomright.png
+share/courier/sqwebmail/images/bluetopleft.png
+share/courier/sqwebmail/images/bluetopright.png
+share/courier/sqwebmail/images/calendar.png
+share/courier/sqwebmail/images/cancel.png
+share/courier/sqwebmail/images/eventadd.png
+share/courier/sqwebmail/images/eventedit.png
+share/courier/sqwebmail/images/first.png
+share/courier/sqwebmail/images/folder.png
+share/courier/sqwebmail/images/folder2.png
+share/courier/sqwebmail/images/folders.png
+share/courier/sqwebmail/images/forward.png
+share/courier/sqwebmail/images/forwardatt.png
+share/courier/sqwebmail/images/fullheaders.png
+share/courier/sqwebmail/images/graybottomleft.png
+share/courier/sqwebmail/images/graybottomright.png
+share/courier/sqwebmail/images/graytopleft.png
+share/courier/sqwebmail/images/graytopright.png
+share/courier/sqwebmail/images/last.png
+share/courier/sqwebmail/images/left.png
+share/courier/sqwebmail/images/left2.png
+share/courier/sqwebmail/images/logo.png
+share/courier/sqwebmail/images/print.png
+share/courier/sqwebmail/images/reply.png
+share/courier/sqwebmail/images/replyall.png
+share/courier/sqwebmail/images/replylist.png
+share/courier/sqwebmail/images/right.png
+share/courier/sqwebmail/images/right2.png
+share/courier/sqwebmail/images/save.png
+share/courier/sqwebmail/images/sep.png
+share/courier/sqwebmail/images/signin.png
+share/courier/sqwebmail/images/sm-frowney.png
+share/courier/sqwebmail/images/sm-frowney2.png
+share/courier/sqwebmail/images/sm-notsmiley.png
+share/courier/sqwebmail/images/sm-notsmiley2.png
+share/courier/sqwebmail/images/sm-ohno.png
+share/courier/sqwebmail/images/sm-smiley.png
+share/courier/sqwebmail/images/sm-smiley2.png
+share/courier/sqwebmail/images/sm-wink.png
+share/courier/sqwebmail/images/sm-wink2.png
 share/courier/sqwebmail/images/sqwebmail.css
-share/courier/sqwebmail/images/trash2.gif
-share/courier/sqwebmail/images/uncancel.gif
+share/courier/sqwebmail/images/trash2.png
+share/courier/sqwebmail/images/uncancel.png
 @dirrm share/courier/sqwebmail/images
 share/courier/sqwebmail/ldapsearch
 share/courier/sqwebmail/sendit.sh
@@ -630,7 +644,7 @@ share/courier/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
 %%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
-%%PORTDOCS%%%%SUB_UUCP%%%%DOCSDIR%%/html/courieruucp.html
+%%SUB_UUCP%%%%PORTDOCS%%%%DOCSDIR%%/html/courieruucp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html