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

Approved by: krion@ PR: ports/88711 (related)
malavon · Jan 22, 2006 · 0416031 · 0416031
1 parent 9318965
commit 0416031
Show file tree

Hide file tree

Showing 423 changed files with 2,753 additions and 2,753 deletions.
diff --git a/games/adonthell/pkg-plist b/games/adonthell/pkg-plist
@@ -472,4 +472,4 @@ share/pixmaps/wastesedge_32x32.xpm
 @dirrm %%DATADIR%%/games
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/games/afternoonstalker/pkg-plist b/games/afternoonstalker/pkg-plist
@@ -15,5 +15,5 @@ share/pixmaps/afternoonstalker.png
 share/applications/afternoonstalker.desktop
 @dirrm share/afternoonstalker/sounds
 @dirrm share/afternoonstalker
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
@@ -17,4 +17,4 @@ share/games/asc/units-mk3.con
 %%MUSIC:%%share/games/asc/music/machine_wars.mp3
 %%MUSIC:%%@dirrm share/games/asc/music
 @dirrm share/games/asc
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/barrage/pkg-plist b/games/barrage/pkg-plist
@@ -25,8 +25,8 @@ share/applnk/Applications/barrage.desktop
 %%DATADIR%%/sounds/highlight.wav
 %%DATADIR%%/sounds/scream1.wav
 %%DATADIR%%/sounds/scream2.wav
-@unexec rmdir %D/share/applnk/Applications/ 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Applications/
+@dirrmtry share/applnk
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/gfx
 @dirrm %%DATADIR%%

diff --git a/games/blobwars/pkg-plist b/games/blobwars/pkg-plist
@@ -3,4 +3,4 @@ bin/blobwars
 share/applications/blobwars.desktop
 share/pixmaps/blobwars.png
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/briquolo/pkg-plist b/games/briquolo/pkg-plist
@@ -113,4 +113,4 @@ share/locale/sk/LC_MESSAGES/briquolo.mo
 @dirrm %%DATADIR%%
 @dirrm share/pixmaps
 share/applications/briquolo.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
@@ -3280,11 +3280,11 @@ var/crossfire/temp.maps
 @exec mkdir -p %D/var/crossfire/maps
 @exec mkdir -p %D/var/crossfire/players
 @exec mkdir -p %D/var/crossfire/unique-items
-@unexec rmdir %D/var/crossfire/unique-items 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/players 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/maps 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/datafiles 2>/dev/null || true
-@unexec rmdir %D/var/crossfire 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
-@unexec rmdir %D/lib/crossfire/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/crossfire 2>/dev/null || true
+@dirrmtry var/crossfire/unique-items
+@dirrmtry var/crossfire/players
+@dirrmtry var/crossfire/maps
+@dirrmtry var/crossfire/datafiles
+@dirrmtry var/crossfire
+@dirrmtry var
+@dirrmtry lib/crossfire/plugins
+@dirrmtry lib/crossfire
diff --git a/games/dopewars/pkg-plist b/games/dopewars/pkg-plist
@@ -48,9 +48,9 @@ share/locale/nn/LC_MESSAGES/dopewars.mo
 share/locale/pl/LC_MESSAGES/dopewars.mo
 share/locale/pt_BR/LC_MESSAGES/dopewars.mo
 share/gnome/apps/Games/dopewars.desktop
-@unexec rmdir %D/share/gnome/apps/Games 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/apps/Games
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome
 @dirrm share/dopewars/pixmaps
 @dirrm share/dopewars
 %%PORTDOCS%%@dirrm share/doc/dopewars/help

diff --git a/games/dsnake/pkg-plist b/games/dsnake/pkg-plist
@@ -11,4 +11,4 @@ bin/dsnake
 %%DATADIR%%/midi/The_Jayomon_Beat.mid
 @dirrm %%DATADIR%%/midi
 @dirrm %%DATADIR%%/data
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/games/duke3d/pkg-plist b/games/duke3d/pkg-plist
@@ -12,4 +12,4 @@ bin/duke3d-build
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/gnu.txt
 @dirrm share/duke3d/testdata
