Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)

24 files changed, 103 insertions, 103 deletions

diff --git a/net-im/amsn/pkg-plist b/net-im/amsn/pkg-plist
index 807c9db29bba..12496c314412 100644
--- a/net-im/amsn/pkg-plist
+++ b/net-im/amsn/pkg-plist
@@ -623,14 +623,14 @@ share/icons/hicolor/64x64/aMSN_64.png
 share/icons/hicolor/64x64/tux-64x64.png
 share/icons/hicolor/96x96/aMSN_96.png
 share/icons/hicolor/96x96/tux-96x96.png
-@unexec rmdir %D/share/icons/hicolor/96x96 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
 @dirrm share/amsn/docs
 @dirrm share/amsn/icons/128x128
 @dirrm share/amsn/icons/32x32
diff --git a/net-im/gaim-ignorance/pkg-plist b/net-im/gaim-ignorance/pkg-plist
index 3d44d048c0ae..9c10225f4401 100644
--- a/net-im/gaim-ignorance/pkg-plist
+++ b/net-im/gaim-ignorance/pkg-plist
@@ -5,4 +5,4 @@ lib/gaim/ignorance.so
 etc/gaim/ignorance.conf.sample
 @exec [ -f %B/ignorance.conf ] || cp %B/%f %B/ignorance.conf
 @dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/etc/gaim/ 2>/dev/null || true
+@dirrmtry etc/gaim/
diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist
index 72df34e3ae3b..5e5095092eb8 100644
--- a/net-im/gaim-openq/pkg-plist
+++ b/net-im/gaim-openq/pkg-plist
@@ -527,5 +527,5 @@ share/gnome/pixmaps/gaim/status/default/qq_p_group_unexit.png
 share/gnome/pixmaps/gaim/status/default/qqshow_default.gif
 share/locale/zh_CN/LC_MESSAGES/openq.mo
 @dirrm share/gnome/pixmaps/gaim/smileys/2003iii
-@unexec rmdir %D/share/gnome/doc 2> /dev/null || true
-@unexec rmdir %D/share/gnome/gaim 2> /dev/null || true
+@dirrmtry share/gnome/doc
+@dirrmtry share/gnome/gaim
diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist
index 34a72a94f0fc..b7b1b48aee2a 100644
--- a/net-im/ickle/pkg-plist
+++ b/net-im/ickle/pkg-plist
@@ -146,7 +146,7 @@
 @dirrm %%ICKLEDATADIR%%ickle/icons/doors
 @dirrm %%ICKLEDATADIR%%ickle/icons
 @dirrm %%ICKLEDATADIR%%ickle
-@unexec rmdir %D/%%ICKLEDATADIR%%applets/Network 2>/dev/null || true
-@unexec rmdir %D/%%ICKLEDATADIR%%applets 2>/dev/null || true
-@unexec rmdir %D/etc/CORBA/servers 2>/dev/null || true
-@unexec rmdir %D/etc/CORBA 2>/dev/null || true
+@dirrmtry %%ICKLEDATADIR%%applets/Network
+@dirrmtry %%ICKLEDATADIR%%applets
+@dirrmtry etc/CORBA/servers
+@dirrmtry etc/CORBA
diff --git a/net-im/jabber-pyicq/pkg-plist b/net-im/jabber-pyicq/pkg-plist
index 36d835d87b1a..78c0001f850e 100644
--- a/net-im/jabber-pyicq/pkg-plist
+++ b/net-im/jabber-pyicq/pkg-plist
@@ -40,6 +40,6 @@ lib/jabber/pyicq/xmlconfig.py
 @dirrm lib/jabber/pyicq/tlib
 @dirrm lib/jabber/pyicq/webadmin
 @dirrm lib/jabber/pyicq
-@unexec rmdir %D/lib/jabber 2>/dev/null || true
+@dirrmtry lib/jabber
 @dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%
diff --git a/net-im/jabber-pymsn/pkg-plist b/net-im/jabber-pymsn/pkg-plist
index 144efe30f491..63ba883d1de6 100644
--- a/net-im/jabber-pymsn/pkg-plist
+++ b/net-im/jabber-pymsn/pkg-plist
@@ -47,6 +47,6 @@ lib/jabber/pymsn/xmlconfig.py
 @dirrm lib/jabber/pymsn/legacy
 @dirrm lib/jabber/pymsn/baseproto
 @dirrm lib/jabber/pymsn
-@unexec rmdir %D/lib/jabber 2>/dev/null || true
+@dirrmtry lib/jabber
 @dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%
diff --git a/net-im/jabber-users-agent/pkg-plist b/net-im/jabber-users-agent/pkg-plist
index 7e8e8052a252..68b7279ddd30 100644
--- a/net-im/jabber-users-agent/pkg-plist
+++ b/net-im/jabber-users-agent/pkg-plist
@@ -2,7 +2,7 @@
 lib/jabber/users-agent/createDB
 lib/jabber/users-agent/users-agent
 @dirrm lib/jabber/users-agent
-@unexec rmdir %D/lib/jabber 2>/dev/null || true
+@dirrmtry lib/jabber
 @unexec if cmp -s %D/etc/jabber-users-agent.xml %D/etc/jabber-users-agent.xml.sample; then rm -f %D/etc/jabber-users-agent.xml; fi
 etc/jabber-users-agent.xml.sample
 @exec [ -f %B/jabber-users-agent.xml ] || cp %B/%f %B/jabber-users-agent.xml
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
index 1deafcfe4e18..28009d733bfa 100644
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@@ -24,5 +24,5 @@ etc/jabberd/templates/roster.xml.dist
 %%DATADIR%%/db-setup.mysql
 %%DATADIR%%/db-setup.pgsql
 @dirrm %%DATADIR%%
-@unexec rmdir %D/etc/jabberd/templates 2> /dev/null || true
-@unexec rmdir %D/etc/jabberd 2> /dev/null || true
+@dirrmtry etc/jabberd/templates
+@dirrmtry etc/jabberd
diff --git a/net-im/jit/pkg-plist b/net-im/jit/pkg-plist
index 81557808af4d..693be2c4abf9 100644
--- a/net-im/jit/pkg-plist
+++ b/net-im/jit/pkg-plist
@@ -4,4 +4,4 @@ sbin/jit
 etc/jabber-icq.example
 etc/rc.d/jit.sh
 @dirrm lib/jabber/jit
-@unexec rmdir %D/lib/jabber 2>/dev/null || true
+@dirrmtry lib/jabber
diff --git a/net-im/jwchat/pkg-plist b/net-im/jwchat/pkg-plist
index 1770dddf84ac..1e3c86d76a37 100644
--- a/net-im/jwchat/pkg-plist
+++ b/net-im/jwchat/pkg-plist
@@ -776,5 +776,5 @@
 @dirrm %%WWW_ROOT%%/jwchat/images/emoticons
 @dirrm %%WWW_ROOT%%/jwchat/images/CVS
 @dirrm %%WWW_ROOT%%/jwchat/images
-@unexec rmdir %D/%%WWW_ROOT%%/jwchat 2> /dev/null || true
+@dirrmtry %%WWW_ROOT%%/jwchat
 @dirrm %%DATADIR%%
diff --git a/net-im/kf/pkg-plist b/net-im/kf/pkg-plist
index 6fd57fe6f08b..cff918b19250 100644
--- a/net-im/kf/pkg-plist
+++ b/net-im/kf/pkg-plist
@@ -126,4 +126,4 @@ share/locale/ru/LC_MESSAGES/kf.mo
 share/pixmaps/kf.png
 @dirrm %%DATADIR%%/emoticons
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/net-im/kmerlin/pkg-plist b/net-im/kmerlin/pkg-plist
index e84a3b08f46b..5f65c2c4d079 100644
--- a/net-im/kmerlin/pkg-plist
+++ b/net-im/kmerlin/pkg-plist
@@ -81,10 +81,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
 share/icons/locolor/32x32/apps/kmerlin.png
 share/icons/locolor/16x16/apps/kmerlin.png
 share/applnk/Internet/kmerlin.desktop
-@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true
+@dirrmtry share/locale/zh-CN/LC_MESSAGES
+@dirrmtry share/locale/zh-CN
+@dirrmtry share/locale/zh-TW/LC_MESSAGES
+@dirrmtry share/locale/zh-TW
 @dirrm share/doc/HTML/en/kmerlin
 @dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
 @dirrm share/apps/kmerlin/icons/hicolor/16x16
diff --git a/net-im/ocaml-jabbr/pkg-plist b/net-im/ocaml-jabbr/pkg-plist
index ad02d0cd737d..463924383cdf 100644
--- a/net-im/ocaml-jabbr/pkg-plist
+++ b/net-im/ocaml-jabbr/pkg-plist
@@ -51,4 +51,4 @@ lib/ocaml/xmlstream.cmi
 %%PORTDOCS%%share/doc/jabbr/type_Xmlstream.xml_stream_reader.html
 %%PORTDOCS%%share/doc/jabbr/type_Xmlstream.xml_stream_writer.html
 %%PORTDOCS%%@dirrm share/doc/jabbr
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml
diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist
index 3bb9b194db29..132ee470a8d9 100644
--- a/net-im/p5-Net-AIM/pkg-plist
+++ b/net-im/p5-Net-AIM/pkg-plist
@@ -3,6 +3,6 @@
 %%SITE_PERL%%/Net/AIM/Event.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/AIM
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist
index a77414bb513f..d4019bd116ac 100644
--- a/net-im/p5-Net-AOLIM/pkg-plist
+++ b/net-im/p5-Net-AOLIM/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/Net/AOLIM.pm
 %%SITE_PERL%%/Net/example.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist
