14 files changed, 19 insertions, 19 deletions

diff --git a/lang/fpc-devel/pkg-plist b/lang/fpc-devel/pkg-plist
index 1b6320e123c4..6d6698f39914 100644
--- a/lang/fpc-devel/pkg-plist
+++ b/lang/fpc-devel/pkg-plist
@@ -5679,4 +5679,4 @@ share/examples/fpc-%%PORTVERSION%%/zvt/testzvt.pp
 %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%%/compiler/alpha
 %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%%/compiler
 %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%%
-%%PORTDOCS%%@unexec rmdir %D/src 2> /dev/null || true
+%%PORTDOCS%%@dirrmtry src
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 386a950c2b12..7c09edb26679 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -134,7 +134,7 @@ post-install:
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
+	(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 40b22f5211c6..f36c936c90f4 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -135,7 +135,7 @@ post-install:
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
+	(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index 9c2e837c6c99..243c5e48e42e 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -952,4 +952,4 @@
 @unexec rmdir %D/%%COMPILERDIR%%/licenses >/dev/null 2>&1 || echo '*** License directory (%D/%%COMPILERDIR%%/licenses/) not removed, it may contain a license.'
 @dirrm %%COMPILERDIR%%/man/man1
 @dirrm %%COMPILERDIR%%/man
-@unexec rmdir %D/%%COMPILERDIR%% >/dev/null 2>&1 || true
+@dirrmtry %%COMPILERDIR%%
diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist
index 4965911ad588..c52cc5ba4f03 100644
--- a/lang/icc7/pkg-plist
+++ b/lang/icc7/pkg-plist
@@ -1355,4 +1355,4 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a
 %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training
 @dirrm intel/%%COMPILERDIR%%
 @unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** License directory (%D/intel/licenses/) not removed, it may contain a license.'
-@unexec rmdir %D/intel >/dev/null 2>&1 || true
+@dirrmtry intel
diff --git a/lang/ifc/pkg-plist b/lang/ifc/pkg-plist
index ddf9a91e2a31..9b6429b1dc0f 100644
--- a/lang/ifc/pkg-plist
+++ b/lang/ifc/pkg-plist
@@ -1192,4 +1192,4 @@
 @unexec rmdir %D/%%COMPILERDIR%%/licenses >/dev/null 2>&1 || echo '*** License directory (%D/%%COMPILERDIR%%/licenses/) not removed, it may contain a license.'
 @dirrm %%COMPILERDIR%%/man/man1
 @dirrm %%COMPILERDIR%%/man
-@unexec rmdir %D/%%COMPILERDIR%% >/dev/null 2>&1 || true
+@dirrmtry %%COMPILERDIR%%
diff --git a/lang/ifc7/pkg-plist b/lang/ifc7/pkg-plist
index efccae78b546..ef757ca08dbf 100644
--- a/lang/ifc7/pkg-plist
+++ b/lang/ifc7/pkg-plist
@@ -1301,4 +1301,4 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a
 %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training
 @dirrm intel/%%COMPILERDIR%%
 @unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** License directory (%D/intel/licenses/) not removed, it may contain a license.'
-@unexec rmdir %D/intel >/dev/null 2>&1 || true
+@dirrmtry intel
diff --git a/lang/kroc/pkg-plist b/lang/kroc/pkg-plist
index 80b1a6daf4cf..29701a63e065 100644
--- a/lang/kroc/pkg-plist
+++ b/lang/kroc/pkg-plist
@@ -103,12 +103,12 @@ lib/kroc/libudc.so
 %%PORTDOCS%%%%DATADIR%%/doc/txt/hostio.txt
 %%PORTDOCS%%%%DATADIR%%/doc/txt/o2cl.txt
 %%PORTDOCS%%%%DATADIR%%/doc/txt/pragma.txt
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/txt 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/sc 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/ps 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/lib 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/html 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/txt
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/sc
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/ps
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/lib
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/html
+%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc
 @dirrmtry %%DATADIR%%/vtlib
 @dirrmtry %%DATADIR%%/vtinclude
 @dirrmtry %%DATADIR%%
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 0e90af167bb3..d3807a0c2cba 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -62,7 +62,7 @@ pre-install:
 	@cd ${WRKSRC} && (${FIND} * -type d | \
 		${SED} -e 's,^,@dirrm share/doc/${PYTHON_VERSION}/,' | \
 			${SORT} -r) >> ${PLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true" >> ${PLIST}
+	@${ECHO_CMD} "@dirrmtry share/doc/%%PYTHON_VERSION%%" >> ${PLIST}
 .endif
 
 do-install:
diff --git a/lang/python-doc-html/pkg-plist_html b/lang/python-doc-html/pkg-plist_html
index 71c98b60fd0d..5a9eb7824eac 100644
--- a/lang/python-doc-html/pkg-plist_html
+++ b/lang/python-doc-html/pkg-plist_html
@@ -873,4 +873,4 @@ share/doc/%%PYTHON_VERSION%%/tut/tut.html
 @dirrm share/doc/%%PYTHON_VERSION%%/doc
 @dirrm share/doc/%%PYTHON_VERSION%%/dist
 @dirrm share/doc/%%PYTHON_VERSION%%/api
-@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true
+@dirrmtry share/doc/%%PYTHON_VERSION%%
diff --git a/lang/python-doc-html/pkg-plist_pdf-a4 b/lang/python-doc-html/pkg-plist_pdf-a4
index 5a9100be1fff..dbe570c20a1e 100644
--- a/lang/python-doc-html/pkg-plist_pdf-a4
+++ b/lang/python-doc-html/pkg-plist_pdf-a4
@@ -8,4 +8,4 @@ share/doc/%%PYTHON_VERSION%%/mac.pdf
 share/doc/%%PYTHON_VERSION%%/ref.pdf
 share/doc/%%PYTHON_VERSION%%/tut.pdf
 %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.pdf
-@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true
+@dirrmtry share/doc/%%PYTHON_VERSION%%
diff --git a/lang/python-doc-html/pkg-plist_pdf-letter b/lang/python-doc-html/pkg-plist_pdf-letter
index 5a9100be1fff..dbe570c20a1e 100644
--- a/lang/python-doc-html/pkg-plist_pdf-letter
+++ b/lang/python-doc-html/pkg-plist_pdf-letter
@@ -8,4 +8,4 @@ share/doc/%%PYTHON_VERSION%%/mac.pdf
 share/doc/%%PYTHON_VERSION%%/ref.pdf
 share/doc/%%PYTHON_VERSION%%/tut.pdf
 %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.pdf
-@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true
+@dirrmtry share/doc/%%PYTHON_VERSION%%
diff --git a/lang/python-doc-html/pkg-plist_postscript-a4 b/lang/python-doc-html/pkg-plist_postscript-a4
index d53add6711a1..363d5cf0b47f 100644
--- a/lang/python-doc-html/pkg-plist_postscript-a4
+++ b/lang/python-doc-html/pkg-plist_postscript-a4
@@ -9,4 +9,4 @@ share/doc/%%PYTHON_VERSION%%/ref.ps
 share/doc/%%PYTHON_VERSION%%/tut.ps
 share/doc/%%PYTHON_VERSION%%/README
 %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.ps
-@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true
+@dirrmtry share/doc/%%PYTHON_VERSION%%
diff --git a/lang/python-doc-html/pkg-plist_postscript-letter b/lang/python-doc-html/pkg-plist_postscript-letter
index d53add6711a1..363d5cf0b47f 100644
--- a/lang/python-doc-html/pkg-plist_postscript-letter
+++ b/lang/python-doc-html/pkg-plist_postscript-letter
@@ -9,4 +9,4 @@ share/doc/%%PYTHON_VERSION%%/ref.ps
 share/doc/%%PYTHON_VERSION%%/tut.ps
 share/doc/%%PYTHON_VERSION%%/README
 %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.ps
-@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true
+@dirrmtry share/doc/%%PYTHON_VERSION%%