svn commit: r406526 - head/mail/courier

Pawel Pekala pawel at FreeBSD.org
Sun Jan 17 18:44:07 UTC 2016 

Author: pawel
Date: Sun Jan 17 18:44:05 2016
New Revision: 406526
URL: https://svnweb.freebsd.org/changeset/ports/406526

Log:
  Modernize pkg-plist, remove deprecated @dirrm
  
  Approved by:	portmgr blanket

Modified:
  head/mail/courier/pkg-plist

Modified: head/mail/courier/pkg-plist
==============================================================================
--- head/mail/courier/pkg-plist	Sun Jan 17 18:24:21 2016	(r406525)
+++ head/mail/courier/pkg-plist	Sun Jan 17 18:44:05 2016	(r406526)
@@ -9,25 +9,9 @@
 @unexec [ -x %D/sbin/webmaild ] && %D/sbin/webmaild stop || true
 @unexec [ -x %D/sbin/courierldapaliasd ] && %D/sbin/courierldapaliasd stop || true
 @unexec [ -x %D/sbin/courierfilter ] && %D/sbin/courierfilter stop || true
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/aliasdir
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %D/etc/courier/aliases
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/esmtpacceptmailfor.dir
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/esmtppercentrelay.dir
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %D/etc/courier/filters
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %D/etc/courier/filters/active
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/shared
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/shared.tmp
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %D/etc/courier/smtpaccess
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 -d %D/etc/courier/webadmin
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 -d %D/etc/courier/webadmin/added
- at exec install -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 -d %D/etc/courier/webadmin/removed
 @unexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
 bin/addcr
- at owner %%MAILOWN%%
- at group %%MAILGRP%%
-bin/cancelmsg
- at owner
- at group
+@(%%MAILOWN%%,%%MAILGRP%%,) bin/cancelmsg
 bin/courier-config
 bin/couriermlm
 bin/couriertls
