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

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

24 files changed, 56 insertions, 56 deletions

diff --git a/java/diablo-jdk13/pkg-plist b/java/diablo-jdk13/pkg-plist
index 8ce0c6f6f727..7363480439f2 100644
--- a/java/diablo-jdk13/pkg-plist
+++ b/java/diablo-jdk13/pkg-plist
@@ -749,9 +749,9 @@ diablo-jdk%%JDK_VERSION%%/man/man1/serialver.1
 diablo-jdk%%JDK_VERSION%%/man/man1/tnameserv.1
 diablo-jdk%%JDK_VERSION%%/src.jar
 @exec   mkdir -p %D/diablo-jdk%%JDK_VERSION%%/jre/lib/ext/
-@unexec rmdir %D/diablo-jdk%%JDK_VERSION%%/jre/lib/ext 2>/dev/null || true
+@dirrmtry diablo-jdk%%JDK_VERSION%%/jre/lib/ext
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/diablo-jdk%%JDK_VERSION%%/bin/java # DiabloCaffe%%JDK_VERSION%%"
 @dirrm diablo-jdk%%JDK_VERSION%%/man/man1
 @dirrm diablo-jdk%%JDK_VERSION%%/man
diff --git a/java/diablo-jre13/pkg-plist b/java/diablo-jre13/pkg-plist
index ec3f96a1bcf4..232819962236 100644
--- a/java/diablo-jre13/pkg-plist
+++ b/java/diablo-jre13/pkg-plist
@@ -130,9 +130,9 @@ diablo-jre%%JRE_VERSION%%/man/man1/tnameserv.1
 %%PLUGIN:%%diablo-jre%%JRE_VERSION%%/plugin/i386/ns600/libjavaplugin_oji.so
 %%PLUGIN:%%diablo-jre%%JRE_VERSION%%/plugin/i386/ns600/libjavaplugin_oji_g.so
 @exec   mkdir -p %D/diablo-jre%%JRE_VERSION%%/lib/ext/
-@unexec rmdir %D/diablo-jre%%JRE_VERSION%%/lib/ext 2>/dev/null || true
+@dirrmtry diablo-jre%%JRE_VERSION%%/lib/ext
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/diablo-jre%%JRE_VERSION%%/bin/java # DiabloLatte%%JRE_VERSION%%"
 %%PLUGIN:%%@dirrm diablo-jre%%JRE_VERSION%%/plugin/i386/ns600
 %%PLUGIN:%%@dirrm diablo-jre%%JRE_VERSION%%/plugin/i386/ns4
diff --git a/java/eclipse-cdt/pkg-plist b/java/eclipse-cdt/pkg-plist
index a7ebc6cbe63f..c369fb25d93f 100644
--- a/java/eclipse-cdt/pkg-plist
+++ b/java/eclipse-cdt/pkg-plist
@@ -601,6 +601,6 @@ eclipse/features/org.eclipse.cdt_3.0.1/epl-v10.html
 @dirrm eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os
 @dirrm eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1
 @dirrm eclipse/features/org.eclipse.cdt_3.0.1
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-checkstyle/pkg-plist b/java/eclipse-checkstyle/pkg-plist
index 933f4e1ce9e8..b61e1d7ae087 100644
--- a/java/eclipse-checkstyle/pkg-plist
+++ b/java/eclipse-checkstyle/pkg-plist
@@ -70,6 +70,6 @@ eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xmlParserAPIs.jar
 @dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs
 @dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc
 @dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse
 
diff --git a/java/eclipse-examples/pkg-plist b/java/eclipse-examples/pkg-plist
index b7c6f74566ed..6deda56edc1a 100644
--- a/java/eclipse-examples/pkg-plist
+++ b/java/eclipse-examples/pkg-plist
@@ -340,6 +340,6 @@ eclipse/features/org.eclipse.sdk.examples_3.0.0/license.html
 @dirrm eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/doc-html
 @dirrm eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0
 @dirrm eclipse/features/org.eclipse.sdk.examples_3.0.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-gef-examples/pkg-plist b/java/eclipse-gef-examples/pkg-plist
index d64ab654f2eb..46d1ff359c69 100644
--- a/java/eclipse-gef-examples/pkg-plist
+++ b/java/eclipse-gef-examples/pkg-plist
@@ -27,6 +27,6 @@ eclipse/features/org.eclipse.gef.examples_3.0.0/feature.properties
 @dirrm eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0
 @dirrm eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0
 @dirrm eclipse/features/org.eclipse.gef.examples_3.0.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-langpack/pkg-plist b/java/eclipse-langpack/pkg-plist