-@unexec rmdir %D/share/duke3d 2> /dev/null || true
+@dirrmtry share/duke3d
diff --git a/games/easysok/pkg-plist b/games/easysok/pkg-plist
@@ -233,21 +233,21 @@ share/wallpapers/GreenBallThemeBackground.jpg
 share/wallpapers/KSokobanThemeBackground.jpg
 share/wallpapers/SpaceThemeBackground.png
 share/wallpapers/WarehouseKeeperThemeBackground.jpg
-@unexec rmdir %D/share/wallpapers 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/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/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 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 2>/dev/null || true
+@dirrmtry share/wallpapers
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/easysok
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/easysok/themes/xsokoban
 @dirrm share/apps/easysok/themes/warehousekeeper
 @dirrm share/apps/easysok/themes/text
@@ -276,7 +276,7 @@ share/wallpapers/WarehouseKeeperThemeBackground.jpg
 @dirrm share/apps/easysok/icons
 @dirrm share/apps/easysok/deadlocks
 @dirrm share/apps/easysok
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games/TacticStrategy 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Games/TacticStrategy
+@dirrmtry share/applnk/Games
+@dirrmtry share/applnk
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
@@ -73,7 +73,7 @@ share/icons/worldforge/ember.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @dirrm etc/ember
 @dirrm share/games/ember/carpenter/blockspec
 @dirrm share/games/ember/carpenter/blueprints
@@ -97,6 +97,6 @@ share/icons/worldforge/ember.png
 @dirrm share/games/ember/media
 @dirrm share/games/ember
 @dirrm share/games
-@unexec rmdir %D/share/icons/worldforge 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/worldforge
+@dirrmtry share/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/enigma/pkg-plist b/games/enigma/pkg-plist
@@ -2736,12 +2736,12 @@ share/locale/it/LC_MESSAGES/enigma.mo
 share/locale/nl/LC_MESSAGES/enigma.mo
 share/pixmaps/enigma.png
 
-@unexec rmdir %D/share/pixmaps 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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/applications/ 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications/
 
 @dirrm share/enigma/sound
 @dirrm share/enigma/levels/patches

diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
@@ -324,20 +324,20 @@ share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
 share/applications/freeciv.desktop
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/he_IL/LC_MESSAGES
+@dirrmtry share/locale/he_IL
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrm %%DATADIR%%/trident
 @dirrm %%DATADIR%%/scenario
 @dirrm %%DATADIR%%/nation
@@ -350,4 +350,4 @@ share/applications/freeciv.desktop
 @dirrm %%DATADIR%%/flags
 @dirrm %%DATADIR%%/isophex
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/freesci/pkg-plist b/games/freesci/pkg-plist
@@ -6,18 +6,18 @@ bin/freesci
 bin/freesci-setup
 bin/sciv
 share/applnk/Games/Adventure/FreeSCI.desktop
-@unexec rmdir %D/share/applnk/Games/Adventure 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Games/Adventure
+@dirrmtry share/applnk/Games
+@dirrmtry share/applnk
 share/icons/hicolor/48x48/apps/freesci.png
-@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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 share/games/freesci/config.template
 %%PORTDOCS%%share/games/freesci/sci.sgml
 %%PORTDOCS%%share/games/freesci/sci-kernel.sgml
 %%PORTDOCS%%share/games/freesci/freesci.sgml
 %%PORTDOCS%%share/games/freesci/game-list.sgml
 @dirrm share/games/freesci
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
@@ -3071,8 +3071,8 @@ share/locale/tr/LC_MESSAGES/gcompris.mo
 share/locale/vi/LC_MESSAGES/gcompris.mo
 share/locale/wa/LC_MESSAGES/gcompris.mo
 share/locale/zh_CN/LC_MESSAGES/gcompris.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/help/gcompris/fr
 @dirrm share/gnome/help/gcompris/eu
 @dirrm share/gnome/help/gcompris/C

