6 files changed, 18 insertions, 9 deletions
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 3929c227a9f4..8a05b7ecfc2c 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -37,6 +37,9 @@ SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
 
+# checksetup will fail if these directories are not present!
+EMPTY_DIRS_LIST=data graphs contrib lib t xt
+
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -167,15 +170,13 @@ do-install:	.SILENT
 	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
 .endif
 
-# checksetup will fail if these directories are not present!
-	${MKDIR} ${WWWDIR}/contrib ${WWWDIR}/lib ${WWWDIR}/t ${WWWDIR}/xt
-
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index 733b5cdb355f..63c95ad22429 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -1033,4 +1033,6 @@
 @exec mkdir -p %D/%%WWWDIR%%/xt
 @exec mkdir -p %D/%%WWWDIR%%/t
 @exec mkdir -p %D/%%WWWDIR%%/lib
+@exec mkdir -p %D/%%WWWDIR%%/graphs
+@exec mkdir -p %D/%%WWWDIR%%/data
 @exec mkdir -p %D/%%WWWDIR%%/contrib
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 46fcd670386c..e70f5884a9ee 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -37,6 +37,9 @@ SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
 
+# checksetup will fail if these directories are not present!
+EMPTY_DIRS_LIST=data graphs contrib lib t
+
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -166,15 +169,13 @@ do-install:	.SILENT
 	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
 .endif
 
-# checksetup will fail if these directories are not present!
-	${MKDIR} ${WWWDIR}/contrib ${WWWDIR}/lib ${WWWDIR}/t
-
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
diff --git a/devel/bugzilla3/pkg-plist b/devel/bugzilla3/pkg-plist
index 65e2aa661600..2286f721a176 100644
--- a/devel/bugzilla3/pkg-plist
+++ b/devel/bugzilla3/pkg-plist
@@ -849,4 +849,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/%%WWWDIR%%/t
 @exec mkdir -p %D/%%WWWDIR%%/lib
+@exec mkdir -p %D/%%WWWDIR%%/graphs
+@exec mkdir -p %D/%%WWWDIR%%/data
 @exec mkdir -p %D/%%WWWDIR%%/contrib
diff --git a/devel/bugzilla42/Makefile b/devel/bugzilla42/Makefile
index 18974141020b..01cac908a621 100644
--- a/devel/bugzilla42/Makefile
+++ b/devel/bugzilla42/Makefile
@@ -40,6 +40,9 @@ SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
 
+# checksetup will fail if these directories are not present!
+EMPTY_DIRS_LIST=data graphs contrib lib t xt
+
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -177,15 +180,13 @@ do-install:	.SILENT
 	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
 .endif
 
-# checksetup will fail if these directories are not present!
-	${MKDIR} ${WWWDIR}/contrib ${WWWDIR}/lib ${WWWDIR}/t ${WWWDIR}/xt
-
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
diff --git a/devel/bugzilla42/pkg-plist b/devel/bugzilla42/pkg-plist
index 1ceedff8e115..4ffe9916217b 100644
--- a/devel/bugzilla42/pkg-plist
+++ b/devel/bugzilla42/pkg-plist
@@ -1051,4 +1051,6 @@
 @exec mkdir -p %D/%%WWWDIR%%/xt
 @exec mkdir -p %D/%%WWWDIR%%/t
 @exec mkdir -p %D/%%WWWDIR%%/lib
+@exec mkdir -p %D/%%WWWDIR%%/graphs
+@exec mkdir -p %D/%%WWWDIR%%/data
 @exec mkdir -p %D/%%WWWDIR%%/contrib