Date: Wed, 19 Feb 2014 01:32:23 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344982 - head/Mk Message-ID: <201402190132.s1J1WNt4055230@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Wed Feb 19 01:32:23 2014 New Revision: 344982 URL: http://svnweb.freebsd.org/changeset/ports/344982 QAT: https://qat.redports.org/buildarchive/r344982/ Log: - Allow to stage drupal mods Modified: head/Mk/bsd.drupal.mk Modified: head/Mk/bsd.drupal.mk ============================================================================== --- head/Mk/bsd.drupal.mk Wed Feb 19 01:27:20 2014 (r344981) +++ head/Mk/bsd.drupal.mk Wed Feb 19 01:32:23 2014 (r344982) @@ -133,31 +133,29 @@ PLIST_DIRS+= %%DOCSDIR%% do-install: .if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME) - @${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|} + @${MKDIR} ${DRUPAL_MODDIR:C|^|${STAGEDIR}${PREFIX}/|} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${STAGEDIR}${PREFIX}/|} .endif .if defined(MODULE_CONF_DIRS) - @${MKDIR} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|} + @${MKDIR} ${MODULE_CONF_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_CONF_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} .endif .if defined(MODULE_DIRS) - @${MKDIR} ${MODULE_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|} + @${MKDIR} ${MODULE_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} .endif .for f in ${MODULE_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DRUPAL_MODDIR}/${f} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${DRUPAL_MODDIR}/${f} + @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f} .endfor .for f in ${MODULE_CONF_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DRUPAL_MODDIR}/${f}-dist - @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${DRUPAL_MODDIR}/${f}-dist + @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f}-dist + @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f}-dist .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} ${DOC_DIRS:C|^|${DOCSDIR}/|} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${DOC_DIRS:C|^|${STAGEDIR}${DOCSDIR}/|} .for f in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f} + @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} .endfor -.endif .if defined(MODULE_CONF_FILES) post-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402190132.s1J1WNt4055230>