14 files changed, 46 insertions, 115 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 978e014a3d3b..15b4f501470c 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -36,7 +36,6 @@ DATA_DIRS_LIST=	images js skins
 # checksetup will fail if these directories are not present!
 EMPTY_DIRS_LIST=data graphs contrib lib t xt
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -155,30 +154,25 @@ post-patch:
 		| ${XARGS} ${RM} -rf
 
 do-install:	.SILENT
-	${MKDIR} ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
-		${INSTALL_SCRIPT} {} ${WWWDIR} \;
-	@${MKDIR} ${DATA_DIRS_LIST:S!^!${WWWDIR}/!}
+		${INSTALL_SCRIPT} {} ${STAGEDIR}${WWWDIR} \;
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 .for D in ${DATA_DIRS_LIST}
-	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
+	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${D})
 .endfor
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
-	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${WWWDIR}/contrib/{}" \;
-.endif
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bugzilla/Makefile.common b/devel/bugzilla/Makefile.common
index feb60374b821..0e218760ccd7 100644
--- a/devel/bugzilla/Makefile.common
+++ b/devel/bugzilla/Makefile.common
@@ -3,7 +3,6 @@
 DIST_SUBDIR=	${PORTNAME}
 
 CONFLICTS_INSTALL=	\
-		bugzilla-3.* \
 		bugzilla-4.[^0].*
 
 PORTSCOUT=	limit:^4\.0\.
diff --git a/devel/bugzilla42/Makefile b/devel/bugzilla42/Makefile
index 4624c446110f..9d5998004cea 100644
--- a/devel/bugzilla42/Makefile
+++ b/devel/bugzilla42/Makefile
@@ -39,7 +39,6 @@ DATA_DIRS_LIST=	images js skins
 # checksetup will fail if these directories are not present!
 EMPTY_DIRS_LIST=data graphs contrib lib t xt
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -164,30 +163,25 @@ post-patch:
 		| ${XARGS} ${RM} -rf
 
 do-install:	.SILENT
-	${MKDIR} ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
-		${INSTALL_SCRIPT} {} ${WWWDIR} \;
-	@${MKDIR} ${DATA_DIRS_LIST:S!^!${WWWDIR}/!}
+		${INSTALL_SCRIPT} {} ${STAGEDIR}${WWWDIR} \;
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 .for D in ${DATA_DIRS_LIST}
-	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
+	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${D})
 .endfor
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
-	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${WWWDIR}/contrib/{}" \;
-.endif
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bugzilla42/Makefile.common b/devel/bugzilla42/Makefile.common
index 9a212094b4d5..7a3935a49d85 100644
--- a/devel/bugzilla42/Makefile.common
+++ b/devel/bugzilla42/Makefile.common
@@ -3,7 +3,6 @@
 DIST_SUBDIR=	${PORTNAME}
 
 CONFLICTS_INSTALL=	\
-		bugzilla-3.* \
 		bugzilla-4.[^2].*
 
 PORTSCOUT=	limitw:1,even
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index e51b95c7596f..6df6481cb9b9 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -39,7 +39,6 @@ DATA_DIRS_LIST=	images js skins
 # checksetup will fail if these directories are not present!
 EMPTY_DIRS_LIST=data graphs contrib lib t xt
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 .include <bsd.port.options.mk>
@@ -178,30 +177,25 @@ post-patch:
 		| ${XARGS} ${RM} -rf
 
 do-install:	.SILENT
-	${MKDIR} ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
-		${INSTALL_SCRIPT} {} ${WWWDIR} \;
-	@${MKDIR} ${DATA_DIRS_LIST:S!^!${WWWDIR}/!}
+		${INSTALL_SCRIPT} {} ${STAGEDIR}${WWWDIR} \;
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 .for D in ${DATA_DIRS_LIST}
-	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${WWWDIR}/${D})
+	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${D})
 .endfor
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${WWWDIR} -xf -
-	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${WWWDIR}/!}
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
+	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}/)
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .if ${PORT_OPTIONS:MCONTRIB}
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${WWWDIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${WWWDIR}/contrib/{}" \;
-.endif
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bugzilla44/Makefile.common b/devel/bugzilla44/Makefile.common
index eb4a1f42d5d9..bb4b87e4ac07 100644
--- a/devel/bugzilla44/Makefile.common
+++ b/devel/bugzilla44/Makefile.common
@@ -3,7 +3,6 @@
 DIST_SUBDIR=	${PORTNAME}
 
 CONFLICTS_INSTALL=	\
-		bugzilla-3.* \
 		bugzilla-4.[^4].*
 
 PORTSCOUT=	limitw:1,even
diff --git a/german/bugzilla/Makefile b/german/bugzilla/Makefile
index b41083212cea..bba2fa5cbfaf 100644
--- a/german/bugzilla/Makefile
+++ b/german/bugzilla/Makefile
@@ -16,7 +16,6 @@ LATEST_LINK=	${PKGNAMEPREFIX}bugzilla
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
 
 LANGDIR=	${WWWDIR}/template/de
@@ -27,13 +26,8 @@ LANGDIR=	${WWWDIR}/template/de
 #	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
-	@-${MKDIR} ${LANGDIR}
-	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${LANGDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}
+	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR})
 
 # Maintainer
 plist: patch
