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

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

5 files changed, 17 insertions, 17 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d0f0b594cc05..c671dc7ba0fd 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -207,7 +207,7 @@ PLIST_FILES=	include/gstreamer-0.8/gst/gconf/gconf.h \
 		lib/libgstgconf-0.8.so \
 		lib/libgstgconf-0.8.so.1 \
 		libdata/pkgconfig/gstreamer-gconf-0.8.pc \
-		'@unexec rmdir %D/include/gstreamer-0.8/gst/gconf 2>/dev/null || true'
+		'@dirrmtry include/gstreamer-0.8/gst/gconf'
 .endif
 
 # gdkpixbuf
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index d0f0b594cc05..c671dc7ba0fd 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -207,7 +207,7 @@ PLIST_FILES=	include/gstreamer-0.8/gst/gconf/gconf.h \
 		lib/libgstgconf-0.8.so \
 		lib/libgstgconf-0.8.so.1 \
 		libdata/pkgconfig/gstreamer-gconf-0.8.pc \
-		'@unexec rmdir %D/include/gstreamer-0.8/gst/gconf 2>/dev/null || true'
+		'@dirrmtry include/gstreamer-0.8/gst/gconf'
 .endif
 
 # gdkpixbuf
diff --git a/multimedia/kplayer-kde4/pkg-plist b/multimedia/kplayer-kde4/pkg-plist
index 3a615e0bb54d..e90607dcac0f 100644
--- a/multimedia/kplayer-kde4/pkg-plist
+++ b/multimedia/kplayer-kde4/pkg-plist
@@ -239,8 +239,8 @@ share/services/mmst.protocol
 share/services/mmsu.protocol
 share/services/pnm.protocol
 share/services/rtsp.protocol
-@unexec rmdir %D/lib/kde3 >/dev/null 2>&1 || true
-@unexec rmdir %D/share/services >/dev/null 2>&1 || true
+@dirrmtry lib/kde3
+@dirrmtry share/services
 @dirrm share/doc/HTML/en/kplayer
 @dirrm share/apps/kplayer/icons/hicolor/32x32/actions
 @dirrm share/apps/kplayer/icons/hicolor/32x32
diff --git a/multimedia/kplayer/pkg-plist b/multimedia/kplayer/pkg-plist
index 3a615e0bb54d..e90607dcac0f 100644
--- a/multimedia/kplayer/pkg-plist
+++ b/multimedia/kplayer/pkg-plist
@@ -239,8 +239,8 @@ share/services/mmst.protocol
 share/services/mmsu.protocol
 share/services/pnm.protocol
 share/services/rtsp.protocol
-@unexec rmdir %D/lib/kde3 >/dev/null 2>&1 || true
-@unexec rmdir %D/share/services >/dev/null 2>&1 || true
+@dirrmtry lib/kde3
+@dirrmtry share/services
 @dirrm share/doc/HTML/en/kplayer
 @dirrm share/apps/kplayer/icons/hicolor/32x32/actions
 @dirrm share/apps/kplayer/icons/hicolor/32x32
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 04d8ad37bc11..373ac43a74f7 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -231,14 +231,14 @@ lib/linux-mozilla/plugins/nphelix.xpt
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-ogg_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-rv_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-swf_48x48.png
-%%GNOME%%@unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true
-%%GNOME%%@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-%%GNOME%%@unexec rmdir %D/share/gnome/mime-info 2>/dev/null || true
-%%GNOME%%@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192/apps 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192/mimetypes 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192 2>/dev/null || true
-%%ICONS%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+%%GNOME%%@dirrmtry share/gnome/application-registry
+%%GNOME%%@dirrmtry share/gnome/applications
+%%GNOME%%@dirrmtry share/gnome/mime-info
+%%GNOME%%@dirrmtry share/gnome/pixmaps
+%%ICONS%%@dirrmtry share/icons/hicolor/48x48/apps
+%%ICONS%%@dirrmtry share/icons/hicolor/48x48/mimetypes
+%%ICONS%%@dirrmtry share/icons/hicolor/48x48
+%%ICONS%%@dirrmtry share/icons/hicolor/192x192/apps
+%%ICONS%%@dirrmtry share/icons/hicolor/192x192/mimetypes
+%%ICONS%%@dirrmtry share/icons/hicolor/192x192
+%%ICONS%%@dirrmtry share/icons/hicolor