diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile index dfd8466ed6e9..a5378bd136f1 100644 --- a/chinese/wordpress-zh_CN/Makefile +++ b/chinese/wordpress-zh_CN/Makefile @@ -30,7 +30,6 @@ OPTIONS_DEFINE= DOCS SUB_FILES+= pkg-message SUB_LISTS+= WWWDIR=${WWWDIR} -NO_STAGE= yes pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" @@ -48,21 +47,16 @@ pre-install: .include do-install: - @${MKDIR} ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \ >> ${TMPPLIST} - @${CHMOD} -R 755 ${WWWDIR} + @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST} - ${CP} -R ${WRKSRC}/ ${WWWDIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i} .endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} .include diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile index ec26c625960f..cfdad277935f 100644 --- a/chinese/wordpress-zh_TW/Makefile +++ b/chinese/wordpress-zh_TW/Makefile @@ -30,7 +30,6 @@ OPTIONS_DEFINE= DOCS SUB_FILES+= pkg-message SUB_LISTS+= WWWDIR=${WWWDIR} -NO_STAGE= yes pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" @@ -48,21 +47,16 @@ pre-install: .include do-install: - @${MKDIR} ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \ >> ${TMPPLIST} - @${CHMOD} -R 755 ${WWWDIR} + @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST} - ${CP} -R ${WRKSRC}/ ${WWWDIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i} .endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} .include diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile index 7ae799a74480..aed6a467e38f 100644 --- a/russian/wordpress/Makefile +++ b/russian/wordpress/Makefile @@ -27,7 +27,6 @@ PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS -NO_STAGE= yes pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" @@ -43,15 +42,12 @@ pre-install: .include do-install: - ${INSTALL} -d -g ${WWWGRP} -m 755 -o ${WWWOWN} ${WWWDIR}/ - ${CP} -R ${WRKSRC}/ ${WWWDIR}/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif + ${INSTALL} -d -g ${WWWGRP} -m 755 -o ${WWWOWN} ${STAGEDIR}${WWWDIR}/ + ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} .include