diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 02:20:05 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 02:20:05 +0000 |
| commit | 0416031c9ba13da33845bc762078065b482dd551 (patch) | |
| tree | be4d2554a35fe96c98b1eaa2d243964ae3c4f602 /mail | |
| parent | (forced commit) (diff) | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Notes
Notes:
svn path=/head/; revision=154113
Diffstat (limited to '')
133 files changed, 375 insertions, 375 deletions
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist index 6da2c5fed99d..a93b91df75c8 100644 --- a/mail/assp/pkg-plist +++ b/mail/assp/pkg-plist @@ -1,6 +1,6 @@ etc/periodic/daily/510.assp -@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true -@unexec rmdir %D/etc/periodic 2>/dev/null || true +@dirrmtry etc/periodic/daily +@dirrmtry etc/periodic lib/assp/addservice.pl lib/assp/assp.pl lib/assp/move2num.pl diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist index 568bc94fb5e7..f6d509188dfc 100644 --- a/mail/balsa/pkg-plist +++ b/mail/balsa/pkg-plist @@ -135,8 +135,8 @@ share/locale/vi/LC_MESSAGES/balsa.mo share/locale/wa/LC_MESSAGES/balsa.mo share/locale/zh_CN/LC_MESSAGES/balsa.mo share/locale/zh_TW/LC_MESSAGES/balsa.mo -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/rw 2>/dev/null || true +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw @dirrm share/gnome/sounds/balsa @dirrm share/gnome/omf/balsa %%GTKICON%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist index 345aedd99fc7..5fc2d690124b 100644 --- a/mail/bincimap/pkg-plist +++ b/mail/bincimap/pkg-plist @@ -2,7 +2,7 @@ bin/bincimapd bin/bincimap-up etc/bincimap/bincimap.conf.sample -@unexec rmdir %D/etc/bincimap 2>/dev/null || true +@dirrmtry etc/bincimap %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist index 42909f31edc4..fb0c396abf60 100644 --- a/mail/courier-imap/pkg-plist +++ b/mail/courier-imap/pkg-plist @@ -47,11 +47,11 @@ share/courier-imap/mkpop3dcert %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%%%DOCSDIR%%/README.couriertls -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/courier-imap -@unexec rmdir %D/%%LIBEXECDIR%%/authlib 2>/dev/null || true +@dirrmtry %%LIBEXECDIR%%/authlib @dirrm %%LIBEXECDIR%% @dirrm %%CONFDIR%%/shared @dirrm %%CONFDIR%%/shared.tmp -@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true +@dirrmtry %%CONFDIR%% diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist index 172d1ed5a7c3..31679fbba714 100644 --- a/mail/courier/pkg-plist +++ b/mail/courier/pkg-plist @@ -120,19 +120,19 @@ etc/courier/webmail.authpam @exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist @exec [ -f %D/etc/courier/pop3d.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist @exec [ -f %D/etc/courier/sqwebmaild.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/sqwebmaild.dist -@unexec rmdir %D/etc/courier/aliasdir 2>/dev/null || true -@unexec rmdir %D/etc/courier/aliases 2>/dev/null || true -@unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null || true -@unexec rmdir %D/etc/courier/esmtppercentrelay.dir 2>/dev/null || true -@unexec rmdir %D/etc/courier/filters/active 2>/dev/null || true -@unexec rmdir %D/etc/courier/filters 2>/dev/null || true -@unexec rmdir %D/etc/courier/shared 2>/dev/null || true -@unexec rmdir %D/etc/courier/shared.tmp 2>/dev/null || true -@unexec rmdir %D/etc/courier/smtpaccess 2>/dev/null || true -@unexec rmdir %D/etc/courier/webadmin/added 2>/dev/null || true -@unexec rmdir %D/etc/courier/webadmin/removed 2>/dev/null || true -@unexec rmdir %D/etc/courier/webadmin 2>/dev/null || true -@unexec rmdir %D/etc/courier 2>/dev/null || true +@dirrmtry etc/courier/aliasdir +@dirrmtry etc/courier/aliases +@dirrmtry etc/courier/esmtpacceptmailfor.dir +@dirrmtry etc/courier/esmtppercentrelay.dir +@dirrmtry etc/courier/filters/active +@dirrmtry etc/courier/filters +@dirrmtry etc/courier/shared +@dirrmtry etc/courier/shared.tmp +@dirrmtry etc/courier/smtpaccess +@dirrmtry etc/courier/webadmin/added +@dirrmtry etc/courier/webadmin/removed +@dirrmtry etc/courier/webadmin +@dirrmtry etc/courier libexec/courier/aliascombine libexec/courier/aliascreate libexec/courier/aliasexp diff --git a/mail/couriergraph/pkg-plist b/mail/couriergraph/pkg-plist index f84aa392679d..b8f98023f15f 100644 --- a/mail/couriergraph/pkg-plist +++ b/mail/couriergraph/pkg-plist @@ -1,4 +1,4 @@ etc/rc.d/couriergraph.sh www/cgi-bin/couriergraph.cgi sbin/couriergraph.pl -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist index e4e0d81d0de7..ebc9cf7e902a 100644 --- a/mail/ezmlm-idx/pkg-plist +++ b/mail/ezmlm-idx/pkg-plist @@ -30,7 +30,7 @@ bin/ezmlm-weed etc/ezmlm/ezmlmglrc.sample etc/ezmlm/ezmlmrc.sample etc/ezmlm/ezmlmsubrc.sample -@unexec rmdir %D/etc/ezmlm 2>/dev/null || true +@dirrmtry etc/ezmlm %%PORTDOCS%%%%DOCSDIR%%/CHANGES.idx %%PORTDOCS%%%%DOCSDIR%%/DOWNGRADE.idx %%PORTDOCS%%%%DOCSDIR%%/FAQ.idx diff --git a/mail/freepops/pkg-plist b/mail/freepops/pkg-plist index 921c4d8b7283..8df133c625e0 100644 --- a/mail/freepops/pkg-plist +++ b/mail/freepops/pkg-plist @@ -45,5 +45,5 @@ etc/freepops/config.lua.sample @dirrm %%DATADIR%%/lua @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/freepops 2>/dev/null || true +@dirrmtry etc/freepops @exec mkdir -p %D/share/freepops/lua_unofficial diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist index 0a9b90f52018..d1ed2f328689 100644 --- a/mail/gnubiff/pkg-plist +++ b/mail/gnubiff/pkg-plist @@ -32,10 +32,10 @@ share/locale/vi/LC_MESSAGES/gnubiff.mo %%SHAREDIR%%/pixmaps/gnubiff.png %%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server %%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml -@unexec rmdir %D/share/locale/fr_CA/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/fr_CA 2> /dev/null || true -@unexec rmdir %D/%%BONOBODIR%%/servers 2> /dev/null || true -@unexec rmdir %D/%%BONOBODIR%% 2> /dev/null || true -@unexec rmdir %D/%%SHAREDIR%%/gnome-2.0/ui 2> /dev/null || true -@unexec rmdir %D/%%SHAREDIR%%/gnome-2.0 2> /dev/null || true +@dirrmtry share/locale/fr_CA/LC_MESSAGES +@dirrmtry share/locale/fr_CA +@dirrmtry %%BONOBODIR%%/servers +@dirrmtry %%BONOBODIR%% +@dirrmtry %%SHAREDIR%%/gnome-2.0/ui +@dirrmtry %%SHAREDIR%%/gnome-2.0 @dirrm %%SHAREDIR%%/gnubiff diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist index 4aed11a161f8..f4b7a7474b06 100644 --- a/mail/horde-imp/pkg-plist +++ b/mail/horde-imp/pkg-plist @@ -498,5 +498,5 @@ @dirrm %%IMPDIR%%/lib/Auth @dirrm %%IMPDIR%%/lib @dirrm %%IMPDIR%%/js -@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true +@dirrmtry %%IMPDIR%%/config +@dirrmtry %%IMPDIR%% diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist index 697fac19d784..85af75074930 100644 --- a/mail/horde-ingo/pkg-plist +++ b/mail/horde-ingo/pkg-plist @@ -164,5 +164,5 @@ @dirrm %%INGODIR%%/lib/Script @dirrm %%INGODIR%%/lib/Driver @dirrm %%INGODIR%%/lib -@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true +@dirrmtry %%INGODIR%%/config +@dirrmtry %%INGODIR%% diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist index fdb89c479187..07ea12b087a2 100644 --- a/mail/horde-turba/pkg-plist +++ b/mail/horde-turba/pkg-plist @@ -257,5 +257,5 @@ @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics @dirrm %%TURBADIR%%/themes -@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true +@dirrmtry %%TURBADIR%%/config +@dirrmtry %%TURBADIR%% diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist index 4aed11a161f8..f4b7a7474b06 100644 --- a/mail/horde4-imp/pkg-plist +++ b/mail/horde4-imp/pkg-plist @@ -498,5 +498,5 @@ @dirrm %%IMPDIR%%/lib/Auth @dirrm %%IMPDIR%%/lib @dirrm %%IMPDIR%%/js -@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true +@dirrmtry %%IMPDIR%%/config +@dirrmtry %%IMPDIR%% diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist index 697fac19d784..85af75074930 100644 --- a/mail/horde4-ingo/pkg-plist +++ b/mail/horde4-ingo/pkg-plist @@ -164,5 +164,5 @@ @dirrm %%INGODIR%%/lib/Script @dirrm %%INGODIR%%/lib/Driver @dirrm %%INGODIR%%/lib -@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true +@dirrmtry %%INGODIR%%/config +@dirrmtry %%INGODIR%% diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist index fdb89c479187..07ea12b087a2 100644 --- a/mail/horde4-turba/pkg-plist +++ b/mail/horde4-turba/pkg-plist @@ -257,5 +257,5 @@ @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics @dirrm %%TURBADIR%%/themes -@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true +@dirrmtry %%TURBADIR%%/config +@dirrmtry %%TURBADIR%% diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist index 4aed11a161f8..f4b7a7474b06 100644 --- a/mail/imp/pkg-plist +++ b/mail/imp/pkg-plist @@ -498,5 +498,5 @@ @dirrm %%IMPDIR%%/lib/Auth @dirrm %%IMPDIR%%/lib @dirrm %%IMPDIR%%/js -@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true +@dirrmtry %%IMPDIR%%/config +@dirrmtry %%IMPDIR%% diff --git a/mail/ingo/pkg-plist b/mail/ingo/pkg-plist index 697fac19d784..85af75074930 100644 --- a/mail/ingo/pkg-plist +++ b/mail/ingo/pkg-plist @@ -164,5 +164,5 @@ @dirrm %%INGODIR%%/lib/Script @dirrm %%INGODIR%%/lib/Driver @dirrm %%INGODIR%%/lib -@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true +@dirrmtry %%INGODIR%%/config +@dirrmtry %%INGODIR%% diff --git a/mail/kbiff/pkg-plist b/mail/kbiff/pkg-plist index 5390eee2d243..e4ac25933a34 100644 --- a/mail/kbiff/pkg-plist +++ b/mail/kbiff/pkg-plist @@ -60,8 +60,8 @@ share/locale/sv/LC_MESSAGES/kbiff.mo share/locale/tr/LC_MESSAGES/kbiff.mo share/locale/uk/LC_MESSAGES/kbiff.mo share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo -@unexec rmdir %D/share/locale/no_NY/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/no_NY 2> /dev/null || true +@dirrmtry share/locale/no_NY/LC_MESSAGES +@dirrmtry share/locale/no_NY @dirrm share/doc/HTML/fr/kbiff @dirrm share/doc/HTML/es/kbiff @dirrm share/doc/HTML/en/kbiff diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist index 94ee8fe5f90b..f9e376778bc5 100644 --- a/mail/kshowmail/pkg-plist +++ b/mail/kshowmail/pkg-plist @@ -35,26 +35,26 @@ share/locale/es/LC_MESSAGES/kshowmail.mo share/locale/fr/LC_MESSAGES/kshowmail.mo share/locale/hu/LC_MESSAGES/kshowmail.mo share/locale/sv/LC_MESSAGES/kshowmail.mo -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/sv/kshowmail -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true +@dirrmtry share/doc/HTML/sv @dirrm share/doc/HTML/hu/kshowmail -@unexec rmdir %D/share/doc/HTML/hu 2>/dev/null || true +@dirrmtry share/doc/HTML/hu @dirrm share/doc/HTML/fr/kshowmail -@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true +@dirrmtry share/doc/HTML/fr @dirrm share/doc/HTML/es/kshowmail -@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true +@dirrmtry share/doc/HTML/es @dirrm share/doc/HTML/en/kshowmail -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kshowmail -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/de +@dirrmtry share/doc/HTML @dirrm share/apps/kshowmail/sounds @dirrm share/apps/kshowmail/pics @dirrm share/apps/kshowmail -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Internet +@dirrmtry share/applnk diff --git a/mail/mailgraph/pkg-plist b/mail/mailgraph/pkg-plist index afe0e6531c85..7552a8b60cd2 100644 --- a/mail/mailgraph/pkg-plist +++ b/mail/mailgraph/pkg-plist @@ -1,3 +1,3 @@ www/cgi-bin/mailgraph.cgi sbin/mailgraph.pl -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist index 79841e2bbfbb..3d9e2bec166e 100644 --- a/mail/mailman/pkg-plist +++ b/mail/mailman/pkg-plist @@ -2095,15 +2095,15 @@ etc/rc.d/mailman.sh @dirrm %%MMDIR%%/Mailman/Cgi @dirrm %%MMDIR%%/Mailman/Bouncers @dirrm %%MMDIR%%/Mailman/Archiver -@unexec rmdir %D/%%MMDIR%%/spam 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/qfiles 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/logs 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/locks 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/lists 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/data 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/archives/public 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/archives/private 2>/dev/null || true +@dirrmtry %%MMDIR%%/spam +@dirrmtry %%MMDIR%%/qfiles +@dirrmtry %%MMDIR%%/logs +@dirrmtry %%MMDIR%%/locks +@dirrmtry %%MMDIR%%/lists +@dirrmtry %%MMDIR%%/data +@dirrmtry %%MMDIR%%/archives/public +@dirrmtry %%MMDIR%%/archives/private %%SUB_HTDIG%%@unexec rmdir %D/%%MMDIR%%/archives/htdig 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/archives 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/Mailman 2>/dev/null || true -@unexec rmdir %D/%%MMDIR%%/ 2>/dev/null || true +@dirrmtry %%MMDIR%%/archives +@dirrmtry %%MMDIR%%/Mailman +@dirrmtry %%MMDIR%%/ diff --git a/mail/majordomo/pkg-plist b/mail/majordomo/pkg-plist index a7bc415ad570..f6709a0883ce 100644 --- a/mail/majordomo/pkg-plist +++ b/mail/majordomo/pkg-plist @@ -48,7 +48,7 @@ majordomo/doc/post-install-notes @dirrm majordomo/digests @dirrm majordomo/lists/test-l-digest.archive @dirrm majordomo/lists/test-l.archive -@unexec rmdir %D/majordomo/lists 2>/dev/null || true +@dirrmtry majordomo/lists @dirrm majordomo/tmp @dirrm majordomo/Tools -@unexec rmdir %D/majordomo 2>/dev/null || true +@dirrmtry majordomo diff --git a/mail/mew-emacs20/pkg-plist b/mail/mew-emacs20/pkg-plist index 0a95cc321cc2..c0e87333f155 100644 --- a/mail/mew-emacs20/pkg-plist +++ b/mail/mew-emacs20/pkg-plist @@ -147,10 +147,10 @@ bin/uumerge %%EMACS_LIBDIR%%/site-lisp/mew/mew.el %%EMACS_LIBDIR%%/site-lisp/mew/mew.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/mew -@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/site-lisp @dirrm %%EMACS_LIBDIR%%/etc/mew/etc @dirrm %%EMACS_LIBDIR%%/etc/mew -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm %%MEW_DOCDIR%%/patches @dirrm %%MEW_DOCDIR%%/contrib @dirrm %%MEW_DOCDIR%% diff --git a/mail/mew-mule/pkg-plist b/mail/mew-mule/pkg-plist index 5856ad3bdfea..81e77bddd90b 100644 --- a/mail/mew-mule/pkg-plist +++ b/mail/mew-mule/pkg-plist @@ -150,7 +150,7 @@ bin/uumerge @dirrm %%EMACS_LIBDIR%%/site-lisp/mew @dirrm %%EMACS_LIBDIR%%/etc/mew/etc @dirrm %%EMACS_LIBDIR%%/etc/mew -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm %%MEW_DOCDIR%%/patches @dirrm %%MEW_DOCDIR%%/contrib @dirrm %%MEW_DOCDIR%% diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist index 5856ad3bdfea..81e77bddd90b 100644 --- a/mail/mew/pkg-plist +++ b/mail/mew/pkg-plist @@ -150,7 +150,7 @@ bin/uumerge @dirrm %%EMACS_LIBDIR%%/site-lisp/mew @dirrm %%EMACS_LIBDIR%%/etc/mew/etc @dirrm %%EMACS_LIBDIR%%/etc/mew -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm %%MEW_DOCDIR%%/patches @dirrm %%MEW_DOCDIR%%/contrib @dirrm %%MEW_DOCDIR%% diff --git a/mail/mew2-emacs20/pkg-plist b/mail/mew2-emacs20/pkg-plist index 1d80d8a5222c..7ce7981b7fec 100644 --- a/mail/mew2-emacs20/pkg-plist +++ b/mail/mew2-emacs20/pkg-plist @@ -157,9 +157,9 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/site-lisp @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib @dirrm share/doc/mew%%MEW_MAJOR_VER%% diff --git a/mail/mew2/pkg-plist b/mail/mew2/pkg-plist index 1d80d8a5222c..7ce7981b7fec 100644 --- a/mail/mew2/pkg-plist +++ b/mail/mew2/pkg-plist @@ -157,9 +157,9 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/site-lisp @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib @dirrm share/doc/mew%%MEW_MAJOR_VER%% diff --git a/mail/mew3-emacs20/pkg-plist b/mail/mew3-emacs20/pkg-plist index 3d969bc5ab29..4f5aff9b01b0 100644 --- a/mail/mew3-emacs20/pkg-plist +++ b/mail/mew3-emacs20/pkg-plist @@ -182,9 +182,9 @@ bin/mewls %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/site-lisp @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm %%DOCSDIR%%/contrib @dirrm %%DOCSDIR%% diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist index 3d969bc5ab29..4f5aff9b01b0 100644 --- a/mail/mew3/pkg-plist +++ b/mail/mew3/pkg-plist @@ -182,9 +182,9 @@ bin/mewls %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/site-lisp @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%% -@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true +@dirrmtry %%EMACS_LIBDIR%%/etc @dirrm %%DOCSDIR%%/contrib @dirrm %%DOCSDIR%% diff --git a/mail/mulberry/pkg-plist b/mail/mulberry/pkg-plist index 017820e9a805..a6f4d49c7662 100644 --- a/mail/mulberry/pkg-plist +++ b/mail/mulberry/pkg-plist @@ -28,4 +28,4 @@ lib/mulberry/Plug-ins/vCardAdbkIOPlugin.so %%PORTDOCS%%@dirrm %%DOCSDIR%% share/pixmaps/mulberry.png share/pixmaps/mulberry.xpm -@unexec rmdir %D/share/pixmaps 2>/dev/null || true +@dirrmtry share/pixmaps diff --git a/mail/p5-Email-Abstract/pkg-plist b/mail/p5-Email-Abstract/pkg-plist index fcbd80dbfe74..c1cc4dc6828f 100644 --- a/mail/p5-Email-Abstract/pkg-plist +++ b/mail/p5-Email-Abstract/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/Email/Abstract/MailMessage.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract -@unexec rmdir %D/%%SITE_PERL%%/Email/Abstract 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email/Abstract +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Address/pkg-plist b/mail/p5-Email-Address/pkg-plist index f27b4f3a4a25..529a570eebf4 100644 --- a/mail/p5-Email-Address/pkg-plist +++ b/mail/p5-Email-Address/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Email/Address.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Delete/pkg-plist b/mail/p5-Email-Delete/pkg-plist index b8fde326862e..2e54613ea3ef 100644 --- a/mail/p5-Email-Delete/pkg-plist +++ b/mail/p5-Email-Delete/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Email/Delete/Maildir.pm %%SITE_PERL%%/Email/Delete/Mbox.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/Delete 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/Delete +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Filter/pkg-plist b/mail/p5-Email-Filter/pkg-plist index e307b2f2cde4..9443abef42db 100644 --- a/mail/p5-Email-Filter/pkg-plist +++ b/mail/p5-Email-Filter/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Email/Filter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email diff --git a/mail/p5-Email-Folder-IMAP/pkg-plist b/mail/p5-Email-Folder-IMAP/pkg-plist index bd59b3fff733..9965a1a29b89 100644 --- a/mail/p5-Email-Folder-IMAP/pkg-plist +++ b/mail/p5-Email-Folder-IMAP/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/Folder/IMAP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/Folder +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Folder-IMAPS/pkg-plist b/mail/p5-Email-Folder-IMAPS/pkg-plist index 521b2e72ff38..538accefbc01 100644 --- a/mail/p5-Email-Folder-IMAPS/pkg-plist +++ b/mail/p5-Email-Folder-IMAPS/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/Folder/IMAPS.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/Folder +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Folder-POP3/pkg-plist b/mail/p5-Email-Folder-POP3/pkg-plist index b51077dad4a1..dc40555dfdec 100644 --- a/mail/p5-Email-Folder-POP3/pkg-plist +++ b/mail/p5-Email-Folder-POP3/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/Folder/POP3.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/Folder +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Folder/pkg-plist b/mail/p5-Email-Folder/pkg-plist index 4014336d2ee0..7db801df2c90 100644 --- a/mail/p5-Email-Folder/pkg-plist +++ b/mail/p5-Email-Folder/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/Email/Folder/Maildir.pm %%SITE_PERL%%/Email/Folder/Mbox.pm %%SITE_PERL%%/Email/Folder/Reader.pm -@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email/Folder +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-FolderType-Net/pkg-plist b/mail/p5-Email-FolderType-Net/pkg-plist index 5daa7dd29d7f..058df05e5fd9 100644 --- a/mail/p5-Email-FolderType-Net/pkg-plist +++ b/mail/p5-Email-FolderType-Net/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/FolderType/Net.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/FolderType 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/FolderType +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-FolderType/pkg-plist b/mail/p5-Email-FolderType/pkg-plist index 096ccac73a0b..f2b12bd2ddfb 100644 --- a/mail/p5-Email-FolderType/pkg-plist +++ b/mail/p5-Email-FolderType/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/Email/FolderType/MH.pm %%SITE_PERL%%/Email/FolderType/Maildir.pm %%SITE_PERL%%/Email/FolderType/Mbox.pm -@unexec rmdir %D/%%SITE_PERL%%/Email/FolderType 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email/FolderType +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist index 19e1cbdb3e6f..748ea98fdcef 100644 --- a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist +++ b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Email/LocalDelivery/Ezmlm.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery/Ezmlm 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/LocalDelivery/Ezmlm +@dirrmtry %%SITE_PERL%%/Email/LocalDelivery +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-LocalDelivery/pkg-plist b/mail/p5-Email-LocalDelivery/pkg-plist index c0d481573216..558024105bcc 100644 --- a/mail/p5-Email-LocalDelivery/pkg-plist +++ b/mail/p5-Email-LocalDelivery/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Email/LocalDelivery/Mbox.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/LocalDelivery +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist index 48891749897d..9b27aecec4ac 100644 --- a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist +++ b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Email/MIME/Attachment/Stripper.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME/Attachment 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/MIME/Attachment +@dirrmtry %%SITE_PERL%%/Email/MIME +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MIME-ContentType/pkg-plist b/mail/p5-Email-MIME-ContentType/pkg-plist index a8f45151952e..771d10698423 100644 --- a/mail/p5-Email-MIME-ContentType/pkg-plist +++ b/mail/p5-Email-MIME-ContentType/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/MIME/ContentType.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/MIME +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MIME-Encodings/pkg-plist b/mail/p5-Email-MIME-Encodings/pkg-plist index 3e2fe541cac6..0db288d1d856 100644 --- a/mail/p5-Email-MIME-Encodings/pkg-plist +++ b/mail/p5-Email-MIME-Encodings/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Email/MIME/Encodings.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME/Encodings 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/MIME/Encodings +@dirrmtry %%SITE_PERL%%/Email/MIME +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MIME-Modifier/pkg-plist b/mail/p5-Email-MIME-Modifier/pkg-plist index 1988ad3ecbbb..9a21de7ff13d 100644 --- a/mail/p5-Email-MIME-Modifier/pkg-plist +++ b/mail/p5-Email-MIME-Modifier/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/MIME/Modifier.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/MIME +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MIME/pkg-plist b/mail/p5-Email-MIME/pkg-plist index 55ffdfb7bd47..54bdd5ff6a00 100644 --- a/mail/p5-Email-MIME/pkg-plist +++ b/mail/p5-Email-MIME/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Email/MIME.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-MessageID/pkg-plist b/mail/p5-Email-MessageID/pkg-plist index 209112ff4556..9b1b938a8c77 100644 --- a/mail/p5-Email-MessageID/pkg-plist +++ b/mail/p5-Email-MessageID/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Email/MessageID.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Send/pkg-plist b/mail/p5-Email-Send/pkg-plist index affd3d397f52..116d6efe3c51 100644 --- a/mail/p5-Email-Send/pkg-plist +++ b/mail/p5-Email-Send/pkg-plist @@ -5,7 +5,7 @@ %%SITE_PERL%%/Email/Send/SMTP.pm %%SITE_PERL%%/Email/Send/Sendmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email/Send 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email/Send +@dirrmtry %%SITE_PERL%%/Email diff --git a/mail/p5-Email-Simple-Creator/pkg-plist b/mail/p5-Email-Simple-Creator/pkg-plist index bab286c8e0d6..b778ed6c92d8 100644 --- a/mail/p5-Email-Simple-Creator/pkg-plist +++ b/mail/p5-Email-Simple-Creator/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Email/Simple/Creator.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Email/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email/Simple +@dirrmtry %%SITE_PERL%%/Email +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email diff --git a/mail/p5-Email-Simple/pkg-plist b/mail/p5-Email-Simple/pkg-plist index 06d57e7388c1..5a169fe05983 100644 --- a/mail/p5-Email-Simple/pkg-plist +++ b/mail/p5-Email-Simple/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Email/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Email +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email diff --git a/mail/p5-IMAP-Sieve/pkg-plist b/mail/p5-IMAP-Sieve/pkg-plist index f577f070fa57..8b4ee3a0d4ba 100644 --- a/mail/p5-IMAP-Sieve/pkg-plist +++ b/mail/p5-IMAP-Sieve/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/IMAP/Sieve.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IMAP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP +@dirrmtry %%SITE_PERL%%/IMAP diff --git a/mail/p5-Log-Procmail/pkg-plist b/mail/p5-Log-Procmail/pkg-plist index 8a9ad6c35ba3..0ff6b870a2dc 100644 --- a/mail/p5-Log-Procmail/pkg-plist +++ b/mail/p5-Log-Procmail/pkg-plist @@ -3,5 +3,5 @@ bin/mailstat.pl %%SITE_PERL%%/Log/Procmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log +@dirrmtry %%SITE_PERL%%/Log diff --git a/mail/p5-MIME-Fast/pkg-plist b/mail/p5-MIME-Fast/pkg-plist index 67d4affa5df4..e2103c7884b5 100644 --- a/mail/p5-MIME-Fast/pkg-plist +++ b/mail/p5-MIME-Fast/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/autosplit.ix -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME diff --git a/mail/p5-MIME-Lite-HTML/pkg-plist b/mail/p5-MIME-Lite-HTML/pkg-plist index 2a8a8d356a70..89da77011ea6 100644 --- a/mail/p5-MIME-Lite-HTML/pkg-plist +++ b/mail/p5-MIME-Lite-HTML/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/MIME/Lite/HTML.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MIME/Lite 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME +@dirrmtry %%SITE_PERL%%/MIME/Lite +@dirrmtry %%SITE_PERL%%/MIME diff --git a/mail/p5-MIME-Lite/pkg-plist b/mail/p5-MIME-Lite/pkg-plist index a023e7774470..37473c177b61 100644 --- a/mail/p5-MIME-Lite/pkg-plist +++ b/mail/p5-MIME-Lite/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/MIME/changes.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME +@dirrmtry %%SITE_PERL%%/MIME diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist index 673a025e5ff2..26fd210e1eae 100644 --- a/mail/p5-MIME-Tools/pkg-plist +++ b/mail/p5-MIME-Tools/pkg-plist @@ -37,4 +37,4 @@ @dirrm %%SITE_PERL%%/MIME/Field @dirrm %%SITE_PERL%%/MIME/Decoder @dirrm %%SITE_PERL%%/MIME/Parser -@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/MIME diff --git a/mail/p5-MIME-Types/pkg-plist b/mail/p5-MIME-Types/pkg-plist index 3096910ec4b1..a31cfbc26d89 100644 --- a/mail/p5-MIME-Types/pkg-plist +++ b/mail/p5-MIME-Types/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/MIME/Types.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME +@dirrmtry %%SITE_PERL%%/MIME diff --git a/mail/p5-Mail-Address-MobileJp/pkg-plist b/mail/p5-Mail-Address-MobileJp/pkg-plist index 546efb5d106a..4cd58e88d345 100644 --- a/mail/p5-Mail-Address-MobileJp/pkg-plist +++ b/mail/p5-Mail-Address-MobileJp/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Mail/Address/MobileJp.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail/Address 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail/Address +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Alias/pkg-plist b/mail/p5-Mail-Alias/pkg-plist index fed35a3bdfec..e473ff55a817 100644 --- a/mail/p5-Mail-Alias/pkg-plist +++ b/mail/p5-Mail-Alias/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/Alias.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist index 5f3836ff4bf9..ee964d2ab05a 100644 --- a/mail/p5-Mail-Audit/pkg-plist +++ b/mail/p5-Mail-Audit/pkg-plist @@ -15,6 +15,6 @@ share/examples/p5-Mail-Audit/proc2ma @dirrm share/examples/p5-Mail-Audit %%PORTDOCS%%@dirrm share/doc/p5-Mail-Audit @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Audit -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Box-Parser-C/pkg-plist b/mail/p5-Mail-Box-Parser-C/pkg-plist index 19b83457e109..f89a6d7dffca 100644 --- a/mail/p5-Mail-Box-Parser-C/pkg-plist +++ b/mail/p5-Mail-Box-Parser-C/pkg-plist @@ -3,9 +3,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist index 0b9c60de360c..126fd7ee4c51 100644 --- a/mail/p5-Mail-Box/pkg-plist +++ b/mail/p5-Mail-Box/pkg-plist @@ -225,6 +225,6 @@ @dirrm %%SITE_PERL%%/Mail/Box/Dir @dirrm %%SITE_PERL%%/Mail/Box/Dbx @dirrm %%SITE_PERL%%/Mail/Box -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail/Message 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail/Message +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Box1/pkg-plist b/mail/p5-Mail-Box1/pkg-plist index a9fb9b401ae7..e1bceba85ebd 100644 --- a/mail/p5-Mail-Box1/pkg-plist +++ b/mail/p5-Mail-Box1/pkg-plist @@ -17,10 +17,10 @@ %%SITE_PERL%%/Mail/Message.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Box/Locker @dirrm %%SITE_PERL%%/Mail/Box/Mbox @dirrm %%SITE_PERL%%/Mail/Box/MH @dirrm %%SITE_PERL%%/Mail/Box/Tie @dirrm %%SITE_PERL%%/Mail/Box -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Bulkmail/pkg-plist b/mail/p5-Mail-Bulkmail/pkg-plist index 2566fc8a90dc..8a69542706b1 100644 --- a/mail/p5-Mail-Bulkmail/pkg-plist +++ b/mail/p5-Mail-Bulkmail/pkg-plist @@ -5,6 +5,6 @@ %%SITE_PERL%%/Mail/Bulkmail/DummyServer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Bulkmail -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-CClient/pkg-plist b/mail/p5-Mail-CClient/pkg-plist index 0f7b391ff73d..042b31ed32a5 100644 --- a/mail/p5-Mail-CClient/pkg-plist +++ b/mail/p5-Mail-CClient/pkg-plist @@ -26,5 +26,5 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/utf8_mime2text.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist index 1f50dd63234b..15ff74480076 100644 --- a/mail/p5-Mail-CheckUser/pkg-plist +++ b/mail/p5-Mail-CheckUser/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser/.packlist bin/cufilter @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-ClamAV/pkg-plist b/mail/p5-Mail-ClamAV/pkg-plist index ce15780212e9..910a1543ed84 100644 --- a/mail/p5-Mail-ClamAV/pkg-plist +++ b/mail/p5-Mail-ClamAV/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist index 4e5e3eabab94..b95a59537dac 100644 --- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist +++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/DeliveryStatus -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-DomainKeys/pkg-plist b/mail/p5-Mail-DomainKeys/pkg-plist index de48781e1736..5ce0f36b6216 100644 --- a/mail/p5-Mail-DomainKeys/pkg-plist +++ b/mail/p5-Mail-DomainKeys/pkg-plist @@ -10,5 +10,5 @@ @dirrm %%SITE_PERL%%/Mail/DomainKeys/Key @dirrm %%SITE_PERL%%/Mail/DomainKeys @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Mail-Field-Received/pkg-plist b/mail/p5-Mail-Field-Received/pkg-plist index 36861884054f..285d1d2b2f5e 100644 --- a/mail/p5-Mail-Field-Received/pkg-plist +++ b/mail/p5-Mail-Field-Received/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Mail/Field/Received.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail/Field 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail/Field +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist index de212414bc59..6ac9f5073120 100644 --- a/mail/p5-Mail-Folder/pkg-plist +++ b/mail/p5-Mail-Folder/pkg-plist @@ -5,6 +5,6 @@ %%SITE_PERL%%/Mail/Folder/NNTP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Folder -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist index 0416ee2dce38..376afe06047c 100644 --- a/mail/p5-Mail-Freshmeat/pkg-plist +++ b/mail/p5-Mail-Freshmeat/pkg-plist @@ -5,4 +5,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat @dirrm %%SITE_PERL%%/Mail/Freshmeat -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-GnuPG/pkg-plist b/mail/p5-Mail-GnuPG/pkg-plist index df05de3805e7..72b6b5691753 100644 --- a/mail/p5-Mail-GnuPG/pkg-plist +++ b/mail/p5-Mail-GnuPG/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Mail/GnuPG.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG diff --git a/mail/p5-Mail-Graph/pkg-plist b/mail/p5-Mail-Graph/pkg-plist index 0ac43e0a20dc..ef1c954a40c3 100644 --- a/mail/p5-Mail-Graph/pkg-plist +++ b/mail/p5-Mail-Graph/pkg-plist @@ -13,4 +13,4 @@ @dirrm %%EXAMPLESDIR%%/output @dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-IMAPClient/pkg-plist b/mail/p5-Mail-IMAPClient/pkg-plist index 25e885908002..350e5f4c514e 100644 --- a/mail/p5-Mail-IMAPClient/pkg-plist +++ b/mail/p5-Mail-IMAPClient/pkg-plist @@ -8,5 +8,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient @dirrm %%SITE_PERL%%/Mail/IMAPClient/BodyStructure @dirrm %%SITE_PERL%%/Mail/IMAPClient -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-ListDetector/pkg-plist b/mail/p5-Mail-ListDetector/pkg-plist index e55f2b498970..8995d300b9d3 100644 --- a/mail/p5-Mail-ListDetector/pkg-plist +++ b/mail/p5-Mail-ListDetector/pkg-plist @@ -29,6 +29,6 @@ @dirrm %%SITE_PERL%%/auto/Mail/ListDetector @dirrm %%SITE_PERL%%/Mail/ListDetector/Detector @dirrm %%SITE_PERL%%/Mail/ListDetector -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist index 6631fc615c67..84d5f6a12ccf 100644 --- a/mail/p5-Mail-MailStats/pkg-plist +++ b/mail/p5-Mail-MailStats/pkg-plist @@ -6,5 +6,5 @@ bin/countmail %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats @dirrm %%SITE_PERL%%/Mail/Stats -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-plist b/mail/p5-Mail-Mbox-MessageParser/pkg-plist index 9e56ddb23191..8902346db21c 100644 --- a/mail/p5-Mail-Mbox-MessageParser/pkg-plist +++ b/mail/p5-Mail-Mbox-MessageParser/pkg-plist @@ -7,8 +7,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto//Mail/Mbox/MessageParser @dirrm %%SITE_PERL%%/Mail/Mbox/MessageParser -@unexec rmdir %D/%%SITE_PERL%%/Mail/Mbox 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Mail/Mbox 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail/Mbox +@dirrmtry %%SITE_PERL%%/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser +@dirrmtry %%SITE_PERL%%/mach/auto/Mail/Mbox +@dirrmtry %%SITE_PERL%%/mach/auto/Mail diff --git a/mail/p5-Mail-POP3Client/pkg-plist b/mail/p5-Mail-POP3Client/pkg-plist index 1d7be5665c8d..82845503e756 100644 --- a/mail/p5-Mail-POP3Client/pkg-plist +++ b/mail/p5-Mail-POP3Client/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/POP3Client.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Procmail/pkg-plist b/mail/p5-Mail-Procmail/pkg-plist index 1f13b4840736..69f7928f29b9 100644 --- a/mail/p5-Mail-Procmail/pkg-plist +++ b/mail/p5-Mail-Procmail/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Mail/Procmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Mail-Procmailrc/pkg-plist b/mail/p5-Mail-Procmailrc/pkg-plist index 72995c8f3996..bd33e05af9e7 100644 --- a/mail/p5-Mail-Procmailrc/pkg-plist +++ b/mail/p5-Mail-Procmailrc/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/Procmailrc.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Mail-QuoteWrap/pkg-plist b/mail/p5-Mail-QuoteWrap/pkg-plist index feb3473995ba..28257b995294 100644 --- a/mail/p5-Mail-QuoteWrap/pkg-plist +++ b/mail/p5-Mail-QuoteWrap/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/QuoteWrap.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist index 2ccbd7513252..47b10e7f48c7 100644 --- a/mail/p5-Mail-RBL/pkg-plist +++ b/mail/p5-Mail-RBL/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/RBL.pm -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Mail-SPF-Query/pkg-plist b/mail/p5-Mail-SPF-Query/pkg-plist index df75c8deea8a..f672427986e5 100644 --- a/mail/p5-Mail-SPF-Query/pkg-plist +++ b/mail/p5-Mail-SPF-Query/pkg-plist @@ -5,5 +5,5 @@ bin/spfquery @dirrm %%SITE_PERL%%/Mail/SPF @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SPF/Query @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SPF -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-SRS/pkg-plist b/mail/p5-Mail-SRS/pkg-plist index d8be1ed57871..1c54ea3c6f00 100644 --- a/mail/p5-Mail-SRS/pkg-plist +++ b/mail/p5-Mail-SRS/pkg-plist @@ -9,6 +9,6 @@ bin/srs bin/srsd @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/SRS -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist index b1f3c25cc486..3f07b9a97f21 100644 --- a/mail/p5-Mail-Sender/pkg-plist +++ b/mail/p5-Mail-Sender/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/Mail/Sender/CType/Win32.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Sender/CType @dirrm %%SITE_PERL%%/Mail/Sender -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Sendmail/pkg-plist b/mail/p5-Mail-Sendmail/pkg-plist index 5e51bcc274e8..8edee29ecdb0 100644 --- a/mail/p5-Mail-Sendmail/pkg-plist +++ b/mail/p5-Mail-Sendmail/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/Sendmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index 20df547305f5..d8cca88ae8f6 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -141,7 +141,7 @@ etc/rc.d/sa-spamd.sh %%TOOLS%%@dirrm %%DATADIR%%/tools @dirrm %%DATADIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata @@ -152,7 +152,7 @@ etc/rc.d/sa-spamd.sh @dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes @dirrm %%SITE_PERL%%/Mail/SpamAssassin -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true -@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true -@unexec rmdir %D/etc/mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail +@dirrmtry etc/mail/spamassassin +@dirrmtry etc/mail @unexec rmdir /var/run/spamd 2>/dev/null || true diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist index c7ed0911e393..bdf7de8785ad 100644 --- a/mail/p5-Mail-Tools/pkg-plist +++ b/mail/p5-Mail-Tools/pkg-plist @@ -29,10 +29,10 @@ %%SITE_PERL%%/auto/Mail/Util/maildomain.al %%SITE_PERL%%/auto/Mail/Util/read_mbox.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail @dirrm %%SITE_PERL%%/auto/Mail/Util @dirrm %%SITE_PERL%%/auto/Mail/Internet @dirrm %%SITE_PERL%%/auto/Mail @dirrm %%SITE_PERL%%/Mail/Mailer @dirrm %%SITE_PERL%%/Mail/Field -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist index e092fe55d7c5..4ec3a9291e68 100644 --- a/mail/p5-Mail-Verify/pkg-plist +++ b/mail/p5-Mail-Verify/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mail/Verify.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail diff --git a/mail/p5-Mail-Webmail-Gmail/pkg-plist b/mail/p5-Mail-Webmail-Gmail/pkg-plist index cc6cb53a224a..4278ed149552 100644 --- a/mail/p5-Mail-Webmail-Gmail/pkg-plist +++ b/mail/p5-Mail-Webmail-Gmail/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Mail/Webmail/Gmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail -@unexec rmdir %D/%%SITE_PERL%%/Mail/Webmail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Mail/Webmail +@dirrmtry %%SITE_PERL%%/Mail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail diff --git a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist index 91c436a759ad..f9d3986032f2 100644 --- a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist +++ b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Net/IMAP/Simple/SSL.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple +@dirrmtry %%SITE_PERL%%/Net/IMAP +@dirrmtry %%SITE_PERL%%/Net diff --git a/mail/p5-Net-IMAP-Simple/pkg-plist b/mail/p5-Net-IMAP-Simple/pkg-plist index 127fd768ae24..0776d1de2b89 100644 --- a/mail/p5-Net-IMAP-Simple/pkg-plist +++ b/mail/p5-Net-IMAP-Simple/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Net/IMAP/imap.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net/IMAP +@dirrmtry %%SITE_PERL%%/Net diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist index 267f6efa5ba2..207657736b9c 100644 --- a/mail/p5-Net-SMTP-Server/pkg-plist +++ b/mail/p5-Net-SMTP-Server/pkg-plist @@ -6,13 +6,13 @@ %%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist @dirrm %%SITE_PERL%%/Net/SMTP/Server -@unexec rmdir %D/%%SITE_PERL%%/Net/SMTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/SMTP +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Client @dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Relay @dirrm %%SITE_PERL%%/auto/Net/SMTP/Server -@unexec rmdir %D/%%SITE_PERL%%/auto/Net/SMTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Net/SMTP +@dirrmtry %%SITE_PERL%%/auto/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist index d8788c902572..b1d55c632107 100644 --- a/mail/p5-Net-Server-Mail/pkg-plist +++ b/mail/p5-Net-Server-Mail/pkg-plist @@ -8,8 +8,8 @@ %%SITE_PERL%%/Net/Server/Mail/SMTP.pm @dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP @dirrm %%SITE_PERL%%/Net/Server/Mail -@unexec rmdir %D/%%SITE_PERL%%/Net/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/Server +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist index 5dd93f06af76..faf9a10abe11 100644 --- a/mail/p5-POE-Component-Client-POP3/pkg-plist +++ b/mail/p5-POE-Component-Client-POP3/pkg-plist @@ -4,9 +4,9 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/term.perl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3 -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/POE +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/mail/p5-POE-Component-Client-SMTP/pkg-plist b/mail/p5-POE-Component-Client-SMTP/pkg-plist index 17998460f2cc..560b444b8502 100644 --- a/mail/p5-POE-Component-Client-SMTP/pkg-plist +++ b/mail/p5-POE-Component-Client-SMTP/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/POE/Component/Client/SMTP.pm -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/mail/p5-POE-Component-SMTP/pkg-plist b/mail/p5-POE-Component-SMTP/pkg-plist index ec9d398c6c48..f09548ae6f0b 100644 --- a/mail/p5-POE-Component-SMTP/pkg-plist +++ b/mail/p5-POE-Component-SMTP/pkg-plist @@ -1,10 +1,10 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP/.packlist %%SITE_PERL%%/POE/Component/Server/SMTP.pm %%SITE_PERL%%/POE/Filter/SMTP.pm -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component/Server +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE/Filter +@dirrmtry %%SITE_PERL%%/POE @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/mail/p5-Sendmail-AccessDB/pkg-plist b/mail/p5-Sendmail-AccessDB/pkg-plist index d36e8db1bf8c..6b62a27c6a9f 100644 --- a/mail/p5-Sendmail-AccessDB/pkg-plist +++ b/mail/p5-Sendmail-AccessDB/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sendmail/AccessDB.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB -@unexec rmdir %D/%%SITE_PERL%%/Sendmail 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Sendmail +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail diff --git a/mail/p5-URI-imap/pkg-plist b/mail/p5-URI-imap/pkg-plist index 44fbf5ef3867..ee98b783e21f 100644 --- a/mail/p5-URI-imap/pkg-plist +++ b/mail/p5-URI-imap/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/URI/imap.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI +@dirrmtry %%SITE_PERL%%/URI diff --git a/mail/p5-URI-imaps/pkg-plist b/mail/p5-URI-imaps/pkg-plist index 35c4bd09cc56..78d2079bbd3a 100644 --- a/mail/p5-URI-imaps/pkg-plist +++ b/mail/p5-URI-imaps/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/URI/imaps.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI +@dirrmtry %%SITE_PERL%%/URI diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist index fb1d949d4719..1456f55e9e87 100644 --- a/mail/popular/pkg-plist +++ b/mail/popular/pkg-plist @@ -35,4 +35,4 @@ sbin/pserv sbin/ringd @dirrm include/popular @dirrm lib/popular -@unexec rmdir %D/etc/popular 2>/dev/null || true +@dirrmtry etc/popular diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist index 31c7b9ecabbe..2a8d68163687 100644 --- a/mail/postfix-current/pkg-plist +++ b/mail/postfix-current/pkg-plist @@ -235,4 +235,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix/pkg-plist +++ b/mail/postfix/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist index 5b6c3c55d5b6..8291aa7f2d28 100644 --- a/mail/postfix1/pkg-plist +++ b/mail/postfix1/pkg-plist @@ -170,4 +170,4 @@ bin/mailq %%PORTDOCS%%share/doc/postfix/virtual.8.html %%PORTDOCS%%@dirrm share/doc/postfix @dirrm libexec/postfix -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist index 37366b49d560..9d6f0766ba0b 100644 --- a/mail/postfix21/pkg-plist +++ b/mail/postfix21/pkg-plist @@ -208,4 +208,4 @@ bin/mailq %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix22/pkg-plist +++ b/mail/postfix22/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix23/pkg-plist +++ b/mail/postfix23/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix24/pkg-plist +++ b/mail/postfix24/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix25/pkg-plist +++ b/mail/postfix25/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix26/pkg-plist +++ b/mail/postfix26/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix27/pkg-plist +++ b/mail/postfix27/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist index df52e5609066..84aaa9deaa28 100644 --- a/mail/postfix28/pkg-plist +++ b/mail/postfix28/pkg-plist @@ -231,4 +231,4 @@ bin/mailq %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/postgrey/pkg-plist b/mail/postgrey/pkg-plist index 05da48294884..397a6d11306c 100644 --- a/mail/postgrey/pkg-plist +++ b/mail/postgrey/pkg-plist @@ -5,4 +5,4 @@ sbin/postgreyreport etc/rc.d/postgrey.sh etc/postfix/dist-postgrey_whitelist_recipients etc/postfix/dist-postgrey_whitelist_clients -@unexec rmdir %D/etc/postfix 2>/dev/null || true +@dirrmtry etc/postfix diff --git a/mail/qmail-conf/pkg-plist b/mail/qmail-conf/pkg-plist index a8242a961def..2b3f2532bff9 100644 --- a/mail/qmail-conf/pkg-plist +++ b/mail/qmail-conf/pkg-plist @@ -3,4 +3,4 @@ bin/qmail-pop3d-conf bin/qmail-qmqpd-conf bin/qmail-qmtpd-conf bin/qmail-smtpd-conf -@unexec rmdir %D/service 2>/dev/null || true +@dirrmtry service diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist index f7e3018df384..bbc89c5de733 100644 --- a/mail/qmail-scanner/pkg-plist +++ b/mail/qmail-scanner/pkg-plist @@ -7,17 +7,17 @@ share/examples/qs2mrtg/mrtg-qmail-scanner.cfg %%SPOOLDIR%%/quarantine-attachments.sample @exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/qmail-scanner-queue-version.txt -@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true +@dirrmtry %%SPOOLDIR%%/archives/cur +@dirrmtry %%SPOOLDIR%%/archives/new +@dirrmtry %%SPOOLDIR%%/archives/tmp +@dirrmtry %%SPOOLDIR%%/archives +@dirrmtry %%SPOOLDIR%%/quarantine/cur +@dirrmtry %%SPOOLDIR%%/quarantine/new +@dirrmtry %%SPOOLDIR%%/quarantine/tmp +@dirrmtry %%SPOOLDIR%%/quarantine +@dirrmtry %%SPOOLDIR%%/working/cur +@dirrmtry %%SPOOLDIR%%/working/new +@dirrmtry %%SPOOLDIR%%/working/tmp +@dirrmtry %%SPOOLDIR%%/working +@dirrmtry %%SPOOLDIR%%/tmp +@dirrmtry %%SPOOLDIR%% diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist index f7e3018df384..bbc89c5de733 100644 --- a/mail/qmail-scanner1/pkg-plist +++ b/mail/qmail-scanner1/pkg-plist @@ -7,17 +7,17 @@ share/examples/qs2mrtg/mrtg-qmail-scanner.cfg %%SPOOLDIR%%/quarantine-attachments.sample @exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/qmail-scanner-queue-version.txt -@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true -@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true +@dirrmtry %%SPOOLDIR%%/archives/cur +@dirrmtry %%SPOOLDIR%%/archives/new +@dirrmtry %%SPOOLDIR%%/archives/tmp +@dirrmtry %%SPOOLDIR%%/archives +@dirrmtry %%SPOOLDIR%%/quarantine/cur +@dirrmtry %%SPOOLDIR%%/quarantine/new +@dirrmtry %%SPOOLDIR%%/quarantine/tmp +@dirrmtry %%SPOOLDIR%%/quarantine +@dirrmtry %%SPOOLDIR%%/working/cur +@dirrmtry %%SPOOLDIR%%/working/new +@dirrmtry %%SPOOLDIR%%/working/tmp +@dirrmtry %%SPOOLDIR%%/working +@dirrmtry %%SPOOLDIR%%/tmp +@dirrmtry %%SPOOLDIR%% diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist index 9ad58a5171a8..b53772970a75 100644 --- a/mail/qsheff/pkg-plist +++ b/mail/qsheff/pkg-plist @@ -18,7 +18,7 @@ etc/qsheff/uninstall-wrapper.sh %%DATADIR%%/sample-OK.msg %%DATADIR%%/sample-SPAM.msg %%DATADIR%%/sample-VIRUS.msg -@unexec rmdir %D/etc/qsheff 2>/dev/null || true +@dirrmtry etc/qsheff @dirrm %%DATADIR%% @unexec echo @unexec echo "Type '%%PREFIX%%/etc/qsheff/uninstall-wrapper.sh' to uninstall qSheff completely." diff --git a/mail/relay-ctrl/pkg-plist b/mail/relay-ctrl/pkg-plist index d873f95e5236..080a0de1aa6c 100644 --- a/mail/relay-ctrl/pkg-plist +++ b/mail/relay-ctrl/pkg-plist @@ -7,7 +7,7 @@ bin/relay-ctrl-send bin/relay-ctrl-udp etc/relay-ctrl/RELAY_CTRL_DIR etc/relay-ctrl/RELAY_CTRL_EXPIRY -@unexec rmdir %D/etc/relay-ctrl 2>/dev/null || true +@dirrmtry etc/relay-ctrl %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/mail/spamass-rules_du_jour/pkg-plist b/mail/spamass-rules_du_jour/pkg-plist index cdc66b37a554..73eec5cc9115 100644 --- a/mail/spamass-rules_du_jour/pkg-plist +++ b/mail/spamass-rules_du_jour/pkg-plist @@ -1,4 +1,4 @@ @exec mkdir -p %D/etc/mail/spamassassin/RulesDuJour -@unexec rmdir %D/etc/mail/spamassassin/RulesDuJour 2>/dev/null || true -@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true -@unexec rmdir %D/etc/mail 2>/dev/null || true +@dirrmtry etc/mail/spamassassin/RulesDuJour +@dirrmtry etc/mail/spamassassin +@dirrmtry etc/mail diff --git a/mail/sqlgrey/pkg-plist b/mail/sqlgrey/pkg-plist index 1c0204d06b5c..f6f53acc76eb 100644 --- a/mail/sqlgrey/pkg-plist +++ b/mail/sqlgrey/pkg-plist @@ -20,5 +20,5 @@ bin/sqlgrey-logstats.pl sbin/sqlgrey sbin/update_sqlgrey_config -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%% +@dirrmtry %%ETCDIR%% diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist index 195191d479a7..a3569ceb67ef 100644 --- a/mail/squirrelmail/pkg-plist +++ b/mail/squirrelmail/pkg-plist @@ -948,8 +948,8 @@ etc/periodic/daily/111.clean-squirrelmail %%SQUIRRELDIR%%/themes/spice_of_life.php %%SQUIRRELDIR%%/themes/spice_of_life_dark.php %%SQUIRRELDIR%%/themes/spice_of_life_lite.php -@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true -@unexec rmdir %D/etc/periodic 2>/dev/null || true +@dirrmtry etc/periodic/daily +@dirrmtry etc/periodic %%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/abook_take %%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/administrator %%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/bug_report @@ -996,7 +996,7 @@ etc/periodic/daily/111.clean-squirrelmail @dirrm %%SQUIRRELDIR%%/plugins/bug_report @dirrm %%SQUIRRELDIR%%/plugins/administrator @dirrm %%SQUIRRELDIR%%/plugins/abook_take -@unexec rmdir %D/%%SQUIRRELDIR%%/plugins 2>/dev/null || true +@dirrmtry %%SQUIRRELDIR%%/plugins @dirrm %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/zh_TW @dirrm %%SQUIRRELDIR%%/locale/zh_CN/LC_MESSAGES @@ -1116,9 +1116,9 @@ etc/periodic/daily/111.clean-squirrelmail @dirrm %%SQUIRRELDIR%%/functions/decode @dirrm %%SQUIRRELDIR%%/functions @dirrm %%SQUIRRELDIR%%/data -@unexec rmdir %D/%%SQUIRRELDIR%%/config 2>/dev/null || true +@dirrmtry %%SQUIRRELDIR%%/config @dirrm %%SQUIRRELDIR%%/class/mime @dirrm %%SQUIRRELDIR%%/class/helper @dirrm %%SQUIRRELDIR%%/class/deliver @dirrm %%SQUIRRELDIR%%/class -@unexec rmdir %D/%%SQUIRRELDIR%% 2>/dev/null || true +@dirrmtry %%SQUIRRELDIR%% diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist index 687cbd975ef8..04a5f954dac3 100644 --- a/mail/sylpheed2-devel/pkg-plist +++ b/mail/sylpheed2-devel/pkg-plist @@ -109,5 +109,5 @@ share/locale/zh_TW/LC_MESSAGES/sylpheed.mo %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/lt 2>/dev/null || true +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist index e26db6784e9e..7045f6254f37 100644 --- a/mail/sylpheed2/pkg-plist +++ b/mail/sylpheed2/pkg-plist @@ -108,5 +108,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/lt 2>/dev/null || true +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist index e26db6784e9e..7045f6254f37 100644 --- a/mail/sylpheed3/pkg-plist +++ b/mail/sylpheed3/pkg-plist @@ -108,5 +108,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/lt 2>/dev/null || true +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt diff --git a/mail/teapop-devel/pkg-plist b/mail/teapop-devel/pkg-plist index 412cff1416b5..83b019008a2a 100644 --- a/mail/teapop-devel/pkg-plist +++ b/mail/teapop-devel/pkg-plist @@ -1,4 +1,4 @@ etc/teapop.passwd.sample libexec/teapop sbin/cronpopauth.pl -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var diff --git a/mail/teapop/pkg-plist b/mail/teapop/pkg-plist index 412cff1416b5..83b019008a2a 100644 --- a/mail/teapop/pkg-plist +++ b/mail/teapop/pkg-plist @@ -1,4 +1,4 @@ etc/teapop.passwd.sample libexec/teapop sbin/cronpopauth.pl -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist index fdb89c479187..07ea12b087a2 100644 --- a/mail/turba/pkg-plist +++ b/mail/turba/pkg-plist @@ -257,5 +257,5 @@ @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics @dirrm %%TURBADIR%%/themes -@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true +@dirrmtry %%TURBADIR%%/config +@dirrmtry %%TURBADIR%% diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist index 5d0922cb1ac9..f25a5e32519a 100644 --- a/mail/vmailmgr/pkg-plist +++ b/mail/vmailmgr/pkg-plist @@ -26,7 +26,7 @@ bin/showvconfig %%CGI_DIR%%/vchattr %%CGI_DIR%%/vchforwards %%CGI_DIR%%/listvdomain -@unexec rmdir %D/%%CGI_DIR%% 2>/dev/null || true +@dirrmtry %%CGI_DIR%% etc/vmailmgr/default-username etc/vmailmgr/vdeliver-postdeliver lib/courier-imap/libexec/authlib/authvmailmgr diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist index 98ff8626c947..bac90d663d92 100644 --- a/mail/vpopmail-devel/pkg-plist +++ b/mail/vpopmail-devel/pkg-plist @@ -55,10 +55,10 @@ vpopmail/include/vpopmail_config.h vpopmail/lib/libvpopmail.a @dirrm vpopmail/lib @dirrm vpopmail/include -@unexec rmdir %D/vpopmail/etc 2>/dev/null || true -@unexec rmdir %D/vpopmail/domains 2>/dev/null || true +@dirrmtry vpopmail/etc +@dirrmtry vpopmail/domains @dirrm vpopmail/doc/man_html @dirrm vpopmail/doc/doc_html @dirrm vpopmail/doc @dirrm vpopmail/bin -@unexec rmdir %D/vpopmail 2>/dev/null || true +@dirrmtry vpopmail diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index 04b83fdcc359..e25fac686691 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -59,10 +59,10 @@ vpopmail/lib/libvpopmail.a %%LDAP%%@dirrm vpopmail/ldap @dirrm vpopmail/lib @dirrm vpopmail/include -@unexec rmdir %D/vpopmail/etc 2>/dev/null || true -@unexec rmdir %D/vpopmail/domains 2>/dev/null || true +@dirrmtry vpopmail/etc +@dirrmtry vpopmail/domains @dirrm vpopmail/doc/man_html @dirrm vpopmail/doc/doc_html @dirrm vpopmail/doc @dirrm vpopmail/bin -@unexec rmdir %D/vpopmail 2>/dev/null || true +@dirrmtry vpopmail diff --git a/mail/wmmail/pkg-plist b/mail/wmmail/pkg-plist index 2aeda846da44..923d4d377579 100644 --- a/mail/wmmail/pkg-plist +++ b/mail/wmmail/pkg-plist @@ -50,5 +50,5 @@ GNUstep/Apps/WMMail.app/Sounds/monkey.au @dirrm GNUstep/Apps/WMMail.app/Defaults @dirrm GNUstep/Apps/WMMail.app/Sounds @dirrm GNUstep/Apps/WMMail.app -@unexec rmdir %D/GNUstep/Apps 2>/dev/null || true -@unexec rmdir %D/GNUstep 2>/dev/null || true +@dirrmtry GNUstep/Apps +@dirrmtry GNUstep |