44 files changed, 51 insertions, 7 deletions

diff --git a/www/autoindex/pkg-plist b/www/autoindex/pkg-plist
index 729ba20496c5..6e4b73e30396 100644
--- a/www/autoindex/pkg-plist
+++ b/www/autoindex/pkg-plist
@@ -171,3 +171,4 @@
 @dirrm %%INSTALLDIR%%/index_icons
 @dirrm %%INSTALLDIR%%/languages
 @dirrm %%INSTALLDIR%%
+@dirrmtry www/data
diff --git a/www/b2evo/Makefile b/www/b2evo/Makefile
index 52f91d33eb5a..9ae5c8e1d1b1 100644
--- a/www/b2evo/Makefile
+++ b/www/b2evo/Makefile
@@ -59,7 +59,8 @@ pre-install:
 		${SED} -e 's|^./||;s|^|${B2EVO_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${B2EVO_DIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST}
+		&& ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrmtry ${WWWDOCROOT} >> ${PLIST}
 
 do-install:
 	-${MKDIR} ${PREFIX}/${B2EVO_DIR}
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index 52f91d33eb5a..9ae5c8e1d1b1 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -59,7 +59,8 @@ pre-install:
 		${SED} -e 's|^./||;s|^|${B2EVO_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${B2EVO_DIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST}
+		&& ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrmtry ${WWWDOCROOT} >> ${PLIST}
 
 do-install:
 	-${MKDIR} ${PREFIX}/${B2EVO_DIR}
diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
index 5bab0886f0da..c28e902c0305 100644
--- a/www/dokuwiki-devel/Makefile
+++ b/www/dokuwiki-devel/Makefile
@@ -101,7 +101,8 @@ pre-install:
 		${SED} -e 's|^./||;s|^|${DOKUWIKI_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${DOKUWIKI_DIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} "@unexec ${RMDIR} %D/${DOKUWIKI_DIR} 2>/dev/null || true">> ${PLIST}
+		&& ${ECHO_CMD} "@dirrmtry ${DOKUWIKI_DIR}">> ${PLIST} \
+		&& ${ECHO_CMD} "@dirrmtry ${WWWDOCROOT}" >> ${PLIST}
 
 do-install:
 # Data files
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 5bab0886f0da..c28e902c0305 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -101,7 +101,8 @@ pre-install:
 		${SED} -e 's|^./||;s|^|${DOKUWIKI_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${DOKUWIKI_DIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} "@unexec ${RMDIR} %D/${DOKUWIKI_DIR} 2>/dev/null || true">> ${PLIST}
+		&& ${ECHO_CMD} "@dirrmtry ${DOKUWIKI_DIR}">> ${PLIST} \
+		&& ${ECHO_CMD} "@dirrmtry ${WWWDOCROOT}" >> ${PLIST}
 
 do-install:
 # Data files
diff --git a/www/feedonfeeds/pkg-plist b/www/feedonfeeds/pkg-plist
index 2317cf7ea220..8697a02b0a79 100644
--- a/www/feedonfeeds/pkg-plist
+++ b/www/feedonfeeds/pkg-plist
@@ -39,3 +39,4 @@
 @dirrm %%DATADIR%%/magpierss/extlib
 @dirrm %%DATADIR%%/magpierss
 @dirrmtry %%DATADIR%%
+@dirrmtry www/data
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index 49c33b22da9e..375f3f29eff5 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1189,3 +1189,4 @@
 @dirrm %%GALLERYDIR%%/classes/HTML
 @dirrm %%GALLERYDIR%%/classes
 @dirrmtry %%GALLERYDIR%%
+@dirrmtry www/data
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index 6167fab0efa6..a45ce0e6d557 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -7826,3 +7826,4 @@
 @dirrmtry %%GALLERY2DIR%%/install
 @dirrm %%GALLERY2DIR%%/images
 @dirrmtry %%GALLERY2DIR%%
+@dirrmtry www/data
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index 6167fab0efa6..a45ce0e6d557 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -7826,3 +7826,4 @@
 @dirrmtry %%GALLERY2DIR%%/install
 @dirrm %%GALLERY2DIR%%/images
 @dirrmtry %%GALLERY2DIR%%
+@dirrmtry www/data
diff --git a/www/geeklog/pkg-plist b/www/geeklog/pkg-plist
index 14142396fc46..dd228b0b9f8b 100644
--- a/www/geeklog/pkg-plist
+++ b/www/geeklog/pkg-plist
@@ -2016,3 +2016,4 @@ www/data/geeklog/system/pear/template.spec
 @dirrm www/data/geeklog/docs
 @dirrm www/data/geeklog/backups
 @dirrm www/data/geeklog
