From d568611c3eb334453c4a0352b61f081a623d72f1 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sun, 22 Jan 2006 05:52:28 +0000
Subject: eplace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)
---
 audio/cantus/pkg-plist     | 8 ++++----
 audio/hydrogen/Makefile    | 6 +++---
 audio/orpheus/pkg-plist    | 2 +-
 audio/polypaudio/pkg-plist | 2 +-
 audio/xmms-kj/pkg-plist    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'audio')

diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist
index 98aea4760c26..6d416d64b759 100644
--- a/audio/cantus/pkg-plist
+++ b/audio/cantus/pkg-plist
@@ -22,9 +22,9 @@ share/pixmaps/cantus/warning.xpm
 share/pixmaps/cantus/addrecursive.xpm
 share/gnome/apps/Applications/cantus.desktop
 @dirrm share/pixmaps/cantus
-@unexec rmdir %D/share/pixmaps
-@unexec rmdir %D/share/gnome/apps/Applications
-@unexec rmdir %D/share/gnome/apps
-@unexec rmdir %D/share/gnome
+@dirrmtry share/pixmaps
+@dirrmtry share/gnome/apps/Applications
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome
 @dirrm doc/Cantus
 @dirrm doc
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 6cb865e769cd..be2d0cdd581d 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -103,9 +103,9 @@ pre-install:
 		${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 	${FIND} data -type d ! -empty | ${SORT} -r | \
 		${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/share/applications 2>/dev/null || true' >> ${PLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R/man1 2>/dev/null || true' >> ${PLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R 2>/dev/null || true' >> ${PLIST}
+	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+	@${ECHO_CMD} '@dirrmtry man/ru.KOI8-R/man1' >> ${PLIST}
+	@${ECHO_CMD} '@dirrmtry man/ru.KOI8-R' >> ${PLIST}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydrogen ${WRKSRC}/hydrogenPlayer ${PREFIX}/bin
diff --git a/audio/orpheus/pkg-plist b/audio/orpheus/pkg-plist
index 2f810213c465..f012b035f7c9 100644
--- a/audio/orpheus/pkg-plist
+++ b/audio/orpheus/pkg-plist
@@ -1,3 +1,3 @@
 bin/orpheus
 %%NLS%%share/locale/ru/LC_MESSAGES/orpheus.mo
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
diff --git a/audio/polypaudio/pkg-plist b/audio/polypaudio/pkg-plist
index 2e9925435fc8..d71469eafb7f 100644
--- a/audio/polypaudio/pkg-plist
+++ b/audio/polypaudio/pkg-plist
@@ -211,4 +211,4 @@ libdata/pkgconfig/polyplib-simple.pc
 libdata/pkgconfig/polyplib.pc
 @dirrm lib/polypaudio-%%VERSION%%
 @dirrm include/polyp
-@unexec rmdir %D/etc/polypaudio 2> /dev/null || /usr/bin/true
+@dirrmtry etc/polypaudio
diff --git a/audio/xmms-kj/pkg-plist b/audio/xmms-kj/pkg-plist
index d302c39deeba..22c87dc716f3 100644
--- a/audio/xmms-kj/pkg-plist
+++ b/audio/xmms-kj/pkg-plist
@@ -1,4 +1,4 @@
 lib/xmms/Visualization/libkjofol.so
 share/xmms/kjofol/default.zip
-@unexec rmdir %D/lib/xmms/Visualization 2>&1 >/dev/null || true
+@dirrmtry lib/xmms/Visualization
 @dirrm share/xmms/kjofol
-- 
cgit v1.2.3