svn commit: r328405 - in head: devel/bugzilla devel/bugzilla42 devel/bugzilla44 german/bugzilla german/bugzilla42 german/bugzilla44 japanese/bugzilla japanese/bugzilla42 japanese/bugzilla44 russian...
Olli Hauer
ohauer at FreeBSD.org
Thu Sep 26 19:00:44 UTC 2013
Author: ohauer
Date: Thu Sep 26 19:00:40 2013
New Revision: 328405
URL: http://svnweb.freebsd.org/changeset/ports/328405
Log:
- add STAGE support to bugzilla ports
- remove bugzilla3 CONFLICTS
Modified:
head/devel/bugzilla/Makefile
head/devel/bugzilla/Makefile.common
head/devel/bugzilla42/Makefile
head/devel/bugzilla42/Makefile.common
head/devel/bugzilla44/Makefile
head/devel/bugzilla44/Makefile.common
head/german/bugzilla/Makefile
head/german/bugzilla42/Makefile
head/german/bugzilla44/Makefile
head/japanese/bugzilla/Makefile
head/japanese/bugzilla42/Makefile
head/japanese/bugzilla44/Makefile
head/russian/bugzilla/Makefile
head/russian/bugzilla42/Makefile
Modified: head/devel/bugzilla/Makefile
==============================================================================
--- head/devel/bugzilla/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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>
Modified: head/devel/bugzilla/Makefile.common
==============================================================================
--- head/devel/bugzilla/Makefile.common Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla/Makefile.common Thu Sep 26 19:00:40 2013 (r328405)
@@ -3,7 +3,6 @@
DIST_SUBDIR= ${PORTNAME}
CONFLICTS_INSTALL= \
- bugzilla-3.* \
bugzilla-4.[^0].*
PORTSCOUT= limit:^4\.0\.
Modified: head/devel/bugzilla42/Makefile
==============================================================================
--- head/devel/bugzilla42/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla42/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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>
Modified: head/devel/bugzilla42/Makefile.common
==============================================================================
--- head/devel/bugzilla42/Makefile.common Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla42/Makefile.common Thu Sep 26 19:00:40 2013 (r328405)
@@ -3,7 +3,6 @@
DIST_SUBDIR= ${PORTNAME}
CONFLICTS_INSTALL= \
- bugzilla-3.* \
bugzilla-4.[^2].*
PORTSCOUT= limitw:1,even
Modified: head/devel/bugzilla44/Makefile
==============================================================================
--- head/devel/bugzilla44/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla44/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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>
Modified: head/devel/bugzilla44/Makefile.common
==============================================================================
--- head/devel/bugzilla44/Makefile.common Thu Sep 26 18:34:36 2013 (r328404)
+++ head/devel/bugzilla44/Makefile.common Thu Sep 26 19:00:40 2013 (r328405)
@@ -3,7 +3,6 @@
DIST_SUBDIR= ${PORTNAME}
CONFLICTS_INSTALL= \
- bugzilla-3.* \
bugzilla-4.[^4].*
PORTSCOUT= limitw:1,even
Modified: head/german/bugzilla/Makefile
==============================================================================
--- head/german/bugzilla/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/german/bugzilla/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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
Modified: head/german/bugzilla42/Makefile
==============================================================================
--- head/german/bugzilla42/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/german/bugzilla42/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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
Modified: head/german/bugzilla44/Makefile
==============================================================================
--- head/german/bugzilla44/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/german/bugzilla44/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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
Modified: head/japanese/bugzilla/Makefile
==============================================================================
--- head/japanese/bugzilla/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/japanese/bugzilla/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -15,7 +15,6 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${
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
Modified: head/japanese/bugzilla42/Makefile
==============================================================================
--- head/japanese/bugzilla42/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/japanese/bugzilla42/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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
Modified: head/japanese/bugzilla44/Makefile
==============================================================================
--- head/japanese/bugzilla44/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/japanese/bugzilla44/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -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
Modified: head/russian/bugzilla/Makefile
==============================================================================
--- head/russian/bugzilla/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/russian/bugzilla/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -14,17 +14,11 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${
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
Modified: head/russian/bugzilla42/Makefile
==============================================================================
--- head/russian/bugzilla42/Makefile Thu Sep 26 18:34:36 2013 (r328404)
+++ head/russian/bugzilla42/Makefile Thu Sep 26 19:00:40 2013 (r328405)
@@ -14,19 +14,13 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${
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
More information about the svn-ports-head
mailing list