Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Oct 2013 12:49:58 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329302 - head/mail/roundcube
Message-ID:  <201310041249.r94CnwPO042805@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Fri Oct  4 12:49:58 2013
New Revision: 329302
URL: http://svnweb.freebsd.org/changeset/ports/329302

Log:
  Support stage dir.

Modified:
  head/mail/roundcube/Makefile

Modified: head/mail/roundcube/Makefile
==============================================================================
--- head/mail/roundcube/Makefile	Fri Oct  4 12:41:25 2013	(r329301)
+++ head/mail/roundcube/Makefile	Fri Oct  4 12:49:58 2013	(r329302)
@@ -17,10 +17,6 @@ NO_BUILD=	yes
 RCUBECOMP=	.htaccess SQL config index.php installer logs plugins program robots.txt skins temp
 PORTDOCS=	CHANGELOG INSTALL README.md UPGRADING
 
-SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
-		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
-		WWWDIR=${WWWDIR}
-
 WANT_PHP_WEB=	yes
 USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter
 IGNORE_WITH_PHP=52
@@ -39,7 +35,6 @@ GD_DESC=	Enable GD support (image conver
 PSPELL_DESC=	Enable PSpell support (internal spellcheck)
 NSC_DESC=	Install network spellchecker
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -87,25 +82,25 @@ post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
 
 do-install:
-	-${MKDIR} ${WWWDIR}
-	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${WWWDIR}
+	-${MKDIR} ${STAGEDIR}/${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}/${WWWDIR}
 .for i in ${RCUBECOMP}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}/${WWWDIR}
 .endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/logs ${WWWDIR}/temp
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${DOCSDIR}/
 .endfor
 .endif
 	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
+		>> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -type d) | ${SORT} -r | \
 		${SED} -ne 's,^,@dirrm ${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@${ECHO_CMD} '@dirrm ${WWWDIR_REL}' >> ${TMPPLIST}
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>



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