diff --git a/german/bugzilla42/Makefile b/german/bugzilla42/Makefile
index 974e6a4683a7..264295ebc15f 100644
--- a/german/bugzilla42/Makefile
+++ b/german/bugzilla42/Makefile
@@ -16,7 +16,6 @@ LATEST_LINK=	${PKGNAMEPREFIX}bugzilla42
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla42/Makefile.common"
 
 LANGDIR=	${WWWDIR}/template/de
@@ -27,13 +26,8 @@ LANGDIR=	${WWWDIR}/template/de
 #	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
-	@-${MKDIR} ${LANGDIR}
-	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${LANGDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}
+	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR})
 
 # Maintainer
 plist: patch
diff --git a/german/bugzilla44/Makefile b/german/bugzilla44/Makefile
index e2c45762c978..67a9ab06b189 100644
--- a/german/bugzilla44/Makefile
+++ b/german/bugzilla44/Makefile
@@ -17,7 +17,6 @@ LATEST_LINK=	${PKGNAMEPREFIX}bugzilla44
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla44/Makefile.common"
 
 LANGDIR=	${WWWDIR}/template/de
@@ -28,13 +27,8 @@ LANGDIR=	${WWWDIR}/template/de
 #	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
-	@-${MKDIR} ${LANGDIR}
-	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${LANGDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}
+	@(cd ${WRKSRC}/de && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR})
 
 # Maintainer
 plist: patch
diff --git a/japanese/bugzilla/Makefile b/japanese/bugzilla/Makefile
index 7b622f68cb3a..4cfc282cf20e 100644
--- a/japanese/bugzilla/Makefile
+++ b/japanese/bugzilla/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
 
 USE_BZIP2=	yes
@@ -23,13 +22,8 @@ USE_BZIP2=	yes
 LANGDIR=	${WWWDIR}/template/ja
 
 do-install:
-	@-${MKDIR} ${LANGDIR}/default
-	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${LANGDIR}/default
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}/default
+	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default
 
 # Maintainer
 plist: patch
diff --git a/japanese/bugzilla42/Makefile b/japanese/bugzilla42/Makefile
index 304959338e58..30f2ca8e077e 100644
--- a/japanese/bugzilla42/Makefile
+++ b/japanese/bugzilla42/Makefile
@@ -17,7 +17,6 @@ LATEST_LINK=	${PKGNAMEPREFIX}bugzilla42
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla42/Makefile.common"
 
 USE_BZIP2=	yes
@@ -25,13 +24,8 @@ USE_BZIP2=	yes
 LANGDIR=	${WWWDIR}/template/ja
 
 do-install:
-	@-${MKDIR} ${LANGDIR}/default
-	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${LANGDIR}/default
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}/default
+	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default
 
 # Maintainer
 plist: patch
diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile
index b32c41965b4a..6f60c4a9a3e8 100644
--- a/japanese/bugzilla44/Makefile
+++ b/japanese/bugzilla44/Makefile
@@ -17,7 +17,6 @@ LATEST_LINK=	${PKGNAMEPREFIX}bugzilla44
 
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla44/Makefile.common"
 
 USE_BZIP2=	yes
@@ -25,13 +24,8 @@ USE_BZIP2=	yes
 LANGDIR=	${WWWDIR}/template/ja
 
 do-install:
-	@-${MKDIR} ${LANGDIR}/default
-	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${LANGDIR}/default
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	@-${MKDIR} ${STAGEDIR}${LANGDIR}/default
+	@cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default
 
 # Maintainer
 plist: patch
diff --git a/russian/bugzilla/Makefile b/russian/bugzilla/Makefile
index c866e64dc9f8..6aeab779ef95 100644
--- a/russian/bugzilla/Makefile
+++ b/russian/bugzilla/Makefile
@@ -14,17 +14,11 @@ RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
 
 do-install:
-	${MKDIR} ${WWWDIR}
-	(cd ${WRKSRC}/ && ${PAX} -r -w * ${WWWDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC}/ && ${PAX} -r -w * ${STAGEDIR}${WWWDIR})
 
 # Maintainer
 plist:	patch
diff --git a/russian/bugzilla42/Makefile b/russian/bugzilla42/Makefile
index 29301858b3b7..4887e9e48d7a 100644
--- a/russian/bugzilla42/Makefile
+++ b/russian/bugzilla42/Makefile
@@ -14,19 +14,13 @@ RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla42
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/bugzilla42/Makefile.common"
 
 LATEST_LINK=	${PKGNAMEPREFIX}bugzilla42
 
 do-install:
-	${MKDIR} ${WWWDIR}
-	(cd ${WRKSRC}/ && ${PAX} -r -w * ${WWWDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC}/ && ${PAX} -r -w * ${STAGEDIR}${WWWDIR})
 
 # Maintainer
 plist:	patch