index 8d7ffb78c4d7..4b3ad6deaad8 100644
--- a/java/eclipse-langpack/pkg-plist
+++ b/java/eclipse-langpack/pkg-plist
@@ -419,41 +419,41 @@
 @dirrm  eclipse/plugins/org.eclipse.help.webapp.nl2_3.1.0
 @dirrm  eclipse/plugins/org.eclipse.help.webapp.nl1_3.1.0/META-INF
 @dirrm  eclipse/plugins/org.eclipse.help.webapp.nl1_3.1.0
-@unexec rmdir %D/eclipse/plugins  2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.sdk_3.1.1  2>/dev/null || true
+@dirrmtry eclipse/plugins 
+@dirrmtry eclipse/features/org.eclipse.sdk_3.1.1 
 @dirrm  eclipse/features/org.eclipse.sdk.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.sdk.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.sdk.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.rcp_3.1.1  2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.rcp_3.1.1 
 @dirrm  eclipse/features/org.eclipse.rcp.source.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.rcp.source.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.rcp.source.nls1_3.1.1
 @dirrm  eclipse/features/org.eclipse.rcp.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.rcp.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.rcp.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.platform_3.1.1  2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.platform.source_3.1.1  2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.platform_3.1.1 
+@dirrmtry eclipse/features/org.eclipse.platform.source_3.1.1 
 @dirrm  eclipse/features/org.eclipse.platform.source.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.platform.source.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.platform.source.nls1_3.1.1
 @dirrm  eclipse/features/org.eclipse.platform.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.platform.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.platform.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.pde_3.1.1  2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.pde.source_3.1.1  2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.pde_3.1.1 
+@dirrmtry eclipse/features/org.eclipse.pde.source_3.1.1 
 @dirrm  eclipse/features/org.eclipse.pde.source.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.pde.source.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.pde.source.nls1_3.1.1
 @dirrm  eclipse/features/org.eclipse.pde.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.pde.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.pde.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.jdt_3.1.1  2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.jdt.source_3.1.1  2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.jdt_3.1.1 
+@dirrmtry eclipse/features/org.eclipse.jdt.source_3.1.1 
 @dirrm  eclipse/features/org.eclipse.jdt.source.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.jdt.source.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.jdt.source.nls1_3.1.1
 @dirrm  eclipse/features/org.eclipse.jdt.nlsBidi_3.1.1
 @dirrm  eclipse/features/org.eclipse.jdt.nls2_3.1.1
 @dirrm  eclipse/features/org.eclipse.jdt.nls1_3.1.1
-@unexec rmdir %D/eclipse/features  2>/dev/null || true
-@unexec rmdir %D/eclipse  2>/dev/null || true
+@dirrmtry eclipse/features 
+@dirrmtry eclipse 
diff --git a/java/eclipse-log4e/pkg-plist b/java/eclipse-log4e/pkg-plist
index 11751773c551..8e6ca0a4e747 100644
--- a/java/eclipse-log4e/pkg-plist
+++ b/java/eclipse-log4e/pkg-plist
@@ -21,6 +21,6 @@ eclipse/plugins/de.jayefem.log4e_0.7.6/welcome.xml
 @dirrm eclipse/plugins/de.jayefem.log4e_0.7.6/lib
 @dirrm eclipse/plugins/de.jayefem.log4e_0.7.6
 @dirrm eclipse/plugins/de.jayefem.log4e.help_0.7.6
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-vep-examples/pkg-plist b/java/eclipse-vep-examples/pkg-plist
index 7420d016ee23..1c9b7cf8aa50 100644
--- a/java/eclipse-vep-examples/pkg-plist
+++ b/java/eclipse-vep-examples/pkg-plist
@@ -54,6 +54,6 @@ eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.properties
 @dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src
 @dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%
 @dirrm eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/gj-jdk11/pkg-plist b/java/gj-jdk11/pkg-plist
index b1081b1915d5..784779c19767 100644
--- a/java/gj-jdk11/pkg-plist
+++ b/java/gj-jdk11/pkg-plist
@@ -251,4 +251,4 @@ lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/Vector.class
 @dirrm lib/gj/%%JDKSUBDIR%%/gjc/v6
 @dirrm lib/gj/%%JDKSUBDIR%%/gjc
 @dirrm lib/gj/%%JDKSUBDIR%%
-@unexec rmdir %D/lib/gj 2>/dev/null || true
+@dirrmtry lib/gj
diff --git a/java/gj/pkg-plist b/java/gj/pkg-plist
index 11b7819a72bb..dac77882a9a1 100644
--- a/java/gj/pkg-plist
+++ b/java/gj/pkg-plist
@@ -356,4 +356,4 @@ lib/gj/%%JDKSUBDIR%%/java/util/Vector.class
 @dirrm lib/gj/%%JDKSUBDIR%%/java/util
 @dirrm lib/gj/%%JDKSUBDIR%%/java
 @dirrm lib/gj/%%JDKSUBDIR%%
