Index: head/mail/sqwebmail/files/patch-Makefile.in =================================================================== --- head/mail/sqwebmail/files/patch-Makefile.in (revision 450398) +++ head/mail/sqwebmail/files/patch-Makefile.in (revision 450399) @@ -1,34 +1,60 @@ ---- Makefile.in.orig 2013-12-24 00:50:01.000000000 +0100 -+++ Makefile.in 2014-10-23 22:36:30.826836195 +0200 -@@ -384,13 +384,13 @@ +--- Makefile.in.orig 2017-06-23 20:05:50.000000000 +0900 ++++ Makefile.in 2017-08-11 02:13:12.050582000 +0900 +@@ -395,18 +395,18 @@ scriptbindir = $(sbindir) scriptbin_SCRIPTS = \ - sharedindexinstall sharedindexsplit + sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@ libexec_SCRIPTS = sqwebmaild.rc CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \ - sharedindexinstall sharedindexsplit + sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail pkgman8dir = @mandir@/man8 - pkgman8_DATA = deliverquota.8 -@@ -1087,11 +1087,11 @@ +-pkgman8_DATA = deliverquota.8 ++pkgman8_DATA = deliverquota.sqwebmail.8 + pkgman1dir = @mandir@/man1 +-pkgman1_DATA = maildirmake.1 ++pkgman1_DATA = maildirmake.sqwebmail.1 + WWW = $$HOME/www/www.courier-mta.org + @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index.html + all: config.h +@@ -1091,14 +1091,14 @@ + maildirmake: libs/maildir/maildirmake + cp libs/maildir/maildirmake . + +-maildirmake.1: libs/maildir/maildirmake.1 +- cp libs/maildir/maildirmake.1 . ++maildirmake.sqwebmail.1: libs/maildir/maildirmake.1 ++ cp libs/maildir/maildirmake.1 maildirmake.sqwebmail.1 + + deliverquota: libs/maildir/deliverquota + cp libs/maildir/deliverquota . + +-deliverquota.8: libs/maildir/deliverquota.8 +- cp libs/maildir/deliverquota.8 . ++deliverquota.sqwebmail.8: libs/maildir/deliverquota.8 ++ cp libs/maildir/deliverquota.8 deliverquota.sqwebmail.8 + + reformime: libs/rfc2045/reformime + cp libs/rfc2045/reformime . +@@ -1106,11 +1106,11 @@ makemime: libs/rfc2045/makemime cp libs/rfc2045/makemime . -sharedindexinstall: libs/maildir/sharedindexinstall - cp -f libs/maildir/sharedindexinstall . +sharedindexinstall.sqwebmail: libs/maildir/sharedindexinstall + cp -f libs/maildir/sharedindexinstall ./sharedindexinstall.sqwebmail -sharedindexsplit: libs/maildir/sharedindexsplit - cp -f libs/maildir/sharedindexsplit . +sharedindexsplit.sqwebmail: libs/maildir/sharedindexsplit + cp -f libs/maildir/sharedindexsplit ./sharedindexsplit.sqwebmail # # Install SqWebMail setuid to root, if we're running as root Index: head/mail/sqwebmail/pkg-plist =================================================================== --- head/mail/sqwebmail/pkg-plist (revision 450398) +++ head/mail/sqwebmail/pkg-plist (revision 450399) @@ -1,142 +1,142 @@ @sample %%ETCDIR%%/ldapaddressbook.sample @sample %%ETCDIR%%/sqwebmaild.sample @unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true libexec/sqwebmail/deliverquota libexec/sqwebmail/maildirmake libexec/sqwebmail/makemime libexec/sqwebmail/pcpd libexec/sqwebmail/reformime libexec/sqwebmail/sqwebmaild @(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd libexec/sqwebmaild.rc -man/man1/maildirmake.1.gz -man/man8/deliverquota.8.gz +man/man1/maildirmake.sqwebmail.1.gz +man/man8/deliverquota.sqwebmail.8.gz %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl sbin/sharedindexinstall.sqwebmail sbin/sharedindexsplit.sqwebmail share/sqwebmail/cleancache.pl share/sqwebmail/html/en share/sqwebmail/html/en-us/CHARSET share/sqwebmail/html/en-us/ISPELLDICT share/sqwebmail/html/en-us/LANGUAGE share/sqwebmail/html/en-us/LANGUAGE_PREF share/sqwebmail/html/en-us/LOCALE share/sqwebmail/html/en-us/TIMEZONELIST share/sqwebmail/html/en-us/abooklist.html share/sqwebmail/html/en-us/acl.html share/sqwebmail/html/en-us/attachments.html share/sqwebmail/html/en-us/autoresponder.html share/sqwebmail/html/en-us/calendarlogin.inc.html share/sqwebmail/html/en-us/empty.html share/sqwebmail/html/en-us/eventacl.html share/sqwebmail/html/en-us/eventdaily.html share/sqwebmail/html/en-us/eventdelete.html share/sqwebmail/html/en-us/eventmonthly.html share/sqwebmail/html/en-us/eventnotifydelete.txt share/sqwebmail/html/en-us/eventnotifynew.txt share/sqwebmail/html/en-us/eventnotifysubject.txt share/sqwebmail/html/en-us/eventshow.html share/sqwebmail/html/en-us/eventweekly.html share/sqwebmail/html/en-us/expired.html share/sqwebmail/html/en-us/filter.html share/sqwebmail/html/en-us/folder.html share/sqwebmail/html/en-us/folders.html share/sqwebmail/html/en-us/gpg.html share/sqwebmail/html/en-us/gpgcreate.html share/sqwebmail/html/en-us/gpgerr.html share/sqwebmail/html/en-us/index.html share/sqwebmail/html/en-us/invalid.html share/sqwebmail/html/en-us/keyimport.html share/sqwebmail/html/en-us/ldaplist.html share/sqwebmail/html/en-us/ldapsearch.html share/sqwebmail/html/en-us/login.html share/sqwebmail/html/en-us/loginform.inc.html share/sqwebmail/html/en-us/navbar.inc.html share/sqwebmail/html/en-us/navbar2.inc.html share/sqwebmail/html/en-us/navbar3.inc.html share/sqwebmail/html/en-us/newevent.html share/sqwebmail/html/en-us/newmsg.html share/sqwebmail/html/en-us/preferences.html share/sqwebmail/html/en-us/print.html share/sqwebmail/html/en-us/printnocookie.html share/sqwebmail/html/en-us/printredirect.html share/sqwebmail/html/en-us/quickadd.html share/sqwebmail/html/en-us/readmsg.html share/sqwebmail/html/en-us/redirect.html share/sqwebmail/html/en-us/refreshfr.html share/sqwebmail/html/en-us/smileys.txt share/sqwebmail/html/en-us/spellchk.html share/sqwebmail/ldapsearch share/sqwebmail/sendit.sh share/sqwebmail/webgpg %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.logindomainlist.html %%PORTDOCS%%%%DOCSDIR%%/README.pam %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%@dir %%DOCSDIR%% @dir etc/sqwebmail %%CACHE%%@dir(%%CACHEOWN%%,,) %%CACHEDIR%% @dir /var/sqwebmail/calendar/public @dir /var/sqwebmail/calendar/private @dir /var/sqwebmail/calendar/localcache @dir /var/sqwebmail/calendar @dir /var/sqwebmail/run @dir /var/sqwebmail @dir share/sqwebmail/html/en-us @dir share/sqwebmail/html @dir share/sqwebmail @dir libexec/sqwebmail %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail @dir %%CGIBINDIR%%/%%CGIBINSUBDIR%% @dir %%CGIBINDIR%% %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventadd.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventedit.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/first.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/key.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/last.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-ohno.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css %%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/wikifmt.html @dir %%WEBDATADIR%%/%%WEBDATASUBDIR%% @dir %%WEBDATADIR%%