diff --git a/graphics/generic_image_decoder/pkg-plist b/graphics/generic_image_decoder/pkg-plist
index de8351a420e0..975b099959df 100644
--- a/graphics/generic_image_decoder/pkg-plist
+++ b/graphics/generic_image_decoder/pkg-plist
@@ -32,6 +32,3 @@ lib/generic_image_decoder/gid-headers.ali
 lib/generic_image_decoder/gid.ali
 lib/generic_image_decoder/libgenimgdec.a
 lib/gnat/generic_image_decoder.gpr
-@dirrmtry lib/gnat
-@dirrm lib/generic_image_decoder
-@dirrm include/generic_image_decoder
diff --git a/math/plplot-ada/Makefile b/math/plplot-ada/Makefile
index a0753dab41dd..9cb53eec5086 100644
--- a/math/plplot-ada/Makefile
+++ b/math/plplot-ada/Makefile
@@ -24,7 +24,7 @@ INSTALL_WRKSRC=	${WRKSRC}/bindings
 post-extract:
 	${CP} ${FILESDIR}/build_plplot.gpr ${FILESDIR}/Makefile \
 		${BUILD_WRKSRC}
-	${CAT} ${FILESDIR}/plplot.gpr.in | ${SED} -e "s|@PREFIX@|${PREFIX}|g" > \
-		${BUILD_WRKSRC}/plplot.gpr
+	${CAT} ${FILESDIR}/plplot.gpr.in | \
+		${SED} -e "s|@PREFIX@|${PREFIX}|g" > ${BUILD_WRKSRC}/plplot.gpr
 
 .include <bsd.port.mk>
diff --git a/math/plplot-ada/pkg-plist b/math/plplot-ada/pkg-plist
index 917125ab2220..eca484d76ea2 100644
--- a/math/plplot-ada/pkg-plist
+++ b/math/plplot-ada/pkg-plist
@@ -12,6 +12,3 @@ lib/plplotada/plplot.ali
 lib/plplotada/plplot_auxiliary.ali
 lib/plplotada/plplot_thin.ali
 lib/plplotada/plplot_traditional.ali
-@dirrm lib/plplotada
-@dirrmtry lib/gnat
-@dirrm include/plplotada
diff --git a/misc/excel-writer/pkg-plist b/misc/excel-writer/pkg-plist
index 8a3265f32826..ffb18dcdce57 100644
--- a/misc/excel-writer/pkg-plist
+++ b/misc/excel-writer/pkg-plist
@@ -15,7 +15,3 @@ lib/excel_writer/ieee_754.ali
 lib/excel_writer/libexcelwriter.a
 lib/gnat/excel_writer.gpr
 %%DATADIR%%/Big.xls
-@dirrm %%DATADIR%%
-@dirrmtry lib/gnat
-@dirrm lib/excel_writer
-@dirrm include/excel_writer
diff --git a/misc/ini_file_manager/pkg-plist b/misc/ini_file_manager/pkg-plist
index 1188937acef0..b6e6955dfe08 100644
--- a/misc/ini_file_manager/pkg-plist
+++ b/misc/ini_file_manager/pkg-plist
@@ -3,6 +3,3 @@ include/ini_file_manager/config.ads
 lib/gnat/ini_file_manager.gpr
 lib/ini_file_manager/config.ali
 lib/ini_file_manager/libinifiles.a
-@dirrm lib/ini_file_manager
-@dirrmtry lib/gnat
-@dirrm include/ini_file_manager
diff --git a/net/adasockets/pkg-plist b/net/adasockets/pkg-plist
index c70c88816108..440897167a54 100644
--- a/net/adasockets/pkg-plist
+++ b/net/adasockets/pkg-plist
@@ -26,8 +26,3 @@ lib/adasockets/sockets.ali
 lib/gnat/adasockets.gpr
 libdata/pkgconfig/adasockets.pc
 share/man/man1/adasockets-config.1
-@dirrmtry share/man/man1
-@dirrmtry share/man
-@dirrmtry lib/gnat
-@dirrm lib/adasockets
-@dirrm include/adasockets
diff --git a/net/anet/pkg-plist b/net/anet/pkg-plist
index 897978d8dcae..dc6435d22554 100644
--- a/net/anet/pkg-plist
+++ b/net/anet/pkg-plist
@@ -74,8 +74,3 @@ lib/gnat/anet.gpr
 lib/libanet.a
 %%PORTDOCS%%%%DOCSDIR%%/html/asciidoc.css
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm include/anet
-@dirrm lib/anet
-@dirrmtry lib/gnat
diff --git a/net/polyorb/Makefile b/net/polyorb/Makefile
index 309da2e31ba6..0c548506a727 100644
--- a/net/polyorb/Makefile
+++ b/net/polyorb/Makefile
@@ -40,14 +40,9 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} default
 
 post-install:
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-	   ${SORT} >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
-	   ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' -e '/share\/gps/d' \
-	   -e 's/^/@dirrm /g' >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${TMPPLIST}
+	@(cd ${STAGEDIR}${PREFIX}; \
+		${FIND} * -type d -empty -print | ${XARGS} ${RMDIR})
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/security/libsparkcrypto/pkg-plist b/security/libsparkcrypto/pkg-plist
index f50c17cd06bd..a51adea6a6ff 100644
--- a/security/libsparkcrypto/pkg-plist
+++ b/security/libsparkcrypto/pkg-plist
@@ -112,9 +112,3 @@ lib/libsparkcrypto/lsc.ali
 %%PORTDOCS%%%%DOCSDIR%%/lsc.html
 %%PORTDOCS%%%%DOCSDIR%%/lsc_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/subprograms.html
-@dirrm include/libsparkcrypto/sharedinclude
-@dirrm include/libsparkcrypto/adainclude
-@dirrm include/libsparkcrypto
-@dirrm lib/libsparkcrypto
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/gnat