From owner-svn-ports-all@freebsd.org Sat Jul 7 14:30:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9AB3A1025FB5; Sat, 7 Jul 2018 14:30:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6DF79BE4; Sat, 7 Jul 2018 14:30:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FD411890F; Sat, 7 Jul 2018 14:30:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w67EU83V057955; Sat, 7 Jul 2018 14:30:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w67EU7gS057953; Sat, 7 Jul 2018 14:30:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201807071430.w67EU7gS057953@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 7 Jul 2018 14:30:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474094 - head/www/foswiki X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/www/foswiki X-SVN-Commit-Revision: 474094 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jul 2018 14:30:08 -0000 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 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