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

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

7 files changed, 74 insertions, 74 deletions

diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index 1d6bfa19b2be..ae731ce9c290 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -134,6 +134,6 @@ share/mime/packages/gchemutils.xml
 @dirrm share/gnome/doc/gchemutils/reference
 @dirrm share/gnome/doc/gchemutils
 @dirrm share/gnome/doc
-@unexec rmdir %D/share/mime/chemical 2>/dev/null || true
+@dirrmtry share/mime/chemical
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/science/kst/pkg-plist b/science/kst/pkg-plist
index 63e4702918bb..fed9070dcc2f 100644
--- a/science/kst/pkg-plist
+++ b/science/kst/pkg-plist
@@ -353,48 +353,48 @@ share/servicetypes/kst/kstextension.desktop
 share/servicetypes/kst/kstfilter.desktop
 share/servicetypes/kst/kstplugin.desktop
 @dirrm share/servicetypes/kst
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
+@dirrmtry share/servicetypes
 @dirrm share/services/kst
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/mimetypes 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/mimetypes 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/hicolor/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 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 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/mimetypes
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/mimetypes
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/kst
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kst
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/it/kst
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kst
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kst
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kst
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kst
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/kst
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config/colors 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config/colors
+@dirrmtry share/config
 @dirrm share/apps/kst
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications/Sciences 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications/Sciences
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
 @dirrm lib/kde3/kstplugins
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index 63e4702918bb..fed9070dcc2f 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -353,48 +353,48 @@ share/servicetypes/kst/kstextension.desktop
 share/servicetypes/kst/kstfilter.desktop
 share/servicetypes/kst/kstplugin.desktop
 @dirrm share/servicetypes/kst
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
+@dirrmtry share/servicetypes
 @dirrm share/services/kst
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/mimetypes 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/mimetypes 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/hicolor/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 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 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/mimetypes
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/mimetypes
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/kst
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kst
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/it/kst
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kst
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kst
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kst
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kst
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/kst
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config/colors 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config/colors
+@dirrmtry share/config
 @dirrm share/apps/kst
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications/Sciences 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications/Sciences
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
 @dirrm lib/kde3/kstplugins
diff --git a/science/mpb/pkg-plist b/science/mpb/pkg-plist
index f8d2245f5294..6bb62c7e2c94 100644
--- a/science/mpb/pkg-plist
+++ b/science/mpb/pkg-plist
@@ -2,4 +2,4 @@ bin/mpb
 bin/mpb-split
 bin/mpb-data
 share/libctl/specs/mpb.scm
-@unexec rmdir %D/share/libctl/specs 2>/dev/null || true
+@dirrmtry share/libctl/specs
diff --git a/science/p5-Chemistry-Elements/pkg-plist b/science/p5-Chemistry-Elements/pkg-plist
index be8be406a681..193d99b3c4ff 100644
--- a/science/p5-Chemistry-Elements/pkg-plist
+++ b/science/p5-Chemistry-Elements/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Chemistry/Elements.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Chemistry 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/ruby-gphys/pkg-plist b/science/ruby-gphys/pkg-plist
index 9160b505bcb5..6bf8a2fa37cf 100644
--- a/science/ruby-gphys/pkg-plist
+++ b/science/ruby-gphys/pkg-plist
@@ -44,7 +44,7 @@ bin/grads2nc_with_gphys
 %%RUBY_SITELIBDIR%%/numru/gphys/varraygrib.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/varraynetcdf.rb
 @dirrm %%RUBY_SITELIBDIR%%/numru/gphys
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/numru 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/numru
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/cira86_to_nc.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_cli1.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_cli2.rb
diff --git a/science/v_sim/pkg-plist b/science/v_sim/pkg-plist
index 174226bf8a98..9845b9df65e8 100644
--- a/science/v_sim/pkg-plist
+++ b/science/v_sim/pkg-plist
@@ -122,7 +122,7 @@ share/pixmaps/v_sim.xpm
 %%DATADIR%%/v_sim.res
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%REFDOC%%@dirrm %%DOCSDIR%%/APIreference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%