Make use of the @rmtry macro

10 files changed, 14 insertions, 14 deletions

diff --git a/devel/distel/pkg-plist b/devel/distel/pkg-plist
index b6ce102665b2..64a59ba4a02a 100644
--- a/devel/distel/pkg-plist
+++ b/devel/distel/pkg-plist
@@ -34,4 +34,4 @@
 @dirrm %%LIB32DIR%%/erlang/lib/distel-2007.11.03/ebin
 @dirrm %%LIB32DIR%%/erlang/lib/distel-2007.11.03
 @exec ln -sf distel-%%VERSION%% %D/%%LIB32DIR%%/erlang/lib/distel
-@unexec rm -f %D/%%LIB32DIR%%/erlang/lib/distel
+@rmtry %%LIB32DIR%%/erlang/lib/distel
diff --git a/devel/erlslang/pkg-plist b/devel/erlslang/pkg-plist
index 872fc460192d..f5c20ec2c81b 100644
--- a/devel/erlslang/pkg-plist
+++ b/devel/erlslang/pkg-plist
@@ -21,4 +21,4 @@ lib/erlang/lib/slang-%%VERSION%%/src/slang_lib.erl
 @dirrm lib/erlang/lib/slang-%%VERSION%%/c_src
 @dirrm lib/erlang/lib/slang-%%VERSION%%
 @exec ln -sf slang-%%VERSION%% %D/lib/erlang/lib/slang
-@unexec rm -f %D/lib/erlang/lib/slang
+@rmtry lib/erlang/lib/slang
diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist
index 6b282427bd4f..5234114a68db 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/esdl/pkg-plist
@@ -88,4 +88,4 @@ lib/erlang/lib/esdl-%%VERSION%%/vsn
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/c_src
 @dirrm lib/erlang/lib/esdl-%%VERSION%%
 @exec ln -sf esdl-%%VERSION%% %D/lib/erlang/lib/esdl
-@unexec rm -f %D/lib/erlang/lib/esdl
+@rmtry lib/erlang/lib/esdl
diff --git a/devel/fam/pkg-plist b/devel/fam/pkg-plist
index fd180a8969a6..d1c6b84672e8 100644
--- a/devel/fam/pkg-plist
+++ b/devel/fam/pkg-plist
@@ -5,5 +5,5 @@ lib/libfam.a
 lib/libfam.la
 lib/libfam.so
 lib/libfam.so.0
-@comment For non-standart prefixes
-@unexec rm -f %D/libdata/ldconfig/fam || true
+@comment For non-standard prefixes
+@rmtry libdata/ldconfig/fam
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 2a0e9685cd47..536997b2771e 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -131,7 +131,7 @@ System/Tools/opentool
 @dirrm System/Tools/Resources
 @dirrm System/Tools/Java
 @dirrm System/Tools
-@unexec rm -f %D/System/Makefiles
+@rmtry System/Makefiles
 @dirrm System/Library/Sounds
 @dirrm System/Library/Services
 @dirrm System/Library/PostScript
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index 5b279d5dafe8..335b1143d2a5 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -22,7 +22,7 @@ bin/iReport
 %%DATADIR%%/fonts/flatline.ttf
 %%DATADIR%%/fonts/progenisis.ttf
 @exec ln -sf %D/%%JAVAJARDIR%% %D/%%DATADIR%%/lib
-@unexec rm -f %D/%%DATADIR%%/lib
+@rmtry %%DATADIR%%/lib
 %%DATADIR%%/notice.txt
 %%DATADIR%%/plugins/JRXMLDataSourcePlugin.xml
 %%DATADIR%%/plugins/checkupdate.xml
diff --git a/devel/libphish/pkg-plist b/devel/libphish/pkg-plist
index 42f44e4c8599..2326ea273f7b 100644
--- a/devel/libphish/pkg-plist
+++ b/devel/libphish/pkg-plist
@@ -3,7 +3,7 @@ lib/libphish.a
 lib/libphish.la
 include/phish.h
 bin/libphish-config
-@unexec rm -f %D/lib/libphish.so
+@rmtry lib/libphish.so
 %%PORTDOCS%%%%DOCSDIR%%/Doxyfile
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
diff --git a/devel/noweb/pkg-plist b/devel/noweb/pkg-plist
index 90eda704f71f..e36729d99ae0 100644
--- a/devel/noweb/pkg-plist
+++ b/devel/noweb/pkg-plist
@@ -49,7 +49,7 @@ share/noweb/xchunks
 @dirrmtry share/texmf-local/tex/latex
 @dirrmtry share/texmf-local/tex/plain
 @dirrmtry share/texmf-local/tex
-@unexec rm %D/share/texmf-local/ls-R 2>/dev/null || true
+@rmtry hare/texmf-local/ls-R
 @dirrmtry share/texmf-local
 @unexec mktexlsr 2>/dev/null || true
 @dirrm share/noweb
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index 3e651ef7df92..f128722e2384 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -149,7 +149,7 @@
 %%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.so
 %%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.bs
 @dirrm %%SITE_PERL%%/mach/auto/Locale/gettext_xs
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Locale
+@dirrmtry %%SITE_PERL%%/mach/auto/Locale
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl
 @dirrm %%SITE_PERL%%/Locale/RecodeData
 @dirrm %%SITE_PERL%%/Locale/Recode
diff --git a/devel/pear/pkg-plist b/devel/pear/pkg-plist
index b265c51bc92b..71375eec0120 100644
--- a/devel/pear/pkg-plist
+++ b/devel/pear/pkg-plist
@@ -160,10 +160,10 @@ etc/pear.conf
 @dirrm %%DOCSDIR%%/Structures_Graph/docs
 @dirrm %%DOCSDIR%%/Structures_Graph
 @dirrmtry share/doc/pear
-@unexec rm %D/share/pear/.depdb 2> /dev/null || true
-@unexec rm %D/share/pear/.depdblock 2> /dev/null || true
-@unexec rm %D/share/pear/.filemap 2> /dev/null || true
-@unexec rm %D/share/pear/.lock 2> /dev/null || true
+@rmtry share/pear/.depdb
+@rmtry share/pear/.depdblock
+@rmtry share/pear/.filemap
+@rmtry share/pear/.lock
 @dirrmtry share/pear/.channels/.alias
 @dirrmtry share/pear/.channels
 @dirrmtry share/pear/.registry/.channel.__uri