diff --git a/games/ggz-client-libs/pkg-plist b/games/ggz-client-libs/pkg-plist
@@ -13,7 +13,7 @@ lib/libggzmod.so.4
 share/desktop-directories/ggz-games.directory
 share/desktop-directories/ggz.directory
 share/locale/de/LC_MESSAGES/ggz-config.mo
-@unexec rmdir %D/share/desktop-directories 2>/dev/null || true
-@unexec rmdir %D/etc/xdg/menus/applications-merged 2>/dev/null || true
-@unexec rmdir %D/etc/xdg/menus 2>/dev/null || true
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
+@dirrmtry share/desktop-directories
+@dirrmtry etc/xdg/menus/applications-merged
+@dirrmtry etc/xdg/menus
+@dirrmtry etc/xdg
diff --git a/games/ggz-gtk-client/pkg-plist b/games/ggz-gtk-client/pkg-plist
@@ -19,7 +19,7 @@ share/locale/de/LC_MESSAGES/ggz-gtk.mo
 share/locale/es/LC_MESSAGES/ggz-gtk.mo
 share/locale/pt_BR/LC_MESSAGES/ggz-gtk.mo
 share/locale/sv/LC_MESSAGES/ggz-gtk.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @dirrm share/ggz/ggz-gtk/help
 @dirrm share/ggz/ggz-gtk
-@unexec rmdir %D/share/ggz 2>/dev/null || true
+@dirrmtry share/ggz
diff --git a/games/ggz-sdl-games/pkg-plist b/games/ggz-sdl-games/pkg-plist
@@ -16,4 +16,4 @@ share/ggz/ttt3d/lines.bmp
 @dirrm lib/ggz
 @dirrm share/ggz/geekgame
 @dirrm share/ggz/ttt3d
-@unexec rmdir %D/share/ggz 2>/dev/null || true
+@dirrmtry share/ggz
diff --git a/games/ggz-txt-client/pkg-plist b/games/ggz-txt-client/pkg-plist
@@ -3,5 +3,5 @@ etc/ggz.modules
 lib/ggz/tttxt
 share/applications/ggz-txt.desktop
 share/locale/de/LC_MESSAGES/ggz-txt.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/ggz 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry lib/ggz
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
@@ -45,5 +45,5 @@ share/locale/is/LC_MESSAGES/gnubg.mo
 share/locale/it/LC_MESSAGES/gnubg.mo
 share/locale/ja/LC_MESSAGES/gnubg.mo
 share/locale/tr/LC_MESSAGES/gnubg.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
diff --git a/games/gretools/pkg-plist b/games/gretools/pkg-plist
@@ -19,5 +19,5 @@ share/gnome/pixmaps/gretools.png
 @dirrm share/gnome/gretools/glade
 @dirrm share/gnome/gretools
 @dirrm %%PYTHON_SITELIBDIR%%/gretools
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/games/gtkpool/pkg-plist b/games/gtkpool/pkg-plist
@@ -43,4 +43,4 @@ bin/gtkpool
 %%DATADIR%%/ball_hit.raw
 @dirrm %%DATADIR%%
 share/icons/gtkpool.png
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
diff --git a/games/halflifeserver/pkg-plist b/games/halflifeserver/pkg-plist
@@ -1856,10 +1856,10 @@
 @dirrm %%HLDSDIR%%dmc/events
 @dirrm %%HLDSDIR%%dmc/dlls
 @dirrm %%HLDSDIR%%dmc/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%valve 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%reslists 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%tfc 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%ricochet 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%dmc 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%valve
+@dirrmtry %%HLDSDIR%%reslists
+@dirrmtry %%HLDSDIR%%tfc
+@dirrmtry %%HLDSDIR%%ricochet
+@dirrmtry %%HLDSDIR%%dmc
 @unexec rmdir %D/%%HLDSDIR%% 2>/dev/null || echo "If you are permanently removing this port and its mods, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%`` to remove any configuration files and logs left." | fmt
