diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2018-07-07 22:30:07 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2018-07-07 22:30:07 +0800 |
| commit | 66dad107968b2433973e2e5b7a088437f4d57fd1 (patch) | |
| tree | 688a3ce8b76cf62e508db8fbc8420426d3a4af6f | |
| parent | 5fe45b8e993d3b8aabd8a6f71ef32bd94a5fd1f0 (diff) | |
| download | freebsd-ports-gnome-66dad107968b2433973e2e5b7a088437f4d57fd1.tar.gz freebsd-ports-gnome-66dad107968b2433973e2e5b7a088437f4d57fd1.tar.zst freebsd-ports-gnome-66dad107968b2433973e2e5b7a088437f4d57fd1.zip | |
- Fix plist
- Simplify installation, conditions are useless when staging is used
Approved by: portmgr blanket
| -rw-r--r-- | www/foswiki/Makefile | 13 | ||||
| -rw-r--r-- | www/foswiki/pkg-plist | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile index 2da8d86d5453..37bd73be1a9a 100644 --- a/www/foswiki/Makefile +++ b/www/foswiki/Makefile @@ -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> diff --git a/www/foswiki/pkg-plist b/www/foswiki/pkg-plist index 105ebe368f43..be633260dd80 100644 --- a/www/foswiki/pkg-plist +++ b/www/foswiki/pkg-plist @@ -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 |