+@dirrmtry www/data
diff --git a/www/ismail/pkg-plist b/www/ismail/pkg-plist
index d0a8020c22d4..12e3fbd1c26d 100644
--- a/www/ismail/pkg-plist
+++ b/www/ismail/pkg-plist
@@ -156,3 +156,4 @@
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%
 @dirrm %%ISMAILDIR%%
+@dirrmtry www/data
diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile
index 2a06a73535b8..0bc596d03a85 100644
--- a/www/lifetype/Makefile
+++ b/www/lifetype/Makefile
@@ -71,7 +71,8 @@ pre-install:
 		&& ${ECHO_CMD} "@unexec ${RM} -fr %D/${PLOGDIR}/tmp/* 2>/dev/null || ${TRUE}" >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${PLOGDIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PLOGDIR} >> ${PLIST}
+		&& ${ECHO_CMD} @dirrm ${PLOGDIR} >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrmtry ${WWWDOCROOT} >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PLOGDIR}
diff --git a/www/limesurvey/pkg-plist b/www/limesurvey/pkg-plist
index fe0d03803987..52f54c88550e 100644
--- a/www/limesurvey/pkg-plist
+++ b/www/limesurvey/pkg-plist
@@ -304,3 +304,4 @@
 @dirrm %%PHPSURVEYORDIR%%/admin
 @dirrm %%PHPSURVEYORDIR%%
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %%PREFIX%%/%%PHPSURVEYORDIR%%
+@dirrmtry www/data
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki13/Makefile b/www/mediawiki13/Makefile
index 6bdfc74c153e..279a7ad362cc 100644
--- a/www/mediawiki13/Makefile
+++ b/www/mediawiki13/Makefile
@@ -52,6 +52,7 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki14/Makefile b/www/mediawiki14/Makefile
index c91ec2692ced..3bb148c1cb55 100644
--- a/www/mediawiki14/Makefile
+++ b/www/mediawiki14/Makefile
@@ -51,6 +51,7 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki15/Makefile b/www/mediawiki15/Makefile
index 5644180a10eb..ba87b84db133 100644
--- a/www/mediawiki15/Makefile
+++ b/www/mediawiki15/Makefile
@@ -51,6 +51,7 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 3e4df16f7522..3b06ae52c1e0 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -52,6 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 3a5f6644462d..f47f15cd2b2f 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -48,6 +48,7 @@ pre-install:
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${MOODLEDIR}?g" >> ${PLIST}
 	@${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST}
+	@${ECHO} @dirrmtry www/data >> ${PLIST}
 
 do-install:
 	${INSTALL_DATA} -d ${PREFIX}/${MOODLEDIR}
diff --git a/www/moodle2/Makefile b/www/moodle2/Makefile
index 3a5f6644462d..f47f15cd2b2f 100644
--- a/www/moodle2/Makefile
+++ b/www/moodle2/Makefile
@@ -48,6 +48,7 @@ pre-install:
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${MOODLEDIR}?g" >> ${PLIST}
 	@${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST}
+	@${ECHO} @dirrmtry www/data >> ${PLIST}
 
 do-install:
 	${INSTALL_DATA} -d ${PREFIX}/${MOODLEDIR}
diff --git a/www/notftp/pkg-plist b/www/notftp/pkg-plist
index 7493ff3de1c9..cec8a7f53f52 100644
--- a/www/notftp/pkg-plist
+++ b/www/notftp/pkg-plist
@@ -18,3 +18,4 @@
 @dirrm %%INSTALLDIR%%/lib/lang
 @dirrm %%INSTALLDIR%%/lib
 @dirrm %%INSTALLDIR%%
+@dirrmtry www/data
diff --git a/www/oscommerce/pkg-plist b/www/oscommerce/pkg-plist
index 0e4d1689f7d1..65e6c9aee97c 100644
--- a/www/oscommerce/pkg-plist
+++ b/www/oscommerce/pkg-plist
@@ -1076,3 +1076,4 @@ www/data/oscommerce/catalog/tell_a_friend.php
 @dirrm www/data/oscommerce/catalog/admin
 @dirrm www/data/oscommerce/catalog
 @dirrm www/data/oscommerce
+@dirrmtry www/data
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index c102183711ac..e11b920c1313 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -328,3 +328,4 @@
 @dirrmtry %%PHPBBDIR%%/templates/subSilver
 @dirrmtry %%PHPBBDIR%%/templates
 @unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