index c12fde127c95..778a72f302c9 100644
--- a/net-im/p5-Net-ICQ2000/pkg-plist
+++ b/net-im/p5-Net-ICQ2000/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/ICQ2000.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index 5a7bd0993fd5..66a33988b5d1 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -21,5 +21,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
 @dirrm %%SITE_PERL%%/Net/Jabber/Dialback
 @dirrm %%SITE_PERL%%/Net/Jabber
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-im/p5-Net-MSN/pkg-plist b/net-im/p5-Net-MSN/pkg-plist
index 09913d0e3076..4752afc02b75 100644
--- a/net-im/p5-Net-MSN/pkg-plist
+++ b/net-im/p5-Net-MSN/pkg-plist
@@ -7,7 +7,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN/.packlist
 @dirrm %%SITE_PERL%%/Net/MSN
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/MSN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/MSN
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-NetSend/pkg-plist b/net-im/p5-Net-NetSend/pkg-plist
index 7c3ad6a92ac4..1b8922cddcb7 100644
--- a/net-im/p5-Net-NetSend/pkg-plist
+++ b/net-im/p5-Net-NetSend/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/NetSend.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-OSCAR/pkg-plist b/net-im/p5-Net-OSCAR/pkg-plist
index b2fc025b73a9..0924568a91f0 100644
--- a/net-im/p5-Net-OSCAR/pkg-plist
+++ b/net-im/p5-Net-OSCAR/pkg-plist
@@ -18,4 +18,4 @@
 @dirrm %%SITE_PERL%%/Net/OSCAR/XML
 @dirrm %%SITE_PERL%%/Net/OSCAR/Connection
 @dirrm %%SITE_PERL%%/Net/OSCAR
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-XMPP/pkg-plist b/net-im/p5-Net-XMPP/pkg-plist
index ac6e30beec51..f010ca234798 100644
--- a/net-im/p5-Net-XMPP/pkg-plist
+++ b/net-im/p5-Net-XMPP/pkg-plist
@@ -13,6 +13,6 @@
 %%SITE_PERL%%/Net/XMPP/Stanza.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Net
 @dirrm %%SITE_PERL%%/Net/XMPP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 4555cb2b01a5..6bcdfbcf88f7 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -107,36 +107,36 @@ share/locale/uk/LC_MESSAGES/sim.mo
 share/locale/zh_TW/LC_MESSAGES/sim.mo
 share/mimelnk/application/x-icq.desktop
 share/services/simctrl.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@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
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sw 2> /dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/22x22/apps
+@dirrmtry share/icons/locolor/22x22
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
 @dirrm share/apps/sim/pict
 @dirrm share/apps/sim
-@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
 @dirrm lib/sim
-@unexec rmdir %D/lib/menu 2>/dev/null || true
+@dirrmtry lib/menu
diff --git a/net-im/simicq/pkg-plist b/net-im/simicq/pkg-plist
index 4555cb2b01a5..6bcdfbcf88f7 100644
--- a/net-im/simicq/pkg-plist
+++ b/net-im/simicq/pkg-plist
@@ -107,36 +107,36 @@ share/locale/uk/LC_MESSAGES/sim.mo
 share/locale/zh_TW/LC_MESSAGES/sim.mo
 share/mimelnk/application/x-icq.desktop
 share/services/simctrl.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@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
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sw 2> /dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/22x22/apps
+@dirrmtry share/icons/locolor/22x22
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
 @dirrm share/apps/sim/pict
 @dirrm share/apps/sim
-@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
 @dirrm lib/sim
-@unexec rmdir %D/lib/menu 2>/dev/null || true
+@dirrmtry lib/menu
diff --git a/net-im/vicq/pkg-plist b/net-im/vicq/pkg-plist
index b8b31b16b64b..328a1adc517b 100644
--- a/net-im/vicq/pkg-plist
+++ b/net-im/vicq/pkg-plist
@@ -4,5 +4,5 @@ bin/vicq
 share/examples/vicq/vicqrc.example
 @dirrm share/examples/vicq
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net