diff options
| author | wg <wg@FreeBSD.org> | 2013-09-24 20:35:36 +0800 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2013-09-24 20:35:36 +0800 |
| commit | f6e55d514ce3671542889574c651e1a20aa6bb68 (patch) | |
| tree | 3307facda99174552491adb1abd96f33652b7770 | |
| parent | 8d510e9cb6462d57107aa2217b989824c207f360 (diff) | |
| download | freebsd-ports-gnome-f6e55d514ce3671542889574c651e1a20aa6bb68.tar.gz freebsd-ports-gnome-f6e55d514ce3671542889574c651e1a20aa6bb68.tar.zst freebsd-ports-gnome-f6e55d514ce3671542889574c651e1a20aa6bb68.zip | |
www/dojo: allow staging
- Allow staging
- Use options sub helper
- Fix plist with APACHE option
| -rw-r--r-- | www/dojo/Makefile | 17 | ||||
| -rw-r--r-- | www/dojo/pkg-plist | 1 |
2 files changed, 9 insertions, 9 deletions
diff --git a/www/dojo/Makefile b/www/dojo/Makefile index 2142e1d4580e..1ee9f6c01874 100644 --- a/www/dojo/Makefile +++ b/www/dojo/Makefile @@ -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> diff --git a/www/dojo/pkg-plist b/www/dojo/pkg-plist index 16aaff1e95be..a59ecd35b2ea 100644 --- a/www/dojo/pkg-plist +++ b/www/dojo/pkg-plist @@ -1,3 +1,4 @@ +%%APACHE%%%%APACHEETCDIR%%/dojo.conf %%WWWDIR%%/build-report.txt %%WWWDIR%%/dijit/BackgroundIframe.js %%WWWDIR%%/dijit/BackgroundIframe.js.uncompressed.js |