-@unexec rmdir %D/lib/gj 2>/dev/null || true
+@dirrmtry lib/gj
diff --git a/java/jdk11/pkg-plist b/java/jdk11/pkg-plist
index 7c9186ce4fb4..b64d84868eaf 100644
--- a/java/jdk11/pkg-plist
+++ b/java/jdk11/pkg-plist
@@ -518,7 +518,7 @@ jdk%%JDK_VERSION%%/README.FreeBSD
 jdk%%JDK_VERSION%%/CHANGES
 jdk%%JDK_VERSION%%/index.html
 @exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
 @dirrm jdk%%JDK_VERSION%%/lib/security
 @dirrm jdk%%JDK_VERSION%%/lib/locale/ja_JP.UTF-8/app-defaults
diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist
index 46421d6f989c..3896c2ae954a 100644
--- a/java/jdk13/pkg-plist
+++ b/java/jdk13/pkg-plist
@@ -925,9 +925,9 @@ jdk%%JDK_VERSION%%/man/man1/serialver.1
 jdk%%JDK_VERSION%%/man/man1/tnameserv.1
 jdk%%JDK_VERSION%%/src.jar
 @exec   mkdir -p %D/jdk%%JDK_VERSION%%/jre/lib/ext/
-@unexec rmdir %D/jdk%%JDK_VERSION%%/jre/lib/ext 2>/dev/null || true
+@dirrmtry jdk%%JDK_VERSION%%/jre/lib/ext
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
 @dirrm jdk%%JDK_VERSION%%/man/man1
 @dirrm jdk%%JDK_VERSION%%/man
diff --git a/java/jre/pkg-plist b/java/jre/pkg-plist
index 062655480c8e..0b5c2ca3d895 100644
--- a/java/jre/pkg-plist
+++ b/java/jre/pkg-plist
@@ -49,7 +49,7 @@ jre%%JRE_VERSION%%/lib/rt.jar
 jre%%JRE_VERSION%%/lib/security/java.security
 jre%%JRE_VERSION%%/lib/serialver.properties
 @exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec %%LOCALBASE%%/bin/registervm "%D/jre%%JRE_VERSION%%/bin/java # JRE%%JRE_VERSION%%"
 @dirrm jre%%JRE_VERSION%%/lib/security
 @dirrm jre%%JRE_VERSION%%/lib/i386/green_threads
diff --git a/java/linux-blackdown-jdk12/pkg-plist b/java/linux-blackdown-jdk12/pkg-plist
index 8b255e17c37f..5f33db3d1a3c 100644
--- a/java/linux-blackdown-jdk12/pkg-plist
+++ b/java/linux-blackdown-jdk12/pkg-plist
@@ -724,7 +724,7 @@
 %%T%%/lib/tools.jar
 %%T%%/src.jar
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
 @dirrm %%T%%/lib
 @dirrm %%T%%/jre/lib/security
diff --git a/java/linux-blackdown-jdk13/pkg-plist b/java/linux-blackdown-jdk13/pkg-plist
index 2a06e36789cf..7b016348b0a2 100644
--- a/java/linux-blackdown-jdk13/pkg-plist
+++ b/java/linux-blackdown-jdk13/pkg-plist
@@ -966,7 +966,7 @@
 %%T%%/COPYRIGHT
 %%T%%/src.jar
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
 @dirrm %%T%%/jre/bin/i386/green_threads
 @dirrm %%T%%/jre/bin/i386/native_threads
diff --git a/java/linux-blackdown-jdk14/pkg-plist b/java/linux-blackdown-jdk14/pkg-plist
index d295105aa113..80020de78502 100644
--- a/java/linux-blackdown-jdk14/pkg-plist
+++ b/java/linux-blackdown-jdk14/pkg-plist
@@ -1540,7 +1540,7 @@
 %%T%%/man/man1/tnameserv.1.gz
 %%T%%/src.zip
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
 @dirrm %%T%%/man/man1
 @dirrm %%T%%/man/ja_JP.eucJP/man1
