8 files changed, 38 insertions, 38 deletions

diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 17420ca23f13..eb3ceb0522f0 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -34,16 +34,16 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
 share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
 share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
 @dirrm share/gEDA/bitmap
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index 6405c6ee6f8f..fece6401e9f1 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -46,6 +46,6 @@ share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-redac.scm
 share/gEDA/scheme/gnet-systemc.scm
 share/gEDA/scheme/gnet-eagle.scm
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
diff --git a/cad/geda-symcheck/pkg-plist b/cad/geda-symcheck/pkg-plist
index 8dce2be362e9..59da26b9ea8c 100644
--- a/cad/geda-symcheck/pkg-plist
+++ b/cad/geda-symcheck/pkg-plist
@@ -1,4 +1,4 @@
 bin/gsymcheck
 share/doc/geda-doc/man/gsymcheck.html
 share/gEDA/system-gsymcheckrc
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
diff --git a/cad/geda-utils/pkg-plist b/cad/geda-utils/pkg-plist
index 674da1e9471a..355a2c856ef6 100644
--- a/cad/geda-utils/pkg-plist
+++ b/cad/geda-utils/pkg-plist
@@ -18,4 +18,4 @@ share/doc/geda-doc/readmes/README.gsch2pcb
 share/doc/geda-doc/readmes/README.olib
 share/doc/geda-doc/readmes/README.tragesym
 share/gEDA/system-gschlasrc
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
index 6405c6ee6f8f..fece6401e9f1 100644
--- a/cad/gnetlist/pkg-plist
+++ b/cad/gnetlist/pkg-plist
@@ -46,6 +46,6 @@ share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-redac.scm
 share/gEDA/scheme/gnet-systemc.scm
 share/gEDA/scheme/gnet-eagle.scm
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
index 17420ca23f13..eb3ceb0522f0 100644
--- a/cad/gschem/pkg-plist
+++ b/cad/gschem/pkg-plist
@@ -34,16 +34,16 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
 share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
 share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
 @dirrm share/gEDA/bitmap
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
diff --git a/cad/gwave/pkg-plist b/cad/gwave/pkg-plist
index e62afab24972..610672a0c050 100644
--- a/cad/gwave/pkg-plist
+++ b/cad/gwave/pkg-plist
@@ -19,4 +19,4 @@ share/guile/app/gwave/export.scm
 share/guile/app/gwave/gtk-helpers.scm
 share/guile/app/gwave/utils.scm
 @dirrm share/guile/app/gwave
-@unexec rmdir %D/share/guile/app 2>/dev/null || true
+@dirrmtry share/guile/app
diff --git a/cad/systemc/pkg-plist b/cad/systemc/pkg-plist
index 9a1b023a4ba0..3cc18c655f30 100644
--- a/cad/systemc/pkg-plist
+++ b/cad/systemc/pkg-plist
@@ -279,12 +279,12 @@ systemc/include/sysc/utils/sc_vector.h
 systemc/include/systemc
 systemc/include/systemc.h
 systemc/lib-freebsd/libsystemc.a
-@unexec rmdir %D/systemc/docs 2>/dev/null || true
+@dirrmtry systemc/docs
 @dirrm systemc/examples/sysc/2.1
 @dirrm systemc/examples/sysc/fft
 @dirrm systemc/examples/sysc
 @dirrm systemc/examples/systemc
-@unexec rmdir %D/systemc/examples 2>/dev/null || true
+@dirrmtry systemc/examples
 @dirrm systemc/include/sysc/communication
 @dirrm systemc/include/sysc/datatypes/bit
 @dirrm systemc/include/sysc/datatypes/fx
@@ -306,6 +306,6 @@ systemc/lib-freebsd/libsystemc.a
 @dirrm systemc/include/sysc/tracing
 @dirrm systemc/include/sysc/utils
 @dirrm systemc/include/sysc
-@unexec rmdir %D/systemc/include 2>/dev/null || true
-@unexec rmdir %D/systemc/lib-freebsd 2>/dev/null || true
-@unexec rmdir %D/systemc 2>/dev/null || true
+@dirrmtry systemc/include
+@dirrmtry systemc/lib-freebsd
+@dirrmtry systemc