Date: Tue, 24 Sep 2013 12:35:36 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328122 - head/www/dojo Message-ID: <201309241235.r8OCZasX068643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Tue Sep 24 12:35:36 2013 New Revision: 328122 URL: http://svnweb.freebsd.org/changeset/ports/328122 Log: www/dojo: allow staging - Allow staging - Use options sub helper - Fix plist with APACHE option Modified: head/www/dojo/Makefile head/www/dojo/pkg-plist Modified: head/www/dojo/Makefile ============================================================================== --- head/www/dojo/Makefile Tue Sep 24 12:26:43 2013 (r328121) +++ head/www/dojo/Makefile Tue Sep 24 12:35:36 2013 (r328122) @@ -14,29 +14,29 @@ SHAREOWN= www SHAREGRP= www OPTIONS_DEFINE= APACHE +OPTIONS_SUB= yes -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes -PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} +PLIST_SUB+= CONFDIR=${CONFDIR_REL} CONF= dojo.conf SUB_FILES+= pkg-message ${CONF} -.else -PLIST_SUB+= NOAPACHE="@comment " .endif do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} .if ${PORT_OPTIONS:MAPACHE} -post-install: - @if [ -d "${CONFDIR}" ]; then \ - ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/dojo.conf; \ +. if empty(STAGEDIR) + @${MKDIR} ${STAGEDIR}${CONFDIR} +. endif + @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \ + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/dojo.conf; \ else \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \ @@ -45,7 +45,6 @@ post-install: ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi - @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.mk> Modified: head/www/dojo/pkg-plist ============================================================================== --- head/www/dojo/pkg-plist Tue Sep 24 12:26:43 2013 (r328121) +++ head/www/dojo/pkg-plist Tue Sep 24 12:35:36 2013 (r328122) @@ -1,3 +1,4 @@ +%%APACHE%%%%APACHEETCDIR%%/dojo.conf %%WWWDIR%%/build-report.txt %%WWWDIR%%/dijit/BackgroundIframe.js %%WWWDIR%%/dijit/BackgroundIframe.js.uncompressed.js
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309241235.r8OCZasX068643>