diff --git a/java/linux-blackdown-jre11/pkg-plist b/java/linux-blackdown-jre11/pkg-plist
index 7b0eced47287..a21858456544 100644
--- a/java/linux-blackdown-jre11/pkg-plist
+++ b/java/linux-blackdown-jre11/pkg-plist
@@ -70,7 +70,7 @@ linux-blackdown-jre%%JRE_VERSION%%/lib/rt.jar
 linux-blackdown-jre%%JRE_VERSION%%/lib/security/java.security
 linux-blackdown-jre%%JRE_VERSION%%/lib/serialver.properties
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/linux-blackdown-jre%%JRE_VERSION%%/bin/java # Linux-Blackdown-JRE%%JRE_VERSION%%"
 @dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/security
 @dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/i686/native_threads
diff --git a/java/linux-ibm-jdk13/pkg-plist b/java/linux-ibm-jdk13/pkg-plist
index 7f7959b7cb2f..2e103c46674b 100644
--- a/java/linux-ibm-jdk13/pkg-plist
+++ b/java/linux-ibm-jdk13/pkg-plist
@@ -887,7 +887,7 @@
 %%T%%/demo/jfc/TableExample/src/TableMap.java
 %%T%%/demo/jfc/TableExample/src/TableSorter.java
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-IBM-JDK%%PORTVERSION%%"
 @dirrm %%T%%/lib
 @dirrm %%T%%/jre/lib/security
diff --git a/java/linux-ibm-jdk14/pkg-plist b/java/linux-ibm-jdk14/pkg-plist
index dfbb0db832e3..b4df5c762e55 100644
--- a/java/linux-ibm-jdk14/pkg-plist
+++ b/java/linux-ibm-jdk14/pkg-plist
@@ -770,7 +770,7 @@
 %%T%%/lib/tools.jar
 %%T%%/src.jar
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-IBM-JDK%%PORTVERSION%%"
 @dirrm %%T%%/lib
 @dirrm %%T%%/jre/lib/security
diff --git a/java/linux-sun-jdk12/pkg-plist b/java/linux-sun-jdk12/pkg-plist
index 26b9c67c1bf5..fecfbc6d04dd 100644
--- a/java/linux-sun-jdk12/pkg-plist
+++ b/java/linux-sun-jdk12/pkg-plist
@@ -721,7 +721,7 @@
 %%T%%/lib/tools.jar
 %%T%%/src.jar
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%JDK_VERSION%%"
 @dirrm %%T%%/bin/i386/green_threads
 @dirrm %%T%%/bin/i386/native_threads
diff --git a/java/linux-sun-jdk13/pkg-plist b/java/linux-sun-jdk13/pkg-plist
index 106b76acf8bc..47d493e2474f 100644
--- a/java/linux-sun-jdk13/pkg-plist
+++ b/java/linux-sun-jdk13/pkg-plist
@@ -798,7 +798,7 @@
 %%T%%/man/man1/tnameserv.1
 %%T%%/src.jar
 @exec   mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
 @exec   %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%PORTVERSION%%"
 @dirrm %%T%%/man/man1
 @dirrm %%T%%/man/ja_JP.eucJP/man1
diff --git a/java/phpeclipse/pkg-plist b/java/phpeclipse/pkg-plist
index e07f1bcf1c00..b85ae50f3ceb 100644
--- a/java/phpeclipse/pkg-plist
+++ b/java/phpeclipse/pkg-plist
@@ -1381,13 +1381,13 @@ eclipse/plugins/%%OTS%%.subclipse_%%OTSVER%%/plugin.xml
 @dirrm eclipse/features/org.eclipse.team.extras_%%TEAMVER%%
 @dirrm eclipse/features/%%NSP%%_%%VER%%
 @dirrm eclipse/features/net.sf.eclipsetidy.feature_%%TIDYVER%%
-@unexec rmdir %D/eclipse/features/%%QVER%%/lib 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons/unused 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons/.xvpics 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/doc/images 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/doc 2>/dev/null || true
+@dirrmtry eclipse/features/%%QVER%%/lib
+@dirrmtry eclipse/features/%%QVER%%/icons/unused
+@dirrmtry eclipse/features/%%QVER%%/icons/.xvpics
+@dirrmtry eclipse/features/%%QVER%%/icons
+@dirrmtry eclipse/features/%%QVER%%/doc/images
+@dirrmtry eclipse/features/%%QVER%%/doc
 @dirrm eclipse/features/%%QVER%%
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/simplicity/pkg-plist b/java/simplicity/pkg-plist
index 659b9180c73a..0ba926c08c6e 100644
--- a/java/simplicity/pkg-plist
+++ b/java/simplicity/pkg-plist
@@ -429,4 +429,4 @@ share/java/Simplicity/icon32.bmp
 @dirrm share/java/Simplicity/javadoc
 @dirrm share/java/Simplicity/doc/images
 @dirrm share/java/Simplicity/doc
-@dirrm share/java/Simplicity
\ No newline at end of file
+@dirrm share/java/Simplicity