6 files changed, 17 insertions, 17 deletions

diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index f519e7233fba..8db4e4324834 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -176,7 +176,7 @@ lib/modules/libxf8_32bpp.a
 @dirrm lib/modules/fonts
 @dirrm lib/modules/freebsd
 @dirrm lib/modules/input
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
-@unexec rmdir %D/lib/modules 2>/dev/null || true
-@unexec rmdir %D/share/doc/XFree86/Japanese 2>/dev/null || true
-@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
+@dirrmtry lib/modules
+@dirrmtry share/doc/XFree86/Japanese
+@dirrmtry share/doc/XFree86
diff --git a/x11-servers/Xfstt/pkg-plist b/x11-servers/Xfstt/pkg-plist
index 7f6789ea02c4..f4233ee3f538 100644
--- a/x11-servers/Xfstt/pkg-plist
+++ b/x11-servers/Xfstt/pkg-plist
@@ -8,4 +8,4 @@ etc/rc.d/xfstt.sh
 @exec mkdir -p %D/lib/X11/fonts/TrueType
 @unexec rm -f %D/lib/X11/fonts/TrueType/ttname.dir
 @unexec rm -f %D/lib/X11/fonts/TrueType/ttinfo.dir
-@unexec rmdir %D/lib/X11/fonts/TrueType 2>/dev/null || true
+@dirrmtry lib/X11/fonts/TrueType
diff --git a/x11-servers/xorg-fontserver/pkg-plist b/x11-servers/xorg-fontserver/pkg-plist
index 7d070d3c6d79..02128e26eb2a 100644
--- a/x11-servers/xorg-fontserver/pkg-plist
+++ b/x11-servers/xorg-fontserver/pkg-plist
@@ -2,4 +2,4 @@ bin/xfs
 etc/rc.d/xfs.sh
 @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi
 lib/X11/fs/config.default
-@unexec rmdir %D/lib/X11/fs 2>/dev/null || true
+@dirrmtry lib/X11/fs
diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist
index cc697f7b6d54..db513f54d616 100644
--- a/x11-servers/xorg-printserver/pkg-plist
+++ b/x11-servers/xorg-printserver/pkg-plist
@@ -957,4 +957,4 @@ lib/X11/xserver/zulu
 @dirrm lib/X11/xserver/en_US/print/attributes
 @dirrm lib/X11/xserver/en_US/print
 @dirrm lib/X11/xserver/en_US
-@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
+@dirrmtry lib/X11/xserver
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 1b3331588efb..4e743e9bada4 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -205,8 +205,8 @@ lib/modules/multimedia/uda1380_drv.so
 @dirrm lib/modules/extensions
 @dirrm lib/modules/drivers
 @dirrm lib/X11/getconfig
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
-@unexec rmdir %D/lib/X11/doc 2>/dev/null || true
-@unexec rmdir %D/lib/X11/etc 2>/dev/null || true
-@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
-@unexec rmdir %D/lib/modules 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
+@dirrmtry lib/X11/doc
+@dirrmtry lib/X11/etc
+@dirrmtry lib/X11/xserver
+@dirrmtry lib/modules
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index bd3bcb02577e..cadb9a395ce4 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -200,8 +200,8 @@ lib/modules/multimedia/uda1380_drv.so
 @dirrm lib/modules/input
 @dirrm lib/modules/internal
 @dirrm lib/modules/multimedia
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
-@unexec rmdir %D/lib/X11/doc 2>/dev/null || true
-@unexec rmdir %D/lib/X11/etc 2>/dev/null || true
-@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
-@unexec rmdir %D/lib/modules 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
+@dirrmtry lib/X11/doc
+@dirrmtry lib/X11/etc
+@dirrmtry lib/X11/xserver
+@dirrmtry lib/modules