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

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

9 files changed, 34 insertions, 34 deletions

diff --git a/emulators/its/pkg-plist b/emulators/its/pkg-plist
index b815bdb6e3d2..4882a5abe95b 100644
--- a/emulators/its/pkg-plist
+++ b/emulators/its/pkg-plist
@@ -10,4 +10,4 @@ bin/its-user-install
 @comment We specify to delete %%IMAGE_HOME%%.  In most cases, it's the
 @comment same as the klh10 port is using, so it won't be empty (and thus
 @comment not deleted).  This dirrm command is for the exceptions to that.
-@unexec rmdir %D/%%IMAGE_HOME%% 2>/dev/null || true
+@dirrmtry %%IMAGE_HOME%%
diff --git a/emulators/linux-peops-softgpu/pkg-plist b/emulators/linux-peops-softgpu/pkg-plist
index e0cb1a95fd8e..ed4b73317fa1 100644
--- a/emulators/linux-peops-softgpu/pkg-plist
+++ b/emulators/linux-peops-softgpu/pkg-plist
@@ -1,12 +1,12 @@
 lib/psemupro/plugins/libgpuPeopsSoftX.so.%%MAJOR%%.0.%%MINOR%%
 libexec/psemupro/cfg/cfgPeopsSoft
 share/psemupro/cfg/gpuPeopsSoftX.cfg
-@unexec rmdir %D/lib/psemupro/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/psemupro 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro 2>/dev/null || true
-@unexec rmdir %D/share/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/share/psemupro 2>/dev/null || true
+@dirrmtry lib/psemupro/plugins
+@dirrmtry lib/psemupro
+@dirrmtry libexec/psemupro/cfg
+@dirrmtry libexec/psemupro
+@dirrmtry share/psemupro/cfg
+@dirrmtry share/psemupro
 %%PORTDOCS%%%%DOCSDIR%%/peops_soft_readme_%%MAJOR%%_%%MINOR%%.txt
 %%PORTDOCS%%%%DOCSDIR%%/peops_soft_version_%%MAJOR%%_%%MINOR%%.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/emulators/linux-peops-spu/pkg-plist b/emulators/linux-peops-spu/pkg-plist
index 2440ebaedaa5..f559a6622aec 100644
--- a/emulators/linux-peops-spu/pkg-plist
+++ b/emulators/linux-peops-spu/pkg-plist
@@ -1,12 +1,12 @@
 lib/psemupro/plugins/libspuPeopsOSS.so.%%MAJOR%%.0.%%MINOR%%
 libexec/psemupro/cfg/cfgPeopsOSS
 share/psemupro/cfg/spuPeopsOSS.cfg
-@unexec rmdir %D/lib/psemupro/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/psemupro 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro 2>/dev/null || true
-@unexec rmdir %D/share/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/share/psemupro 2>/dev/null || true
+@dirrmtry lib/psemupro/plugins
+@dirrmtry lib/psemupro
+@dirrmtry libexec/psemupro/cfg
+@dirrmtry libexec/psemupro
+@dirrmtry share/psemupro/cfg
+@dirrmtry share/psemupro
 %%PORTDOCS%%%%DOCSDIR%%/readme_%%MAJOR%%_%%MINOR%%.txt
 %%PORTDOCS%%%%DOCSDIR%%/version_%%MAJOR%%_%%MINOR%%.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/emulators/linux-pete-mesagpu/pkg-plist b/emulators/linux-pete-mesagpu/pkg-plist
index 755a13cd64aa..c96f4524d26e 100644
--- a/emulators/linux-pete-mesagpu/pkg-plist
+++ b/emulators/linux-pete-mesagpu/pkg-plist
@@ -1,12 +1,12 @@
 lib/psemupro/plugins/libgpuPeteMesaGL.so.%%MAJOR%%.0.%%MINOR%%
 libexec/psemupro/cfg/cfgPeteMesaGL
 share/psemupro/cfg/gpuPeteMesaGL.cfg
-@unexec rmdir %D/lib/psemupro/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/psemupro 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro 2>/dev/null || true
-@unexec rmdir %D/share/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/share/psemupro 2>/dev/null || true
+@dirrmtry lib/psemupro/plugins
+@dirrmtry lib/psemupro
+@dirrmtry libexec/psemupro/cfg
+@dirrmtry libexec/psemupro
+@dirrmtry share/psemupro/cfg
+@dirrmtry share/psemupro
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/version.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/emulators/linux-pete-xgl2gpu/pkg-plist b/emulators/linux-pete-xgl2gpu/pkg-plist
index 8e2e22ad7be9..c29af3aeb653 100644
--- a/emulators/linux-pete-xgl2gpu/pkg-plist
+++ b/emulators/linux-pete-xgl2gpu/pkg-plist
@@ -1,12 +1,12 @@
 lib/psemupro/plugins/libgpuPeteXGL2.so.%%MAJOR%%.0.%%MINOR%%
 libexec/psemupro/cfg/cfgPeteXGL2
 share/psemupro/cfg/gpuPeteXGL2.cfg
-@unexec rmdir %D/lib/psemupro/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/psemupro 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/libexec/psemupro 2>/dev/null || true
-@unexec rmdir %D/share/psemupro/cfg 2>/dev/null || true
-@unexec rmdir %D/share/psemupro 2>/dev/null || true
+@dirrmtry lib/psemupro/plugins
+@dirrmtry lib/psemupro
+@dirrmtry libexec/psemupro/cfg
+@dirrmtry libexec/psemupro
+@dirrmtry share/psemupro/cfg
+@dirrmtry share/psemupro
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/version.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/emulators/raine/pkg-plist b/emulators/raine/pkg-plist
index f8c2b88dce61..c5e37ad57f63 100644
--- a/emulators/raine/pkg-plist
+++ b/emulators/raine/pkg-plist
@@ -26,8 +26,8 @@ bin/raine
 %%DATADIR%%/raine.dat
 share/gnome/applications/raine.desktop
 share/gnome/pixmaps/raine.png
-@unexec rmdir %D/%%DATADIR%%/roms 2> /dev/null || true
-@unexec rmdir %D/%%DATADIR%%/emudx 2> /dev/null || true
-@unexec rmdir %D/%%DATADIR%%/artwork 2> /dev/null || true
+@dirrmtry %%DATADIR%%/roms
+@dirrmtry %%DATADIR%%/emudx
+@dirrmtry %%DATADIR%%/artwork
 @dirrm %%DATADIR%%/languages
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/emulators/rtc/pkg-plist b/emulators/rtc/pkg-plist
index 7e19f4baf0a7..3126aac78695 100644
--- a/emulators/rtc/pkg-plist
+++ b/emulators/rtc/pkg-plist
@@ -3,5 +3,5 @@ include/rtc.h
 modules/rtc.ko
 %%EXAMPLESDIR%%/test.c
 @dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/modules 2>/dev/null || true
+@dirrmtry modules
 @unexec rm -f /dev/rtc
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 681e6d376eb4..5e3d43f32a5a 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -789,6 +789,6 @@ share/wine/generic.ppd
 @dirrm include/wine/windows/ddk
 @dirrm include/wine/windows
 @dirrm include/wine
-@unexec rmdir %D/man/man3w 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry man/man3w
+@dirrmtry share/applications
 @dirrm share/wine
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 681e6d376eb4..5e3d43f32a5a 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -789,6 +789,6 @@ share/wine/generic.ppd
 @dirrm include/wine/windows/ddk
 @dirrm include/wine/windows
 @dirrm include/wine
-@unexec rmdir %D/man/man3w 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry man/man3w
+@dirrmtry share/applications
 @dirrm share/wine