13 files changed, 41 insertions, 41 deletions

diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index f6d509188dfc..fc9584bb618e 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -139,7 +139,7 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @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
+%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index b59e7a320d30..9df1f775d55b 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -22,7 +22,7 @@ MAN1=		bbmail.1
 PLIST_FILES=	bin/bbmail share/bbtools/bbmail.bb
 
 post-install:
-	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
+	@${ECHO_CMD} "@dirrmtry share/bbtools" \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 0008020e28e0..0596059b0a5c 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -206,8 +206,8 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
-@unexec rmdir %D/include/sylpheed-claws/plugins 2>/dev/null >/dev/null || true
-@dirrm include/sylpheed-claws
+@dirrmtry include/sylpheed-claws/plugins
+@dirrmtry include/sylpheed-claws
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.deps
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index dbf1d74a5842..dcc772fd8605 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -110,7 +110,7 @@ libdata/pkgconfig/dspam.pc
 %%CGI%%@dirrm www/vhosts/dspam/templates
 %%CGI%%@dirrm www/vhosts/dspam
 %%CGI%%@dirrm www/vhosts
-%%CGI%%@unexec rmdir %D/www 2>/dev/null || true
+%%CGI%%@dirrmtry www
 @dirrm include/dspam
 @cwd %%DSPAM_HOME%%
 firstrun.txt.sample
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index c48136f12954..0613e614db4b 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -91,7 +91,7 @@ libdata/pkgconfig/dspam.pc
 %%CGI%%@dirrm www/vhosts/dspam/templates
 %%CGI%%@dirrm www/vhosts/dspam
 %%CGI%%@dirrm www/vhosts
-%%CGI%%@unexec rmdir %D/www 2>/dev/null || true
+%%CGI%%@dirrmtry www
 @dirrm include/dspam
 @cwd %%DSPAM_HOME%%
 firstrun.txt.sample
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 60eb90e166d0..0216e257dafa 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -37,7 +37,7 @@ sbin/exiwhat
 %%PORTDOCS%%%%DOCSDIR%%/pcrepattern.txt
 %%PORTDOCS%%%%DOCSDIR%%/pcretest.txt
 %%PORTDOCS%%%%DOCSDIR%%/spec.txt
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 %%PORTDOCS%%%%EXAMPLESDIR%%/convert4r3
 %%PORTDOCS%%%%EXAMPLESDIR%%/convert4r4
 %%PORTDOCS%%%%EXAMPLESDIR%%/pcretest
@@ -45,8 +45,8 @@ sbin/exiwhat
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%DAEMON%%etc/periodic/daily/150.exim-tidydb
 %%DAEMON%%etc/periodic/daily/460.exim-mail-rejects
-%%DAEMON%%@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-%%DAEMON%%@unexec rmdir %D/etc/periodic 2>/dev/null || true
+%%DAEMON%%@dirrmtry etc/periodic/daily
+%%DAEMON%%@dirrmtry etc/periodic
 @unexec if cmp -s %D/etc/exim/configure %D/etc/exim/configure.default; then rm -f %D/etc/exim/configure; fi
 etc/exim/configure.default
 @exec [ -f %B/configure ] || cp %B/%f %B/configure
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 3d9e2bec166e..bb1757914a4c 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -2103,7 +2103,7 @@ etc/rc.d/mailman.sh
 @dirrmtry %%MMDIR%%/data
 @dirrmtry %%MMDIR%%/archives/public
 @dirrmtry %%MMDIR%%/archives/private
-%%SUB_HTDIG%%@unexec rmdir %D/%%MMDIR%%/archives/htdig 2>/dev/null || true
+%%SUB_HTDIG%%@dirrmtry %%MMDIR%%/archives/htdig
 @dirrmtry %%MMDIR%%/archives
 @dirrmtry %%MMDIR%%/Mailman
 @dirrmtry %%MMDIR%%/
diff --git a/mail/p5-Email-Date/pkg-plist b/mail/p5-Email-Date/pkg-plist
index 1b4c021ca17c..ebd5b491a1ed 100644
--- a/mail/p5-Email-Date/pkg-plist
+++ b/mail/p5-Email-Date/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Email/Date.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date
-@unexec rmdir %D/Email 2>/dev/null ||true
+@dirrmtry Email
diff --git a/mail/p5-Qmail-Envelope/pkg-plist b/mail/p5-Qmail-Envelope/pkg-plist
index 8b891c6a1621..587e06cb5b60 100644
--- a/mail/p5-Qmail-Envelope/pkg-plist
+++ b/mail/p5-Qmail-Envelope/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Qmail/Envelope.pm
-@unexec rmdir %D/%%SITE_PERL%%/Qmail || true
+@dirrmtry %%SITE_PERL%%/Qmail
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail
diff --git a/mail/roundcube/pkg-plist b/mail/roundcube/pkg-plist
index b5ca51565a4f..3803105c3161 100644
--- a/mail/roundcube/pkg-plist
+++ b/mail/roundcube/pkg-plist
@@ -358,8 +358,8 @@
 @dirrm %%RCUBEDIR%%/program/include
 @dirrm %%RCUBEDIR%%/program
 @dirrm %%RCUBEDIR%%/SQL
-@unexec rmdir %D/%%RCUBEDIR%%/temp 2>&1 >/dev/null || true
-@unexec rmdir %D/%%RCUBEDIR%%/logs 2>&1 >/dev/null || true
-@unexec rmdir %D/%%RCUBEDIR%%/config 2>&1 >/dev/null || true
-@unexec rmdir %D/%%RCUBEDIR%% 2>&1 >/dev/null || true
+@dirrmtry %%RCUBEDIR%%/temp
+@dirrmtry %%RCUBEDIR%%/logs
+@dirrmtry %%RCUBEDIR%%/config
+@dirrmtry %%RCUBEDIR%%
 @dirrm %%DOCSDIR%%
diff --git a/mail/spruce/pkg-plist b/mail/spruce/pkg-plist
index a73efe956b63..7375a6d31d36 100644
--- a/mail/spruce/pkg-plist
+++ b/mail/spruce/pkg-plist
@@ -12,5 +12,5 @@ bin/spruce
 %%NLS%%share/locale/sk/LC_MESSAGES/spruce.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/spruce.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 0008020e28e0..0596059b0a5c 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -206,8 +206,8 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
-@unexec rmdir %D/include/sylpheed-claws/plugins 2>/dev/null >/dev/null || true
-@dirrm include/sylpheed-claws
+@dirrmtry include/sylpheed-claws/plugins
+@dirrmtry include/sylpheed-claws
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.deps
diff --git a/mail/sympa5/pkg-plist b/mail/sympa5/pkg-plist
index b12d257a2b22..067efec8fbcc 100644
--- a/mail/sympa5/pkg-plist
+++ b/mail/sympa5/pkg-plist
@@ -372,26 +372,26 @@ sympa/icons/right.png
 sympa/icons/sound1.png
 sympa/icons/text.png
 sympa/icons/unknown.png
-%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/el 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/oc/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/oc 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_US
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
 @dirrm sympa/spool/tmp
 @dirrm sympa/spool/task
 @dirrm sympa/spool/outgoing