+@dirrmtry www/data
diff --git a/www/phpgedview/Makefile b/www/phpgedview/Makefile
index 3f43f565db1e..bf51d8fd2cda 100644
--- a/www/phpgedview/Makefile
+++ b/www/phpgedview/Makefile
@@ -40,6 +40,7 @@ post-extract:
 .endfor
 	${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?%%GEDVIEWDIR%%?g" >${PLIST}
 	${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm %%GEDVIEWDIR%%?g" >> ${PLIST}
+	${ECHO_CMD} @dirrmtry www/data >> ${PLIST}
 
 do-install:
 	${INSTALL_DATA} -d ${FULLGWDIR}
diff --git a/www/phpsurveyor/pkg-plist b/www/phpsurveyor/pkg-plist
index fe0d03803987..52f54c88550e 100644
--- a/www/phpsurveyor/pkg-plist
+++ b/www/phpsurveyor/pkg-plist
@@ -304,3 +304,4 @@
 @dirrm %%PHPSURVEYORDIR%%/admin
 @dirrm %%PHPSURVEYORDIR%%
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %%PREFIX%%/%%PHPSURVEYORDIR%%
+@dirrmtry www/data
diff --git a/www/phpwebapp/Makefile b/www/phpwebapp/Makefile
index 7e46224f2168..171ce926845b 100644
--- a/www/phpwebapp/Makefile
+++ b/www/phpwebapp/Makefile
@@ -27,5 +27,6 @@ do-install:
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${PHPWEBAPP} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/pnews/Makefile b/www/pnews/Makefile
index f0c68d4d7916..d46a14fcd9a4 100644
--- a/www/pnews/Makefile
+++ b/www/pnews/Makefile
@@ -30,5 +30,6 @@ do-install:
 		${SED} -e "s,^${PREFIX}/,," >> ${TMPPLIST}
 	@${FIND} ${PNEWSDIR} -type d | ${SORT} -r | \
 		${SED} -e "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/data 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/postnuke/pkg-plist b/www/postnuke/pkg-plist
index 4fcb99ff5068..b12bc0edc0d0 100644
--- a/www/postnuke/pkg-plist
+++ b/www/postnuke/pkg-plist
@@ -3438,3 +3438,4 @@
 @dirrm %%NUKEDIR%%/html/docs
 @dirrm %%NUKEDIR%%/html
 @dirrm %%NUKEDIR%%
+@dirrmtry www/data
diff --git a/www/usermanager/pkg-plist b/www/usermanager/pkg-plist
index 9d7325f303a5..5b75e2eabbc6 100644
--- a/www/usermanager/pkg-plist
+++ b/www/usermanager/pkg-plist
@@ -183,3 +183,4 @@
 @dirrm %%INSTALLDIR%%/style
 @dirrm %%INSTALLDIR%%/includes
 @dirrm %%INSTALLDIR%%
+@dirrmtry www/data
diff --git a/www/wacko/pkg-plist b/www/wacko/pkg-plist
index d81c27f3f1c1..af445e4fa7fe 100644
--- a/www/wacko/pkg-plist
+++ b/www/wacko/pkg-plist
@@ -375,3 +375,4 @@
 @dirrm %%WACKODIR%%/actions
 @dirrm %%WACKODIR%%/_cache
 @dirrm %%WACKODIR%%
+@dirrmtry www/data
diff --git a/www/wordpress-mu/Makefile b/www/wordpress-mu/Makefile
index 21301cb92058..e86bc7ea7ec4 100644
--- a/www/wordpress-mu/Makefile
+++ b/www/wordpress-mu/Makefile
@@ -45,7 +45,8 @@ pre-install:
 		${SED} -e 's|^|${WORDPRESSMU}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 	${SED} -e 's|^|@dirrm ${WORDPRESSMU}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${WORDPRESSMU} >> ${PLIST}
+		&& ${ECHO_CMD} @dirrm ${WORDPRESSMU} >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrmtry www/data >> ${PLIST}
 
 post-install:
 	${CAT} ${PKGMESSAGE}
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 73aa64be91ff..493239f1c460 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -36,7 +36,8 @@ pre-install:
 		${SED} -e 's|^|${WORDPRESS}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${WORDPRESS}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${WORDPRESS} >> ${PLIST}
+		&& ${ECHO_CMD} @dirrm ${WORDPRESS} >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrmtry www/data >> ${PLIST}
 	if [! -f ${WRKSRC}/wp-config-sample.php]; then ${CP} \
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi