svn commit: r474094 - head/www/foswiki

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Jul  7 14:30:07 2018
New Revision: 474094
URL: https://svnweb.freebsd.org/changeset/ports/474094

Log:
  - Fix plist
  - Simplify installation, conditions are useless when staging is used
  
  Approved by:	portmgr blanket

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

Modified: head/www/foswiki/Makefile
==============================================================================
--- head/www/foswiki/Makefile	Sat Jul  7 14:29:24 2018	(r474093)
+++ head/www/foswiki/Makefile	Sat Jul  7 14:30:07 2018	(r474094)
@@ -74,17 +74,8 @@ post-patch:
 
 post-install-APACHE-on:
 	@${MKDIR} ${STAGEDIR}${CONFDIR}
-	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
-	  ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
-		${STAGEDIR}${CONFDIR}/foswiki.conf.sample; \
-	else \
-	  ${ECHO_MSG} "" ; \
-	  ${ECHO_MSG} "Please check your Apache installation -" ; \
-	  ${ECHO_MSG} "${CONFDIR} doesn't exist," ; \
-	  ${ECHO_MSG} "so I cannot install foswiki.conf.sample there!" ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
+		${STAGEDIR}${CONFDIR}/foswiki.conf.sample
 
 .include "${.CURDIR}/bsd.foswiki.mk"
 .include <bsd.port.mk>

Modified: head/www/foswiki/pkg-plist
==============================================================================
--- head/www/foswiki/pkg-plist	Sat Jul  7 14:29:24 2018	(r474093)
+++ head/www/foswiki/pkg-plist	Sat Jul  7 14:30:07 2018	(r474094)
@@ -6645,8 +6645,8 @@
 %%WWWDIR%%/templates/viewtopbar.pattern01x01.tmpl
 %%WWWDIR%%/templates/viewtopicactionbuttons.tmpl
 %%WWWDIR%%/templates/workflowedit.natedit.tmpl
-%%APACHE%%%%WWWDIR%%/tools/%%AP_NAME%%.freebsd.etc-defaults
-%%APACHE%%%%WWWDIR%%/tools/%%AP_NAME%%.freebsd.init-script
+%%APACHE%%%%WWWDIR%%/tools/foswiki.freebsd.etc-defaults
+%%APACHE%%%%WWWDIR%%/tools/foswiki.freebsd.init-script
 %%WWWDIR%%/tools/bulk_copy.pl
 %%WWWDIR%%/tools/configure
 %%WWWDIR%%/tools/convertTopicSettings.pl
@@ -6663,7 +6663,7 @@
 %%WWWDIR%%/tools/mod_perl_startup.pl
 %%WWWDIR%%/tools/rewriteshebang.pl
 %%WWWDIR%%/tools/save-pending-checkins
-%%APACHE%%%%WWWDIR%%/tools/systemd/%%AP_NAME%%.service
+%%APACHE%%%%WWWDIR%%/tools/systemd/foswiki.service
 %%WWWDIR%%/tools/tick_foswiki.pl
 %%WWWDIR%%/tools/tml2html.pl
 %%WWWDIR%%/tools/upgrade_emails.pl