-@unexec rmdir %D/%%HLDSBASE%% 2>/dev/null || true
+@dirrmtry %%HLDSBASE%%
diff --git a/games/hlserver-admin/pkg-plist b/games/hlserver-admin/pkg-plist
@@ -230,4 +230,4 @@
 @dirrm %%HLDSDIR%%Adminmod/config/Samples
 @dirrm %%HLDSDIR%%Adminmod/config
 @dirrm %%HLDSDIR%%Adminmod/.amdd
-@unexec rmdir %D/%%HLDSDIR%%Adminmod 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%Adminmod
diff --git a/games/hlserver-esf/pkg-plist b/games/hlserver-esf/pkg-plist
@@ -944,5 +944,5 @@
 @dirrm %%HLDSDIR%%esf/dlls
 @dirrm %%HLDSDIR%%esf/classes
 @dirrm %%HLDSDIR%%esf/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%esf/SAVE 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%esf/SAVE
 @unexec rmdir %D/%%HLDSDIR%%esf 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%esf`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-existence/pkg-plist b/games/hlserver-existence/pkg-plist
@@ -625,7 +625,7 @@
 @dirrm %%HLDSDIR%%existence/sound/radio/accent_agent
 @dirrm %%HLDSDIR%%existence/sound/radio
 @dirrm %%HLDSDIR%%existence/sound/player
-@unexec rmdir %D/%%HLDSDIR%%existence/sound/plats 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%existence/sound/plats
 @dirrm %%HLDSDIR%%existence/sound/oldman
 @dirrm %%HLDSDIR%%existence/sound/misc
 @dirrm %%HLDSDIR%%existence/sound/items
@@ -660,5 +660,5 @@
 @dirrm %%HLDSDIR%%existence/events
 @dirrm %%HLDSDIR%%existence/dlls
 @dirrm %%HLDSDIR%%existence/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%existence/SAVE 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%existence/SAVE
 @unexec rmdir %D/%%HLDSDIR%%existence 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%existence`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-fa/pkg-plist b/games/hlserver-fa/pkg-plist
@@ -1611,6 +1611,6 @@
 @dirrm %%HLDSDIR%%firearms/events
 @dirrm %%HLDSDIR%%firearms/dlls
 @dirrm %%HLDSDIR%%firearms/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%firearms/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%firearms/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%firearms/SAVE
+@dirrmtry %%HLDSDIR%%firearms/logs
 @unexec rmdir %D/%%HLDSDIR%%firearms 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%firearms`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-flf/pkg-plist b/games/hlserver-flf/pkg-plist
@@ -655,6 +655,6 @@
 @dirrm %%HLDSDIR%%/frontline/events
 @dirrm %%HLDSDIR%%/frontline/dlls
 @dirrm %%HLDSDIR%%/frontline/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%frontline/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%frontline/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%frontline/SAVE
+@dirrmtry %%HLDSDIR%%frontline/logs
 @unexec rmdir %D/%%HLDSDIR%%frontline 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%frontline`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-opera/pkg-plist b/games/hlserver-opera/pkg-plist
@@ -1092,7 +1092,7 @@
 @dirrm %%HLDSDIR%%opera/sound
 @dirrm %%HLDSDIR%%opera/schemes
 @exec mkdir %D/%%HLDSDIR%%opera/nodes
-@unexec rmdir %D/%%HLDSDIR%%opera/nodes 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%opera/nodes
 @dirrm %%HLDSDIR%%opera/models/player/yun
 @dirrm %%HLDSDIR%%opera/models/player/ying
 @dirrm %%HLDSDIR%%opera/models/player/yamishiro
@@ -1169,7 +1169,7 @@
 @dirrm %%HLDSDIR%%opera/manual/images
 @dirrm %%HLDSDIR%%opera/manual
 @exec mkdir %D/%%HLDSDIR%%opera/logs
-@unexec rmdir %D/%%HLDSDIR%%opera/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%opera/logs
 @dirrm %%HLDSDIR%%opera/gfx/shell
 @dirrm %%HLDSDIR%%opera/gfx
 @dirrm %%HLDSDIR%%opera/events