@@ -147,19 +131,6 @@ etc/courier/webmail.authpam
 etc/courier/webmlmrc.dist
 @exec [ -f %D/etc/courier/webmlmrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/webmlmrc.dist
 @comment etc/courier/webmlmrc
- at dirrmtry etc/courier/aliasdir
- at dirrmtry etc/courier/aliases
- at dirrmtry etc/courier/esmtpacceptmailfor.dir
- at dirrmtry etc/courier/esmtppercentrelay.dir
- at dirrmtry etc/courier/filters/active
- at dirrmtry etc/courier/filters
- at dirrmtry etc/courier/shared
- at dirrmtry etc/courier/shared.tmp
- at dirrmtry etc/courier/smtpaccess
- at dirrmtry etc/courier/webadmin/added
- at dirrmtry etc/courier/webadmin/removed
- at dirrmtry etc/courier/webadmin
- at dirrmtry etc/courier
 libexec/courier/aliascombine
 libexec/courier/aliascreate
 libexec/courier/aliasexp
@@ -171,19 +142,13 @@ libexec/courier/makedatprog
 @owner %%MAILOWN%%
 @group %%MAILGRP%%
 libexec/courier/modules/dsn/courierdsn
- at dirrm libexec/courier/modules/dsn
 libexec/courier/modules/esmtp/addcr
 libexec/courier/modules/esmtp/courieresmtp
 libexec/courier/modules/esmtp/courieresmtpd
- at dirrm libexec/courier/modules/esmtp
 %%WITHFAX%%libexec/courier/modules/fax/courierfax
-%%WITHFAX%%@dirrm libexec/courier/modules/fax
 libexec/courier/modules/local/courierdeliver
 libexec/courier/modules/local/courierlocal
- at dirrm libexec/courier/modules/local
 %%WITHUUCP%%libexec/courier/modules/uucp/courieruucp
-%%WITHUUCP%%@dirrm libexec/courier/modules/uucp
- at dirrm libexec/courier/modules
 @owner
 @group
 libexec/courier/pcpd
@@ -194,11 +159,8 @@ libexec/courier/submitmkdir
 libexec/courier/webmail/webadmin
 libexec/courier/webmail/webmail
 libexec/courier/webmail/webmlm
- at dirrm libexec/courier/webmail
- at dirrm libexec/courier
 libexec/filters/dupfilter
 libexec/filters/perlfilter
- at dirrmtry libexec/filters
 man/man1/cancelmsg.1.gz
 man/man1/couriermlm.1.gz
 man/man1/couriertcpd.1.gz
@@ -335,7 +297,6 @@ share/courier/couriermlm/webmlmprocessed
 share/courier/couriermlm/webmlmrequestreceived.tmpl.html
 share/courier/couriermlm/webmlmsubinfo.tmpl.html
 share/courier/couriermlm/webmlmsublist.tmpl.html
- at dirrm share/courier/couriermlm
 share/courier/courierwebadmin/admin-00machine.html
 share/courier/courierwebadmin/admin-00machine.pl
 share/courier/courierwebadmin/admin-05local.html
@@ -381,7 +342,6 @@ share/courier/courierwebadmin/notsupp.ht
 share/courier/courierwebadmin/unsecure.html
 share/courier/courierwebadmin/webadmin.pl
 share/courier/courierwebadmin/webadmin.pm
- at dirrm share/courier/courierwebadmin
 share/courier/esmtpd
 share/courier/esmtpd-ssl
 %%WITHFAX%%share/courier/faxmail/application-pdf.filter
@@ -393,7 +353,6 @@ share/courier/esmtpd-ssl
 %%WITHFAX%%share/courier/faxmail/init
 %%WITHFAX%%share/courier/faxmail/new_fax
 %%WITHFAX%%share/courier/faxmail/text-plain.filter
-%%WITHFAX%%@dirrm share/courier/faxmail
 share/courier/filterctl
 share/courier/imapd
 share/courier/imapd-ssl
@@ -464,8 +423,6 @@ share/courier/sqwebmail/html/en-us/refre
 share/courier/sqwebmail/html/en-us/smileys.txt
 share/courier/sqwebmail/html/en-us/spellchk.html
 share/courier/sqwebmail/html/en
- at dirrm share/courier/sqwebmail/html/en-us
- at dirrm share/courier/sqwebmail/html
 share/courier/sqwebmail/images/bg.png
 share/courier/sqwebmail/images/bluebottomleft.png
 share/courier/sqwebmail/images/bluebottomright.png
@@ -513,12 +470,9 @@ share/courier/sqwebmail/images/sqwebmail
 share/courier/sqwebmail/images/trash2.png
 share/courier/sqwebmail/images/uncancel.png
 share/courier/sqwebmail/images/wikifmt.html
- at dirrm share/courier/sqwebmail/images
 share/courier/sqwebmail/ldapsearch
 share/courier/sqwebmail/sendit.sh
 share/courier/sqwebmail/webgpg
- at dirrm share/courier/sqwebmail
- at dirrm share/courier
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.imap
@@ -636,8 +590,6 @@ share/courier/sqwebmail/webgpg
 %%PORTDOCS%%%%DOCSDIR%%/html/submit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
 %%PORTDOCS%%%%DOCSDIR%%/html/webmlmd.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
 @comment @exec chown %%BINOWN%%:mail %D/bin/maildrop
 @comment @exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
@@ -673,16 +625,33 @@ share/courier/sqwebmail/webgpg
 @comment @exec chmod 0555 %D/share/courier/sqwebmail/html/en-us
 @comment @exec chmod 0555 %D/share/courier/sqwebmail/images
 @unexec echo y | crontab -u %%CACHEOWN%% -r 2>/dev/null || true
- at unexec rm -rf %%CALENDIR%% %%CACHEDIR%% 2>/dev/null || true
- at dirrmtry %%CALENDIR%%/localcache
- at dirrmtry %%CALENDIR%%/private
- at dirrmtry %%CALENDIR%%/public
- at dirrmtry %%CALENDIR%%
- at dirrmtry %%LOCALSTATEDIR%%/allfilters
- at dirrmtry %%LOCALSTATEDIR%%/filters
- at dirrmtry %%LOCALSTATEDIR%%/msgq
- at dirrmtry %%LOCALSTATEDIR%%/msgs
- at dirrmtry %%LOCALSTATEDIR%%/tmp
- at dirrmtry %%LOCALSTATEDIR%%/track
- at dirrmtry %%LOCALSTATEDIR%%
- at dirrmtry %%CACHEDIR%%
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/aliasdir
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/aliases
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/esmtpacceptmailfor.dir
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/esmtppercentrelay.dir
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/filters
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/filters/active
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/shared
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/shared.tmp
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/smtpaccess
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin/added
+ at dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin/removed
+ at dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/dsn
+ at dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/esmtp
+%%WITHFAX%%@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/fax
+ at dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/local
+%%WITHUUCP%%@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/uucp
+ at dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules
+ at dir %%CALENDIR%%/localcache
+ at dir %%CALENDIR%%/private
+ at dir %%CALENDIR%%/public
+ at dir %%CALENDIR%%
+ at dir %%LOCALSTATEDIR%%/allfilters
+ at dir %%LOCALSTATEDIR%%/filters
+ at dir %%LOCALSTATEDIR%%/msgq
+ at dir %%LOCALSTATEDIR%%/msgs
+ at dir %%LOCALSTATEDIR%%/tmp
+ at dir %%LOCALSTATEDIR%%/track
+ at dir %%LOCALSTATEDIR%%
+ at dir %%CACHEDIR%%

More information about the svn-ports-head mailing list