svn commit: r328127 - head/www/dojo

[William Grzybowski]

Author: wg
Date: Tue Sep 24 13:17:00 2013
New Revision: 328127
URL: http://svnweb.freebsd.org/changeset/ports/328127

Log:
  www/dojo: fix plist
  
  - Fix plist for APACHE option
  - Make CONFDIR

Modified:
  head/www/dojo/Makefile
  head/www/dojo/pkg-plist

Modified: head/www/dojo/Makefile
==============================================================================
--- head/www/dojo/Makefile	Tue Sep 24 13:03:52 2013	(r328126)
+++ head/www/dojo/Makefile	Tue Sep 24 13:17:00 2013	(r328127)
@@ -32,19 +32,8 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .if ${PORT_OPTIONS:MAPACHE}
-. 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 -" ; \
-	  ${ECHO_MSG} "${CONFDIR} doesn't exist," ; \
-	  ${ECHO_MSG} "so I cannot install ${CONF} there!" ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
+	${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/dojo.conf
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/dojo/pkg-plist
==============================================================================
--- head/www/dojo/pkg-plist	Tue Sep 24 13:03:52 2013	(r328126)
+++ head/www/dojo/pkg-plist	Tue Sep 24 13:17:00 2013	(r328127)
@@ -1,4 +1,4 @@
-%%APACHE%%%%APACHEETCDIR%%/dojo.conf
+%%APACHE%%%%CONFDIR%%/dojo.conf
 %%WWWDIR%%/build-report.txt
 %%WWWDIR%%/dijit/BackgroundIframe.js
 %%WWWDIR%%/dijit/BackgroundIframe.js.uncompressed.js