Date: Sat, 23 Aug 2014 01:37:27 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365706 - head/www/siteframe Message-ID: <201408230137.s7N1bRVv088318@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Aug 23 01:37:27 2014 New Revision: 365706 URL: http://svnweb.freebsd.org/changeset/ports/365706 QAT: https://qat.redports.org/buildarchive/r365706/ Log: www/siteframe: Rework so that overriding extract target is unnecessary Modified: head/www/siteframe/Makefile Modified: head/www/siteframe/Makefile ============================================================================== --- head/www/siteframe/Makefile Sat Aug 23 00:20:48 2014 (r365705) +++ head/www/siteframe/Makefile Sat Aug 23 01:37:27 2014 (r365706) @@ -19,7 +19,7 @@ USE_MYSQL= yes # where to install NO_BUILD= yes -NO_WRKSUBDIR= yes +WRKSRC= ${WRKDIR}/__site .ifndef SITEFRAMEDIR .ifdef APACHE_DATADIR SITEFRAMEDIR= ${APACHE_DATADIR}/siteframe @@ -32,12 +32,12 @@ SUB_FILES= pkg-message SUB_LIST= DIR=${SITEFRAMEDIR} PLIST_SUB= WWWOWN="${WWWOWN}" -do-extract: - @${MKDIR} ${WRKDIR}/${PORTNAME} - @ cd ${WRKDIR}/${PORTNAME}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} ${EXTRACT_AFTER_ARGS} +post-extract: + @${MKDIR} ${WRKSRC} + @(cd ${WRKDIR} && ${MV} [CLRa-z]* _htaccess ${WRKSRC}) do-install: - ${MKDIR} ${STAGEDIR}${SITEFRAMEDIR}/ - ${CP} -R ${WRKDIR}/${PORTNAME}/* ${STAGEDIR}${SITEFRAMEDIR}/ + ${MKDIR} ${STAGEDIR}${SITEFRAMEDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SITEFRAMEDIR}) .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408230137.s7N1bRVv088318>