Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jul 2012 16:25:12 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301665 - in head/devel: bugzilla bugzilla3 bugzilla42
Message-ID:  <201207281625.q6SGPCtI045746@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Sat Jul 28 16:25:11 2012
New Revision: 301665
URL: http://svn.freebsd.org/changeset/ports/301665

Log:
  - pkgng: cosmetic fix against lstat messages

Modified:
  head/devel/bugzilla/Makefile
  head/devel/bugzilla/pkg-plist
  head/devel/bugzilla3/Makefile
  head/devel/bugzilla3/pkg-plist
  head/devel/bugzilla42/Makefile
  head/devel/bugzilla42/pkg-plist

Modified: head/devel/bugzilla/Makefile
==============================================================================
--- head/devel/bugzilla/Makefile	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla/Makefile	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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/{}" \; && \

Modified: head/devel/bugzilla/pkg-plist
==============================================================================
--- head/devel/bugzilla/pkg-plist	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla/pkg-plist	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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

Modified: head/devel/bugzilla3/Makefile
==============================================================================
--- head/devel/bugzilla3/Makefile	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla3/Makefile	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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/{}" \; && \

Modified: head/devel/bugzilla3/pkg-plist
==============================================================================
--- head/devel/bugzilla3/pkg-plist	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla3/pkg-plist	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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

Modified: head/devel/bugzilla42/Makefile
==============================================================================
--- head/devel/bugzilla42/Makefile	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla42/Makefile	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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/{}" \; && \

Modified: head/devel/bugzilla42/pkg-plist
==============================================================================
--- head/devel/bugzilla42/pkg-plist	Sat Jul 28 15:59:32 2012	(r301664)
+++ head/devel/bugzilla42/pkg-plist	Sat Jul 28 16:25:11 2012	(r301665)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207281625.q6SGPCtI045746>